[1.37.11]

Changes to languages: pt, fr


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

dictsource/cs_rules

 // translation rules for Czech
 // This file is UTF-8 encoded
 
+// Letter groups:
+// G   voiced: bdgjlmnrvwzaeiouy
+
 .group a
         a        a
         au       aU

dictsource/dict_phonemes

 Dictionary fr_dict
 
 @    @-   a    A    A~   e    E    E~   
-i    i:   o    O    o-   O2   O~   u    
+i    i:   o    O    O2   O~   u    u:   
 w    W    W2   w^i  W~   y    Y    
 
 :    ;    b    c    d    dZ   f    g    

dictsource/en_list

 bow              baU           $verb 
 breakfast        brEkf@st
 breath           bri:D
-breath           brET          $only
+breath           brET          $onlys
 breath           bri:D         $verb
 breathless       brETl@s
 brethren         brEDr@n
 ?5 colonel       kVRn@L
 combat           k0mbat       // combating
 combo            k0mboU
+comer            kVm3
 comet            k0mIt
 commence         k@mEns
 commend          k@mEnd

dictsource/en_rules

         &x) e's (_$2i    Iz
         &C) e's (_$2i    z
        &Cr) e's (_       @z
-            e (tion      i:
+        @)  e (tio       i:
      discr) e (tion      E
             eu           ju:
          d) eu (ts       OI
          h) ea (ther     E
         th) ea (t        i@
         th) ea (tri      i:a
-         l) ea (th       E
+         l) eath         ED
         br) ea (th       E
         br) ea (the      i:
         cr) ea (t        i:'eI
         @t) ed (_$2vdei   I2d
 ?8      @t) ed (_$2vdei   Ed
        @fr) ed (_$2v      Id
+        yw) ed (_         Ed
         @x) ed (_$2vi     t
          y) ed (_$2v      d
             edly (_      IdlI2

dictsource/fr_list

 
 // 2006-11-18  Gilles Casse  <[email protected]>
 //
-// Updated 2008-07-26 Michel Such  <[email protected]>
+// Updated 2008-08-07 Michel Such  <[email protected]>
 //
 //	* Numbers, a few abbreviations and exceptions.
 //
 o	o
 _ô	$accent
 ö       $accent
+œ	o||@||lie
 p	pe
 q	ky
 r	ER
 _0	zeRo
 _1	W~
 _2	dYz2
-_3	tRo-az2
+_3	tRwaz2
 _4	katR
 _5	sE~k
 _6	siz3
 _20	vE~
 _21	vE~te:W~
 _22	vE~tdYz2
-_23	vE~t:tRo-az2
+_23	vE~t:tRwaz2
 _24	vE~tkatR
 _25	vE~tsE~k
 _26	vE~tsiz3
 _41	kaRA~te:W~
 _5X	sE~kA~t
 _51	sE~kA~te:W~
-_6X	so-asA~t
-_61	so-asA~te:W~
-_7X	so-asA~t:diz3
-_71	so-asA~te:O~z
-_72	so-asA~t:duz
-_73	so-asA~t:tREz
-_74	so-asA~t:katORz
-_75	so-asA~t:kE~z
-_76	so-asA~t:sEz
-_77	so-asA~t:dis:Et
-_78	so-asA~t:diz'w^it
-_79	so-asA~t:diznWf
+_6X	swasA~t
+_61	swasA~te:W~
+_7X	swasA~t:diz3
+_71	swasA~te:O~z
+_72	swasA~t:duz
+_73	swasA~t:tREz
+_74	swasA~t:katORz
+_75	swasA~t:kE~z
+_76	swasA~t:sEz
+_77	swasA~t:dis:Et
+_78	swasA~t:diz'w^it
+_79	swasA~t:diznWf
 _8X	katR@vE~
 _80	katR@vE~z2
 _9X	katR@vE~diz3
 (31 ème)	trA~te:yniEm
 (41 ème)	karA~te:yniEm
 (51 ème)	sE~kA~te:yniEm
-(61 ème)	so-asA~te:yniEm
+(61 ème)	swasA~te:yniEm
 (81 ème)	katr@vE~:yniEm
 
 // ABBREVIATIONS
 ctrl		kO~tRol $pause
 dept		depaRt@mA~
 etc		etseteRa
+ghz		ZigaErts
 hmm		h@m
+hz		_!Erts
 ibm		$abbrev
 ide		$abbrev
 ip		$abbrev
 jaws		Z'owz
 kde		$abbrev
+kg		kilogram
+khz		kiloErts
+km		kilomEtr
+kw		kilowat
 m.		m@sjY
 mbrola		Em'bRola
-mlle		mad@mo-azEl
+mhz		megaErts
+mlle		mad@mwazEl
 mme		madam
 mr		m@sjY
 nsi             $abbrev
 avant $u+ $brk
 après  $u+ $brk
 alors	alOr $u+
+depuis $u+
+ainsi $u+
+aussi $u+
 
 
 dont	   dO~t2 $u
 lorsque	   $u
-parce 	   pars@- $u
+puisque	   $u
+presque	   $u+
+(parce que) 	   parsk@ $u+
 que	   $u $verbf
 qui	   $u+ $verbf
 quoique	   $u
 ça	$u+ $verbf
 
 ce	$u+ $nounf
+ceci	$u+ $verbf
+cela	$u+ $verbf
+voici	$u+
+voilà	$u+
 cette	$u $nounf
 ces	sez2 $u $nounf
 ceci	$u+ $verbf
 (ceux là)	sY||la $verbf
 (celles ci)	sEl||si $verbf
 (celles là)	sEl||la $verbf
+plupart	$u+
 
 // possessives
 ma	$u $nounf
 
 à	a $u
 au	$u
+aux	$u
 
-autour	otur
+autour	otur $u+
 dans	$u+
 en	$u+
 en	$u+ $verb $verbextend
 tant	tA~t2 $u+
 entre	$u+
 contre	$u+
-
+plusieurs $u+
 durant	$u+
+avec	$u+
+sans	$u+
 
 // negative
 ne	$u $verbf
 pas	$u+
 plus	$u+
 guère	$u+
+jamais $u+
 
 // questions
 quand	   kA~t2 $u+
 quoi	   $u+
 où	$brk $u+
+comment	$u+
+pourquoi	$u+
+pourtant	$u+
 
 // auxillary verbs  (be, have, can, etc)
 suis		 $u+ $verb
 // some common adjectives and adverbs
 
 quelque	$u+
+quelques	$u+
 tout	t'ut2 $u+
 toute	t'ut $u+
 toutes	t'utz2 $u+
 ressent          r@s'A~t2
 riz       ri
 sphincter           sfE~ktEr
+sous	$u+
+sur	$u+
 tunis           tynis
 
 
 
 
 monsieur         m@sjY
+messieurs         mesjYz2
 montréal         mO~Real
 (n'est ce pas)   n'Es@-||p'az2
 (qu'est ce que)  kEsk@ $u
 dernier    dErnier2
 estomac     Estoma
 éloquent     ElokA~t2
+fier	      fier2 $verb
 fils	      fis
+fuel	      fjul
 gars	      ga
 hélas 		elas
 iris	      iris
 mens	      mA~z2
 sens	      sA~s
 sens	      sA~z2 $verb
-qu'à          ka
 (sud est)       sydEst
 (nord est)      nOREst
 
 brut		bR'yt
 but		by $verb
 but		byt
-club		klWb
-(le pub)		l@||p'Wb
-(un pub)		W~||p'Wb
-(du pub)		dy||p'Wb
 cut	cWt
-hub	_|Wb
 mazout		mazut
 michael		mikaEl
 out		aut
 amazon		amaz'On
 apple		_^_en
 at		_^_en
-(audible manager) odibl||manadZWr
+(audible manager) od,ibl||manadZ'Wr
 bit		_^_en
 bluetooth 		blut'us
 computer		_^_en
 (cyber link) 		_^_en
 debian		dEbjAn
-driver		_^_en
 edit		_^_en
 emacs		Emaks
 emacspeak	Emakspi:k
 (mac os x)	makoEsiks
 made	_^_en
 media     		medja
-messenger 		_^_en
+messenger 		mesEnZWr
 my		_^_en
 not		_^_en
 null	_^_en
 ok         oke
 open            Op'Wn
-outlook         autluk
+outlook         autlu:k
 paint    		_^_en
 paper    		_^_en
 people    		_^_en
 sametime	_^_en
 schubert	SubER
 sun		_^_en
-(text aloud) tEkst||@lawd
+(text aloud) tEkst||@la=wd
 ubuntu		ubuntu
 up		_^_en
 yacht		jot
 débutions	debytjO~z2
 désertions	dezERtjO~z2 $verb
 détentions	detA~tjO~z2
-exploitions	Eksplo-atjO~z2
+exploitions	EksplwatjO~z2
 exportions	EkspORtjO~z2
 heurtions	_!WRtjO~z2
 limitions	limitjO~z2

dictsource/fr_rules

 
 // 2006-11-18  Gilles Casse  <[email protected]>
 //
-// Updated: 2008-07-26 Michel Such  <[email protected]>
+// Updated: 2008-08-07 Michel Such  <[email protected]>
 //
 
 // Letter classes:
 // Y  front vowels: e i y 矇 礙 癡 簾
 // K  not a vowel  (i.e. consonant, space, )
 
-.L01 e 矇 礙 禱 癡 i 簾 簿 y
 
 .group a
 		ae (_       e		// reggae vitae
 		a簾          E		// ma簾tre
 		aim (K      W~		// faim
 		ain (K      E~		// pain
-	CC)	ain (_A      E~n2		// prochain arret
-	CC)	ain (_h      W~n2		// prochain hiver
+	CC)	ain (_      E~n2		// prochain arret
 		ai (_      e		// dirai ferai...
 	CC)	ai (_      E		// vrai
 		ais (_      Ez2		// dirais ferais...
 		am (p       A~		// camp
 		am (m       a		// programmation
 	_)	am (n       am		// amnistie
-		am (n       a		// amnistie
+		am (n       a		// condamner
 
 	_)	arch矇 (@P5      arke		// arch矇ologue
 	_)	arch矇o (@P6      arkeo		// arch矇ologue
 		an (C       A~		// ancien
 		an (_       A~		// 矇lan
 	_C)	aon  (_        A~		// faon, paon, taon
-	s)	aoul  (_        u		// saoul
-		ao羶         ut		// ao羶t
-		au (l_      O		// Paul
+	s)	aoul (_         u		// saoul
+	s)	aou (le          u		// saoule
+		ao羶t         ut		// ao羶t
+		ao羶t (i        aus		// ao羶tien
 		au          o		// autruche
+		au (l_      O		// Paul
+		au (re      O		// dinosaure
 	_)	audio (@P5       odio
 	_)	auto (@P4       oto
 	_)	autom (n       otO
 	p)	ay (s       Ei		// pays paysage
 		ay (C       E		// aym矇
 		ay          Ej		// paye
-	Xl)	ayer (X         'Ej@r		// player, layer
+	Xl)	ayer (X         EjWr		// player, layer
 		a           a		// bateau
 
 // group a: English section
 		bird       _^_en		// bird
 		board      _^_en              // board, keyboard
 		box (_      _^_en              // box, inbox, outbox
-		bug (_      _^_en              // bug, debug
 		bug (g      _^_en              // debugger
 	_)	by       _^_en              // by, bye, bypass
 
 	or) 	ch (iC      k		// orchid矇e
 	_) 	ch (ao      k		// chaos, chaotique
 	_) 	ch (or      k		// chorale
+	te)	ch (_       k
 		ch (r       k		// chr矇tien
 	_)	chrono (@P6       krono
 		ch (l       k
 		cq          k		// pecq
 	s)	c (Y			//
 	x)	c (Y
-		c (L01        s 		// c癡de
+		c (Y        s 		// c癡de
 	_)	cyber (P5       sibEr
 	ban)	c (_			// banc
 	blan)	c (_			// blan
 
 	s)	cien (t	    jA~		// conscient scientifique
 		cien (t_    si		// ils appr嚙箠ent, remercient.
-	effi)	cien (t_    sjA~	// coefficient
-	d矇fi)	cien (t_    sjA~	// d矇ficient
+	effi)	cien (t    sjA~	// coefficient
+	d矇fi)	cien (t    sjA~	// d矇ficient
 
 // group c: English section
 		cast (_      _^_en		// broadcast
-	C)	ch (_      _^_en		// french
+	n)	ch (_      _^_en		// french
 		cut (_      _^_en		// cut, shortcut
 
 
 // Define use of the final 'e' in french
 		e (_
 	qu)	e (_   =@-
-	elqu)	e    =@
+	qu)	e (s_   =@-
+	elqu)	e    	  =@-
 	uisqu)	e    =@
-	rsqu)	e    =@
+	rsqu)	e   	  =@
 	_C) 	e (_        @		// je te
 	-c) 	e (_       @-
 	-j) 	e (_       @-
 
 		e (Ce_      E
+	ack)	er (K      Wr
+	ock)	er (K      Er
+	rock)	er (K      Wr
 		eau         o		// bateau cheveaux
 	g)	ea (s_ 	a      		// mangeas
 	j)	e (a        		// Jean Jeanne
 		ect (_      Ekt		// direct
 	pi)	ed (_         e		// pied
 	_cl)	ef (_       e		// clef
-		ein (C      E~		// peindre
-		ein (_      E~
-	CC)	ein (_A      E~n2		// plein emploi
-	CC)	ein (_h      E~n2		// plein hiver
+		ein (K      E~		// peindre
+	CC)	ein (_      E~n2		// plein emploi
 		eint (_      E~t2
 		e (il       E		// vieille
 		ei          E		// neige
 		el (C       El		// celsius
 		el (_       El		// caramel
 	_f)	em (me      a		// femme
+	i)	e (ment     		// remerciement, d�loiement
 	@)	em (me      a		// patiemment
 		em (b       A~		// d矇cembre
 		em (mACC       A~		// emmancher
 	矇Cid)	en (t_      A~
 	V矇Cid)	en (t_
 	Xtrid)	en (t_      A~
+	_flor)	en (t_      A~
 	_laur)	en (t_      A~
 	_m矇cont) en (t_     A~
 	_cont)	en (t_      A~
 		en (t_            	// 矇taient mangent
 	A)	en (t_            	// 矇taient mangent
 
-	Ci)	en (_       E~      	// viendra
-	Ci)	en (C       E~      	// viendra
+	Ci)	en (K       E~      	// rien, lien
 	Ci)	en (c       A~      	// science
 
 
 	AA)	en (_       E~
 	C)	en (_       En      	// amen, abdomen, golden
 	xam)	en (_       E~      	// examen
-	CA)	en (_       E~      	// rien
 
 		en (s_      A~
 		en (CA      A~      	// pentathlon
 	_Ch)	er (_       ER      	// cher
 	_env)	er (_       ER
 	_hi)	er (_       ER      	// hier
-	_hiv)	er (_       ER      	// hiver
+	_fi)	er (_       ER      	// fier
+	_hiv)	er (X       ER      	// hiver
 	_ti)	er (_       ER
 
 
 		e羶          Y		// je羶ne
 
 		e (x        E		// exact
-		ey (_       e		// dahomey
+		ey (_       E		// dahomey
 		ey (C       e		// ceylan
 		ey          Ej		// asseye
 
 		ez (_       ez2		// nez mangez chez
 
 	g) 	e (A       		// mangeons
+	g) 	eu		W      		// vengeur
+	g) 	eu	(re	y      		// gageure
 
 	_d) 	e (ch       @
 	_r) 	e (ch       @  		// recherche
  		e (rC       E
  		es (_       z2
 
-	ll) 	e (m       		// actuellement guillemets
-	C) 	e (ment   @-    		// vitement s羶rement
+	%C) 	e (CA   @-
+	%C) 	e (Ce     		// actuellement guillemets
+	%C) 	e (xA   E  		// actuellement guillemets
+	%C) 	e (mA     		// actuellement guillemets
+	ct) 	e (ment   @
+	rC) 	e (ment   @
+	AC) 	e (ment
 	u) 	e (ment   @-
 
 	As) 	e (gA
 	As) 	e (pA
-	Ass) 	e (gA
-	Ass) 	e (pA       		// passeport
 	Av) 	e (gA       		// sauvegarde
 	Av) 	e (pA
 
 	 	e           @		// menue
 	_) 	e (CA          e
 	_) 	e (xA          E
+	Cr)	eamer		i:mWr
+	Cl)	eaner		i:nWr
 
 
 // group e: English section
 		eac		_^_en
 	C)	ead		_^_en      		// read, head
 		eak           _^_en		// break, speak
-	Cr)	eam		_^_en      		// stream
-	Cl)	ean		_^_en      		// clean
 		ear		_^_en      		// ear, search
 		eas  	_^_en      		// please
 		eave       _^_en		// leave
 // group f: English section
 	_)	fire       _^_en
 		fly        _^_en
-	_)	frame         _^_en
+	_)	frame            _^_en
 
 
 .group g
 		g           g
-		g (L01          Z
+		g (Y          Z
 
 	su)	gg (Y       gZ       	// sugg矇rer suggestif
 		gg          g		// agglom矇rer
 		gt (_ 			// vingt doigts
 
 		gt          t		// vingtaine doigt矇
-		gua       gua		// anguille
 		gui       gi		// anguille
 	ai)	gu (il      gy		// aiguillage
 	in)     gu (is      gy		// linguiste
 	_)	game (X         _^_en
 	@@)	gate (X         _^_en
 		girl        _^_en		// girl
-		give (X         _^_en
 		gy (_         _^_en
 
 
 _)	h	(ippo			// hippodrome
 _)	h	(iro			// hirondelle
 _)	h	(ist			// histoire
-_)	h	(ive			// hiver
+_)	h	(iv			// hiver
 _)	h	(omm			// homme
 _)	h	(onn			// honneur
 _)	h	(繫p			// h繫pital
 	_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 (eur    j
 		i (o    j
-		ie (ment    i		// remerciement balbutiement
 	C)	ien (t_       i
 	d矇v)	ien (t_       i
 	t)	ient (_      jE~t2		// tient
 	or)	ien (t      jA~		// orient, orienter
 	ot)	ien (t_      jA~		// quotient
 
-		i (es_      i		// parties
 		i (e_       i
 	_)	ill         ill		// ill矇gal
 	aigu)	ill         ij		// aiguille
-	anqu)	ill         ill		// tranquille
+	anqu)	ill         il		// tranquille
+	dist)	ill         il		// distiller
 	_m)	ill         il		// mille
 	v)	ill         il		// village
 	qu)	ill         ij		// cuilli癡re cueillir
 		im (_       im		// karim
 		im (C       E~		// timbre
 	w)	in        in		// winrar
-		in (h       in		// inhumain
 		inct (_     E~		// distinct
+		in (h       in		// inhumain
+		in (kX       in		// link
 		in (n       in		// innombrable
 		in (C       E~		// vingt
 		in (_       W~		// vin
 	_C)	ind (er_     _^_en		// finder, reminder
 	_AC)	ind (er_     _^_en		// finder, reminder
 		ing (_      _^_en		// parking
-		ink       _^_en		// link
-		ize          _^_en		// realize
+//		ink       _^_en		// link
+		ize (X         _^_en		// realize
 
 
 .group 簾
 		ll          l		// aller
 	_)	l' (P2      l
 	au)	lt			// h矇rault
-	outi)	l (_ 			// outil
+	uCi)	l (_ 			// outil, fusil
 	ui)	ll          j		// juillet
 
 // group l: English section
 		m           m		// film
 		mm          m		// pomme
 	_)	m' (P2v      m
+	_)	ms (P2      Em_!Es
 
 // group m: English section
 	_)	mail (_       _^_en  // mailer
 .group o
 	br) 	oc (_       o		// broc
 	cr) 	oc (_       o		// escroc
+	 	o (ckK       O2
 	 	o (lC       O2
 	 	on (n       O
 	 	on (nerA       O2
 	 	o (t_       o
 	 	o (tre_       O2
 
-		oe (ll      o-a		// moelleux
+		oe (ll      wa		// 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          o-a		// poil
-		oie (m         o-a		// d�loiement
-		o礙 (l       o-a		// po礙le
-		o簾          o-a		// bo簾te
+		oi          wa		// poil
+		o礙 (l       wa		// po礙le
+		o簾          wa		// bo簾te
 		om (C       O~		// bombe
 		om (m       O		// nommer
 	_)	om (n       O2m		// omnibus
 		onh (A      On		// bonhomme
 	_)		on	(z	_!O~		// onze, onzi㿭e
 
-	_b)	on (_A      On		// liaison: bon 矇l癡ve
-	_b)	on (_h      O~n2		// liaison: bon hiver
-	_C)	on (_      O~n2		// mon appui, mon histoire, mon havre
 	_c)	on (_      O~		// no comment
+	_C)	on (_      O~n2		// mon appui, mon histoire, mon havre
 
 	alc)	oo (l       O		// alcool
 	z) 	oo          o		// zoo
 		ou          u		// hibou brouillard
 		o羅          u		// o羅
 		o羶          u		// co羶ter
-		oyes (_     o-a		// troyes
-		oy (A       o-aj		// noyer voyelles
-		oy          o-a		// roy
+		oyes (_     wa		// troyes
+		oy (A       waj		// noyer voyelles
+		oy          wa		// roy
 		o (_        o		// zorro all矇gro
 		o (z_       o		// berlioz
 		o           O
 
 .group q
 		q           k		// coq
+	_)	qu' (AP3          k
  	_a)	qu (a      kw		// aquarium
  	_a)	qu (if      kw		// aquif癡re
  	_A)	qu (idist      ky		// 矇quidistant
  	_)	qu (artz      kw		// quartz
 		qu          k		// quatre
  	_)	que (_      k@		// que
-	_)	qu' (P3     k		// qu'il
 	n)	q (_        k		// cinq cent
 
 // group q: English section
 	_)	radio (@P5       radio
 
 // group r: English section
-	AC)	ram (_        _^_en
 	_)	real         _^_en
 		rese         _^_en
 		rst (_        _^_en
 	_)	s' (P2v      s		// s'am癡ne
 		s癟 	    s		// immis癟a
 		sch (ie     sk		// schierzo
-		sch (iz     sk		// schizophr癡ne
+		sch (iz    sk		// schizophr癡ne
 		sch (ol     sk
 		sch (oo     sk
 
 
 	ai) 	s (em       s		// vraisemblable
 	ub)	s (is       z		// subsister
-	han)	s (on       s		// chanson
+	tran) 	s (A        z		// transition
+	tran) 	s (e        s		// transe
+	tran) 	s (ub       s		// transubstantiation
 	A) 	s (A        z		// baiser
 	A) 	s (oft        s		// microsoft
-	y) 	s (A        z		// paysage
-	CCan) 	s (A        z		// transition
-	xpan) 	s (A        s		// expansion
+	_anti) 	s (A        s		// antisocial
 	_)	socio (@P5       sosio
 	_)	super (@P5       sypEr
 	_)	super (_       sypEr
 	ni) 	tien (t_     si
 	bu) 	tien (t_     si
 
-	cra) 	t (ie_      s	// d矇mocratie
-	cra) 	t (ies_     s
+	cra) 	t (ieX      s	// d矇mocratie
 
-	ner) 	t (ie_      s	// inertie
-	ner) 	t (ies_     s
+	ner) 	t (ie     s	// inertie
 
 	_ce) 	t (_        t
 
 	g) 	ueil (_     Wj	// orgueil
 
 
+	C)	u (bX      W	// hub, club
+	C)	u (gX      W	// bug, mug
 		um (_       Om	// album
 	f) 	um (_     W~  // parfum
 		um (b       W~	// humble
 
 .group v
 		v           v
-		vers (_S4          vErz2
+		vers (_          vErz2
 
 // goup v: English section
 		voice  (X       _^_en
 	_)	wir 	  _^_en    // wire
 		winn 	  _^_en    // winner
 		wise 	  _^_en
-		wor 	  _^_en    // word, world
+		wor 	  _^_en
 
 
 .group x
 
 .group y
 		y           i	// cryog矇nique myope
+	_)	y (A          _!i	// yak, yacht
+	_)	y (eu          i	// yak, yacht
 
 	_)	yahoo (P5       ia'u	// symbolique
 		ym (b       E~	// symbolique
 		, (D        pilk:u
 	!	Eksklamasj'O~
 	$	dOlaR
-	@	aRobas
+	@	aRobaz
 	%	puRsA~
 	&	_e
 	+	plys

dictsource/pt_list

 a	$u+	$nounf
 os	$u+
 as	$u+
-?1 a    & $u+
+?1 a    & $u+   $nounf
 
 um	$u
 uma	$u
 pelos	$u $brk
 ?2	pelas	$u $brk	p'el&s
 
-a	$u $brk	// to,at
-?1 a    & $u $brk
 ao	$u $brk
 à	,a: $brk
 aos	$u $brk

dictsource/pt_rules

           b          b
           b (b
 ?3        b (B       bI
+?3        b (s       b
 ?3        b (_C      b_
 
 
           c          k
           c (Y       s         // ce ci
 ?3        c (B       kI
+?3        c (s       k
+?3        c (t       k
 ?3        c (_C      k_
           ch         S
           ck         k
           k          k
           k (k
 ?3        k (B       kI
+?3        k (s       k
+?3        k (t       k
 ?3        k (_C      k_
 
 
           o (tA_     O
           o (tAm_    O
 
-?2        ox (_      Oks
+?2        o (x_      O
 ?1        oz (_      Os#
 ?2        oz (_      Oz
           o (zes_    O
           p          p
           p (p
 ?3        p (B       pI
+?3        p (s       p
+?3        p (t       p
 ?3        p (_C      p_
 ?1        ph         f     //Didn’t use in European Portuguese (eg: English)
 ?1        ple (_     _^_EN
 .group x
           x (A       S
        A) x (A       ks
-?4     A) x (A       S
       _e) x (A       z
        e) x (A       ks
 ?1     e) x (CA      S

dictsource/sk_rules

 // translation rules for Slovak
 // This file is UTF-8 encoded
 
+// Letter groups:
+// G   voiced: bdgjlmnrvwzaeiouy
+
 .group a
         a        a
 

phsource/compile_report

                 [l;] ro
                 [l] zh
 l/l_            [l/] base
-                [l] fr
                 [l/] fr
 l/l@            [(@)] base
-                [l] fr
 l/L1_aL         [(a)] base
 l/L1_eL         [(e)] base
 l/L1_iL         [(i)] base
                 [u:] en_rp
 l/l_3           [l/] de
 l/la            [(a)] base
-                [l] fr
 l/le            [(e)] base
-                [l] fr
 l/L_eL_af       [&] af
                 [&:] af
 l/li            [(i)] base
-                [l] fr
                 [l] zh
 l/l_long        [l] base
                 [l] fr
                 [l] la
                 [l;] ro
 l/lo            [(o)] base
-                [l] fr
 l^/l_rfx        [l.] hi
 l/lu            [(u)] base
-                [l] fr
 l/tl            [l] base
                 [l] en
                 [l] en_wi
 r2/r2u          [(u)] base
 r3/r_           [r/] base
                 [r/] af
-                [r] fr
+                [r/] fr
                 [r/] ru
 r3/r_@          [(@)] base
 r3/r#_          [r#] is
 r3/r_e          [(e)] base
 r3/r_i          [(i)] base
 r3/r_n          [r/] base
+                [r/] fr
                 [r/] ru
 r3/r_o          [(o)] base
 r3/r_ru         [R4] ru
 r3/rx           [*] base
                 [r/] base
                 [r/] af
+                [R] fr
+                [r] fr
+                [r/] fr
+                [r2] fr
                 [R] fr_ca
                 [r/] ru
                 [x] pt_pt
                 [r-] base
                 [r] en_sc
                 [r] de
+                [r2] fr
 r/_r            [r] base
                 [r] en_sc
 r/r_            [r] base
                 [r] en_sc
                 [r] de
                 [r] fi
+                [r] fr
                 [r2] nl
                 [r] ru
                 [r] ro
                 [r/] af
                 [r] de
                 [r] fi
+                [r/] fr
                 [r2] nl
                 [r] ru
                 [r/] ru
                 [r/] af
                 [r] de
                 [r] fi
+                [r/] fr
                 [r2] nl
                 [r] ru
                 [r/] ru
 ustop/q_u       [q] base
 ustop/t         [t] base
                 [t2] en
-                [t] fr
-                [t2] fr
                 [t.h] hi
                 [t] zhy
 ustop/t_        [t] base
 ustop/tr        [t] base
                 [t[] base
                 [t2] en
-                [t] fr
                 [t.h] hi
                 [t] ru
 ustop/ts        [ts] base2
                 [c] zhy
 ustop/tsh2      [tS] hr
                 [dZ] hr
-ustop/t_short   [t.] hi
+ustop/t_short   [t] fr
+                [t2] fr
+                [t.] hi
                 [t] sk
                 [t] el
 ustop/tsh_pzd   [tS;] zh
                 [aa] en_wm
                 [a] cy
                 [a] de
-                [a] fr
                 [a] ta
                 [a:] hu
                 [a:] nl
                 [V] en_wm
 vowel/o_3       [oU] en_sc
                 [o] fr
-                [o-] fr
 vowel/o-_3      [U] en_rp
 vowel/o_4       [oU] en_n
 vowel/o-_4      [o] ro
 vowel/oe_4      [W] sv
 vowel/o_mid     [O] fr
                 [O2] fr
+                [O~] fr
                 [o] hu
                 [o] tr
 vowel/oo        [O:] en_sc
                 [u#] rw
                 [u] ko
 vowel/u_bck2    [u] fr
+                [u:] fr
                 [u:] la
 vowel/u_fnt     [u:] en_rp
 vowel/uu        [U] en
 vwl_en_us/ur    [U@] en_us
 vwl_fr/@R       [R] fr
                 [r] fr
-                [r/] fr
                 [r2] fr
                 [x] pt_pt
 vwl_fr/@R2      [R] fr_ca
 w/w_            [w/] base
 w/w@            [(@)] base
 w/w2            [w2] base2
+                [w] fr
                 [w] pl
                 [w] sk
                 [w] pt_pt

phsource/mbrola/ptbr

 0   R   NULL   0   r
 0   j   NULL   0   y
 
+// consonant combinations which are OK for br4 voice, but need epenthetic [i] for  br1 br3
+0   k   s      90  k  i
+0   k   t      90  k  i
+0   p   s      90  p  i
+0   p   t      90  p  i
+0   b   s      90  b  i
+
 0   a/  NULL   0   a
 0   A   NULL   0   a
 0   &   NULL   0   a

phsource/ph_french

-
 //====================================================
 //  French
 //====================================================
   vowel  starttype (a)  endtype (a)
   length 170
   formants vowel/a_3
-  after w vowel/a
 endphoneme
 
 
 endphoneme
 
 
-phoneme o-
-  vowel starttype (o) endtype (o)
-  length 100
-  formants vowel/o_3
-endphoneme
-
-
 phoneme O
   vowel starttype (o) endtype (o)
   length 170
 endphoneme
 
 
+phoneme u: // slitely longer than u
+  vowel starttype (u) endtype (u)
+  length 220
+  formants vowel/u_bck2
+endphoneme
+
+
 phoneme y
-  vowel starttype (e) endtype (u)
+  vowel starttype (u) endtype (u)
   length 170
   formants vowel/y_2
 endphoneme
 
 
 phoneme w
-  vowel starttype (o) endtype w
-  length 120
+  vowel starttype (u) endtype (@)
+  length 80
   beforenotvowel w/
   lengthmod 7
-  formants w/w
+  formants w/w2
   after _ w/_w
+  after (r) w/w
 endphoneme
 
 
   vowel  starttype (o)  endtype (o)
   length 200
   formants vnasal/o_n3
+  before n2 vowel/o_mid
 endphoneme
 
 
 phoneme b
   vcd blb stop
   vowelout f1=0  f2=1000 -500 -300  f3=-300 80 brk
-  formants b/b+x/b
+  formants b/b+x/b%50
   before _ b/b_+x/b_
-  before (a) b/ba+x/b
-  before (@) b/b@+x/b
-  before (e) b/be+x/b
-  before (i) b/bi+x/b
-  before (o) b/bo
-  before (u) b/bu
-  before @-  b/b@2+x/b
+  before (a) b/ba+x/b%50
+  before (@) b/b@+x/b%40
+  before (e) b/be+x/b%50
+  before (i) b/bi+x/b%50
+  before (o) b/bo+x/b%25
+  before (u) b/bu+x/b%40
+  before @-  b/b@2+x/b%50
   after _ NULL
-  after @ b/xb
+  after @ b/xb%50
   lengthmod 5
   switchvoicing p
 endphoneme
   vowelout f1=0 f2=1700 -300 300  f3=-100 80
   formants d/d+x/d%40
   before _ d/d_+x/d_%50
-  before r d/dr+x/d%50
+  before (r) d/dr+x/d%50
   after _ d/d+x/d%50
   after @ d/xd
   lengthmod 5
   vowelin f1=0  f2=2300 200 400  f3=-100 80
   vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
   lengthmod 2
-  wave ustop/k%45     // reduce strength of noise burst
+  wave ustop/k%40     // reduce strength of noise burst
   before _ ustop/k_
-  before r ustop/kr%45
+  before (r) ustop/kr%45
   before l ustop/kl%45
   before (i) ustop/ki%45
   switchvoicing g
   after _  l/_l
   after t  l/tl
   after l/ l/l_long    // double l, make it longer
-  before (a) l/la
-  before (e) l/le
-  before (i) l/li
-  before (o) l/lo
-  before (u) l/lu
-  before (@) l/l@
-  before _ l/l_
 endphoneme
 
 
   wave ustop/p%45
   before _ ustop/p_%70
   after _ ustop/p%70
-  before r ustop/pr%60
-  before R ustop/pr%60
+  before (r) ustop/pr%60
   before @- ustop/p_unasp%60
   before l ustop/pl%60
   switchvoicing b
 
 
 phoneme r
-  vcd rfx frc starttype r endtype r
+  vcd rfx frc starttype (r) endtype (r)
   vowelin f1=0  f2=800 -50 50  f3=-100 100 len=0 rms=30
   vowelout f1=0  f2=800 -50 50  f3=-100 100 len=0 brk
   length 100
   lengthmod 3
   beforenotvowel r/
-  formants vwl_fr/@R
+  formants vwl_fr/@R+r3/rx%25
   after t r/tr
   after k r/tr
   after p r/tr
-  before _ r3/r_
+  before _   r/r_
 endphoneme
 
 
 phoneme r2	// silent unless followed by vowel
-  vcd rfx frc starttype r endtype r
-  vowelin f1=0  f2=800 -50 50  f3=-100 100
+  vcd rfx frc starttype (r) endtype (r)
+  vowelin f1=0  f2=800 -50 50  f3=-100 100 len=0 rms=30
   vowelout f1=0  f2=600 -100 100  f3=-100 100 len=0 brk
   length 100
   lengthmod 3
   beforenotvowel NULL
-  formants vwl_fr/@R
-  before _ vwl_fr/@R
+  formants vwl_fr/@R+r3/rx%25
+  before _ r/r
 endphoneme
 
 
 phoneme R
-  vcd rfx frc starttype r endtype r
+  vcd rfx frc starttype (r) endtype (r)
   vowelin f1=0  f2=800 -50 50  f3=-100 100 len=0 rms=30
   length 100
   lengthmod 3
   beforenotvowel r/
-  formants vwl_fr/@R
+  formants vwl_fr/@R+r3/rx%25
 //  after r  r/rr
 endphoneme
 
 phoneme r/   // variant of [r] when not preceding a vowel
-  vcd rfx frc starttype r endtype r
-  vowelout f1=0  f2=800 -50 50  f3=-100 100 len=0 rms=20
+  vcd rfx frc starttype (r) endtype (r)
+  vowelout f1=0  f2=800 -50 50  f3=-100 100 len=0 brk
   length 100
   lengthmod 2
-  formants NULL
-  before j vwl_fr/@R
-  before l vwl_fr/@R
+  formants r3/r_+r3/rx%25
+  before n   r3/r_n+r3/rx%50
+  after _ r/rr
+  after t r/trr
+  after p r/trr
+  after k r/trr
 endphoneme
 
 
   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%30
-  before _ ustop/t_%60
-  before @- ustop/t%30
-  before r ustop/tr%30
-  before R ustop/tr%30
+  wave  ustop/t_short%30
+  before _ ustop/t_%40
+  before (r) ustop/t_short%30
   switchvoicing d
 endphoneme
 
   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%30
-  before _ ustop/t_%45
+  wave  ustop/t_short%30
+  before _ ustop/t_%40
 endphoneme
 
 

src/synthdata.cpp

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

src/tr_languages.cpp

 			SetupTranslator(tr,stress_lengths_pt,stress_amps_pt);
 			tr->langopts.length_mods0 = tr->langopts.length_mods;  // don't lengthen vowels in the last syllable
 
-//			tr->langopts.vowel_pause = 1;
 			tr->langopts.stress_rule = 3;        // stress on final syllable
 			tr->langopts.stress_flags =  0x6 | 0x10 | 0x20000; 
 			tr->langopts.numbers = 0x269 + 0x2000 + NUM_ROMAN;
 			SetLetterVowel(tr,'y');
+			ResetLetterBits(tr,0x2);
 			SetLetterBits(tr,1,"bcdfgjkmnpqstvxz");      // B  hard consonants, excluding h,l,r,w,y
 		}
 		break;
 
 			SetLetterVowel(tr,'y');
 			SetLetterVowel(tr,'r');
-			ResetLetterBits(tr,0x2);
+			ResetLetterBits(tr,0x20);
 			SetLetterBits(tr,5,sk_voiced);
 		}
 		break;