[1.37.13]

Changes to: en-r, fr, pt


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@185 d46cf337-b52f-0410-862d-fd96e6ae7743

dictsource/cy_list

 
 
 // pronouns
-i         %I
-ti        %ti:
-e         %E
-hi        %hi:
-ni        %ni:
-chi       %xi:
-nhw       %nhu:
+i         I	$u+
+ti        ti:	$u+
+e         E	$u+
+hi        hi:	$u+
+ni        ni:	$u+
+chi       xi:	$u+
+nhw       nhu:	$u+
 
 hon       $u+       // this one (f)
 honna     $u+       // that one (f)

dictsource/dict_phonemes

 
 Dictionary fr_dict
 
-@    @-   a    A    a2   A~   e    E    
-E~   i    i:   o    O    o2   O2   O~   
-u    u:   W    W2   w^i  W~   y    Y    
+@    @-   @2   a    A    a2   A~   e    
+E    E~   i    i:   o    O    o2   O2   
+O~   u    u:   W    W2   w^i  W~   y    
+Y    
 
 :    ;    b    c    d    dZ   f    g    
 h    j    k    l    m    n    N    n2   
 n^   p    p2   r    R    r2   s    S    
-t    t2   tS   v    w    z    Z    z2   
-z3   
+t    t2   t3   tS   v    w    z    Z    
+z2   z3   
 
 
 Dictionary hi_dict

dictsource/en_list

 geni             dZi:nI2
 genome           dZi:noUm
 genre            Z0nr@
-genuine          dZEnju:In
+?!3 genuine      dZEnju:In
 geyser           gi:z3
 gibbon           gIb@n
 gig              gIg

dictsource/en_rules

          _) conse (q     k0nsI
             conser (v    k%0ns3:
             conser (vatio k0ns@
-            consider    k%0nsId@
+            consider     k%0nsId3
             co (nson     k0
          _) co (nstabl   k0
             co (nstan    k0
          c) ire (n       aIr@
             ir (ect      %aIr
             ir (ety      aIr
-            irer (_      aI@r@
+            irer (_      aI@r3
             ir           3:
 ?5          ir           IR
         @C) ir (_        i@3
          w) or (th       3:
 ?5       w) or (th       VR
         sw) or           o@
-         &) or (ous      @
+         &) or (ous      3r
             orough       Vr@
        eff) or (t        3
          f) orte (_      'o@teI

dictsource/fr_list

 
+// ***************************************************************************
+// *   Copyright (C) 2005 to 2007 by Jonathan Duddington                     *
+// *   email: [email protected]                                    *
+// *                                                                         *
+// *   This program is free software; you can redistribute it and/or modify  *
+// *   it under the terms of the GNU General Public License as published by  *
+// *   the Free Software Foundation; either version 3 of the License, or     *
+// *   (at your option) any later version.                                   *
+// *                                                                         *
+// *   This program is distributed in the hope that it will be useful,       *
+// *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+// *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+// *   GNU General Public License for more details.                          *
+// *                                                                         *
+// *   You should have received a copy of the GNU General Public License     *
+// *   along with this program; if not, see:                                 *
+// *               <http://www.gnu.org/licenses/>.                           *
+
 // This file in UTF8 encoded
 
+// Conditional rules
+// ?2  Special numbering for Belgium and Switzerland
+
 // 2006-11-18  Gilles Casse  <[email protected]>
 //
-// Updated 2008-08-12 Michel Such  <[email protected]>
+// Updated 2008-08-17 Michel Such  <[email protected]>
 //
 //	* Numbers, a few abbreviations and exceptions.
 //
 _*   astERisk:
 _,   viRgyl
 _-   tiRE
-_.   _pw%E~
+_.   _|pw%E~
 _/   slaS
 _:   d'Ypw'E~
 _;   pwE~viRg'yl
 _5	sE~k
 _6	siz3
 _7	sEt
-_8	_|w^it
+_8	_|w^it3
 _9	nWf
 _10	diz3
 _11	_!O~z
 _15	kE~z
 _16	sEz
 _17	dis:Et
-_18	dizw^it
+_18	dizw^it3
 _19	diznWf
 _20	vE~
 _21	vE~te:W~
 _25	vE~tsE~k
 _26	vE~tsiz3
 _27	vE~tsEt
-_28	vE~tw^it
+_28	vE~tw^it3
 _29	vE~tnWf
 _3X	tRA~t
 _31	tRA~te:W~
 _75	swa2sA~t:kE~z
 _76	swa2sA~t:sEz
 _77	swa2sA~t:dis:Et
-_78	swa2sA~t:diz'w^it
+_78	swa2sA~t:diz'w^it3
 _79	swa2sA~t:diznWf
 _8X	katR@vE~
 _80	katR@vE~z2
 _95	katR@vE~:kE~z
 _96	katR@vE~:sEz
 _97	katR@vE~:dis:Et
-_98	katR@vE~:dizw^it
+_98	katR@vE~:dizw^it3
 _99	katR@vE~:diznWf
 _0C	sA~
 _1C0	sA~t2
 _0and	e
 _dpt	virgyl
 
+//some numbers have special pronunciation in Belgium and Switzerland
+?2 _7X	sEptA~t
+?2 _71	sEptA~te:W~
+?2 _72	sEptA~t:dYz2
+?2 _73	sEptA~t:trwa2z2
+?2 _74	sEptA~t:katr
+?2 _75	sEptA~t:sE~k
+?2 _76	sEptA~t:siz3
+?2 _77	sEptA~t:sEt
+?2 _78	sEptA~t:w^it3
+?2 _79	sEptA~t:nWf
+?2 _8X	o2ktA~t
+?2 _80	o2ktA~t
+?2 _81	o2ktA~te:W~
+?2 _9X	no2nA~t
+?2 _91	no2nA~te:W~
+?2 _92	no2nA~t:dYz2
+?2 _93	no2nA~t:trwa2z2
+?2 _94	no2nA~t:katr
+?2 _95	no2nA~t:sE~k
+?2 _96	no2nA~t:siz3
+?2 _97	no2nA~t:sEt
+?2 _98	no2nA~t:w^it3
+?2 _99	no2nA~t:nWf
+
 (21 ème)	vE~te:yniEm
 (31 ème)	trA~te:yniEm
 (41 ème)	karA~te:yniEm
 cio		$abbrev
 ctrl		kO~tRol $pause
 dept		depaRt@mA~
+edf		$abbrev
 etc		etseteRa
 ghz		ZigaErts
 hmm		h@m
 et	e $u $brk
 ni	$u $brk
 car	$u+ $brk
+car	$noun
 cependant  $brk
 néanmoins  $brk
 toutefois  $brk
 aussi $u+
 
 
+certes	$u+
 dont	   dO~t2 $u
 lorsque	   $u
 puisque	   $u
 voilà	$u+
 cette	$u $nounf
 ces	sez2 $u $nounf
-ceci	$u+ $verbf
-cela	$u+ $verbf
 (celle ci)	sEl||si $verbf
 (celle là)	sEl||la $verbf
 (ceux ci)	sY||si $verbf
 tes	tez2 $u $nounf
 sa	$u $nounf
 son	$u+ $nounf
+son	sO~ $noun
 ses	sez2 $u $nounf
 notre	$u $nounf
 votre	$u $nounf
 autre	$u+
 autres	$u+
 dans	$u+
+vers	vEr $u+
+vers	$noun
 en	$u+
 en	$u+ $verb $verbextend
 (en suspens) A~||sysp'A~
 tandis	$u+
 dès	$u
 entre	$u+
+entre	$verb
 contre	$u+
 plusieurs $u+
 durant	$u+
 trop	$u+
 assez	$u+
 beaucoup	$u+
+peu	$u+
+peu	$noun
 très	$u
 
 // negative
 ne	$u $verbf
 pas	$u+
+pas	$noun
 plus	$u+
+plus	$noun
 guère	$u+
 jamais $u+
+non	nO~ $u+
+oui	$u+
 
 // questions
 quand	   kA~t2 $u+
 quoi	   $u+
 où	$brk $u+
+comme	kO2m	$u+
 comment	$u+
 pourquoi	$u+
 pourtant	$u+
 ô	$atend $accent
 
 
-
-
 // pronunciation exceptions
 
 consent          kO~s'A~t2
 phallus    falys
 polder    pOldEr
 premier    pr@mier2
+scanner	skaner2
+scanner	skanWr $noun
 souris       suri
 sus       sys
 sus       sy $verb

dictsource/fr_rules

 
 // 2006-11-18  Gilles Casse  <[email protected]>
 //
-// Updated: 2008-08-12 Michel Such  <[email protected]>
+// Updated: 2008-08-17 Michel Such  <[email protected]>
 //
 
 // Letter classes:
 	s)	aou (le          u		// saoule
 		août         ut		// août
 		août (i        aus		// aoûtien
+		aut (_          ot2
 		au          o		// autruche
 		au (l_      O		// Paul
 		au (re      O		// dinosaure
 	elqu)	e    	  =@-
 	uisqu)	e    =@
 	rsqu)	e   	  =@
-	_C) 	e (_        @		// je te
+	_C) 	e (_        @2		// je te
 	-c) 	e (_       @-
 	-j) 	e (_       @-
 	C) 	e (-       @-
 		el (K       El		// celsius, caramel
 	_f)	em (me      a		// femme
 	i)	e (mA     		// remerciement, d‚ploiement
-	i)	e (rA     		// remerciera
+	A)	e (rA     		// remerciera
+	gu)	e (rA     	@-
+	qu)	e (rA     	@-
 	@)	em (me      a		// patiemment
 		em (b       A~		// décembre
 		em (mACC       A~		// emmancher
  		e (Cr       @
  _)		e (ff       e  		// effet, effectuer
  		e (C_       E
- 		e (t_       Et2
+ 		e (t_       E
  		e (rC       E
  		es (_       z2
 
 	Cr)	i (é    i:
 	Cr)	i (er_    i:
 	dr)	iver    ajvWr
-		i (eur    j
+		i (euK    j
 		i (o    j
 	C)	ien (t_       i
 	dév)	ien (t_       i
 .group j
 		j           Z		// adjoint joujoux
 	_) 	j' (P2v      Z
+	_) 	j (obK      dZ
+	_) 	j (ohK      dZ
 	_) 	jusqu' (P6      Zysk
 
 
 	_)	l' (P2      l
 	au)	lt			// hérault
 	uCi)	l (_ 			// outil, fusil
+	nti)	l (_ 			// gentil
 	ui)	ll          j		// juillet
 	_)	lorsqu' (P7          lO2rsk
 
 		mm          m		// pomme
 	_)	m' (P2v      m
 	_)	ms (P2      Em_!Es
+		master (_S6      mastWr
 
 // group m: English section
 	_)	mail (_       _^_en  // mailer
 	X) 	o (se_       o2
 	X) 	o (ses_       o2
 	 	o (CCement_       O2
+	 	o (Che@       O2
 	 	o (Cement_       O2
 	 	o (t_       o
 	 	o (tre_       O2
 		oeu       W		// soeur coeur
 		oeufs       @		// oeufs boeufs
 		o (eC       o		// coefficient
+		 _l)	o (gi		o2
+		 _p)	o (ten		o2
+		 _pr)	o (gra		o2
+		 _C)	o (teri		O2
 	_) 	oi (gnon    o		// oignons
 		oin (C      wE~
 		oin (_      wE~		// coin
+	_)	oi          o2a		// oiseau
 		oi          wa2		// poil
 		oê (l       wa2		// poêle
 		oî          wa2		// boîte
 		om (_       Om          //  www.web.com
 		on (K       O~		// mon
 		on (t_       O~t2		// mont vont sont
+	_m)	ont (CAC       O~		// montpellier
 		onsh (A     O~z		// bonshommes
 		onh (A      On		// bonhomme
 	_)		on	(z	_!O~		// onze, onziŠme
 
 	alc)	oo (l       O		// alcool
 	z) 	oo          o		// zoo
-	z)	oo (C       oo		// zoologue
+	z)	oo (C       o2o		// zoologue
 	z)	oo (m       u		// zoom
 	_gal)	op (_       o		// galop
 
 	_)	para (CCP4       para
 	_)	photo (@P5       fo2to
 	_)	poly (@P4       poli
+	_) 	post (KP4       pO2st
+	_) 	post (ACCP4       pO2st
 	_)	pseudo (@P6       psYdo
 		p (p			// appliquer
 		ph          f		// phrase
 	tran) 	s (ub       s		// transubstantiation
 	A) 	s (A        z		// baiser
 	A) 	s (oft        s		// microsoft
+	A) 	s (ol_        s		// tournesol
 	_anti) 	s (A        s		// antisocial
 	_)	socio (@P5       sosio
 	_)	super (@P5       sypEr
 
 	s) 	th (m 		// asthme
 		th          t	// théorie
-	hui)	t (_        t	// huit
+	hui)	t (_        t3	// huit
 
 	_)	t           t   // tien tiers
 	an) 	t (ia       t   // Santiago
+	C) 	t (ieu       s   // contentieux
 
 		t (io_      s 	// ratio
 
 	C)	th (_      _^_en      // month
 	_)	th (eX      _^_en      // the, then
 	_)	th (aX      _^_en      // than, that
-	_)	th (As      _^_en      // these those there
 	_)	time      _^_en
 		tle (_     _^_en
 		too      _^_en
 
 .group u
 		u           y	// cruel nuage brut
+		ui          w^i	// nuit, fuite
+		uy (A         w^ij
 
 	_b)	usi       _^_en  // business, businessman
 	c)	ueill       Wj  // cueillir

dictsource/pt_list

 // Options
 // ?1  European Portuguese
 // ?2  Brazilian Portuguese
+// ?3  Epenthetic [I] between consonants
+// ?4  Brazil mbrola voice
 
 // Note for "pt-pt" [R] is the same sound as [r]
 //      for "pt" [y] is the same sound as [i]
 _1M4	'u~ntrilj'&U~
 _0and	_i
 _dpt    _v'irgul&
-_0Z2	seNt'Ezim&     // 100ths
-_0Z3	mil'Ezim&      // 1000ths
+// _0Z2	seNt'Ezim&     // 100ths
+// _0Z3	mil'Ezim&      // 1000ths
 
 // not roman numbers
 vi	vi
 ?2	neste	$u+	$nounf	n'estSi      //in this
 ?2	nestes	$u+	n'estSis      //in these
 ?2	esse	$u+	$nounf	'esi       // that
-essa	'Es& $brk  $u+	$nounf
-desse	d'esy	$u+	$nounf
-nesse	n'esy	$u+	$nounf
+essa	'Es& $brk  $u+
+desse	d'esy	$u+
+nesse	n'esy	$u+
 aquele	&k'ely	$u+	$nounf       // that
-aquela	$u+	$nounf
+aquela	$u+
 daquele	d&k'ely	$u+	$nounf
 
 ?1	que	ky	$u 
 
 // possessive adjectives
 meu	$u+	$nounf
-minha	$u+	$nounf
+minha	$u+
 meus	$u+
 minhas	$u+
 teu	$u+	$nounf
-tua	$u+	$nounf
+tua	$u+
 teus	$u+
 tuas	$u+
 seu	$u+	$nounf
-sua	$u+	$nounf
+sua	$u+
 seus	$u+
 suas	$u+
-?2	nosso	$u+	$nounf
-?2	nossa	$u+	$nounf
-?2	nossos	$u+
-?2	nossas	$u+
+?2	nosso	$u+	n'OsU
+?2	nossa	$u+	n'Os&
+?2	nossos	$u+	n'OsUs
+?2	nossas	$u+	n'Os&s
 dele	dely	$u1+
 dela	$u+
 deles	$u+
 
 em	$u $brk  // in,on,at
 no	nu $u $brk	$nounf
-na	$u $brk	$nounf
+na	$u $brk
 ?2	nos	nus# $u $brk
 nas	$u $brk
 num	$u $brk
 governo	gov'ernU	$noun
 olho	'oljU	$noun
 colher	kolj'Er	$noun
-força	f'ors&	$noun
 
 
 // MAIN WORD DICTIONARY
 //*********************
 borboleta        b,orbol'et&
 catorze        k&t'orzy
-forca        f'ork&
 fosse        f'osy
 fossem       f'oseIN
 hoje         'oZi
 líderes        l'ide*ys
+mexa     m'eS&
+mexi        meS'i
+mexo     m'eSU
 mulher       mulj'Er
 mui          mu~j
 muito        m'u~jtu	// -s is included as a suffix
 muita        m'u~jt&
-osso        'osU
+praxedes        pR&S'EdZys
 ?2 rede      x'edZy
 selvagem        seUv'aZeIN
 teta         t'et&
 axé          aSE
 elixir       eliSir
 ?1 fixe       f'iSy
-lixo         l'iSu
 roxo         x'oSU
-
+xiquexique     S,ikeS'iky
 // foreign words
 ?1 alt        'alt
 ?2        agosto        &g'ostU
 ?1 down       d'a,wn
 ?1 download   d'a,wnl'oud
 ?2 download        daUNl'owd
-?2 downloads        daUNl'owds
 ?3 download        dau~Nl'owd
-?3 downloads        dau~Nl'owdIs
 ?1 end        'end
 ?1 escape     Sk'eIpy
+?2 esc     'Esk
+?3 esc     'EskI
 ?1 explorer   ,ekspl'O:*&r-
 ?2        Explorer        ekspl'O*er
 ?1 eyes       'aiz
 ?2        logo        l'OgU
 ?1 lock       l'Ok
    mail       m'eIl
-?3  mail     m'eI@l
         mails        m'eIls
-?3  mails     m'eI@ls
 ?1 maior      m,&j'Or-
 ?2 maior      maI'Or
 ?2        maiores        maI'O*is

dictsource/pt_rules

           à (n       &~
           àm (K      &~m
           àn (K      &~N
-          à (nhA     &~n^
+          ành (A     &~n^
 
 
 .group á
           @@) o (rA_     o
 
           o (p_     O
-          o (ps_     O
 ?1     _) o (C       O     // eg: olá, orla, opção, etc...
 ?1    _C) o (CACAC   u     // Documento, documentação, localizar, etc.
 ?1     f) o (rmat    u     // formatar, formato.
        C) r (A       R        // for "pt-pt" [R] is the same as [r]
        _) r          x
        l) r          x
-       n) r          x
+       n) r (+         x
        s) r          x
 ?1     A) r (_       r-       // [r-] is English linking-r
 
           x (s
           x (_       ks
      ale) x (a       S
+      _fa) x (i     S
+       _li) x (A     S
+       má) x (im     s // máximo, máximas, etc.
+        me) x (A     S
      pro) x (i       s  // aproximado, aproximadamente, aproximar, etc.
      pró) x (i       s  // próximo, etc.
+        pu) x (A     S // verb "puxar" and all its conjugations
+        rela) x (A     S
+      _xi) x (A     S
 ?1     i) x (a_      S
 ?1     i) x (as_     S
 
           . (.       _:
       \.) .
 
-          *          ,aste*'iskU
+          *          aste*r'isku
       *)  * (*
           ** 
      **)  * (_       _::

espeak-data/voices/en/en-r

 language en 3
 gender male
 
-formant 1 99 100 100
-
 phonemes en_us
 dictrules 3 6
 option 12 1       // reduce [t]

phsource/compile_report

       eo  13  110
      jbo   4  111
       fi  40  129
-      fr  51  130
-   fr_ca  11  130
+      fr  53  132
+   fr_ca  11  132
       hi  51  135
       ta  17  138
       hu  23  114
                 [t2] en
                 [t] fr
                 [t2] fr
+                [t3] fr
                 [t.] hi
                 [t.h] hi
                 [t] sk
                 [dZ] hr
 ustop/t_short   [t] fr
                 [t2] fr
+                [t3] fr
                 [t.] hi
                 [t] sk
                 [t] el
                 [U@] en_n
                 [U@] en_wm
                 [u@] vi
+vdiph2/uw       [u:] en_us
+vdiph2/uw_2     [u:] en
+vdiph2/uw_3     [yU] ro
+vdiph2/uw_4     [u:] en_n
+vdiph2/uw_6     [y] ko
 vdiph2/y@       [y@] zh
 vdiph2/y#@      [Y@] af
 vdiph2/yu       [yU] nl
                 [@] en
                 [@2] en
                 [@5] en
-                [@] en_us
                 [3] en_rp
                 [@] en_rp
                 [V] cy
                 [3:] af
 vowel/@_4       [@] nl
                 [@] no
+vowel/@_5       [@] en_us
 vowel/8         [o-] zh
 vowel/8_2       [U] en_us
                 [8] sv
                 [a/] en_sc
                 [A:] en_sc
                 [aa] en_sc
-                [a] fr
                 [a:] cs
                 [a:] la
                 [a] is
                 [a] zhy
 vowel/a_4       [a/] el
                 [a] vi
-vowel/a_5       [a2] fr
+vowel/a_5       [a] fr
+                [a2] fr
                 [a:] ta
                 [a/] it
                 [a] la
 vowel/@_fnt     [@] en_wi
                 [@2] en_wi
                 [@2] hr
+vowel/@_fr      [@2] fr
 vowel/@_hgh     [@] fr
                 [@] hr
 vowel/i         [i] base2
 vowel/i_fnt     [i:] en_wi
                 [i] hi
                 [i:] hi
-vowel/ii        [i] en_us
-                [I] en_rp
+vowel/ii        [I] en_rp
                 [I2] en_rp
                 [I] en_wm
                 [I2] en_wm
                 [u] tr
 vowel/u#_2      [u-] ta
                 [u-] sv
-vowel/u_3       [yU] ro
 vowel/u#_3      [U] ta
                 [U:] ta
-vowel/u_4       [u:] en_n
 vowel/u#_4      [U] en_sc
                 [u:] en_sc
 vowel/u_5       [u] sw
 vowel/u_6       [U] pt_pt
                 [u] pt_pt
                 [u] ku
-vowel/u#_6      [y] ko
 vowel/u_7       [u] vi
 vowel/u#_7      [u#] tr
 vowel/u_bck     [u] base2
 vwl_en_rp/e@    [e@] en_rp
 vwl_en_rp/i@    [i@] en_rp
 vwl_en_rp/oo    [U@] en_rp
-vwl_en/u        [u:] en
 vwl_en/u_L      [u:] en
                 [u:] en_n
                 [u:] en_rp
                 [A@] en_us
 vwl_en_us/ee    [E] en_us
 vwl_en_us/er    [e@] en_us
+vwl_en_us/ii_3  [i] en_us
 vwl_en_us/ir    [i@3] en_us
                 [i@3] en_sc
 vwl_en_us/oor   [O@] en_us
 vwl_en_us/or    [O:] en_us
                 [o@] en_us
                 [O:] en_sc
-vwl_en_us/u     [u:] en_us
 vwl_en_us/ur    [U@] en_us
 vwl_fr/@R       [R] fr
                 [r] fr

phsource/ph_english

 phoneme u:
   vowel  starttype (u)  endtype (u)
   length 210
-  formants vwl_en/u
+  formants vdiph2/uw_2
   before l/2 vwl_en/u_L-40+l/L2_uL
 endphoneme
 

phsource/ph_english_n

 phoneme u:
   vowel  starttype (u)  endtype (u)
   length 200
-  formants vowel/u_4
+  formants vdiph2/uw_4
   before _  vwl_en_n/u_
   before l/2 vwl_en/u_L-40+l/L2_uL
 endphoneme

phsource/ph_english_us

 
 phoneme @    //  Schwa
   vowel   starttype (@)  endtype (@)
-  formants vowel/@
+  formants vowel/@_5
   unstressed
   length 140
 endphoneme
 
 phoneme E
   vowel  starttype (e)  endtype (e)
-  length 185
+  length 190
 //  formants vowel/ee_2
   formants vwl_en_us/ee
   reduceto I  0
 
 phoneme I
   vowel  starttype (i) endtype (i)
-  length 155
+  length 160
   formants vowel/ii_4
   linkout ;
 endphoneme
 phoneme I2
   vowel  starttype (i)  endtype (i)
   unstressed
-  length 155
+  length 160
   formants vowel/ii_4
   linkout ;
 endphoneme
 
 phoneme i   //  optional variant of [I] for end of words
   vowel  starttype (i)  endtype (i)
-  length 190
-  formants vowel/ii
-//  formants vwl_en_us/ii_2
+  length 180
+//  formants vowel/ii_3
+  formants vwl_en_us/ii_3
 //  formants vowel/i#
   linkout ;
 endphoneme
 
 phoneme V
   vowel  starttype (a)  endtype (@)
-  length 160
+  length 170
   formants vowel/V_6
   reduceto @  0
 endphoneme
 
 phoneme U
   vowel  starttype (o)  endtype (o)
-  length 140
+  length 145
   formants vowel/8_2
 endphoneme
 
 phoneme u:
   vowel  starttype (u)  endtype (u)
   length 170
-//  formants vowel/u#_6
-  formants vwl_en_us/u
+  formants vdiph2/uw
 endphoneme
 
 
 
 phoneme oU
   vowel  starttype (@)  endtype (u)
-  length 235
+  length 230
   formants vdiph/8u
 endphoneme
 
 
 phoneme U@
   vowel  starttype (@)  endtype (@)
-  length 230
+  length 240
   formants vwl_en_us/ur
   linkout r-
 endphoneme

phsource/ph_french

 endphoneme
 
 
+phoneme @2
+  vowel starttype (@) endtype (@)
+  length 150
+  formants vowel/@_fr
+endphoneme
+
+
 phoneme a
   vowel  starttype (a)  endtype (a)
   length 170
-  formants vowel/a_3
+  formants vowel/a_5
+  reduceto a2 1
 endphoneme
 
 
 phoneme a2
   vowel  starttype (a)  endtype (a)
-  length 160
+  length 150
   unstressed
   formants vowel/a_5
 endphoneme
 
 phoneme i
   vowel starttype (i) endtype (i)
-  length 160
+  length 150
   formants vowel/i_3
   linkout ;
 endphoneme
 
 
 phoneme w^i
-  vowel starttype (i) endtype (i)
+  vowel starttype (u) endtype (i)
   length 220
   formants vdiph/yi_fr
 endphoneme
   vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 amp=11
   vowelout f1=0  f2=1000 -500 -350  f3=-300 80 brk
   lengthmod 2
-  wave ustop/p%45
+  wave ustop/p%60
   before _ ustop/p_%70
   after _ ustop/p%70
   before (r) ustop/pr%60
   vowelin f1=0  f2=1700 -100 100  f3=-100 80
   vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave  ustop/t_short%30
+  wave  ustop/t_short%50
   before _ ustop/t_%40
-  before (r) ustop/t_short%30
+  before (r) ustop/t_short%50
   switchvoicing d
 endphoneme
 
 endphoneme
 
 
+phoneme t3      // silent unless followed by vowel or pause
+  beforepause t
+  beforenotvowel NULL
+  vls alv stop
+  vowelin f1=0  f2=1600 -300 300  f3=-100 80
+  vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
+  lengthmod 2
+  wave  ustop/t_short%30
+  before _ ustop/t_%40
+endphoneme
+
+
 phoneme v
   vcd lbd frc
   vowelin  f1=0  f2=1000 -300 -200  f3=-300 100 len=0

phsource/ph_korean

 phoneme y
   vowel starttype (i) endtype (u)
   length 180
-  formants vowel/u#_6
+  formants vdiph2/uw_6
 endphoneme
 
 phoneme u-

phsource/ph_romanian

 phoneme yU
   vowel starttype (@) endtype (u)
   length 230
-  formants vowel/u_3
+  formants vdiph2/uw_3
 endphoneme
 
 phoneme ea

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.37.11  07.Aug.08";
+const char *version_string = "1.37.13  18.Aug.08";
 const int version_phdata  = 0x013400;
 
 int option_device_number = -1;

src/tr_languages.cpp

 
 			tr->langopts.stress_rule = 3;        // stress on final syllable
 			tr->langopts.stress_flags =  0x6 | 0x10 | 0x20000; 
-			tr->langopts.numbers = 0x269 + 0x2000 + NUM_ROMAN;
+			tr->langopts.numbers = 0x269 + 0x4000 + NUM_ROMAN;
 			SetLetterVowel(tr,'y');
 			ResetLetterBits(tr,0x2);
 			SetLetterBits(tr,1,"bcdfgjkmnpqstvxz");      // B  hard consonants, excluding h,l,r,w,y