Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

dictsource/en_list

 // ?8  Use full vowel, not schwa in some word endings
 
 
-// $alt1   use strong ending (-age, -an, -ance, -ate, -ative, -table, -ed, -eria, -et, -inal, -ier  -mouth -on -or -ored, -ose, -s -y)
+// $alt1   use strong ending (-age, -an, -ance, -ate, -ative, -table, -ed, -eria, -et, -i ,-inal, -ier  -mouth -on -or -ored, -ose, -s -y)
 // $alt2   use weak ending (ace, ain, an, ar*, ard, ate, ath, ell, ery, ess, et, ie, ile, ine, men, on, ot)
 // $alt3   use weak first vowel, a->[a#], e->[@], o->[0#]
 // $alt4   separate 'h', not 'th' 'ph' 'sh';  [t2] not [t]
 // $alt5   remove only 's' from plural (-ies -is)
-// $alt6   use strong first vowel (a-> [eI], e->[i:], i->[aI])
+// $alt6   use strong first vowel (a-> [eI], e->[i:], i->[aI]  y->[aI])
 // $alt7   for the word "to", with $verbf, check that verb doesn't have 's' suffix
 
 
 aaa	$abbrev
 abc	$abbrev
 ac	$abbrev
+acsi	$abbrev
 adf	$abbrev
 adhd	$abbrev
 adsl	$abbrev
 api	$abbrev
 apr	apr@
 asap	$abbrev
+aspca	$abbrev
+astm	$abbrev
 ati	$abbrev
 atk	$abbrev
 atm	$abbrev
+atsc	$abbrev
 atv	$abbrev
 avc	$abbrev
 avg	$abbrev
 cet	$abbrev
 cia	$abbrev
 cio	$abbrev
+ctia	$abbrev
 ctrl	k@ntroUl
 dept	dI2pA@tm@nt
 diy	$abbrev
 eg	fO@Egz'aamp@L	$only
 (e . g .) fO@Egz'aamp@L
 ept	$abbrev
-ersb	$abbrev
+esrb	$abbrev
 espn	$abbrev
 est	$abbrev
 etc	Et'sEtr@
 ibm	$abbrev
 ibmtts	$abbrev
 icmp	$abbrev
+ietf	$abbrev
 iidc	$abbrev
 iis	$abbrev
 ie	aIi:_!   $pause $only
 nypsd	$abbrev
 nyse	$abbrev
 nyt	$abbrev
+ocd	$abbrev
 ocr	$abbrev
 odf	$abbrev
 oecd	$abbrev
 academe		a#kad@mi
 acapela		aka#p'El@
 access		aksEs
+accompli	a#k0mpl'i:
 accouchement	a#ku:SmO~
-accusation	akju:z'eIS@n
-acer		eIs3
-acetylene	a#sEt@li:n
 accurate	$alt2
 accursed	a#k3:sI#d
 ?5 accursed	a#kVRsI#d
 accuses		a#kju:zI#z
+accusation	akju:z'eIS@n
+acer		eIs3
+acetylene	a#sEt@li:n
 ached		eIkt
 achille		a#kIli:
 aching		eIkIN
 amoral		eIm'0r@L
 amore		a#mo@reI
 amount		a#maUnt
+amour		a#mU@
 amply		amplI         $verbf
 amuck		a#mVk
 anal		eIn@L
 appal		a#pO:l
 appall		a#pO:l
 appaloosa	ap@l'u:s@
-apparal		$alt3
+apparel		a#par@L
 apparatus	ap@r'eIt@s
 ?3 apparatus	ap@r'at@s
 appropriate	a#proUprI|@t
 bigot		bIg@t  // -ed
 bijou		bi:Zu:
 bikini		bIk'i:ni
+bikiny		bIk'i:ni  // -ed
 binman		bInman
 bio		baIoU
 biome		baIoUm
 cantilever	kantI#li:v3
 canton		kant0n
 canvas		kanv@s
-capish		ka#pi:S
+capische	ka#pi:S
 capita		kapIt@
 capitol		kapIt@L
 capri		ka#pri:
 career		$alt3
 caress		k@rEs
 carole		kar@L
+carotid		$alt3
 carouse		ka#raUz
 carpel		kA@p@l
+cartel		kA@t'El
 cascade		$alt3
 cashier		kaS'i@3
 cashmere	kaSmi@3
 caterer		$alt6
 cathedral	$alt3
 catholic	kaTlIk
-carotid		$alt3
-cartel		kA@t'El
+catsup		katS@p
 cavalier	$alt1
 caveat		kavIat
 ?3 caveat	kavIA:t
 conclave	$1
 concourse	$1
 concubine	$1
+conde		k0ndi
 conduct		$1
 conduct		$verb
 cone		koUn
 diablo		di:'A:bloU
 diabolo		daI'ab@loU
 diagnose	$3
-?3 dialog	daI|@lO:g
+//?3 dialog	daI|@lO:g
 dialysis	daI'al@sIs
 diameter	daI'amI2t3
 diaper		daIp3
 jumbalaya	dZVmb@l'aI|@
 
 kabaddi		$alt3
+kaboom		$alt3
 kalian		kalj'A:n
 kaput		$alt3
 karaoke		karI'oUki
 multitude	$1
 multiplexer	$1
 mundane		$2
-murmur		m3:m3
-?5 murmur	mVRm3
 museum		mju:z'i@m
 muslim		mUzlIm
 mutate		mju:t'eIt
 o'clock		@kl0k
 octave		0ktIv
 october		0kt'oUb3
+octopi		$alt1
 oem		oUi:'Em
 oeuvre		3:vr@
 ?5 oeuvre	VRvr@
 piecemeal	p'i:sm,i:l
 pier		pi@3
 pigheaded	$2
+pigpen		$alt1
 pigsty		pIgstaI
 pilau		$2
 pilot		paIl@t
 ?3 plateau	$2
 platoon		$alt3
 playa		plaI@
+playpen		$alt1
 playtest	$alt1
 plaza		plA:z@
 plebeian	pl@b'i:@n
 satiric		$alt3
 saucepan	sO:sp@n
 saudi		saUdi
+saur		saU3
 saute		sO:teI
 ?3 savant	sa#vA:nt
 savagery	savIdZri
 ?5 sir		s,VR $only
 site		saIt          // for sited
 ski		ski:
+skier		ski:3
 skies		skaIz
 skied		ski:d
 skua		sku:@
 sonar		soUnA@
 sonny		sVnI
 sooth		su:D
+sope		soUpeI
 souffle		su:fl'eI
 soundbite	saUndbaIt
 souvenir	su:v@n'i@3
 Faroe		fe@roU
 Faroes		fe@roUz
 Fermanagh	f3:m'an@
+Fayetteville	feI@tvIl
 Flores		flo@rIz
 Folkestone	foUkstoUn
 Fuego		fweIgoU
 Gabon		gab0n
 ?3 Gabon	ga#boUn
+Galle		gA:l@
 Galveston	galvI#st@n
 Geneva		dZ@ni:v@
 Gdansk		g@-dansk
 Minneapolis	mIni:'ap@lI2s
 Minnesotan	mI2nI2soUt@n
 Missouri	mIz'U@ri
+Missouria	mIz'U@ri@
 Mizoram		mI2zoUram
 Mojave		moUh'A:vi
 Monaco		m0n@koU
 Niagra		naI'agr@
 Nineveh		nInIv@
 Nocera		noUs'i@r@
+Nogales		noUg'A:l@s
 Noumea		nu:m'eI@
 Oahu		oU'A:hu:
+Oceania		oUSI'A:ni@
 Ochiltree	0k@Ltri
 Oklahoma	oUkla#h'oUm@
 Ohio		oUh'aIoU
 Oregon		0rI2g@n
 Oriya		O:r'i:@
 Ottawa		0ta#w@
+Ouagadougou	$3
 Ozark		oUzA@k
 Pacific		$alt3
 Pakhtunkhwa	p@xtUnkwA:
 Arianna		arI'A:n@
 Arnold		A@n@Ld
 Astley		astli
+Ayane		eI'an
 Baez		baI'Ez
 Bambi		bambi:
 Barack		ba#rA:k
 Caiseal		kaS@L
 Camille		ka#mi:l
 Candace		kandIs
+Carissa		$alt3
 Carol		kar@L
 Caroline	kar@laIn
 Calliope	ka#laI@pi
 Isabel		Iz@bEl
 isabela		Iz@b'El@
 Isaiah		aIz'aI@
+?3 Isaiah	aIz'eI@
 Isobel		Iz@bEl
 Isla		aIl@
 Isiah		aIz'aI@
 Lois		loUIs
 Louis		lu:i
 Louise		lu:w'i:z
+Luciano		lu:tS'A:noU
 Luigi		lu:'i:dZi
 Luis		lu:Is
 Lupe		lu:peI
 Napoleon	$alt3
 Natalie		nata#li
 Natasha		$alt3
+Nathalie	nat@li
 Nathan		$alt6
 Nathaniel	$alt3
 Neville		nEvIl
+Nicci		nIki
 Nicholas	nIk@l@s
 Nicola		nIk@l@
 Nicole		$2
 Wally		w0li
 Wilhelmina	wIlh@lm'i:n@
 ?3 William	wIlj@m
+Wyatt		waI|@t
 Yerevan		jEr@v'an
 Yves		i:v
 Yvonne		$2
 Compton		k0mpt@n
 Connelly	k0n@li
 Connolly	$1
+Coor		kU@
 Corazon		kO@r@z0n
 Cortez		$2
 Cthulhu		k@-Tu:l#u:
 (da vinci)	da#vIntSi
 Dante		dA:nt2eI
 ?3 Datsun	dA:ts@n
+Decatur		dI#keIt3
 Degas		deIgA:  $capital
 Desiree		dI2zi@reI
 ?3 Desiree	dEz@r'eI
 Dolittle	du:lIt@L
 Donatello	d0n@t'EloU
 Douglass	$alt2
+Drysdale	$alt6
 Dulles		dVl@s
 Dupuis		du:pw'i:
 Dvorak		d@-vo@Zak
+Earp		3:p
 Emory		Em3ri
 exxon		Eks0n
 Ferguson	f3:g@s@n
 Garcia		gA@si@
 ?3 Garcia	gA@s'i:a#
 Genghis		dZENgIs
+geico		gaIkoU
+gevalia		dZ@vA:li@
 Ghandhi		gA:ndi
 Gibson		gIbs@n
 Godzilla	g0dz'Il@
 Sachs		saks
 Sanchez		santSEz
 ?3 Sara		se@r@
+Scalia		ska#li:@
 scheherazade	S@hEr@zA:d
 Seymour		si:mo@
 Shakur		Sa#kU@
 
 
 an		a#2n           $nounf $only $u
-(a la)		,ala
+(a la)		,A#la
+(à la)		,A#la
 the		D@2           $only $nounf
 (a while)	a#||waIl      // no pause
 (the while)	D@2||waIl

dictsource/en_rules

     sw) a (g       a
         a (hA_     'A:
         ah (K      A:
+        ah (y      ah
         ahr (_N    A@
      &) ah (_      @
      m) a (hog     @
      m) acro (@    akr@
         ac (rum_   'eIk
      _) ac (t      ak
-        ac (tory   'ak
         actu (A    aktSu:
         ac (ture   'ak
         ac (um     ak
    cel) e (bra     @
         e (bria    i:
      _) e (bulli   %I
-     t) ech        E2k
      m) e (chanic  I
     sp) e (cial    E
     sp) e (cies    i:
      l) eath       ED
     br) ea (th     E
     br) eath (e    i:D
+     &) ea (te_    i:eI
     cr) ea (t      i:'eI
     cr) ea (tic    i:a
     gr) ea (t      eI
 
 .group en
      _) en (@      %En
+        en (_$w_alt1 En
  chick) en         In
         en (a_     'i:n
         en (al_    i:n
         et (itor   'Et
      _) et (r      I2t
      m) etre       i:t3
+    om) eter (_    =It3
      m) etry (_    =@tr%i
      &) ett (_     I2t
   subn) et         E2t
 .group i
         i          I
         i (_       i
+        i (_$w_alt1 aI
  ntell) i          I
      _) i'         %aI
      X) i ($w_alt6+++ aI
         or (um_    'o@r
      &) ory (_     @ri
 ?3 @@At) ory (_     ,o:ri
+    ct) ory (_     =@ri
+    ct) orily (_   =@r@li
    _st) ory        o@ri
 
 .group os
      d) ouch       u:S
      b) ou (d      u:
         ou (f      u:
-     d) ou (g      V
+    _d) ou (gK     V
+     d) ou (g      u:
      r) ouge       u:Z
      _) ough       O:
         ough (t    O:
         t (ap_     t2
     ie) t (ary_    t2
      A) tch        tS
+        tech       t2E2k
      @) tek (_S3   tEk
      _) tele       tElI2
      _) tera       tEr@
      n) th (er+    T
         therap     TEr@p
         th (erm+   T
+     _) thermo     T3:moU#
     ca) th (eri    T
     _e) th (er     T
         th (ern_   D
 
 .group u
         u          V
+     X) u (Cy_     u: 
    man) u          ju:
   _sol) u (C       ju:
         u (CA      ju:
     &g) ur (_      3
     &h) ur (_      3
     &m) ur (_      3
+  murm) ur         3
     &p) ur (_      U@
     sp) ur (_      3:
 ?5  sp) ur (_      VR
         y (C_      I
         y (CC      I
    XoB) y (@+      I
+     X) y ($w_alt6+ aI
      _) y (C@      I
      _) y (n@      V
      _) y (s@      V

dictsource/es_list

 _17o	DeTimos'Eptim
 _18o	DeTimOkt'aB
 _19o	DeTimonoB'en
+_20o	Bix'Esim
 _2Xo	Bix'Esim
 _3Xo	trix'Esim	
 _4Xo	kwaDrax'Esim
 _9Xo	nonax'Esim
 _0Co	TEnt'Esim
 _1Co	TEnt'Esim
+_2Co	duTEnt'Esim
+_3Co	triTEnt'Esim
+_4Co	kwaDriNxEnt'Esim
+_5Co	kiNxEnt'Esim
+_6Co	seksTEnt'Esim
+_7Co	sep:tiNxEnt'Esim
+_8Co	OktiNxEnt'Esim
+_9Co	noniNxEnt'Esim
 _0M1o	mil'Esim
 
 

dictsource/it_list

 // This file is UTF-8 encoded
-// Updated 2014 August 18 by Chris, Christian Leo M, <[email protected]>
+// Updated 2014 october 22 by Chris, Christian Leo M, <[email protected]>
 
 //  $alt   change [e] or [o] in the stressed syllable to [E] or [O]
 //  $alt2  change [E] or [O] in the stressed syllable to [e] or [o]
 _17     ditSas:'Et:e
 _18     ditS'Ot:o
 _19     ditSann'ove
-_2X	v'entj
+_2X	v'entI
 _21     v'ent'uno
 _23	ventit@-*'e
 _24	ventikw'at:@-*o
 _0Z3	mill'ezimi      // 1000ths
 _roman	@-*Om'ano
 
+// ordinal numbers
+_#º	'Ezimo    // ordinal suffix
+_#ª	'Ezima
+_x#º	o         // suffix for 1 - 10
+_x#ª	a
+
+_1ox	p@-*im
+_2ox	sekond
+_3ox	tE@-*ts
+_4ox	kw2a:@-*t
+_5ox	kw2int
+_6ox	sEst
+_7ox	sEt:im
+_8ox	ot:av
+_9ox	non
+_10ox	d'EtSim
+
+_1o	un
+_2o	du
+_3o	t@-*e
+_4o	kw2at:@-*
+_5o	tSinkw2
+_6o	sEj
+_7o	sEt:
+_8o	Ot:
+_9o	nOv
+_20o	vent
+_30o	t@-*'ent
+_40o	kua*'a:nt
+_50o	tSinkw2'ant
+_60o	sess'ant
+_70o	set:'ant
+_80o    ot:'ant
+_90o	nov'ant
+_0Co	tSEnt
+_0M1o	mil
+_1M1o	mil
+
+
+
 // abbreviations
 
 abc	a||bi||tS'i
 mr	mIster	$hasdot $dot
 nvda	$abbrev
 ocr	o||tSi||'ER*e	$only
-ok	ok'eI
+ok	ok'eI $only
 olp	o||el:e||p'i
 omg	o||em:e||dZ'i
 prof	$hasdot $dot
 st	$dot
 uic	u||i||tS'i
 uk	$abbrev
+unicef	$1
 url	u||eR*e||'El:e $only
 usb	$abbrev
 www	v,u||_vu||_v'u
 xml	iks||em:e||'El:e
 
 // articles
-i	$u+ $only
+i	$u+ $only $nounf
 il	$u $only $nounf
 la	$u+ $only
 le	$u+ $only
 bancomat	$1
 banner	$1	$onlys
 barbecue	_^_FR
+beat	_^_en $only
 beep	b'i:p
 beige b'E:Z
+bestseller	b'Est[_||s'el:e@-*
 birthday	b'e/:rt[||d,ei
 bitter	$1
 blackout	bl'Ek'aUt
 blues	bl'u:z
 boiler	$1
+bonjour	b,O:_Z'u:r // _^_fr
 boom	bum
 bordeaux	_^_FR
 boutique	but'i:k
 boxer	$1
 braille	b@-*ail:
 brandy	b@-*'E:ndI
+bricolage	b@-*ikol'aZ
 browser	b@-*'a:UzE@-*
 buffer	b'afe@-*
 bouquet	_^_FR
 bulldozer	$2
 bunker	$1
 business	_^_EN
+by	b'aI $only
+bye	_^_EN
 byte	_^_EN
 camper	$1
 caterpillar	$1
 couscous	k,us||k'us
 cover	$1
 cracker	$1
+club	kl'a/:b $onlys
 database	datab'Eiz
 deejay		_^_EN
 default	_^_EN
 fuji	fu:ZI
 gangster	$1
 garage	gaR'aZ
+general	$1 $onlys
+generation	dZeneR'ES@n $onlys
 geyser	g'aIzE@-*
 ginger	$1
 gmail	dZI||m'eil
 girl	_^_EN
 google		_^_EN
+green	g@-*i:n $onlys
+guinness	g'ines:
 hacker	'ake@-*
 hamburger	hamb'u@-*ge@-*
 happy	_^_EN 
 home	hO:m
 hospital	$1 $alt
 hotel	$2
-hunter	$1
+hunter	'ha/nte@-* $onlys
+hunt	_^_en $only
 iceberg	'aIs||b,e@-*g
 impeachment	imp'itSm,ent[
 installer	inst'a:l:e@-*
 lady	l'E:dI
 laser	$1
 leader	lidE@-*
+league	_^_en
 line	l'aIn	$only
 live	l'aIv
 login	l'Og||In
 mixer	$1
 monitor	$1 $onlys
 monsieur	_^_FR
+motor	$1 $alt $onlys
 mouse	maus
 new	_^_EN
 newsletter	njuzl:'et:e@-*
 nonchalance	non_Sal'ans
 nylon	n'aIlon
 office		_^_EN
-one	w'a/n $onlys
+one	w'a/n $onlys $capital
 online	,on||l'aIn
 order	$1
 oscar	$1
 play	pl'EI
 player	pl'eIE@-*
 pointer	$1
-poker	$1
+poker	$1 $alt
 portacontainer	$4
 poster	$1	$onlys
 power	p'a:|we@-*
 premier	$1
 privacy	p@-*'aivazi
 project	p@-*'odZet
-provider	p@-*ov'aide@-*
+provider	p@-*ov'aide@-* $onlys
 pullover	$2
 puzzle	p'atsol
 python	_^_EN
 radar	$1	$onlys
 raider	$1
 ranger	@-*'endZe@-*
-reader	@-*'idE@-*
+reader	@-*'i:dE@-*
 recorder	$2	$onlys
 reporter	$2	$onlys
 reportage	@-*epo@-*t'a:Z
-revolver	$2
+residence	@-*'Ezidens	$onlys
+revolver	$2 $onlys
 rockefeller	@-*Okf'el:e@-*
 rocker	$1
-router	@-*'ute@-*
+round	@-*'awnd $onlys
+router	@-*'u:te@-*
 routine	@-*Ut'iN
 rover	$1	$only
+saver	_^_en $onlys
 scanner	$1
 schiller	$1
 schopenhauer	_^_EN
 scorpion	$1	$onlys
 scotch	sk'OtS
 screen	sk@-*'i:n
+screenreader	sk@-*'i:n||@-*'i:de@-*
 seller	$1 $onlys
 server	$1	$onlys
 setter	$1	$onlys
 shampoo	S'a:mpo
 shuttle	S'a/tOl
 sky	sk'aI
+single	s'ing,Ol $onlys
 sister	$1	$onlys
 sitar	$1	$only
 sitter	$1	$onlys
 snack		_^_EN
 software	s'Oft[_we@-*
 sonar	$1	$only
+streaming	_^_EN
 street	_^_EN
 souvenir	suvEn'i@-*
 spanish		_^_EN
 wow		w'a:u
 writer	v@-*'aIte@-*
 yahoo		_^_EN
+yacht	j'Ot[
 yoghourt	'jogurt
-zoom	dz'u:m
+zoom	dz:'u:m
 zoster	$1
 
 rock'n'roll	@-*,Oken@-*'o:l
 vagin	$2
 vegano	$2
 veget	$1 $alt
-vergini	$1
 vernic	$2
 vesciche	$2
 vestiboli	$2
 voragini	$2
 vuot	vu'O:t
 
+cos'è	koz'E
 l'ancora	l'ankoRa
 (in balia)	in||bal'i:a
 (principi attivi)	p@-*intS'i:pI||at:'ivI
 atene	$2
 avezzano	$3
 azerbaijan	a@-*dz,eb,ajdZ'an
+azerbaigian	$5
 azzano	$2
 barbagia	ba/@-*b'adZa/
 barisciano	$3
 brusciano	$2
 bruxelles	b@-*uks'El:
 bruzzano	$2
+bucarest	$1
 bucciano	$2
 bulgare	$1
-cagliari	$1
+cagliari	k:'al^,a/RI
 calestano	$3
 calizzano	kalits:'ano
 calvizzano	$3
 camerun	$1
 campidano	$3
 campobassano	$4
+canyon	k'EnIon
 caporciano	$3
 caracas	$2
 carbognano	$3
 haiti	a'i:ti
 haitian	aiti'an
 hawaii	aw'a:i:
+helsinki	$1
 hollywood	_^_EN
 huligano	$3
 ilbono	$2
 imperia	$2
 indonesia	$3
 indostano	$3
+janeiro	Zan'E:iRo
 jerzu	j'E@-*tsu
 jonio	j'Onio
 jugoslav	jugozl'a/v
 leverano	$3
 libano	$1
 liberia	$2
+liverpool	l'ive@-*pul
 lizzano	lits:'ano
 longano	$2
 lungadige	$2
 napoli	$1
 nazzano	$2
 nevano	$2
+newyorkes	nI,u||io@-*k'Ez
 niger	$1
 nizzano	nits:'ano
 nocciano	$2
 rognano	$2
 rosciano	$2
 rossano	$2
+rotterdam	$1
 rotoplano	$3
 rozzano	$2
 rusticiano	$3
 alessia	$2 $capital
 alexander	$3
 alzeimer	alts'aime@-*
+alzheimer	alts'aIme@-*
 amelia	$2	$alt2
 amerigo	$2
+amicis	$2
+anderson	$1
 andreina	and@-*e'i:na
 andromeda	$2
 anita	$2
 brian	b@-*'aian
 caino	ka'i:nO
 camilleri	$3
+carey	_^_en
 carmelo	$2
 cassano	$2
 catia	k'a:tia
 charlotte	Sa@-*l'Ot
 chevalier	_^_FR
 chopin	Sop'EN
+churchill	_^_en
 christie	k@-*'istI
 christofer	$1
 christopher	$1
+chrysler	_^_EN
 danilo	$2
 debor $1  $alt
 deborah	$1 $alt2
 ferrero	$2
 francisco	f@-*ans'isko
 françois	f@-*,a/NsU'a
+frederic	$1
 galilei	galil'E:j
 garcía	_^_ES
 gavino	$2
 ludovic	$3
 luigi	lu'i:dZI
 luigia	lU'i:dZa
+manolo	ma/n'Olo
 manzon	m,andz'On
-margaret	$1 $only
+margareth	$1 $only
 maria	m,a/R'i:a
+mariah	$2
 mariangel	$3
 mariapaola	maRIap'aola
 marilyn	m'E:r*ilIN
 michelangel	$3
 mike	_^_EN
 monroe	m'On||r,ow
-morrissette	m,OR*iz'Et[
+morissette	m'ORIsEt[
 mozilla	m,o|dz'il:a
 murgia	$1
 nancy	n'E:nsI
 pierpaol	pje@-*p'aUl
 poirot	puaR'o
 potter	$1	$onlys
+presley	p@-*'e:zleI
 ray	@-*'eI
 rizzo	@-*'its:O
 rizzoli	@-*its:'OlI
+rocky	@-*'Oki
 roger	$1 $alt
 ryanair	@-*'aIaneR
 sandoval	$3
 steven	st'iven	$onlys
 tamara	$2
 taylor	t'EIlo@-*
+tiffany	$1
 tyson	t'aIzon
 wagner	v'agnE@-*
 vainer	v'aIne@-*	$only
 
 // Unit of measure
 
+ampere	$2 $alt2
 millesim  $alt
 millimetr	$2
 millilitr	$2
 accampano	$2
 accecano	$2
 accechino	$2
+accelerano	atS:'E:l,eRano
+acceler	atS:'E:l,ER
 accentuano	$2
 accertano	$2
 accettino 	$2
 allontanino	$3
 allontano	al:ont'ano
 alter	$1
+alterano	$1
 alzano	$1
 alzino	$1
 amano	$1
 attirino	$2
 attonit	$2
 augura	$1
-augurano	$3
+augurano	$1
 auguro	$1
 aumentino	awm'Entino
 auspicano	$1
 celebr	$1
 celebrano	$1
 censurano	$2
+censurati	$3
 chiaccherano	$1
 chiamano	$1
 chiamino	$1
 espatriano	$2
 esplicitano	$2
 esplod	$2
+esplodano	$2
 esplorano	$2
 esprimano	$2
 espugnano	$2
 evidenziano	$3
 evit	$1
 evitano	$1
+evoc	$1
+evochi	$1
 fantasticano	$2
 faticano	$2
 fatturano	$2
 muoiano	$2
 muoviti	$2
 mutano	$1
+naquero	$1
 narrano	$1
 nauseano	$1
 navig	$1
 navigano	$1
 navighi	$1
-necessita	$2
+necessit	$2
 necessitano	$2 $alt
 negal	$1
 neglige	negl'idZe
 oscillano	$2
 ospitano	$1	$alt
 ossequiano	$2 $alt
+osservino	$2
 ossidano	$1
 ossigenano	$2
 ostacolano	$2
 pettegol	$2
 pettinano	$1
 piac	pj'atS
+piantano	$1
 pigia	$1
 pigiano	$1
 pignorano	$2
 reputa	$1
 reputano	$1
 respirano	$2
+restaurano	$2
 riabbandono	$4
 riabbono	$3 $alt2
 riabbottono	$4
 sloggiano	$1
 smascher	$1
 sniffano	$1
+snodano	$1
 socializzino	$3
 soddisfano	$2
 soddisfino	$2
 cancellami	$2
 carical	$1
 cercasi	$1
+compil	$2
 comunical	$2
 contattaci	$2
 contattami	$2
 copial	$1 $alt
 curati	$2
+costituitosi	$4
 dedical	$1
 digitalo	$1
+dirigerl	$2
 dirigersi	$2
 distrugerne	$2
 domandatel	$3
 guardaci	$1
 guidaci	$1
 impostaci	$2
+insegnagli	$2	$alt
 intonaci	$2
 invaghitosi	$3
 lasciataci	$2
 restatene	$1
 riceverne	$2
 ricordati	$2
+rieccoci	$2
 rieccomi	@-*i'e:k:Omi
+rieccoti	$2
+rieccol	$2
 rincorrerl	$2
 ripeterl	$2
 ripetersi	$2
 spogliati	$1 $alt
 stabilitosi	$3
 svuotalo	$2 $alt2
+trattasi	$1
 usal	'u:za/l
 vendesi	$1 $alt
 verificatasi	$4

dictsource/it_listx

 diadem  $alt
 diagnosi $1
 dialett  $alt
-dialisi $2
+dialisi	dI'a:lizi
 diametr $1
 diapason $1
 diarchia $3
 discredit $2  $alt2
 disistim	$3
 dislessia $3
-disonesta $4
 dispareunia $5
 dispari $1
 dispendi  $alt
 forcol  $alt2
 forfor $1  $alt2
 forgia $1
-fori		$alt $only
-fori $2
 formic $2
 forn  $alt2
 forr  $alt2
 franciacort  $alt2
 francoboll  $alt2
 frassin $1
-fraternita $4
 frattemp  $alt
 freccette  $alt2
 fredd  $alt2
 fren  $alt2
 frigia $1
 frod  $alt
-frode  $alt
 frumenzi  $alt
 fruscii	f@-*uS'i:j
-fruscio  f@-*uS'i:o
+fruscio	f@-*uS'i:o
 fruttosi  $alt
 fucile $2
 fucine	$2
 garzon $2
 gasdott  $alt2
 gaudenzi  $alt
-ge  $alt
 gebel  $alt
 gec  $alt
 gemin $1
 gladiol $2
 glaucofane $3
 gleb  $alt
-glia  l^'i:a
+glia  gl'i:a
 glicemiche	glitS'emike
 glicemie	glitSem'i;e
 glicerin	glitSe*'in
 gluteo $1
 gnom  $alt
 gnome  $alt
-gogo $2  $alt
 gol  $alt
 golasecc  $alt2
 goleador $4
 gutei $2
 hellas $2
 heracleopolis $3  $alt2
-herve $2
 hieron $2
 hiroshima	$3
 honore $3
 imenotteri  $alt
 imol $1
 imperfett  $alt
+imperi	$2
 impet $1
 impieg  $alt
 implicit $2
+incazzati	inkats:'ati
 incendi  $alt
+incerti	$2 $alt
 incentr  $alt
 incivil	intSiv'il
 incognit $2  $alt
 inedia  $alt
 inedit $2
 inett  $alt
-infamia $2
+infamie $2
+infamia	$2
 infantil	$3
 infedele  $alt2
 infer $1
 krakow $2
 kurumb $1
 labar $1
-lacche $2  $alt
 lachete  $alt
 laconi $1
 laigueglia  $alt
 lemure $1  $alt
 lemuri $1  $alt
 lena		$alt2
-leo  $alt2
+leo  $alt
 leon  $alt2
 leonzi  $alt
 leopold  $alt
 leuci $1
 levanz $1  $alt
 leve  $alt
-levita $3
 liber $1
-liber $1
-liberi $1
 licantrop $2
 licomede  $alt
 liet  $alt
 limen $1
 limin $1
 limitrof $2
-limon $2
-limone  $alt
+limon $2 $alt2
 limousine	limuz'iN
 linfonod $3  $alt
 linguine	$1
 malapen  $alt2
 malavoglia  $alt
 malcesine	$2 $alt2
-male  $alt
 malebolge  $alt
 malesia $2  $alt
 malessere  $alt
 malevol  $alt
 malia $2
-malinconia $4
+malinconia	$4
+malinconie	malinkon'iE
 malincuore  $alt
 mallare $1
 mallofagi $2
 nausea $1
 nausee	$1
 nauseo	$1
+ndrangheta	$1
 neb  $alt
 nebul  $alt2
 necchi  $alt
 poem  $alt
 poet  $alt
 poggi  $alt
+poggiagomit	$3
 pol  $alt
 polarimetr $3
 polc  $alt
 prepost  $alt2
 presbite $1  $alt
 presbiter $2
+presenil	p@-*e||sen'il
 presepi  $alt
 press  $alt
 prestit $1
 semicerchi  $alt2
 semidi $3
 semin $1  $alt2
+semini	$2 $noun
 semiopac	semIop'ak
 semirett  $alt
 semol $1
 sfregi  $alt
 sgomber $1
 sguizzare	zgwIts:'aRe
+shh	hS:_
 sibari $1
 sidereo $2
 siepe  $alt
 subfebbril	$3
 subito  $1
 suddiacon $2
+sudicia	$1
+sudicio	$1
 suddit $1
 sudest $2
 sudicie	$1
 tartareo	$2
 tartari $1
 tassametr $2
-tassi $2
 tatar $1
 tatari $1
-taurianov  $alt
-te  $alt
 tec  $alt
 technicolor  $alt
 teck  $alt
 tedofor $2
 teetet  $alt
 tegol $1
-tegu $2
 teista  tE'ista
 teistiche	te'Istike
 tel  $alt2
 telecamer $3
-telef $1
+telefax	$1
 telefilm $3
 telefon $2  $alt
 telegon $2  $alt
 temistocle $2
 temnospondili  $alt
 temp  $alt
-tempe  $alt
 temper $1  $alt
 temperie	$2
 tempi  $alt
 tempor  $alt
 tempor $1
 tempr  $alt
-temu $2
 tenebr $1  $alt
 tened $1  $alt
 tenera	$1  $alt
 tesi  $alt
 tespi  $alt
 tessile  $alt
-testimone  $alt
+testimon	$alt
 tetan $1  $alt
 tetraedr  $alt
 tetraetil	$4
 toni  $alt
 tonn  $alt2
 top  $alt
-tora $2
 torb  $alt2
 torbid  $alt2
 torbole  $alt2
 torchiarol $3
 tord  $alt2
 torn  $alt2
+tornei	to@-*n'E:I
 tornabuoni  $alt
 tornarecci  $alt
 torni  $alt2
 tot  $alt
 totan $1
 totem  $alt
-toto  $alt
-toto $2
+toto $2 $alt
 totogol $3
 tournee  $alt2
 trabea $1
 tredici  $alt2
 tremil $2
 trentaduesim  $alt
-trentasei	$3
-trentenni  $alt
+trentasei	t@-*entas'EI
+trentenn	$alt
 trentesim  $alt
-treppiede  $alt
-tres  $alt
+treppied	$alt
 tres  $alt
-tresette  $alt
-tressette  $alt
+tresette	t@-*es'Et:e
 treveri $1  $alt
 treves  $alt
 treviri $1
 trevisan $3
 triac $1
-triade $1
 triathlon $1
 tribu $2
 tricesim  $alt
 trombocitopenia $6
 trot  $alt
 trov  $alt
-trovarobe  $alt
 truffaldine	$3
 tuber $1
 tunisi $1
 tutu $2
 ubbriac	$3
 ubbriache	ub:@-*I'ake
-uberta $3
 ubold  $alt
 ubriac $3
 ucronia $3
 valsecc  $alt2
 valsesia $2  $alt
 vandal $1
-vandali $1
 varen  $alt2
 varenn  $alt2
-vate $2
 vazzol $2
 vecchia  $alt
 vedov $1
 vegli  $alt
 veicol	vE'ikol
 vel  $alt2
-vel  $alt2
 velen  $alt2
 velletri  $alt2
-velocipede $3
+velociped	$3
 ven  $alt2
 venaria $3
 venceslao $3
 vendit $1
-venere  $alt
+vener	$1 $alt
 venet $1  $alt
-veneti $1  $alt
-ventenni  $alt
+ventenn	$alt
 ventesim  $alt
 ventiquattresim  $alt
-ventisette  $alt
+ventisette  ventis'Et:e
 ventol  $alt
 ventre  $alt
 ventriloqua	$2
 ventriloque	$2
 ventriloqui  $2 $only
 ventriloquo $2
-venusta $3
 vepre  $alt
 ver  $alt2
-ver  $alt2
-verde  $alt2
+verd	$alt2
 verg  $alt2
-vergine  $alt2
-verne $2
+vergin	$1 $alt2
 verolanuov  $alt
 veroli $1
 verosimil	veRo||s'imil
 vertebr $1
-vertebre $1
 vertov $1
 verz  $alt2
 verzegnis  $alt
 vitrea	$1
 vitree	$1
 vitreo	$1
-vitreo $1
-vittoria  $alt2
 viveri $1
-vo  $alt
 vobbia  $alt
 vocii	votS'i:j
 vodk  $alt
 voglia  $alt2
-voivod  $alt
 volere $2  $alt2
 volg  $alt
 voll  $alt2
 vomer $1
 vomit $1
 vosgi  $alt
-vot  $alt
-voti  $alt
+vot  $alt2
 vulture $1
-wattor  $alt2
 wilanow $3
 wuchereria $3
 xenia $3
 xenoglossia $4
 xilem  $alt
-yahweh $2
+yahweh jav'E
 yaounde $4
 yod  $alt
 yog  $alt
 zagar $1
 zagarol $3
 zaira  dza'i:Ra
-zambesi  $alt
+zambes	$alt
 zandobbi  $alt
-zane $2  $alt
 zanobi  $alt
 zapotechi  $alt
 zarevic  $alt
 zeugm $1
 zevi  $alt
 ziggurat $1
-zigote  $alt
+zigot	$alt
 zigotteri  $alt
 zingar $1
 zizzanie	dzidz:'anie
 zoccol  $alt
 zoe  $alt
 zon  $alt
-zone	$alt2
 zoofilia $4
 zoppia $2
 zoppie	dzop:'i:e
 zoppol  $alt
 zuccari $1
-zuccher $1
+zuccher	dz:'U_k:eR

dictsource/it_rules

 // Italian translation rules
 // This file is UTF-8 encoded
-// Last update: 2014 August 18 by Chris <[email protected]>
+// Last update: 2014 October 22 by Chris <[email protected]>
 // letter groups
 // A  any vowel
 // C  any consonant
      _) c' (P2t     tS
 	@@A) ce (A_	=tSE
 	ciano (_	=tSano   // verbs
-	cciano (_	=tS:ano   // verbs
+	cciano (_	=tS:ano
 	chiano (_	=kiano
-	A) cchiano (_	=k:iano   // verbs
+	A) cchiano (_	=k:iano
 	ceder (L04_	tS'Ede@-*  // Pron.s verbs
 	cceder (L04_	tS:'Ede@-*
 	in) cer (L04_	=tSe@-*
+	cuocer (L04_	kU'OtSe@-*
 	_L04Z) capit (A_	k'a:p,it
 		_L04Z) capit (ano_	k'a:p,it
 	correr (L04_	k'o:R*eR

dictsource/pt_list

 // $alt   changes stressed [e] or [o] phoneme to open [E] or [O]
 // $alt2   changes stressed [E] or [O] phoneme to close [e] or [o]
 
-abordo		$alt
 aborto		$alt  $verb
 abortos	$alt2
 absorta		$alt2
 bolo		$alt2
 bolo		$alt  $verb
 borboleta	$alt2
-bordo		$alt
 borra		$alt2 $noun
 boto		$alt2 $noun
 boxe		$alt
 decoreba	$alt
 decoro		$alt2 $noun
 degelo		$alt2
+desacerto	$alt2
 desaforo	$alt2
 desamores	$alt2
 desapego	$alt2
 remorso		$alt
 renovo		$alt $verb
 represa		$alt2
+represes		$alt
 retorno		$alt $verb
 reveses	$alt
 rigores		$alt2
 troco		$alt2 $noun
 tropa		$alt
 tropeço		$alt2 $noun
+tropeços		$alt2
 trombeta	$alt2
 ureia	$alt
 vanessa		$alt2

dictsource/pt_rules

 _ortod) o (xL08_   O
   _arr) ox (A      OS
   _B) o (jo_   o
+  b) o (rdo_  O
   C) o (smA_  O
     _g) o (zL04_   O
   _alm) o (çL01_   O

dictsource/ta_rules

  _கோபி) க		kV#
  _ஸ்டா) க		kV#
 _ஜமாய்) க		kV#
+    _சு) க(ி_சிவ	k
  _வெங்) கட		kVt.V#
   அலை) க (டல		kV
   _முட்) க (டிகார	gV
     ஆ) க (ாஷ		k
   _கல்) க (ி		k
  வால்மீ) க (ி		k
-    _சு) கி (_சிவ	k
     _ம) க (ிந்த		H
    மோ) க (ினி		H
     _ம) க (ிமை		H
      _) டி (யூப	t.
      _) டி (யூஷன	t.
   _ராஷ்) டி (ர		t.
+ இராஷ்) டி (ர		t.
 _மL06ாராஷ்) டி (ர		t.
      _) டிரக்		t.rVk
      _) டி (ரங்		t.
      _) த (னுச		dV
      _) த (னுர		dV
      _) த (னுஷ		dV
- _ஜன்_) த (ன்		d
+ _ஜன்_) த (ன்		dV
      _) த (ன்மந்திரி	dV
      _) த (ன்ய		dV
      _) த (ன்ராஜ		dV
      _) ப (ேட்ஸ்மேன	b
      _) ப (ேதமி		b
      _) ப (ேதமு		b
+     _) ப (ேதம்		b
      _) ப (ேதி		b
      _) பேனட்		be:nVt.
      _) ப (ேனர		b
  _மலை) ப்பி (ரசங்க	pp
  _மலை) ப்பி (ரசங்க	pp
  _சண்ட) ப்பி (ரசண்ட	pp
+ _தலை) ப்பி (ரசவ	pp
    L03) ப்பிரச (ார	pprVtS
   _கை) ப்பி (ரசுர	pp
 _துண்டு) ப்பி (ரசுர	pp

phsource/ph_aragon

   FMT(vowel/oo_4)
 endphoneme
 
+
+
+phoneme k
+  vls vel stop
+  lengthmod 2
+  voicingswitch g
+  Vowelin f1=0  f2=2300 200 400  f3=-100 80
+  Vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
+
+  IF nextPh(isPause2) THEN
+    WAV(ustop/k_)
+  ELIF nextPh(#i) OR nextPh(;) THEN
+    WAV(ustop/ki_unasp2, 30)
+//  ELIF nextPh(isRhotic) THEN
+//    WAV(ustop/kr)
+//  ELIF nextPh(l) THEN
+//    WAV(ustop/kl)
+  ENDIF
+  WAV(ustop/k_unasp2, 25)
+endphoneme
+
+
+phoneme t
+  vls dnt stop
+  lengthmod 2
+  voicingswitch d
+  Vowelin f1=0  f2=1600 -300 300  f3=-100 80
+  Vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
+  IF nextPh(isPause2) THEN
+    WAV(ustop/t_dnt, 25)
+  ENDIF
+  WAV(ustop/t_unasp3, 50)
+endphoneme
+
+

phsource/ph_english_us

 
 phoneme 0
   vowel  starttype #a   endtype #a
-  length 200
+  length 220
   ipa ɑː
   ChangeIfDiminished(@)
   IF nextPh(r) THEN
 
 phoneme A:
   vowel  starttype #a  endtype #a
-  length 200
+  length 220
   IF nextPhW(r) THEN
     FMT(vwl_en_us/aar)
   ENDIF
 
 phoneme i:
   vowel  starttype #i  endtype #i
-  length 170
+  length 180
   IfNextVowelAppend(;)
   FMT(vowel/i_en)
 endphoneme
 
 phoneme O:
   vowel  starttype #o  endtype #o
-  length 200
+  length 220
   ChangeIfDiminished(@)
   IF nextPhW(r) THEN
     FMT(vwl_en_us/oor)

phsource/ph_german

       IF prevPhW(isVowel) THEN
         ChangePhoneme(R)
       ELSE
-        IF prevPhW(t) OR prevPhW(p) OR prevPhW(k) THEN
-          PauseBefore 40
-        ELSEIF prevPhW(d) OR prevPhW(b) OR prevPhW(g) THEN
+        IF prevPhW(t) THEN
+          PauseBefore 30
+        ELSEIF prevPhW(d) OR prevPhW(b) OR prevPhW(g) OR prevPhW(k) OR prevPhW(p) THEN
           PauseBefore 15
         ELSE
           InsertPhoneme(@-)

phsource/ph_spanish

 endphoneme
 
 
-
-
-phoneme k
-  vls vel stop
-  lengthmod 2
-  voicingswitch g
-  Vowelin f1=0  f2=2300 200 400  f3=-100 80
-  Vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
-
-  IF nextPh(isPause2) THEN
-    WAV(ustop/k_)
-  ELIF nextPh(#i) OR nextPh(;) THEN
-    WAV(ustop/ki_unasp2, 50)
-//  ELIF nextPh(isRhotic) THEN
-//    WAV(ustop/kr)
-//  ELIF nextPh(l) THEN
-//    WAV(ustop/kl)
-  ENDIF
-  WAV(ustop/k_unasp2, 50)
-endphoneme
-
-
-phoneme t
-  vls dnt stop
-  lengthmod 2
-  voicingswitch d
-  Vowelin f1=0  f2=1600 -300 300  f3=-100 80
-  Vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
-  IF nextPh(isPause2) THEN
-    WAV(ustop/t_unasp3, 30)
-  ENDIF
-  WAV(ustop/t_unasp3, 60)
-endphoneme
-
-

src/dictionary.cpp

    If 'tonic' is set (>= 0), replace highest stress by this value.
 
   control:  bit 0   This is an individual symbol, not a word
+            bit 1   Suffix phonemes are still to be added
 */
 
 	unsigned char phcode;
 		break;
 	}
 
-   if((stressflags & S_FINAL_VOWEL_UNSTRESSED) && (vowel_count > 2) && (max_stress_input < 3) && (vowel_stress[vowel_count - 1] == 4))
+   if((stressflags & S_FINAL_VOWEL_UNSTRESSED) && ((control & 2) == 0) && (vowel_count > 2) && (max_stress_input < 3) && (vowel_stress[vowel_count - 1] == 4))
    {
+		// Don't allow stress on a word-final vowel
+		// Only do this if there is no suffix phonemes to be added, and if a stress position was not given explicitly
 		if(phoneme_tab[final_ph]->type == phVOWEL)
 		{
-			// don't allow stress on a word-final vowel
 			vowel_stress[vowel_count - 1] = 1;
 			vowel_stress[vowel_count - 2] = 4;
 		}

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.48.12  01.Nov.14";
+const char *version_string = "1.48.13  04.Nov.14";
 const int version_phdata  = 0x014801;
 
 int option_device_number = -1;

src/tr_languages.cpp

 			tr->langopts.param[LOPT_REDUCE] = 1;        // reduce vowels even if phonemes are specified in it_list
 			tr->langopts.param[LOPT_ALT] = 2;      // call ApplySpecialAttributes2() if a word has $alt or $alt2
 			tr->langopts.numbers = NUM_SINGLE_VOWEL | NUM_OMIT_1_HUNDRED |NUM_DECIMAL_COMMA | NUM_ROMAN | NUM_DFRACTION_1 | NUM_ROMAN_CAPITALS | NUM_ROMAN_AFTER;
+			tr->langopts.numbers2 = NUM2_NO_TEEN_ORDINALS;
 			tr->langopts.accents = 2;   // Say "Capital" after the letter.
 			SetLetterVowel(tr,'y');
 		}

src/translate.cpp

 	int wmark;
 	int was_unpronouncable = 0;
 	int loopcount;
+	int add_suffix_phonemes = 0;
 	WORD_TAB wtab_null[8];
 
 	// translate these to get pronunciations of plural 's' suffix (different forms depending on
 
 	/* determine stress pattern for this word */
 	/******************************************/
+	add_suffix_phonemes = 0;
+	if(end_phonemes[0] != 0)
+	{
+		add_suffix_phonemes = 2;
+	}
+
 	prefix_stress = 0;
 	for(p = prefix_phonemes; *p != 0; p++)
 	{
 	else
 	{
 		if(prefix_phonemes[0] == 0)
-			SetWordStress(tr, phonemes, dictionary_flags, -1, 0);
+			SetWordStress(tr, phonemes, dictionary_flags, -1, add_suffix_phonemes);
 		else
-			SetWordStress(tr, phonemes, dictionary_flags, -1, 0);
+			SetWordStress(tr, phonemes, dictionary_flags, -1, add_suffix_phonemes);
 #ifdef PLATFORM_WINDOWS
 		sprintf(word_phonemes, "%s%s%s", unpron_phonemes, prefix_phonemes, phonemes);
 #else