[1.37.14]

language updates: fr


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

dictsource/dict_phonemes

 
 @    @-   @2   a    A    a2   A~   e    
 E    E~   i    i:   o    O    o2   O2   
-O~   u    u:   W    W2   w^i  W~   y    
-Y    
+O~   u    u:   W    W2   w^a  w^i  W~   
+y    Y    
 
 :    ;    b    c    d    dZ   f    g    
 h    j    k    l    m    n    N    n2   

dictsource/en_list

 however           $2
 howto            haUtu:
 hubris           hu:brIs
+humane            $2
 hunger           hVng3
 hurrah           hVr'A:
 hurray           hVr'eI
 piano            pI2anoU
 piecemeal        p'i:sm,i:l
 pier             pi@3
-pigeon           pIdZ@n
 pigsty           pIgstaI
 pilot            paIl@t
 pineapple        p'aInap@L
 Mavis		meIvIs
 Melissa		$2
 Michael		maIk@L
+Michele		mI2SEl
 Michelle	mI2SEl
 Miguel		mi:Q'El
 Mohammad	moUh'amId

dictsource/en_rules

             if (icAnC    'If
          r) i (fl        aI
         st) i (fl        aI
+            igeo         IdZ@
+
          n) ihi          aI|@
             ii (_        IaI
          f) i (j         i:

dictsource/fr_list

 
 // 2006-11-18  Gilles Casse  <[email protected]>
 //
-// Updated 2008-08-17 Michel Such  <[email protected]>
+// Updated 2008-08-20 Michel Such  <[email protected]>
 //
 //	* Numbers, a few abbreviations and exceptions.
 //
 _0	zeRo
 _1	W~
 _2	dYz2
-_3	tRwa2z2
+_3	tRw^az2
 _4	katR
 _5	sE~k
 _6	siz3
 _20	vE~
 _21	vE~te:W~
 _22	vE~tdYz2
-_23	vE~t:tRwa2z2
+_23	vE~t:tRw^az2
 _24	vE~tkatR
 _25	vE~tsE~k
 _26	vE~tsiz3
 _41	kaRA~te:W~
 _5X	sE~kA~t
 _51	sE~kA~te:W~
-_6X	swa2sA~t
-_61	swa2sA~te:W~
-_7X	swa2sA~t:diz3
-_71	swa2sA~te:O~z
-_72	swa2sA~t:duz
-_73	swa2sA~t:tREz
-_74	swa2sA~t:katORz
-_75	swa2sA~t:kE~z
-_76	swa2sA~t:sEz
-_77	swa2sA~t:dis:Et
-_78	swa2sA~t:diz'w^it3
-_79	swa2sA~t:diznWf
+_6X	sw^asA~t
+_61	sw^asA~te:W~
+_7X	sw^asA~t:diz3
+_71	sw^asA~te:O~z
+_72	sw^asA~t:duz
+_73	sw^asA~t:tREz
+_74	sw^asA~t:katORz
+_75	sw^asA~t:kE~z
+_76	sw^asA~t:sEz
+_77	sw^asA~t:dis:Et
+_78	sw^asA~t:diz'w^it3
+_79	sw^asA~t:diznWf
 _8X	katR@vE~
 _80	katR@vE~z2
 _9X	katR@vE~diz3
 ?2 _7X	sEptA~t
 ?2 _71	sEptA~te:W~
 ?2 _72	sEptA~t:dYz2
-?2 _73	sEptA~t:trwa2z2
+?2 _73	sEptA~t:trw^az2
 ?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 _93	no2nA~t:trw^az2
 ?2 _94	no2nA~t:katr
 ?2 _95	no2nA~t:sE~k
 ?2 _96	no2nA~t:siz3
 (31 ème)	trA~te:yniEm
 (41 ème)	karA~te:yniEm
 (51 ème)	sE~kA~te:yniEm
-(61 ème)	swa2sA~te:yniEm
+(61 ème)	sw^asA~te:yniEm
 (81 ème)	katr@vE~:yniEm
 
 // ABBREVIATIONS
 ibm		$abbrev
 ide		$abbrev
 ip		$abbrev
-jaws		Z'owz
+jaws		Z'o2wz
 kde		$abbrev
 kg		kilogram
 khz		kiloErts
 m.		m@sjY
 mbrola		Em'bRola
 mhz		megaErts
-mlle		mad@mwa2zEl
+mlle		mad@mw^azEl
 mme		madam
 mr		m@sjY
 nsi             $abbrev
 toutefois  $brk
 avant $u+ $brk
 après  $u+ $brk
+(temps en temps)	tA~zA~tA~
 alors	alOr $u+
 depuis $u+
 ainsi $u+
 entre	$u+
 entre	$verb
 contre	$u+
+chaque	$u+
 plusieurs $u+
 durant	$u+
 avec	$u+
 
 // auxillary verbs  (be, have, can, etc)
 suis		 $u+ $verb
-es		Ez2  $u+ $verb
+es		Ez2  $u+
 est	Et2 $u+
 sommes	$u+ $verb
 êtes	$u+ $verb
 ai	$u	$verb
 as	as
 as	az2	$u+	$verb
+(as tu)	aty
 a	$u+	$verb
 ont	$u+	$verb
 
 hot		_^_en
 in		_^_en
 inside		_^_en
-(internet explorer) E~tErn'Et||EksplOr'Wr
+(internet explorer) E~tErn'Et||Eksplo2r'Wr
 klaxon          klaksOn
 let 		_^_en
 lite 		_^_en
 my		_^_en
 not		_^_en
 null	_^_en
-ok         oke
-open            Op'Wn
+ok         o2ke
+open            o2p'Wn
 outlook         autlu:k
 paint    		_^_en
 paper    		_^_en
 débutions	debytjO~z2
 désertions	dezERtjO~z2 $verb
 détentions	detA~tjO~z2
-exploitions	Eksplwa2tjO~z2
+exploitions	Eksplw^atjO~z2
 exportions	EkspORtjO~z2
 heurtions	hWRtjO~z2
 limitions	limitjO~z2

dictsource/fr_rules

 
 // 2006-11-18  Gilles Casse  <[email protected]>
 //
-// Updated: 2008-08-17 Michel Such  <[email protected]>
+// Updated: 2008-08-20 Michel Such  <[email protected]>
 //
 
 // Letter classes:
 		cient (_    sit2		// ils appr�ient, remercient.
 	effi)	cien (t    sjA~	// coefficient
 	défi)	cien (t    sjA~	// déficient
+		cast (_S4      kast		// podcast
+		casts (_S5      kast		// podcasts
 
 // group c: English section
-		cast (_      _^_en		// broadcast
 	n)	ch (_      _^_en		// french
 		cut (_      _^_en		// cut, shortcut
 
 		eu (x_       Y
 		eu (i       W
 		eu (rC       W2
+	_l)	eu (r_       W2
 		eu (tr       Y
 
 	_)	eut (_       yt2
 
 		e (x        E		// exact
 		ey (_       E		// dahomey
-		ey (C       e		// ceylan
+		ey (C       E		// ceylan
 		ey          Ej		// asseye
 
 		ez (_       ez2		// nez mangez chez
 .group i
 		i           i		// cri
 
-		i (A    i		// rien
+		i (A    i
+		i (o    j
+		i (è    j
+		i (eu    j
 	_f)	i (a    i:
 	l)	i (a    i:
 	Cr)	i (a    i:
 	_Cr)	i (A    i:
 	Cr)	i (é    i:
 	Cr)	i (er_    i:
-	dr)	iver    ajvWr
-		i (euK    j
-		i (o    j
+	dr)	iver    a2jvWr
 	C)	ien (t_       i
 	dév)	ien (t_       i
-	t)	ient (_      jE~t2		// tient
-	v)	ient (_      jE~t2		// vient
+	t)	ien (K_      jE~		// tient
+	v)	ien (K_      jE~		// vient
 	at)	ien (t_      jA~		// patient
 	cip)	ien (C     jA~		// récipient
-	cl)	ien (C     iA~		// client
-	mol)	ien (C     iA~		// émolient
+	cl)	ien (C     i:A~		// client
+	mol)	ien (C     jA~		// émolient
 	vén)	ien (C     jA~		// inconvénient
 	or)	ien (t      jA~		// orient, orienter
 	ot)	ien (t_      jA~		// quotient
 	br) 	oc (_       o		// broc
 	cr) 	oc (_       o		// escroc
 	 	o (ckK       O2
+	 	o (CerA       O2
 	 	o (lC       O2
+	 	om (merA       O2
 	 	on (n       O
 	 	on (nerA       O2
 	 	o (rC       O2
 	 	o (Ceau       o2
 	 	o (Co_       o2
 	 	o (Cos_       o2
+	C) 	o (d_       O2
 
-		oe (ll      wa2		// moelleux
+		oe (ll      w^a		// moelleux
 	_)	oe (C       Y		// oesophage
 	_ph)	oe (C       e		// phoetus
 		oeu       W		// soeur coeur
 	_) 	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
+	_)	oi          w^a		// oiseau
+		oi          w^a		// poil
+		oê (l       w^a		// poêle
+		oî          w^a		// boîte
 		om (C       O~		// bombe
 		om (m       O		// nommer
 	_)	om (n       O2m		// omnibus
 		ou          u		// hibou brouillard
 		où          u		// où
 		oû          u		// coûter
-		oyes (_     wa2		// troyes
-		oy (A       wa2j		// noyer voyelles
-		oy          wa2		// roy
+		oyes (_     w^a		// troyes
+		oy (A       w^aj		// noyer voyelles
+		oy          w^a		// roy
 		o (_        o		// zorro allégro
 		o (z_       o		// berlioz
 		o           O
 	A) 	s (ol_        s		// tournesol
 	_anti) 	s (A        s		// antisocial
 	_)	socio (@P5       sosio
-	_)	super (@P5       sypEr
+	_)	super (@@P5       sypEr
 	_)	super (_       sypEr
 	_)	supra (@P5       sypra
 
 .group u
 		u           y	// cruel nuage brut
 		ui          w^i	// nuit, fuite
+		uin (K         yE~	// juin
 		uy (A         w^ij
 
 	_b)	usi       _^_en  // business, businessman

dictsource/pt_list

 ?2   _'	ap'OstR,ofU
 _(	,abRipa*'eINtezy
 _)	f,ES&pa*'eINtezy
-_*	,aste*'iskU
+_*	&ste*'iskU
 _+	m'aIs#
 
 _,	v'irgul&

dictsource/pt_rules

           . (.       _:
       \.) .
 
-          *          aste*r'isku
+          *          &ste*'iskU
       *)  * (*
           ** 
      **)  * (_       _::

espeak-data/voices/fr-be

+language fr-be
+name french (Belgium)
+gender male
+
+dictrules 2
+intonation 2
+

phsource/compile_report

       eo  13  110
      jbo   4  111
       fi  40  129
-      fr  53  132
-   fr_ca  11  132
+      fr  54  133
+   fr_ca  11  133
       hi  51  135
       ta  17  138
       hu  23  114
                 [y] pt
                 [i/] pt
 vowel/ii_en     [i] en
+vowel/ii_final  [i] en_us
 vowel/@_low     [3] en_rp
                 [@] en_rp
                 [@2] en_rp
                 [u] tr
 vowel/u#_2      [u-] ta
                 [u-] sv
+vowel/u_3       [u] fr
+                [u:] fr
 vowel/u#_3      [U] ta
                 [U:] ta
 vowel/u#_4      [U] en_sc
                 [u] rw
                 [u#] rw
                 [u] ko
-vowel/u_bck2    [u] fr
-                [u:] fr
-                [u:] la
+vowel/u_bck2    [u:] la
 vowel/u_fnt     [u:] en_rp
 vowel/uu        [U] en
                 [U] en_wm
                 [u:] en_n
                 [u:] en_rp
 vwl_en_us/3_us  [3] en_us
-                [3:] en_us
+vwl_en_us/3_us2  [3:] en_us
 vwl_en_us/a     [a] en_us
                 [aa] en_us
 vwl_en_us/ai@   [aI@] en_us
                 [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
                 [o@] en_us
                 [O:] en_sc
 vwl_en_us/ur    [U@] en_us
-vwl_fr/@R       [R] fr
+vwl_fr/@R       [x] pt_pt
+vwl_fr/@R2      [R] fr_ca
+vwl_fr/@R3      [R] fr
                 [r] fr
                 [r2] fr
-                [x] pt_pt
-vwl_fr/@R2      [R] fr_ca
+vwl_fr/w_a      [w^a] fr
 vwl_hi/A        [a:] hi
 vwl_hi/l-voc    [l-] jbo
                 [l-] hi

phsource/ph_english_us

 phoneme i   //  optional variant of [I] for end of words
   vowel  starttype (i)  endtype (i)
   length 180
-//  formants vowel/ii_3
-  formants vwl_en_us/ii_3
-//  formants vowel/i#
+  formants vowel/ii_final
   linkout ;
 endphoneme
 
 phoneme 3:
   vowel  starttype (@)  endtype (@)
   length 240
-  formants vwl_en_us/3_us
+  formants vwl_en_us/3_us2
   linkout r-
 endphoneme
 

phsource/ph_french

 endphoneme
 
 
-phoneme i: // Slitely longer than i
+phoneme i: // longer than i
   vowel  starttype (i)  endtype (i)
-  length 212
+  length 240
   formants vowel/i_3
   linkout ;
 endphoneme
 phoneme u
   vowel starttype (u) endtype (u)
   length 180
-  formants vowel/u_bck2
+  formants vowel/u_3
 endphoneme
 
 
 phoneme u: // slitely longer than u
   vowel starttype (u) endtype (u)
   length 220
-  formants vowel/u_bck2
+  formants vowel/u_3
 endphoneme
 
 
 endphoneme
 
 
+phoneme w^a
+  vowel starttype (o) endtype (a)
+  length 220
+  formants vwl_fr/w_a
+endphoneme
+
+
 phoneme w^i
   vowel starttype (u) endtype (i)
   length 220
 
 phoneme A~
   vowel  starttype (a) endtype (a)
-  length 200
+  length 210
   formants vnasal/aa_n2
 endphoneme
 
 
 phoneme O~
   vowel  starttype (o)  endtype (o)
-  length 200
+  length 220
   formants vnasal/o_n3
   before n2 vowel/o_mid
 endphoneme
   length 100
   lengthmod 3
   beforenotvowel r/
-  formants vwl_fr/@R+r3/rx%25
+  formants vwl_fr/@R3+r3/rx%25
   after t r/tr
   after k r/tr
   after p r/tr
   length 100
   lengthmod 3
   beforenotvowel NULL
-  formants vwl_fr/@R+r3/rx%25
+  formants vwl_fr/@R3+r3/rx%25
   before _ r/r
 endphoneme
 
   length 100
   lengthmod 3
   beforenotvowel r/
-  formants vwl_fr/@R+r3/rx%25
+  formants vwl_fr/@R3+r3/rx%25
 //  after r  r/rr
 endphoneme
 

src/numbers.cpp

 					decimal_count--;
 					n_digits++;
 				}
-				if(decimal_count <= max_decimal_count)
+				if((decimal_count <= max_decimal_count) && isdigit(word[n_digits]))
 				{
 					LookupNum3(atoi(&word[n_digits]),buf1,0,0,0);
 					strcat(ph_out,buf1);

src/synthdata.cpp

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

src/tr_languages.cpp

 
 	case L('f','r'):  // french
 		{
-			static const short stress_lengths_fr[8] = {190, 170,  190, 200,  0, 0,  235, 235};
-			static const unsigned char stress_amps_fr[8] = {18,16, 20,20, 20,22, 22,22 };
+			static const short stress_lengths_fr[8] = {190, 170,  190, 200,  0, 0,  235, 240};
+			static const unsigned char stress_amps_fr[8] = {18,16, 20,20, 20,22, 22,21 };
 
 			tr = new Translator();
 			SetupTranslator(tr,stress_lengths_fr,stress_amps_fr);