[1.47.11b]

Language updates: en, ga, hy, pt, sl, ta, vi


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

dictsource/dict_phonemes

 ts   v    x    z    
 
 
-Dictionary en_dict  2013-05-17
+Dictionary en_dict  2013-05-29
 
 0    0#   3    3:   @    @-   @2   @5   
 @L   a    a#   A:   A@   aa   aI   aI3  
 tS   v    z    Z    z2   z3   
 
 
-Dictionary ga_dict  2013-04-25
+Dictionary ga_dict  2013-05-18
 
 0    0#   @    a    a#   A:   aI   aI#  
 aU   aU#  e    E    E#   e:   eI   i    
 
 :    ;    b    c    C    d    d[   dZ   
 f    g    h    j    k    l    m    n    
-p    Q    Q"   r    R    s    S    t    
-t[   tS   v    w    x    X    z    Z    
+N    p    Q    Q"   r    R    s    S    
+t    t[   tS   v    w    x    X    z    
+Z    
 
 
 Dictionary grc_dict  2008-03-03
 z    Z    
 
 
-Dictionary hy_dict  2013-05-03
+Dictionary hy_dict  2013-05-22
 
 @    a    aI   e    eI   i    i@   o    
 u    W    y    
 tS   ts   tS;  v    x    z    Z    
 
 
-Dictionary ml_dict  2013-05-18
+Dictionary ml_dict  2013-05-19
 
 @    a    a#   a:   aI   aU   e    E    
 e:   i    I    i:   o    o:   r-   u    
 ts;  v    w    x    z    Z    Z;   
 
 
-Dictionary pt_dict  2013-05-09
+Dictionary pt_dict  2013-05-29
 
 &    &/   &U~  &~   @    @-   a    A    
 aI   aU   e    E    eI   EI   eU   EU   
 x    z    Z    
 
 
-Dictionary sl_dict  2013-05-16
+Dictionary sl_dict  2013-05-22
 
 @    @-   a    e    E    E#   i    o    
 O    o+   u    y    
 
-:    b    d    dZ   dz   f    g    h    
-j    k    l    l^   m    n    N    n^   
-p    r    R    R^   s    S    t    tS   
-ts   tS;  v    v#   w    x    z    Z    
+*    :    ;    b    c    d    dZ   dz   
+f    g    h    j    k    l    l^   m    
+n    N    n^   p    r    R    R^   s    
+S    t    tS   ts   tS;  v    v#   w    
+x    z    Z    
 
 
 Dictionary sq_dict  2008-12-22
 v    w    x    z    
 
 
-Dictionary ta_dict  2013-05-10
+Dictionary ta_dict  2013-05-18
 
 a    a:   aI   aU   e    E    e:   i    
 I    i:   o    o:   u    U    u2   u:   
 v    w    x    z    Z    z.   
 
 
-Dictionary vi_dict  2013-04-21
+Dictionary vi_dict  2013-05-18
 
 @    @-   @:   @:I  @:U  @I   @U   a    
 a:   a:I  a:U  aI   aU   e    E    eU   

dictsource/en_list

 // ?7  Scottish
 // ?8  Use full vowel, not schwa in some word endings
 
-// $alt1   use strong ending (-an, -table, -inal, -ier)
-// $alt2   use weak ending (ard, ate, ery, ess, ile, men)
+// $alt1   use strong ending (-an, -ance, -ative, -table, -inal, -ier)
+// $alt2   use weak ending (ard, ate, ery, ess, ile, men, on)
 // $alt3   use weak first vowel, a->[a#], e->[@], o->[0#]
 // $alt4   separate 'h', not 'th'
 // $alt6   'to'
 ћ	tS;E:
 ђ	djE:
 ќ	kjE:
+љ	ljE:
 
 
 // Arabic letters
 scsi	skVzi
 ssip	$abbrev
 st	s@nt
+tbsp	teIb@Lspu:n
 th	T
 thu	T3:        // Thursday
 ?5 thu	TIR        // Thursday
 url	$abbrev
 usa	$abbrev
 usb	$abbrev
+usda	$abbrev
 ussr	$abbrev
 utc     $abbrev
 uv	$abbrev
 awry		a#raI
 axes		aksI#z
 axon		aks0n
+ayuh		a#j'@
 
 backend		bak'End
 backstory	baksto@ri
 ?3 beta		beIt@
 betake		bI2teIk
 beverage	bEv@rI2dZ
+bhaji		bA:dZi
 bias		baI@s
 biased		baI@st
 bible		baIb@L
 canvas		kanv@s
 capita		kapIt@
 capitol		kapIt@L
+capri		ka#pri:
 caprice		ka#pri:s
 carafe		ka#raf
 ?!3 caramel	kar@mEl $onlys
 cigarette	sIg@'rEt
 cinema		sIn@m@
 cinnamon	sIn@m@n
-circumference	$2
+circumference	s3:k'Vmfr@ns
+circumstance	$alt1
 circumvent	s3:k@mvEnt
 ?5 circumvent	sIRk@mvEnt
 citadel		sIt@dEl
 competed	k@mp'i:tId
 competing	k@mp'i:tIN
 competition	k0mp@t'IS@n
+?3 composite	$2
 compromise	k0mpr@maIz
 compound	$2 $verb 
 ?3 comrade	k0mrad
 coral		k0r@L
 ?3 cordial	kO@dZ@L
 coronet		k0r@nEt
+corolla		k@roUl@
 corollary	$2
 corporal	kO@pr@L
 corporate	kO@p@r@t
 corps		kO@           $only
 corral		k@r'al
+corsage		kO@s'A:Z
 cosmos		k0zm0s
 ?3 cosmos	k0zmoUs
 cougar		ku:g3
 cutout		kVtaUt
 cyan		saI'an
 cymru		kVmri
+cypress		saIpr@s
 
 dahlia		deIli:@
 dais		deIIs
 debut		deIbju:
 ?3 debut	deIb'ju:
 decade		dEkeId
+decaf		di:kaf
 decent		di:s@nt
 decibel		dEsI#b@L
 declaration	dEkl@'reIS@n
 epub		i:pVb
 equal		i:kw@L
 equation	I2kweIZ@n
+equipage	EkwIpIdZ
 equivocal	I2kwIv@k@L
 erase		I2reIz        // erasing erases
 eraser		I2reIz3
 fedora		fI2d'o@r@
 feisty		faIsti
 feline		fi:laIn
+felon		$alt2
 feminine	fEm@nIn
 fete		feIt
 fetus		fi:t@s
 fiat		fi:@t
 fiery		faI3rI
 ?3 fillet	fI2leI
+finagle		fI#neIg@L
 finale		fI2nA:li
 finance		faInans       $only
 finance		$verb
 giraffe		dZI2raaf
 github		gIthVb
 glacier		gleIS3
+goatee		$2
 ?3 goddess	$alt2
 goin		,goUI2n $only // for goin'
 gonna		g,@n@
 gurus		gu:ru:z
 
 habitual	$alt3
+hacienda	hasI'End@
 haggis		hagIs
 haha		hA:h'A:
 halation	$alt3  // in-
 heist		haIst
 helium		hi:li@m
 helix		hi:lIks
+helluva		hEl@v@
 hello		h@loU
 henceforth	hEnsfo@T
 ?3 herb		3:b
 heroine		hEroUIn
 heron		hEr@n
 herpes		h3:pi:z
+hiatus		haI'eIt@s
 hideout		haIdaUt
 hindus		hIndu:z
 hiya		haIa#
 hooah		h'u:'A:
 hopi		hoUpi:
 horizontal	$3
+hormonal	ho@m'oUn@L
 (hors d'oeuvres) O@'d3:vz
 hospitable	h0sp'It@b@L
 hostage		h0stI2dZ
 however		$2
 howto		haUtu:
 hubris		hu:brIs
+hula		hu:l@
 humane		$2
 hunger		hVNg3
-hurrah		h@r'A:
-hurrah		hVr'eI
+hurrah		h@rA:
+hurray		h@reI
 hurricane	hVrI2keIn
 ?3 hurricane	h3:@keIn
 hussar		hVz'A@
 huzza		h@z'A:
 huzzah		h@z'A:
+hydrangea	haIdr'eIndZ@
 hyperbola	haIp'3:b@l@
 hyperbole	haIp'3:b@li
 hypoxia		haIp'0ksi@
 intel		Int2El
 interim		$1
 intermediate	Int3m'i:di@t
+interment	I2nt3:m@nt
 intern		Int3:n  $noun
 interrogatory	$3
 intestine	I2ntEstI#n
 jedi		dZEdaI
 jehovah		dZ@hoUv@
 jesus		dZi:z@s
+joie		ZwA:
 jour		ZU@  // french
 jukebox		dZu:kb0ks
 july		dZu:l'aI
 kebab		k@bab
 ?3 kebab	k@bA:b
 kefir		ki:f3
-hiatus		haI'eIt@s
+?3 khaki	kaki
 kilo		ki:loU
 kilometer	kIl'0mI2t3
 kilter		kIlt3
 lager		lA:g3
 laity		leI@ti
 landowner	l'and,oUn3
+lapel		$alt3
 las		,las $only
 ?3 las		,lA:s $only
 lasagna		l@zanj@
 lingerie	l0nZ@ri
 ?3 lingerie	l0nZ@r'eI
 linen		lInI2n
+linoleum	$2
 liqueur		lI2kjU@
 ?3 liqueur	lI2k3:
 liter		li:t3
 marquee		mA@k'i:
 margarine	mA@dZ3ri:n
 ?3 margarine	mA@dZ3r@n
+maroon		$alt3
 marquis		mA@rk'i:
 marshall	mA@S@L
 martinet	$3
 //mercenary	m3:s@n@rI
 merest		mi@r@st
 meringue	m@raN
+merlot		me@l'oU
+mesa		meIs@
 meson		mi:z0n
 metabolic	mEt@b'0lIk
 metaphor	mEt@fO@
 metastable	$alt1
+mezzanine	mEz@ni:n
 miaou		mi:'aU
 miaow		mi:'aU
 mic		maIk
 nicety		naIs@ti
 nikon		naIk0n
 ninja		nIndZ@
+nitrous		naItr@s
 noah		noUV
 nobly		noUblI       $verbf
 nobody		'noUb0di
 obesity		oUb'i:s@ti
 obey		oUb'eI
 obituary	0b'ItSU@i
-?3 obituary	0b'ItSUe@i
+?3 obituary	oUb'ItSUe@i
 object		$1 $onlys
 object		$verb
 obsolete	0bs@li:t
 pasted		peIstI#d
 pasting		peIstIN
 pastry		peIstri
+partake		$2
 pate		pat2eI
 ?3 patent	pat@nt
 pathe		paTeI
 petit		p@ti:
 petite		p@ti:t
 petroleum	p@troUli:@m
+?3 petulant	pEtS@l@nt
 petunia		$alt3
 pharaoh		fe@roU
 philistine	fIlI2staIn
 piña		pi:n^a#
 pineapple	p'aInap@L
 pinged		pINd
+pinot		pi:noU
 pint		paInt
 pioneer		paI@n'i@3
 pious		paI@s
 riposte		rI2p0st
 risen		rIz@n
 robust		roUb'Vst
+robusta		$2
 romance		roUm'ans
 rotate		$2
 rotund		roUt'Vnd
 routine		$2
 row		roU
 row		raU	$noun
+royale		rOI'al
 ruby		ru:bi
 rugged		rVgI#d
 ruin		ru:I2n          // for ruining
 salami		$alt3
 saline		seIlaIn
 ?3 saline	seIli:n
+saliva		$alt3
 salmon		sam@n
 ?3 salon	$alt3
 saloon		$alt3
 secretary	sEkr@trI
 sedan		sI2dan
 sedate		sI2deIt
-seduce		sI2dju:s
 sega		seIg@
 segue		sEgweI
 separate	sEp@-r@t
 taboo		$2
 tabu		tabu:
 taffeta		tafI#t@
+(tai chi)	taI'tSi:
 takel		tak@L
 talent		tal@nt
 tallyho		talI'hoU
-timbre		tamb3
 tampon		tamp0n
 tangerine	tandZ@r'i:n
 taoiseach	ti:S@x
 (tear off)	t'e@||'0f
 teargas		ti@3gas
 teddybear	t'EdIb,e@
+tejano		tI#hA:noU
 telemetry	t@lEm@tri
 telepathy	t@lEp@Ti
 telephony	t@l'Ef@ni
 temperature	tEmprI2tS3
 ?!3 temporary	tEmpr@rI
 ?3 template	tEmpl@t
+tetanus		tEt@n@s
 therefore	$1
 thereof		De@r'0v
 thermos		T3:m@s
 thesis		Ti:sIs
 theta		Ti:t@
 tho		DoU $only
-thousand	TaUz@nd
 throughout	$2
 thursday	T3:zdeI
 ?5 thursday	TVRzdeI
 tierra		tI'e@r@
 tikka		ti:k@
 tilde		tIld@
+timbre		tamb3
 timetable	taImteIb@L
 timider		tImId3
 tiny		taIni
 tirade		taIr'eId
+tiramisu	tIramI'su:
 tis		tIz $only
 toboggan	t@b0g@n
 today		t@deI
 twos		tu:z
 typo		taIpoU
 tyr		taI3
+tyranny		tIr@ni
+?3 tyranny	ti@3r@ni
 
 ukulele		ju:k@l'eIli
 ultraviolet	$3
 unaware		Vn@w'e@
 uncle		VNk@L
 undeny		VndIn'aI
+underground	$1 $noun
 underling	$1
 underlings	Vnd3lINz
 underworld	$1
 upgrade		$verb
 uproot		$2
 uplift		$2
-upset		$1 $onlys
-upset		Vps'Et        $past
+upset		$1        $noun
 upstart		$1
 uptight		$2
 urine		jU@rIn
 vegetable	vEdZI2t@b@L
 vehicle		vi@k@L
 vega		vi:g@
+vegetative	$alt1
 veggy		vEdZI
 vengeance	vEndZ@ns
 ventriloquist	$2
 vitamin		vIt@mI#n
 ?3 vitamin	vaIt@mI#n
 vitriol		vItri:@l
+vivre		vi:vr@-
 voila		vwal'A:
 ?3 voila	vwA:l'A:
 volcano		v0lk'eInoU
 (winds up)	w'aIndz||'Vp
 winded		wIndI#d
 winged		wINd
+wino		waInoU
 wither          wID3          // not with+er
 without		$2
 wordprocessor	$2
 Morecambe	mo@k@m
 Norfolk		nO@f@k
 Norwich		n0rI2tS
+Piccadilly	$3
 Plymouth	plIm@T
 Regis		ri:dZI2s
 Rhyl		rIl
 Arkansas	A@k@nsO:
 Atlantis	atl'antIs
 Athens		aTI2nz
+Augusta		$2
+Baja		bA:hA:
 Bahrain		$2
 Bangledesh	baNgl@d'ES
 Barbados	bA@'beId0s
 Liberia		laIb'i@ri:@
 Lima		li:ma#
 Ljubljana	lju:blj'A:n@
+Lorraine	$alt3
 Louisiana	lu:,i:zi:'an@
 Luxembourg	lVks@mb3:g
 Lvov		l@-v0v
 Manhatten	$2
 Manila		$alt3
 Massachusetts	$3
+Maui		maUi:
 Maya		maI@
 Mayan		maI@n
 Melbourne       mElb3n
 Miami		maI'ami
 Michigan	mISIg@n
 Milan		$2
+Milwaukee	$2
 Mindanao	mInd@n'aU
 Mineola		mIni:'oUl@
 Minneapolis	mIni:'ap@lI2s
 Seychelle	seIS'El
 Shanghai	$2
 Shiloh		SaIloU
+Shreveport	Sri:vpo@t
 Siam		saI'am
 Sicily		sIsI2li
 Sinai		saInaI
 Abu		abu:
 Abraham		eIbr@ham
 Ada		eId@  $onlys
+Adolphus	$alt3
 Adrian		eIdri@n
 Agatha		aga#T@
 Aggie		agi
 Angela		andZ@l@
 Angelika	$2
 Anita		$alt3
+Annamaria	an@ma#r'i:@
 Anthony		ant@ni
 Anton		ant0n
 Aoife		i:f@
 Evan		Ev@n
 Evette		I2vEt
 Fainne		fan;@
+Felipe		fI#li:peI
 Freda		fri:d@
 Fírinne		fi:rIn;@
 Gareth		gar@T
 Guinevere	gwInI#vi@3
 Hadrian		heIdri:@n
 Hamish		heImIS
+Harold		har@Ld
 Harriet		hari@t
 Harvey		hA@vi
 Heidi		haIdi
 Liam		li:@m
 Lindsay		lInzi
 Lindsey		lInzi
-Llewellyn	l#@w'ElIn
-Llywelyn	l#@w'ElIn
+Llewellyn	lUw'ElIn
+Llywelyn	lUw'ElIn
 Loinnir		lVni@
 Lois		loUIs
 Louis		lu:i
 Mellisa		$alt3
 Mellissa	$alt3
 Melissa		$alt3
+Meredith	mEr@dIT
 Michele		mI2SEl
 Michelle	mI2SEl
 Miguel		mi:Q'El
 Timothy		tIm@Ti
 Tina		ti:n@
 Titania		tIt'A:ni@
+Titus		taIt@s
 Tracy		treIsi
 Triani		tri:'ani
 Trina		tri:n@
 Carnegie	kA@n@gi
 Cohen		koU@n
 Connolly	$1
+Cortez		$2
 Cthulhu		k@-Tu:l#u:
 Chrysler	kraIsl3
 (da vinci)	da#vIntSi
 Dante		dA:nt2eI
 Deslauriers	dI2lo@rIeI
 Deveraux	dEv3roU
+Digiorno	dI#Zo@noU
 Disney		dIzni
 ?3 Dolby	doUlbi
 Dolce		d0ltSeI
+Dulles		dVl@s
 Dvorak		d@-vo@Zak
 Emory		Em3ri
 Fleming		flEmIN
 Gutierrez	gu:tj'ErEz
 Hades		heIdi:z
 Hamilton	ham@Lt@n
+Heinz		haInz
 Hoosier		hu:Z3
 Jacobi		dZa#koUbi
 Kendell		kEnd@L
+Khrushchev	kru:StSEf
 Kyocera		kaI|@s'i@r@
 Lamaze		la#mA:z
 Laurell		$2
 Michelangelo	maIk@L'andZ@loU
 Montague	m0nt2@gju:
 Mozart		moUtsA@t
+Nietzsche	ni:tSi
 Niro		ni@roU
 Patel		$alt3
 Perez		p3rEz
 Shakur		Sa#kU@
 Tzu		tsu:
 Versace		v3sA:tSi
+Volkswagen	v'oUlksv,A:g@n
 Wii		wi::
 Yaesu		jeIsu:
 Yamaha		jam@hA:
 upon             @p0n		$u2
 from             fr0m		$u
 ?3 from          frVm		$u
+(from the)       fr,VmD@
 (from where)     %frVm||w'e@	$pause
 (from which)     %frVm||w'ItS	$pause
 up               ,Vp		$strend2
 I                aI		$u+ $verbf $only
 (I am)           %aIa#m
 (I am)           %aIam		$atend
+(I shall)        %aIS,a#l
+(I shall)        aIS'al		$atend
 he               hi:		$u $verbsf
 she              Si:		$u $only $verbsf
 it               It		$u $verbsf
 ?3 (it was)      %It||wVz	$atend
 it               		$allcaps $abbrev
 we               wi:		$u $verbf $only
+(we shall)       w%i:S,a#l
+(we shall)       wi:S'al	$atend
 you              ju:		$u $verbf
 they             DeI		$u $verbf
 
 whoever          hu:Ev3		$2
 whatever         w0tEv3		$2 $pause
 ?3 whatever      wVtEv3		$2 $pause
-while            w,aIl		$pause $strend
+while            w,aIl		$brk $strend
 whilst           w,aIlst	$pause
 
 
 (that a)         ,Dat@		$nounf
 (that an)        ,Dat@n		$nounf
 (that it)        ,Da#tIt	$verbsf
+(that was)       Da#t||w0z	$atend
 (that one)       D'atw,0n
 ?3 (that one)    D'atw,Vn
 (that the)       %DatD@2
+(that has been)  Da#tha#zbIn	$u+
+(that's been)    Da#tsbIn	$u+
 these            Di:z		$u $nounf $strend2 $only
 those            DoUz		$u $nounf $strend2 $only
 there            De@		$u $strend2 $only

dictsource/en_rules

          y) ache (_      eIk
          d) aches (_     eIks
          h) aches (_     eIks
+         k) aches (_     eIks
          r) aches (_     eIks
         rt) aches (_     eIks
         tr) ach (e       @k
          _) ac (ri       ak
             ac (ro       ak
          m) acro (@      akr@
+            ac (rum_     'eIk
          _) ac (t        ak
             ac (tory     'ak
             actu (A      aktSu:
             ague         eIg
             ag (a_       'A:g
             agi (_       'A:gI
-         @) agua (_      'agju:@
+            agua (_      'agju:@
+?3          agua (_      'A:gw@
 
 .group ai
          _) ai           eI
          _) al (ast      al
          m) alay         @l'eI
          _) al (b        al
+         _) al (ban      O:l
+         _) al (bani     al
          _) alber (tA    alb'3:
          _) al (c        al
             alco (h      alk@
          h) al (v        A:
 ?3       h) al (v        a
          m) al (no       %al
+       but) al (_        A:l
 
 .group am
          _) am (_        %am
       @erd) am (_        am
 ?!3     &h) am (_N       @m
         &s) am (_        @m
-        @r) am (a_       'A:m
+?3      @r) am (a_       'am
          _) am (al       a#m
             amateur      am@t3
 ?3          amateur      am@tS3
         _f) an (at       a#n
         pl) an (t_       an
          &) an (ce_      @n
+         &) an (ce_$w_alt1 an
 ?8       &) an (ce_      a#n
        fin) an (c        'an
          h) an (ce_      aan
         &l) ar (_        3
         &l) ar (ist      3
         &m) ar (_        3
+       lun) ar (_        =3
         _p) ara          ar@
         qu) ar (a        0r
         _p) ara (de      @reI
          @) ar (ity      ar
             ar (iu+      'e@r
         _p) arlia        A@l@
+         @) ar (ol       @r
             arom (at     a#roUm
             arre (_      A@
             arred (_     A@d
         _s) ata (n       eIt@
         _g) ator         eIt3
          &) ate (_$w_alt2    @t
+         &) ately (_     @tli
        der) ated (_      eItI#d
        pal) ate (_       @t
     consul) ate (_       @t
       mper) ate (_       @t
  _it_separ) ate (_       @t
        par) ates (_      eIt|s
+        ct) ate (_       =eIt
          @) ated (++_    eItId
         _s) ate (ll      at@
          @) ati (_       'A:ti
             at (im_      'eIt
          @) ating (++_   eItIN
          &) at (ive      @t
+         &) at (ive_$w_alt1 eIt
 //       &) ately (_     @tl%I
         ul) at (ory      'eIt
        sen) at           @t
          d) ata          eIt@
          f) at (al       eIt
        str) at (eg       at
-         m) at (er       at
+         m) at (er@      at
          p) at (ern      @t
          f) ath (er      A:D
          b) ath          aaT
          _) be (th       bE
             be (tray     bI2
          _) be (w        bI2
+         d) bed (_       bEd
+         E) bed (_       bEd
          h) bed (_       bEd
         er) bed (_       bEd
          t) bed (_       bEd
             co (mplex_   k0
             co (mplica   k0
             co (mplim    k0
-            co (mposit   k0
+            co (mposit   k0#
             co (mpost    k0
             co (mpou     k0
             co (mprehen  k0
          _) co (rri      k0
             co (rro      k@
             co (rrup     k@
+         _) co (sm       k0
          _) costar       koUstA@
          _) counter (@P7  k'aUnt3            // prefix
 
          _) devas        dEv@s
             de (via      di:
             de (vil      dE
+            de (vill     d@
             de (vio      di:
             de (von      dE
 
          _) e (ffac      %I
             e (ffec      %I
             e (ffic      %I
+            e (ffica     E
             efier (_     I2faI3
             e (ful
          _) e (ffu       %I
             e (qual      i:
          _) e (quat      %I
         _s) e (que       i:
-            e (quip      %I
-            equiv        %IkwIv
+         _) equi (@      ,i:kwI#
+         _) equ (in@     Ekw
+         _) equi (p      %IkwI
+            equiv (@     %IkwIv
          h) e (sion_     'i:
         @)  e (tio       i:
      discr) e (tion      E
          h) ed (ral      'i:d
          h) ed (ron      'i:d
          h) ed (ra       'i:d
+         @) ed (th_      @d
          @) edur         'i:dZ3
          &) ed (y        @d
 
          _) ele (g       ElI
          _) elem         ElIm
          _) ele (p       ElI
+         _) el (er       El
         sk) ele (t       ElI#
          _) ele (va      ElI
             el (igi      'El
          &) elling       @lI2N
          &) eling        @lI2N
          &) ell (ous     @l
+         &) el (ous_     @l
        cib) el (_        El
         xc) el (_        'El
        onn) el (_        'El
 .group em
          _) em           %Em
          _) em (a        I2m
+         &) em (a_       @m
          &) em (_        @m
             em (ail      i:m
          f) em (ale      i:m
       mill) en (ia       'En
          l) eni (e       i:nI
          v) eni (e       i:nI
+            en (sia      En
+            en (tsi      En
          &) en (t_       @n
 ?8       &) en (t_       En
          @) en (tal      'En
         &l) et (_        @t
          j) et (_        Et
          s) et (_        Et
-         t) et (_        Et
+         t) et (_        'Et
       @@An) et (_        Et
       phab) et (_        Et
        ber) et (_        eI
 
 .group eu
             eu           ju:
+         l) eu           u:
 ?3       n) eu           u:
-?3       n) eu (r        U@
+?3       n) eu (r@       U@
          r) eu (d        OI
             eu (m_       'i:@
          s) eu (m_       'i@
             for (ward    f'o@  // straightforward
             ft (en       f
          &) ful (_S3i     f@L
-         &) fully (_S5   f@li
-         &) fulness (_S7   f@Ln@s
 
 .group g
             g            g
             gh (C        g
             gh (an       g
             gm (_        m
+            gm (y_       m
             gn (_        n
       _poi) gn           nj
          _) gnu          g@nu:
             i (CCi_      'I
         XC) i (Ca_       i:
          @) i (Cate_     =I#
+         @) i (Cator_    =I#
          &) i (Cenc      I
          &) i (Cent      I
          @) i (Cer       I
          _) ich          Ik
             iche (_N     'i:S
          m) ichael       'aIk@L
+         l) ich (_       Ix
+         l) ich (er_     Ix
          &) i (ciCe_     =I
             i (cial      'I
             ician        'IS@n
          r) ia (b        I2@
          t) ia (b        I2@
          &) iage (_      I2dZ
+        &l) iage (_      I2I2dZ
             iah (_       'aI@
             ia (m        i@
          &) ia (n        i@
             imm (ig      Im
             imm (in      Im
             immo (bi     Im'oU
-            imm (unis    Im
+            imm (uniL06  Im
          _) immu (no     I2mju:
          @) imous (_     =Im@s
             im (pac      Im
          _) in (sole     In
          _) in (somu     In
          _) in (spir     In
+         _) in (stag     In
          _) in (stan     In
          _) instant      Inst@nt
          _) in (sti      In
         ll) ion (_       =i@n
          n) ion          =i@n
          v) io (l        aI@
-            ione (_      'aI@ni
+         @) ione (_      'aI@ni
+            ione (_      aI'oUni
          g) io (n+       @
          m) io (n        I20
         sh) io (n        @
          &) itous        =I#t@s
          l) itre         i:t3
          n) it (rA       aIt
+        _n) itro (@      ,aItroU     
          n) itro         aItroU
          n) itro (ge     aItr@
             it (um       aIt
          _) k (L01Y      k
          _) k (hY        k
          _) k (wY        k
+         _) kh (r@@      k
          _) kj (e@       kj
          _) kn (Y        n
             kn (if       n
        ief) ly (_S2      l%i
         ff) ly (_S2      l%i
         of) ly (_S2      l%i
+      &ful) ly (_S2m     l%i
          o) ly (_        l%i
     multip) ly           laI
         &p) ly (_S2      l%i
          _) nano (P4     n,anoU
             nause        nO:sI
             necessit     n@sEsIt
-         &) ness (_S4i   n@s
-?8       &) ness (_S4i   nEs
+         &) ness (_S4im  n@s
+?8       &) ness (_S4im  nEs
          @) n (cC        N
          @) n (ch        n
             n (c_        N
             o            0
          _) o            0
          X) o            0#
-         X) o ($w_alt3   %0#
+         X) o ($w_alt3++ %0#
          _) o'(P2        %oU     // prefix
             o'er         o@
             o (Ba_       'oU
         _h) o (cu        oU
         cr) o (cu        oU
             o (cyte_     =@
+         _) o (dA        oU
         _b) o (dy        0
       cust) o (d         @
          k) o (dA        oU
          s) ol (idi      @l
          f) ol (k        oU
          y) ol (k        oU
+         n) oll          oUl
          p) oll (u       @l
          r) oll          oUl
         tr) oll (A       0l
             olo (gic     @l'0
          &) ol (ous_     @l
             olt          oUlt
+         v) olt          oUlt
+         v) ol (C        0l
          w) olv          Ulv
        N_p) oly          ,0lI
          _) ol (ym       @l
 
 .group on
         @@) on (_        @n
+         @) on (_$w_alt2 @n
 ?8       @) on (_++      0n
         %C) on (_        @n
         &b) on (_        @n
          _) re (creat    ,ri:
          _) re (creati   rE
             re (ct       rE
-            re (dC       rE
+         _) re (dC       rE
          _) re (deCP2    ,ri:
         un) rede (C      ,ri:dI2
             re (dem+     rI2
             re (act      rI2
         _c) re (mat      rI2
             rement       rIm@nt
+         _) re (mons     rE
          _) re (nC       rE
             re (nova     rE
          _) reper (t     rEp3
             re (pli      rE
             re (prim     rE
             re (pt       rE
+            re (quis     rE
          _) re (scu      rE
             re (sidue    rE
             res (ign     rI2z
          _) s (va        s
          _) s (ve        s
          _) s (wY        s
-         _) s (zY        s
+         _) sz (@@       Sz
 
             sche (m      ski:
          _) sch (ism     sk
         _e) sch          S
 ?3          sch (ed      sk
          _) sch (il      S
-         _) scar (A      ske@
          _) scar (a      skar
             scarc        ske@s
             sc (L02      s
          e) s (d         z
          _) se (clu      sI2
             secur        sI2kjU@
+         _) se (duc      sI2
             self (_      'sElf
             selves (_    'sElvz
          _) semi (@@P4   s,EmI2
             th (old      th
             th (ole      th
          _) th (om@      t
+            thousand     TaUz@nd
         ph) th           T
       smoo) th           D
        wor) th (_        T
          @) u (da_       'ju:
 ?3    @L08) u (da_       'u:
          b) u (ddh       U
+?3       b) u (ddh       u:
             u (esq       ju:
             u (ga_       'u:
          f) u (gal       'ju:
          d) u (ly        ju:
          z) u (l_        'u:
          &) um (_        @m
+      circ) um           @m
        vol) u (me        ju:
             u (ma_       'u:
          h) u (man       ju:
 ?3       _) vibra (t     v'aIbreI
             vivi (@      vIvI
             viv (_       vaIv
-         _) vo (lC       v0
 
 .group w
             w            w

dictsource/ga_list

 // Irish Gaeilge dictionary
 // written by Ronan McGuirk
 //  2013
-// version 2.6.1
+// version 2.7
 // Please send comments and suggestions to [email protected]
 
 // This file is UTF8 encoded
 p	pi:
 q	kju:
 r	ar
-s	Es
+_s	Es
 t	ti: $atend
 u	ju:
 v	vi:
 ach	0x		$u
 ag Eg $verbf $u
 anall	@n'aUl
+anam	'0n@m
 aige @g'E
 air Er
 acu 0k'U
 arsa	@rs@
 agaibh	0g@Iv
 agus	0g@s
+aisfhilleadh	,aS'Il;@
 amach	@m'0x
 amárach	@m'A:r@x
 amuigh	@mu1'I
 amháin @w'A:in
 am aUm
 anaithnid	'0nah@nIdZ
-anois	@nIS
 anonn @naUn
 ann aUn
 anseo	@nS'O
 chun	xUn		$u
 crainn kri:n
 chrainn	xri:n
+cúlslais	ku:lslaS
 de	dE		$u+
 des	dEs		$u
 
 rabh	raU
 raibh rEv
 raidió	r'adi:o:
-réamhrá r'e:@vr,a:
 réidh	re:
-'s	s
-samhain saUIn
+rímhaith	R'i:w0
+(s é)	S'e:
+(s í)	S'i:
 	  san s@n
 	  seo S@_
 	tabhair t'u:@r

dictsource/ga_rules

 // translation rules for Irish Gaeilge
 // This file is UTF-8 encoded
 // written by Ronan McGuirk  2013
-// Version 2.6.1
+// Version 2.7
 // Please send comments and suggestions to [email protected]
 
 
 
 .L01 e i é í // slender vowels
 .L02 c ch d g gh n  s // following ea gets ; sounds
-.L03 b bh mb  c ch f m mh dh   // used for words likemuir or cuid
+.L03 b bh mb  c ch f m mh dh p ph   // used for words likemuir or cuid
 .L04 b bh mb    // for words like beag
 .L05 nn nna nnas dh r s ntas nach nas nais dar mar rtha nta mh chas chais cht  chta nnach ntach llach d l  ll             // word endings where @ is to repleace ea or a
-.L06 aidh idh aí á eá eadh adh ad adsa imid aimid imis aimis  ainn inn idís aidís éin      // word endings where f changes to h
+.L06 aidh idh aí á eá eadh adh ad ead  adsaeadsa  imid aimid imis aimis  ainn ainnse inn innse idís aidís éin      // word endings where f changes to h
 .L07 b c g ch bh gh mb
 .L08 lc ll nt bhse       // for words like cailc
 .L09 cl cr chr  f
 .L13 oc omb
 .L14 río dún gnío        // followed with mh
 .L15 c ch  f bhf  m d dh g gc  gh mh // aoi following
-.L16 b c bh ch gr ghr    // for inn word ending
+.L16 b c bh ch gr ghr t th    // for inn word ending
 .L17 l le li niste nn
 .L18 n nt nte neann neadh ntear nim nfear nfinn nfidh nfidis neamar
 .L19 na nea ra rea la llea arga     // word endings with silent dh
 .L20 eo eoir eá eabh io iu iú               // slender m
-.L21 ll nn ndán nntán
+.L21 ll nn nna nnta ndán nntán nntáin
 .L22  eadh eag eaga eagán eagáinín eo  io iu iú eall eabh ealtaine eann
 .L23 ea eo i
 .L24 b mb bh g gh p ph bp m mh
         adh (C     aI
         abht       aU#t[
         amhr       aUr       //	words like amhras
+        amha       aU@
      K) amhl       aUl
         abh (C     aU        //	words like slabhra
         aghaidh    aIg
      X) a (nn_     aU#
      X) a (ll_     aU#
         abha       aU@
+        abhai      aU@
         am (pla    aUm
         ama (_     aU#m@
         athair     'ah@r
         agh (d     aI
         agh (s     aI
      _) ath        0h
-
+        a (rraige  a
         ai (m_     @
         aí         i:
         aoi        @i:
         amhna (_   aUn@
         arraing    arIng
      _) ath (@@P3  ,0_
+     _) athr       '0hr
 
 .group á
         á          A:
         ai         a#
    L04) ai (L17    0#
         aile (_    '0l;E     // words like baile
-    Xc) ai (l      '0#
-    ch) ai (l      '0#
+    Xc) ai (lA     '0#
+    ch) ai (lA     '0#
      m) ai (n      0#
      c) ai (th     0#
     ch) ai (th     0#
+        ai (lleach 0#
         ai (tín    0#
         ai (d      0#
      p) ai (l      0#
      @) ai (L11_   I
-        ai (L08+   aI#
+        ai (L08++  aI#
      c) ai (l_     I
         ai (msi    'aI       // words like aimsir
   _L04) ai (L18_++ u1'I//words like bain
      X) aigh       'aI
         aigh       aI#       L04)	aill	(_	wi:l
         aing (_    Ing
-        ai (llimh  '0        // words like Gaillimh
+        ailleach   '0l;@x
+        ai (llimh++ '0       // words like Gaillimh
+        aidhm      aIm
 
 
 .group b
         deirfiúr   d;r@f'u:r
         dheirfiúr  g;r@f'u:r
      _) do (Ch@@P2 d[,U_
-     _) dí (@@P2   d,i:
+     _) dí (C@@P2  d,i:
+        dícheall   d;'i:Ca#l
 
 .group e
         e          E#
 
         eo         o:
         eoi        o:
+        eoi (CC_   o:I
+        eoi (g     o:I
         eogha      o:
         eoghai     o:
      d) eo (ch     O#
      s) eo (_      @
 
 
+
 .group é
         é          'e:
         éi         'e:
         fh (éin_   h
         fh (L22    ;         // slender
      @) f (L06_    h
+        fios       fIs
+        fhios      Is
      _) fo (C@@P2  f,U
      _) fogh       f'aU
+     _) forb       f'Orb
+     _) foc (@++   fOk
 ?1 _bh_) f (@ 
 ?1 _bh_) f (L22     ;
 
         i          I
      _) i          I
         ia         i@
+        iu         U
         ia (tha    i:
         io         O#
         io (dá     I
         ll (L23    l;
         l (g       l@
         l (b       l@
+        ll (b      l
      _) lorg (@@P4 l,Or@g
-     _) lán (C@@P3 l,A:n
+     _) lán (@@P3  l,A:n
 
 .group m
         m          m         // broad
 ?1   _) n (_L01    n;
      _) nd         n         // urú
      _) nd (L01    n;        // urú slender
-     _) ng         n
-     _) ng (L01    n;
+     _) ng         N
+     _) ng (L01    N;
 ?1   _) n (_d      n         // urú
 ?1   _) n (_dL01   n;        // urú slender
-?1   _) n (_g      n
-?1   _) n (_gL01   n;
+?1   _) n (_g      N
+?1   _) n (_gL01   N;
         nn         n
-        nn (L01    n;        // slender
+        nn (L01    nj        // slender
+     i) nn (_      N
         n (b       n@
         n (m       n@
         n (bh      n@
   _L15) oi (+      @'I
      _) oi (b      I
         oi (de     I
+        oi (di     I
+        oi (c_     I
      h) oi (b      I
      _) oi (r      I
      r) oi         I
         oi (nnío   @
         oi (mis    @
         ois (++    O#S
+     n) ois (_++   IS
         oill       w'i:l
      _) oi (leá    'I
         oidh       aI
         oir (_     'ERR
    _sc) oi (r      O
         oigh (ea   aI
+        oighn      aIXn
 
 
 .group p
         r (bh      r@
      s) r (A       R
      _) ramh       raU
+     _) réamh (@P5 r,e:v
 
 
 .group s
         s          s         // broad
    L01) s          S         // slender
         s (L01     S         // slender
-        s (cL01    S
+        s (CL01    S
         s (CCL01   S         // slender
         s (pCé     s         // broad
 ?1 _t_) s (@ 
         uai        u@
         uai (g     ui
         uai (d     ui
+        uainn      u:iN
         uá         u:'A:
         ui         I
-        ui (s      U
-        ui (sce_   I
+
         uinn (_    'i:n
         uinti      U#'i:ntI
     _b) uí         wi:
         ú          u:
         únmh       u:nv
 
-        úi (r      u:
+        úi         u:
+        úinn (_    u:IN
+        úibh (_    u:Iv
+
 
 
 // words which contain j k q v w x y z, speak as English
 
 .group v
         v          _^_EN
+        véarsa     ve:rs@
 
 .group w
         w          _^_EN

dictsource/hy_rules

 
 .group բ
         բ        b
-     _) բ (C     b@
+     _) բ (B     b@
 
 .group գ
         գ        g
-     _) գ (C     g@
+     _) գ (B     g@
 
 .group դ
         դ        d
-     _) դ (C     d@
+     _) դ (B     d@
 
 .group ե
         ե        e
 
 .group զ
         զ        z
-     _) զ (L01   @z
-     _) զ (C     z@
+     _) զ (L01+  @z
+     _) զ (B     z@
 
 .group է
         է        e
 
 .group թ
         թ        t#
-     _) թ (C     t#@
+     _) թ (B     t#@
 
 .group ժ
         ժ        Z
 
 .group լ
         լ        l
-     _) լ (C     l@
+     _) լ (B     l@
 
 .group խ
         խ        X
 
 .group ծ
         ծ        ts
-     _) ծ (C     ts@
+     _) ծ (B     ts@
 
 .group կ
         կ        k
-     _) կ (C     k@
+     _) կ (B     k@
 
 .group հ
         հ        h
-     _) հ (C     h@
+     _) հ (B     h@
 
 .group ձ
         ձ        dz
-     _) ձ (C     dz@
+     _) ձ (B     dz@
 
 .group ղ
         ղ        r"
-     _) ղ (C     r"@
+     _) ղ (B     r"@
 
 .group ճ
         ճ        tS
-     _) ճ (C     tS@
+     _) ճ (B     tS@
 
 .group մ
         մ        m
-     _) մ (C     m@
+     _) մ (B     m@
      C) մ (_     @m
    L02) մ (_     m
 
 .group յ
         յ        j
-     _) յ (C     j@
+     _) յ (B     j@
 ?1   _) յ        h
-?1   _) յ (C     h@
+?1   _) յ (B     h@
 
 .group ն
         ն        n
-     _) ն (C     n@
+     _) ն (B     n@
      C) ն (_     @n
    L02) ն (_     n
 
 .group շ
         շ        S
      _) շ (տ     @S
-     _) շ (C     S@
+     _) շ (B     S@
 
 .group ո
         ո        o
 
 .group չ
         չ        tS#
-     _) չ (C     tS#@
+     _) չ (B     tS#@
 
 .group պ
         պ        p
-     _) պ (C     p@
+     _) պ (B     p@
 
 .group ջ
         ջ        dZ
-     _) ջ (C     dZ@
+     _) ջ (B     dZ@
 
 .group ռ
-        ռ        R2
-     _) ռ (C     R2@
+        ռ        R
+     _) ռ (B     R@
 ?1 L02) ռ (L02   *
 
 .group ս
         ս        s
-     _) ս (L01   @s
-     _) ս (C     s@
+     _) ս (L01+  @s
+     _) ս (B     s@
 
 .group վ
         վ        v
-     _) վ (C     v@
+     _) վ (B     v@
 
 .group տ
         տ        t        // ?? [dd]
-     _) տ (C     t@
+     _) տ (B     t@
 
 .group ր
         ր        r
 ?1 L02) ր (L02   r
-     _) ր (C     r@
+     _) ր (B     r@
      C) ր (_     @r
    L02) ր (_     r
 
 .group ց
         ց        ts#
-     _) ց (C     ts#@
+     _) ց (B     ts#@
 
 .group ւ
         ւ        v
-     _) ւ (C     v@
+     _) ւ (B     v@
 
 .group փ
         փ        p#
-     _) փ (C     p'@
+     _) փ (B     p#@
 
 .group ք
         ք        k#       // ?? [kk]
-     _) ք (C     k#@
+     _) ք (B     k#@
 
 .group օ
         օ        o
 
 .group ֆ
         ֆ        f
-     _) ֆ (C     f@
+     _) ֆ (B     f@
 
 
 

dictsource/pt_list

-
 // This file in UTF8 encoded
 
 // Options
 _é	$accent   // é can be a word
 ê	$accent
 í	$accent
-ó	$accent
+_ó	$accent
 ô	$accent
 õ	$accent
 ú	$accent
 me	$u	$verbf	// reflexive
 te	$u	$verbf
 nos	$u	$nounf
+vos	vus	$u
 la	$u
 lo	lU	$u
 las	$u
 
 por	$u $nounf	// by,for,through
 pelo	$u $nounf
-?2	pela	$u $nounf	p'el&
+?2	pela	$u $nounf
 
 ao	$u	$nounf
 à	,a:
 // conjunctions
 ?1	e	i $u	// and
 ?2	e	i $u   // and
-se	$u+		// if
+se	$u+	$verbf		// if
 
 
 ?2	mas	$u	// but
 ?2	mal			// as soon as, hardly
 ?2	(logo que)	l'Oguki/		// as soon as
 ?2	(antes que)     '&~NtSiski/ 	// before
-?2	(depois que)    dep'OIski/ 	// after
+?2	(depois que)    dep'oIski/ 	// after
 ?2	(sempre que)    s'eNpriki/ 	// whenever
 ?2	enquanto 			// while
 
 // $alt   changes stressed [e] or [o] phoneme to open [E] or [O]
 // $alt2   changes stressed [E] or [O] phoneme to close [e] or [o]
 
-abacaxi		abakaSy
 abordo		$alt
 aborto		$alt  $verb
 absorta		$alt2
 acordo		$alt $verb
 acervo		$alt2
 adepto		$alt
-adore		$alt
 adorno		$alt  $verb
 aeroporto	$alt2
-aeroportos	$alt
 aflore		$alt
 alcateia	$alt
 alcova		$alt2
 ateia		$alt
 aterro		$alt2
 aterro		$alt $verb
-autora		$alt2
 avesso		$alt2
 axé		aSE
 azeda		$alt $verb
 azedo		$alt $verb
 bairro		b'aIxU
 banquete	$alt2
+barreto		$alt2
 bastonete	$alt2
 beco		$alt2
 besta		$alt2
 bilhete		$alt2
 bissulfeto	$alt2
-blazer	bl'eIzer
+blazer		bl'eIzer
 blazers		bl'eIzers
 boca		$alt2
 boceta		$alt2
 broto		$alt2 $noun
 cabresto	$alt2
 cacete		$alt2
-cachorra	$alt2
 caderneta	$alt2
 cadete		$alt2
-cãibra		k'&~IbR&
 caibro		k'aIbRU
+cãibra		k'&~IbR&
 caixeta		$alt2
 camelha		$alt
 camiseta	$alt2
 canaleta	$alt2
 canhoto		$alt2
-cantora		$alt2
 capacete	$alt2
 caractere	$alt
 carbureto	$alt2
-careta		$alt2
+caroços		$alt
 carrapeta	$alt2
 carreta		$alt2
 carroça		$alt
 cefaleia	$alt
 centopeia	$alt
 cerebelo	$alt2
-cerca		$alt2 $noun
+cerca		$alt $verb
 cerco		$alt $verb
-cerda		$alt
 cetro		$alt
 chamego		$alt2 $verb
 chaveta		$alt2
 chefe		$alt
 checam		$alt
+chofer		$alt
 choça		$alt
 choro		$alt2 $noun
 chovesse	$alt2
 colmeia		$alt
 colore		$alt
 colosso		$alt2
-colostro		$alt2
+colossos	$alt2
+colostro	$alt2
 começo		$alt $verb
 comodo		$alt2
 concerto	$alt2 $noun
 cratera		$alt
 crede		$alt2
 credo		$alt
-crepe		$alt
 decore		$alt
 decoro		$alt2 $noun
 degelo		$alt2
+desaforo	$alt2
+desamores	$alt2
 desapego	$alt2 $noun
 descordo	$alt
 desemprego	$alt2
 despojo		$alt2 $noun
 despojos	$alt
 desporto	$alt2
-desportos	$alt
 desprezo	$alt2 $noun
 desse		$alt2
 desse		$alt $verb
 deste		$alt $verb
 desterro	$alt2
 destroem	$alt
+deteriore	$alt
 deveras		$alt
 dez		$alt
 diarreia	$alt
 diogo		$alt2
 discordo	$alt
 dissabores	$alt2
+?1  dispneia	dISpyn'EI&
 ?2  dispneia	dZIspyn'EI&
 dobro		$alt2
 dobro		$alt $verb
 doce		$alt2
-dorminhoco		$alt2
-doutora		$alt2
+dorminhoco	$alt2
+dorminhocos	$alt
 doze		$alt2
 dueto		$alt2
+edson		$alt
 elixir		eliSir
 emprego		$alt2
 emprego		$alt2 $noun
-encasqueta		$alt
+encasqueta	$alt
 encosto		$alt  $verb
 endereço	$alt  $verb
 enforco		$alt
 espoleta	$alt2
 esposa		$alt2
 esqueleto	$alt2
+ester		$alt
 estilete	$alt2
 estorno		$alt  $verb
 estorvo		$alt  $verb
 europa		$alt
 europeia	$alt
 exagero		$alt $verb
-exorto	$alt
+exorto		$alt
 explore		$alt
 faceta		$alt2
 falangeta	$alt2
 farofa		$alt
 farolete	$alt2
-febre		$alt
-feitora		$alt2
 fezes		$alt
 filete		$alt2
 ?1 fixe		fiSy
 hemorroida	$alt
 hoje		$alt2
 horrores	$alt2
-humores		$alt2
 ideia		$alt
 inovo		$alt
 interesse	$alt2
 joguete		$alt2
 lagosta		$alt2
 lambreta	$alt2
-laser	l'eIzer
-lasers	l'eIzers
-lebre		$alt
-leitora		$alt2
+laser		l'eIzer
+lasers		l'eIzers
 lembrete	$alt2
 lepra		$alt
 leste		$alt2 $verb
 ?2   lhe	l^y
-lingueta	$alt2
 lisboeta	$alt2
+livreto		$alt2
 lodo		$alt2
 logro		$alt
 lopes		$alt
 macete		$alt2
-maior		$alt
-major	$alt
-maleta		$alt2
 maniçoba	$alt
 marieta		$alt2
-mariposa		$alt2
+mariposa	$alt2
 marreta		$alt2
 megera		$alt
 melhor		$alt
 menor		$alt
-mentora		$alt2
-merda		$alt
 meta		$alt $noun
-meteoro		$alt
 metro		$alt
 minueto		$alt2
 miolo		$alt2
 morcego		$alt2
 morda		$alt2
 moreia		$alt
-mortos		$alt
-motora		$alt2
 mui		mwi
 muleta		$alt2
 mureta		$alt2
 nervo		$alt2
 nojo		$alt2
 novelo		$alt2
-novos		$alt
 odisseia	$alt
+off		$alt
 onu		$1
 olho		$alt2 $noun
 olhos		$alt
 opereta		$alt2
 ordens		$alt
 osso		$alt2
-ossos		$alt
 ostra		$alt2
-ovos		$alt
-pachorra	$alt2
 paexa		paeSa
 paella		pa'el^&
 palacete	$alt2
-paleta		$alt2
 palheta		$alt2
 palhoça		$alt
 panfleto	$alt2
 pantera		$alt
 papoco		$alt2 $noun
 parede		$alt2
-pastora		$alt2
 peba		$alt
 pedra		$alt
-pela		$alt $verb
+pela		$alt2
 pelo		$alt2
-pelo		$alt $verb
+penhores	$alt2 $noun
+perda		$alt2
 pereba		$alt
+peres		$alt
 peroba		$alt
-peses	$alt
+peses		$alt
 peseta		$alt2
 peso		$alt $verb
 piloto		$alt2 $noun
-pintora		$alt2
 pior		$alt
 pipoco		$alt2 $noun
-pirueta		$alt2
 plateia		$alt
 plebeia		$alt
 polca		$alt
 porreta		$alt2
 porrete		$alt2
 porto		$alt $verb
-portos		$alt
 pose		$alt2
-povos		$alt
 poxa		p'oS&
 primavera	$alt
 primores	$alt2
 recordo		$alt
 recorto		$alt
 rede		$alt2
-redor		$alt
 reembolso	$alt  $verb
 reforço		$alt  $verb
 reforços	$alt
 refresco	$alt  $verb
 rego		$alt2 $noun
-reitora		$alt2
 relevo		$alt2 $noun
 remoem		$alt
 remorso		$alt
 renovo		$alt $verb
+represa		$alt2
 retorno		$alt $verb
 reuva		x'EUv&
 rigores		$alt2
 rota		$alt2
 rota		$alt $noun
 rubores		$alt2
-rumores		$alt2
 sabonete	$alt2
 sabores		$alt2
 saibro		s'aIbRU
-saleta		$alt2
 sarjeta		$alt2
 seborreia	$alt
 seca		$alt2 $noun
 suor		suOr
 sutiã		sutSi'&~N
 tabefe		$alt
+tapera		$alt
 tapete		$alt2
 temores		$alt2
 tempero		$alt2 $noun
 tenores		$alt2
 terrores	$alt2
-teses	$alt
+teses		$alt
 teta		$alt2
 togo		$alt2
 topo		$alt2 $noun
 torre		$alt2 $noun
 torres		$alt2
 torro		$alt
-tortos		$alt
 toso		$alt
 transtorno	$alt $verb
 traqueia	$alt
 tropa		$alt
 tropeço		$alt2 $noun
 trombeta	$alt2
-tumores		$alt2
-valeta		$alt2
 vanessa		$alt2
 vareta		$alt2
 vera		$alt
 verbete		$alt2
+verde		$alt2
 violeta		$alt2
 violoncelo	$alt
 voga		$alt
 ?1 dj         d,i:dZ'eI
 ?2   diesel	dZ'izEU
 ?1 down       d'a,wn
+?2   down   d'aUN
 ?1 download   d'a,wnl'oud
 ?2 download		daUNl'owd
 ?2 downloads		daUNl'owds
 ?2        Explorer        ekspl'O*er
 ?1 eyes       'aiz
 ?2 eyes       'aIs
+flash	flES
 ?1 frame      fr'eImy
 ?2 frame      fR'eImi
 game	g'eImy
 ?1 gmail      g,em'eIl
 ?2 Gmail      Zem'eIl
+get   gEt
 ?1 google     g'u:g&l 
 ?2 google     g'ugol
 ?1 hardware   'ard,w'Er-
 ?2 Intranet   iNtRan'Et
 ?1 kernel     k'Ern,El
 ?2 kernel     k'Ern@l
+left	$alt
 laptop lEptOp
+laptops lEptOps
 ?1 line       l'ain
    layout     l'eI,aUt
    ?2   login  logiN
 ?1 lock       l'Ok
    mail       m'eIl
         mails        m'eIls
+marketing	m'arketSiN
 ?2        mouse        m'aUzi
 ?1 menu       menu
-?1 next       n'Ekst
+next       n'Ekst
    ok         Ok'eI
 ?2 offline    Ofl'aIN
 ?2 online     oNlaIN
    pizza  p'its&
 python     p'aIT&~N
 ?1 readme     r'i:dmi:
+right   r'aIt
 ?1 sapi       s,ap'i
 ?1 scanner    sk'En&r
 sky   sk'ay
 ?1 sporting   sp'Ort,ing
  tab        t'aby
  tablet  t'ablet
+  tablets  t'ablets
  taser	t'eIzer
 ?1 telemóvel  t,El,Em'OvEl
 ?1 telemóveis t,El,Em'OveIs#
 upgrade		&pgR'eId
 upload		&pl'oud
 ?2        web        w'Eb
+writer r'aIter
 ?1 yahoo      'i,ah'u
 ?2 yahoo      iah'u
 ?1 yes        j'Es
 ?1 adobe       &d'Oby
    android &NdR'Oid
 apple  'Epow
+baby	b'eIby
 chrome  kR'owmi
    debian      d'Ebj&~N
 ?1 excel       ,Eks'El
 ?1 fedora      _^_EN
     firefox     f'ai@fOks
 ?1 front       fr'ont
+high   haI
 ?1 jaws        dZ'au:z
+lady	l'eIdy
 ?1 linux       l,in'uks
 ?2 linux       l'inUks
  live        l'aiv
 ?2        Skype        sk'aIp
         Slackware   sl'akwe@-
 ?1 smart       sm'art // nero StartSmart
+?2   society   sos'aIty
    speak       spi:k
    suse        z'u:ts@
 ?1 start       st'art // nero StartSmart
 dijkstra      d'ijkstrA:
 einstein      _!'aInSt,aIn
 ?2   einstein      _!'aInst,aIn
+feuerbach   _^_DE
 feynman       f'ainm@n
 freud         fR'OId
 friedrich     fR'i:dRiS
 gauss         g'aUs
 geisel        g'aIzEU
-gottfried     g'Otfri:t
+gottfried     g'OtfRi:t
+hegel   x'egel
+heidegger   h'aIdege
 hawking       h'o:king
 heisenberg    h'aIzEnberg
 hitler        h'itler
+husserl   x'usEl
 isaac         iz'&k
 lavoisier     lavwazj'e
 leibniz       l'aIbni:ts
 oppenheimer   _!'Op@nh,aImar
 richard       x'iS&rd
 riemann       r'i:man
-rijndael      x'ain;d'al
-?2   rousseau      xus'o
+rijndael      x'ain;d'al 
+rousseau      xus'o
 schrödinger   Sr'edinger
 stephen       st'i:v@n
 steve         st'i:v

dictsource/pt_rules

 .L03 a am o
 .L04 a am e em o ue uem
 .L05 r ra ram re rem rde rmo
-.L06 ra ram ste re rem rmo
+.L06 r ra ram ste sse ssem re rem rmo
 .L07 sse ssem ste
 
 
 ?1      a (_a      =&/       // ?? elide final a before a
 ?1      a (_à      =&/
 
-        a (C_      &
-        a (r_      'a
 ?1   p) a (d_      =E
-        a (CC_     &
-        a (h_      a
 ?1      a (l_      'A        // eg: Portugal, capital, etc.
 ?1      a (lK      ,A        // Algarve, Almerinda, etc...
 ?2      al (K      aU
         an (K+     &~N
         anh (A     &~n^
         am (_      =&U~
-        a (t_      a
-        a (ts_     a
-        a (x_      a
-        a (z_      'a        //eg: paz, rapaz, capaz, etc...
+
 ?1   C) acç        'a's      // eg: selecção, etc...
 
         ai         aI
         ao (_      aU
         au         aU
         au (s      aU
-        a (uCK     a
-    âB) a (CA_     &
-   âBC) a (CA_     &
-    êC) a (CA_     &
-   êCC) a (CA_     &
-    ôB) a (CA_     &
-   ôBC) a (CA_     &
-    áC) a (CA_     &
-   áCC) a (CA_     &
-    éC) a (CA_     &
+        au (CK     aU
+    âB) a (C@      &
+   âBC) a (C@      &
+    êC) a (C@      &
+   êCC) a (C@      &
+    ôB) a (C@      &
+   ôBC) a (C@      &
+    áC) a (C@      &
+   áCC) a (C@      &
+    éC) a (C@      &
      í) a (CA_     &
-    íC) a (CA_     &
-   íCC) a (CA_     &
-    óC) a (CA_     &
-   óCC) a (CA_     &
-    óC) a (CCA_    &
-    úC) a (CA_     &
+    íC) a (C@      &
+   íCC) a (C@      &
+    óC) a (C@      &
+   óCC) a (C@      &
+    úC) a (C@      &
+   úCC) a (C@      &
         ation (_   'eIS&~N
 
 
         e (lh+     e
         e (ll+     E
 
-
         e (bL02_   E
-
         e (cL04_   E
-@c) e (L07_   e
+    @c) e (L07_    e
         e (chL04_  E
 
      r) e (cho_    e
 
      h) e (gL04_   e
 
-        e (guL02_  E
-
         e (lL04_   E
-
+     C) e (pL04_   E
+        e (ptL04_  E
      i) e (r_      E
 
     qu) e (r_      E
     sp) e (rL04_   E
 
      f) e (rL04_   E
-
+        e (rdL04_  E
         e (quL02_  E
         e (rbL04_  E
         e (rgL04_  E
      m) e (tL03_   e
     An) e (tA_     e
     on) e (te_     E
-qu) e (ta_   e
-          e (vL04_   E
+     u) e (ta_     e
+        e (vL04_   E
      t) e (ve_     e
 
         e (rrAs_   E
     ef) e (tuL02_  e
      t) e (tra     E
 
-    âC) e (CA_     e
-   âCC) e (CA_     e
-    êC) e (CA_     e
-   êCC) e (CA_     e
-    ôC) e (CA_     e
-    áC) e (CA_     e
-   áCC) e (CA_     e
-    íC) e (CA_     e
-   íCC) e (CA_     e
-    óC) e (Ca_     e
-   óCC) e (CA_     e
-    úC) e (CA_     e
+    âC) e (C@      e
+   âCC) e (C@      e
+    êC) e (C@      e
+   êCC) e (C@      e
+    ôC) e (C@      e
+    áC) e (C@      e
+   áCC) e (C@      e
+  éCCC) e (C@      e
+    íC) el (_      eU
+    íC) e (C@      e
+   íCC) e (C@      e
+    óC) e (C@      e
+   óCC) e (C@      e
+    úC) e (C@      e
     úC) el (_      eU
         ection (_  'EkS&~N
 
 //sort
     _d) e (L05_    E
-    em) e (L05_    e         // temeram, etc.
     rd) e (L05_    e         // perderam, etc.
    _vi) e (L05_    E
-   end) e (L05_    e         // entenderam, etc.
    fiz) e (L05_    E
+   oub) e (L05_    E         // soubeste, etc.
    tiv) e (L05_    E         // es-
-   viv) e (L05_    e
-  _com) e (L05_    e
-  _cos) e (L05_    e
   _pud) e (L05_    E
- _coub) e (L05_    E
  _exag) e (L05_    E
- _houv) e (L05_    E
  _mulh) e (L05_    E
- _soub) e (L05_    E
  _talh) e (L05_    E
-_escond) e (L05_   e
 _troux) e (L05_    E
-respond) e (L05_   e
+    @m) e (L06_    e         // temeram, etc.
+   end) e (L06_    e         // entenderam, etc.
+   viv) e (L06_    e
+  _cos) e (L06_    e
   diss) e (L06_    E         // contra-
-     m) e (L07_    e         // comeste, etc.
+ _houv) e (L06_    E
+_escond) e (L06_   e
+respond) e (L06_   e
     eb) e (L07_    e         // recebeste, etc.
-        eg) e (L07_    e         // elegeste, etc.
+    eg) e (L07_    e         // elegeste, etc.
+   _@o) e (L07_    e         // doeste, etc.
    _cr) e (L07_    e
-   _do) e (L07_    e
-   _mo) e (L07_    e
-   _ro) e (L07_    e
    bat) e (L07_    e         // re- com-
    ced) e (L07_    e         // pro- con- su-
-   end) e (L07_    e         // vendeste, etc.
-      met) e (L07_    e         // meteste, cometeste, etc.
+   met) e (L07_    e         // meteste, cometeste, etc.
    mex) e (L07_    e
    mov) e (L07_    e         // re- co-
    olv) e (L07_    e         // devolveste, etc.
    ond) e (L07_    e         // escondeste, etc.
    orr) e (L07_    e         // correste, etc.
-   viv) e (L07_    e         // re-
   _ard) e (L07_    e
-  _cos) e (L07_    e
   _coz) e (L07_    e
   colh) e (L07_    e         // & es-
   ench) e (L07_    e         // pre-
+  romp) e (L07_    e         // cor- inter-
   vert) e (L07_    e         // in- re- con-
  _ergu) e (L07_    e
  _mord) e (L07_    e
  screv) e (L07_    e         // e- in- ree- pre- de-
 _atrev) e (L07_    e
 _corro) e (L07_    e
-_interromp) e (L07_ e
 _troux) e (L07_    E
   _ens) e (bL03_   E
-    _v) e (lhL03_  E
 _amanc) e (bL03_   E
     qu) e (brL04_  E
-  _cel) e (brL04_  E
-  _dilac) e (rL04_   E
-  _encarc) e (rL04_   E
+   cel) e (brL04_  E
+    _C) e (bre_    E
  _boch) e (chL04_  e
    _ex) e (crL04_  E
   _enr) e (dL01_   E
   estr) ei (L04_   EI
     _r) e (jL03_   E
   _inv) e (jL04_   E
+    _v) e (lhL03_  E
+  _caC) e (lo_     e
 ?2      el (ton_   'EU
-    tr) e (pL04_   E         // es-
-  _dec) e (pL04_   E
-   _in) e (ptL03_  E
     ad) e (quL04_  E
   _dig) e (rL02_   E
   _ing) e (rL02_   E
    _op) e (rL04_   E
    gen) e (rL04_   E         // de- re-
   _alt) e (rL04_   E
-  _ent) e (sL04_   E
   _enc) e (rL04_   E
   _imp) e (rL04_   E
   _min) e (rL04_   E
  _exub) e (rL04_   E
  _temp) e (rL04_   E
 _adult) e (rL04_   E
+_dilac) e (rL04_   E
+_encarc) e (rL04_  E
 _incin) e (rL04_   E
 _persev) e (rL04_  E
 _recup) e (rL04_   E
     _c) e (rcL02_  E
    _ex) e (rcL02_  E
  _alic) e (rcL02_  E
-    _p) e (rdL02_  E
-    _l) e (rdL03_  E
-    _h) e (rdL04_  E
-  _des) e (rdL04_  E
+ _esqu) e (rdL03_  e
 s_colh) e (res_    E
      _) e (rgL03_  e
    _re) e (rgL03_  e
  _alic) e (rçL03_  E
     _p) e (sL01_   E
     _l) e (sL03_   E
+ _repr) e (sL03_   E
+  _ent) e (sL04_   E
  _refr) e (scL01_  E
     _d) e (scL02_  E
    _cr) e (scL02_  E
     _p) e (squL02_ E
  _refr) e (squL02_ E
     _l) e (ssL02_  e
+   _ac) e (ssL02_  E
   _esp) e (ssL03_  e
     _c) e (stL03_  e
    _pr) e (tL03_   e
   _rem) e (tL03_   e
  _derr) e (tL03_   e
 _obsol) e (tL03_   e
+  _Cal) e (ta_     e
+  _caC) e (ta_     e
   _sol) e (trL03_  E
   _pen) e (trL04_  E
     _n) eu (trL03_ 'eU
   _atr) e (vL03_   e
      m) e (xL03_   e
     _r) e (zL04_   E
-   _pr) e (zL04_   E
-   spr) e (zL04_   E
+    pr) e (zL04_   E         // des-
   _enf) e (zL04_   E
   _rev) e (zL04_   E
 _embel) e (zL04_   E
      p) e (çL03_   E
     _m) e (çL03_   E
 _entorp) e (çL03_  e
-_caC) e (lo_   e
 //endsort
 
 
         êm (C      ''eIm
         ên (K      ''eIN
         ênh        ''en^
-        êm (_      ''eIN
+        êu         ''eU
 
 
 .group f
         i (e       i
         i (ã       i
         i (õ       i
+        i (á       i
+        i (ó       i
         i (ú       i
         i (o       i
     Cr) i          i
         in (k      iN
         inh        in^
 
-        i (A_      'i
-        i (am_     'i
-        i (em_     'i
+        i (L04_    'i
 
         io (_      iU
         io (s_     iU
 ?1   @) ings (_    _^_EN
 ?2      il (ton_   'iU
 ?2      i (rton_   'i
+?2      ight (_    'aIt
 ?1      ight (_    _^_EN
 ?1      ights (_   _^_EN
 
 
         o (lvL02_  O
 
-        o (sA_     O
+        o (sL04_   O
         o (so_N    o         // not for osos_
-        o (sAm_    O
 
         o (ssL04_  O
 
         o (ze_     O
         o (rL04_   O
      c) o (re_     o
-     d) o (re_     o
+    @d) o (ra_     o
+    @d) o (re_     o
+    ri) o (re_     o
      l) o (re_     o
-     t) o (re_     o
+     s) o (ra_     o
+     s) o (re_     o
+    @t) o (ra_     o
+    @t) o (re_     o
      v) o (re_     o
-
-    @@) o (rA_     o
      b) o (rL04_   O
         o (p_      O
 ?1   _) o (C       O         // eg: olá, orla, opção, etc...
 ?1  _s) o (lu      u         // solução, soluções.
 ?1 interr) o (g       u         // eg: interrogação
 ?1   f) o (rmulá   u         // eg: formulário, formulários.
-?1   v) o (lt      O
         o (luem_   o
         o (ssuem_  o
-    êC) o (CA_     o
-   êCC) o (CA_     o
-    ôC) o (CA_     o
-    áC) o (CA_     o
-
-    éC) o (CA_     o
-   éCC) o (CA_     o
-     í) o (CA_     U
-    íC) o (CA_     o
-   íCC) o (CA_     o
-    óC) o (CA_     o
-   óCC) o (CA_     o
-    úC) o (CA_     o
-   úCC) o (CA_     o
+   âBC) o (C@      o
+    êC) o (C@      o
+   êCC) o (C@      o
+    ôC) o (C@      o
+    áC) o (C@      o
+   áCC) o (C@      o
+    éC) o (C@      o
+   éCC) o (C@      o
+     í) o (CA      U
+    íC) o (C@      o
+   íCC) o (C@      o
+    óC) o (C@      o
+   óCC) o (C@      o
+    úC) o (C@      o
+   úCC) o (C@      o
 
 //sort
     _f) o (L05_    o
+  _red) o (L05_    O
 _pormen) o (L05_   O
     _f) o (L07_    o
     _s) o (bL02_   O
   _emp) o (lgL04_  O
      _) o (lhL04_  O
      m) o (lhL04_  O
+   emb) o (lsL02_  O
   _env) o (ltL03_  o
    ent) o (pL02_   O
     _c) o (pL03_   O
      _) o (ptL04_  O
      p) o (rL02_   o
   _dev) o (rL02_   O
+ _apav) o (rL02_   O
  _defl) o (rL02_   O
  _impl) o (rL02_   O
- _inod) o (rL03_   O
-_inson) o (rL03_   O
-_comem) o (rL04    O
- _enam) o (rL04_   O
-_aprim) o (rL04_   O
-_remem) o (rL04_   O
+   _ad) o (rL04_   O
+  _ma@) o (r_      O
+  _@um) o (re_     o
      f) o (rmL03_  O
      c) o (rrL01_  o         // incorra, corra, etc.
     _m) o (rrL01_  o
-     @p) o (rtL03_  O         // importo, etc.
+ _Cach) o (rra_    o
+    @p) o (rtL03_  O         // importo, etc.
+        ortos (_   O*@-t=Us# // tortos, mortos, etc.ortos (_  'O*@-tUs
      t) o (rçL03_  o         // con-
     _r) o (snL04_  O
     _c) o (spL02_  O
   _enr) o (squL02_ O
-     p) ostos (_   Ost=Us#   // dispostos etc.
+        ossos (_   Os=Us#    // nossos, grossos, etc.
+     p) ostos (_   Ost=Us#   // dispostos etc.ortos (_  'O*@-tUs
   _gar) o (tL03_   o
   _mar) o (tL03_   o
  _escr) o (tL03_   o
    _ch) o (vL01_   o
     pr) o (vL03_   O
+        ovos (_    Ov=Us#    novos, povos, etc.
     _g) o (zL04_   O
   _esb) o (çL01_   O
     _r) o (çL03_   O
 ?3      p (t       p
 ?3      p (_C      p_
         ph         f
+        play       pl'eI
+?2   _) práxis (_  pR'aksis
 
 
 .group q
         qu (Y      k
         qu (K      ku
      _) que (_     ky
+?2 por_) que (_     ke
+?2 por_) que (_é    ky
 ?1   _) qua        kwa       // quatro, etc.
 ?1   _) que        ke        // quente, etc.
 ?1   _) quei (C    k'eI      // queira, queima, etc
         r (_       r
         r (C       *@-
      A) r (A       *
-     r (_A      *
- ?2 r (_h   *
+        r (_A      *
+        r (_h      *
      C) r (A       R
         rr         x
      _) r          x
      a) x (ar      S
      a) x (ei      S
     xA) x (A       S
+_abaca) x (i       S
    ale) x (a       S
    bau) x (A       S
    brA) x (A       S
+   _bu) x (o_      S
     bY) x (A       S
    _ca) x (A       S
    _co) x (A       S

dictsource/sl_list

 // $alt1  open vowel [E] or [O] in the stressed syllable
 // $alt2  open vowel [o] or [o] in the stressed syllable
 // $alt3  short stress on final syllable
+// $alt4  final 'e' is schwa
 
  
 // letter names
 ü	$accent
 ß	'o:stri||s'@
 
+а	a:
+б	b@
+в	v@
+г	g@
+д	d@
+е	e:
+ё	jo:
+ж	Z@
+з	z@
+и	i:
+й	,ik@-*'atkOji
+к	k@
+л	l@
+м	m@
+н	n@
+о	o:
+п	p@
+р	R@
+с	s@
+т	t@
+у	u:
+ф	f@
+х	x@
+ц	ts@
+ч	tS@
+ш	S@
+щ	StS@
+э	E:
+ю	ju:
+я	ja:
+ћ	tS;@
+ђ	dj@
+ќ	kj@
+
+
 // accent names
-_dia	sprEgl'asom
+_dia	spREgl'asom
 
 // languages
-_cyr	tsiR'i:litSno
+_cyr	tsiR'i:litSni
+
+// symbols
+
+@	'a:fna
+#	l'e:stvitsa
+$	d'o:laR
+%	Otst'o:tOw
+&	'i:n
+*	zv'e:ditsa
++	plu:s
+=	En'akO
+/	pOS'e:wnitsa
+\	l'e:va||pOS'e:wnitsa
+_.	p'i:ka
+_!	klic'a:j
+_?	upRaS'a:j
+_"	naREkOv'a:j
+_'	En'o:jni||naREkOv'a:j
+_`	OstR'i:vEts
+_,	v'e:jitsa
+_-	pOS'e:wnitsa
+_:	dv#'o:p'i:tSjE
+_;	p'Odp'i:tSjE
+_(	OklEp'a:j
+_)	zaklEp'a:j
+_[	Og;'a:ti||OklEp'a:j
+_]	Og;'a:ti||zaklEp'a:j
+_{	zav'i:ti||OklEp'a:j
+_}	zav'i:ti||zaklEp'a:j
+_…	El'i:psa
+__	pOttS@Rt'a:j
+_<	jE||m'a:njSe
+_>	jE||v'etSjE
+_|	nawp'i:tSna||tS'@Rta
+
 
 // numbers
 _0	n'i:tS
 // exceptions
 // (these are just a few example exceptions)
 
-deset	$2
-devet	$2
-dim	$alt3
-ena	$alt1
-oba	$2
-šel	S@w
-tisoč	$1
-žena	$alt1
-
+deset		$2
+devet		$2
+dim		$alt3
+ena		$alt1
+oba		$2
+osem		$alt4
+poševnica	$2
+sedem		$alt4
+šel		S@w
+tisoč		$1
+žena		$alt1
+
+
+// names
+estonija	$2
+slovenija	$2

dictsource/sl_rules

         a (X$w_alt3+  'a
 
         a (č_    'a:
+        a (j_    'a:
         a (l_    'a:
         
 
         e (X$w_alt3+  'E
         ee       i:
         
+        e (X$w_alt4 @
      @) e (n_    E#
     @C) e (r_    E#
 
         i (X$w_alt3+  'i
         i (A     j
         
-     @) i (jL03_   =i
-     r) i (jL03_   i:
-     z) i (jL03_   i:
         i (l_    'i:
 
 .group j
         m (g     N
         m (k     N
      K) m (K     m@-  // unstressed
+     K) m (r     m
 
 
 .group n
         n (k     N
 
      K) n (K     n@-  // unstressed
+     K) n (r     n
         nj       n^
         nj (A    nj
         nj (i    n^
         o (L04+  o:
 
         o (č_    'o:
+        o (j_    'o:
         o (l_    'o:
         oo	u:
         
 
 .group s
         s        s
+        sch      S
 
 
 .group š
 
         u (A     w
      A) u (K     w
+     C) ue (C    u:    // German names
 
 
 .group v
         v (-A+   v    // preposition 'v' before a vowel
      A) v (K     w
      K) v (K     %u
-        v (r     v
+        v (r+    v
    L01) v (A     v#
 
 
         ü        y:
         ß        _^_DE
 
-        $        d'olaR
-

dictsource/ta_rules

      _) க (ுருகுல	g
      _) க (ுருக்கள	g
      _) க (ுருக்குல	g
+     _) க (ுருக்ஷேத்திர	g
      _) க (ுருசாமி	g
+     _) குருச (ேத்திர	gurUs.
      _) க (ுருஜி		g
      _) க (ுருதேவ	g
      _) க (ுருநா		g
      _) க (ுருமூர்த்தி	g
      _) க (ுருரா		g
      _) க (ுருவடி	g
+     _) க (ுருவம்ச	g
      _) க (ுருவருள	g
      _) க (ுருவா		g
      _) க (ுருவாய	g
      _) க (ுருவை	g
      _) க (ுருவோ	g
      _) க (ுருவோட	g
+     _) க (ுருஷேத்திர	g
+     _) கு (ரூப்		g
      _) க (ுலாப		g
      _) க (ுலாம		g
      _) க (ுலேபா	g
  _கோபி) க		kV#
  _ஸ்டா) க		kV#
 _ஜமாய்) க		kV#
-_வெங்) கட		kVt.V#
+ _வெங்) கட		kVt.V#
   அலை) க (டல		kV
 சமையல்) க (ட்		kV
    உச்ச) க (ட்ட		kV
 சித்திரலே) க (ா		k
  _ஹாங்) க (ாங்		k
  _தென்) க (ாசி		k
+    _சு) க (ாசினி	H
     அ) க (ாடமி		k
   _நேர்) க (ாணல		k
   _கண்) க (ாணா		k
   L03து) க (ுறித்த	k
   அரை) க (ுறை		k
    _கீழ்) க (ுல		k
+   _ரா) க (ுல		H
    அரச) க (ுல		k
+   இரா) க (ுல		H
    ராஜ) க (ுல		k
   _குரு) க (ுல		k
   _கோ) க (ுல		k
    _மு) க்க (ுண		gg
   L03) க்க (ுண		gg
 _போர்) க்க (ுண		gg
+  _கை) க்க (ுண்ட		gg
   அணு) க்க (ுண்ட	gg
  _கோலி) க்க (ுண்ட	gg
  _வெடி) க்க (ுண்ட	gg
      _) பு (ரோட்டான	p
      _) பு (ரௌச	b
      _) ப (ுல்_L15	f
-     _) ப (ுல்கா		f
+     _) புல்க (ா		fulk
      _) ப (ுல்டோசர	b
      _) ப (ுல்லட்		b
      _) ப (ுல்லா_	f
 //endsort
 
 //sort
+   _நீர்) ப		pV#
    _ப்ரூ) ப		fV#
    இடர்) ப		pV#
    நடை) ப		pV#
  _விகல்) ப		pV#
  அடால்) ப		fV#
  அஷ்ரா) ப		fV#
+_ஒL10ி) ப		pV#
 _செயல்) ப		pV#
 _ருடால்) ப		fV#
   _ஷரீ) ப (+		fV#
  அநுதா) ப (+		bV#
  அனுதா) ப (+		bV#
  பிரஸ்தா) ப (+		bV#
+_கோபதா) ப (+		bV#
 _பச்சாதா) ப (+		bV#
 _விரகதா) ப (+		bV#
 மனஸ்தா) ப (+		bV#
     கா) ப (ர		bV
 _ஜெனி) ப (ர		fV
    நாகா) ப (ரண		bV
-   _ஒலி) ப (ரப்		pV
-   _ஒளி) ப (ரப்		pV
     வீர) ப (ராக்கிரம	pV
    _மறு) ப (ரிசீலனை	pV
     ஆ) ப (ரேசன		pV
    ராம்) ப (ூர		p
 _கோலாலம்) ப (ூர		p
     அ) ப (ூர்வ		b
-ஒL10ி) ப (ெ		p
  இன்ஸ்) ப (ெக்டர		p
      _) பெஞ்ச (ா_	pen^dZ
      _) பெஞ்ச (ாலும	pen^dZ
 பெர்னாண்ட) ஸ	zV#
    _ம) ஸ்த (ூர	zd
    அரி) ஸ (ோன		z
+  _சூய) ஸ	zV#
 
 .group ஹ
 	ஹ	HV

docs/voices.html

 <dt>
 <strong>language &nbsp;&lt;language code&gt; [&lt;priority&gt;]</strong><br>
 <dd>This attribute should appear before the other attributes which are listed below.<p>
-It selectes the default behaviour and characteristics for the language, and sets default values for
+It selects the default behaviour and characteristics for the language, and sets default values for
 "phonemes", "dictionary" and other attributes. The &lt;language code&gt; should be a two-letter ISO 639-1 language code.  One or more language variant codes may be appended, separated by hyphens.  (eg.  en-uk-north).<p>
 The optional &lt;priority&gt; value gives the preference of this voice compared with others for the specified language.  A low value indicates a more preferred voice.  The default value is 5.<p>
 More than one <strong>language</strong> line may be present.  A voice may be selected for other related languages (variants which have the same initial 2 letter language code as the specified language), but it will be less preferred for these.  Different language variants may be specified by additional <strong>language</strong> lines in order to indicate that this is a preferred voice for them also.  Eg.<pre>

phsource/compile_report

       no  28  134
       is  42  141
       vi  57  150
-  vi-hue  15  150
-  vi-sgn  17  150
+  vi-hue  17  150
+  vi-sgn  18  150
      zhy  41  138
       zh  64  155
       sw   9  110
       fa   9  112
       rw  15  132
      prs   8  113
-      sl  16  125
+      sl  18  125
       gd   6  109
      nso  12  113
       ht  11  146
                 [J#] ml
                 [J] tr
                 [J] ku
-envelope/i_risefall  [11] zh
+envelope/i_risefall  [1] vi-sgn
+                [11] zh
 envelope/i_risefall2  [+2] rw
 envelope/p_214  [5] vi
+                [5] vi-sgn
                 [214] zh
 envelope/p_512  [+] pa
                 [6] vi
                 [+] rw
 envelope/p_fallrise  [4] vi
                 [3] vi-hue
+                [4] vi-sgn
 envelope/p_level  [1] vi
                 [1] vi-hue
                 [7] vi-hue
-                [1] vi-sgn
                 [1] zhy
                 [3] zhy
                 [6] zhy
                 [55] zh
 envelope/p_rise  [3] vi
                 [3] vi-sgn
-                [4] vi-sgn
-                [5] vi-sgn
                 [2] zhy
                 [5] zhy
                 [44] zh
                 [35] zh
 envelope/vi_5amp  [5] vi
+                [4] vi-sgn
 envelope/vi_6amp  [6] vi
                 [2] vi-hue
                 [5] vi-hue
 ustop/k         [k] base
                 [k] fr
                 [k] zhy
+                [k] sl
 ustop/k_        [k] base
                 [k] base2
                 [k] fr
                 [k] lv
                 [k] el
                 [k] sq
+                [k] sl
 ustop/k_asp     [k#] consonants
                 [kh] consonants
                 [g#] hi
                 [c] tr
                 [J] ku
                 [c] ku
+                [k] sl
 ustop/kl        [k] base
                 [kh] consonants
                 [k] base2
                 [k] lv
                 [k] el
                 [k] zhy
+                [k] sl
                 [kh] tn
 ustop/kr        [k] base
                 [k] base2
                 [k] et
                 [k] el
                 [k] zhy
+                [k] sl
 ustop/k_unasp   [k] base
                 [k-] consonants
                 [k] base2
                 [k] el
                 [k] zhy
                 [k] sq
+                [k] sl
                 [k-] tn
 ustop/k_unasp_  [k] zh
                 [k-] ko
                 [t] lt
                 [t] pl
                 [t] hr
+                [t] sl
 ustop/t_dnt2    [t] base2
                 [d] kn
 ustop/t_hi      [t[] base
                 [eu] mt
 vdiph/@i        [Yi] et
                 [@I] vi
-                [@:I] vi
 vdiph/&i        [&i] fi
                 [&i] et
                 [aI] hi
                 [oi] mt
 vdiph/ooi_2     [OI] af
                 [oI] eo
+                [OI] vi
                 [Oi] vi-hue
                 [Oi] vi-sgn
 vdiph/ooi_3     [OI] en-us
                 [OI] en-rp
                 [aI] en-wm
-                [OI] vi
                 [Oi] vi
 vdiph/ooi_4     [OI] sq
 vdiph/oou       [oU] cs
                 [yi] zh
                 [yi] mt
 vdiph/y#i       [Yi] fi
+                [@:I] vi
                 [Yi] mt
 vdiph/y#i_2     [Yy] is
                 [Yy:] is
 vdiph/y#y       [Yy] fi
+                [@:I] vi-hue
+                [@:I] vi-sgn
                 [Yy] mt
 vdiph/y#y_2     [Yy] af
                 [eoi] zhy
                 [O] hi
                 [O] pt
                 [O] grc
-                [O] vi-hue
-                [O] vi-sgn
 vowel/0_2       [0] en-n
                 [O] pt-pt
-                [O] vi
                 [o] sw
                 [O] sl
                 [o] nso
 vowel/a_4       [a] ga
                 [a] es
                 [a] el
+                [a] vi
 vowel/a#_4      [a:] nl
                 [a] ml
                 [a] bg
                 [a] tn
                 [a] kk
 vowel/a_6       [a] ca
-                [a] vi
                 [a] am
                 [a:] wo
 vowel/a_7       [a] fr
                 [&] tt
 vowel/e_e       [E] en-sc
                 [E:] is
+                [E] vi
 vowel/ee#       [E#] pl
 vowel/ee_1      [E] base2
                 [e@] en
                 [E] grc
                 [E:] sv
                 [E:] no
+                [E] vi-sgn
                 [e] zhy
 vowel/ee_2      [E] cy
                 [E2] nl
 vowel/ee_3      [&] af
                 [&:] af
                 [E] pt
-                [E] vi
 vowel/ee_4      [E] sq
 vowel/ee_5      [E] en
                 [E] ak
                 [i] tt
                 [i] kl
 vowel/i#        [y:] cy
+                [i] vi-sgn
 vowel/i_2       [i2] de
                 [i:] de
                 [i] nl
                 [o:] sk
                 [o] hr
                 [o/] it
+                [O] vi-sgn
                 [O] sq
                 [o] ka
                 [o] si
 vowel/oo_2      [0] en-sc
                 [O] cy
                 [o] cs
+                [O] vi
                 [0] da
                 [?0] da
                 [O] ak
                 [@] ko
 vowel/oo_3      [O] af
+                [O] vi-hue
 vowel/oo_4      [O] base2
                 [0] en-wm
                 [V] en-wi
                 [O] pa
                 [O] it
                 [O] an
+                [O] sl
 vowel/oo_5      [O] bn
                 [O] pl
                 [O] is

phsource/mbrola/in1

 0  r/ NULL   0  r
 0  r- NULL   0  r
 0  l- NULL   0  l
-0  w/ NULL   0  w
+0  w/ NULL   0  v
 0  j/ NULL   0  j
 0  ;  NULL   0  NULL
 0  g- NULL   0  NULL
 0  u~ NULL   60  uu n
 
 0  H  NULL   0  h
+0  p# NULL   0  ph
+0  b# NULL   0  bh
+0  t# NULL   0  th
+0  d# NULL   0  dh
 0  t. NULL   0  T
-0  t.h NULL  0  Th
+0  t.# NULL  0  Th
 0  d. NULL   0  D
-0  d.h NULL  0  Dh
+0  d.# NULL  0  Dh
+0  c# NULL   0  ch
 0  J  NULL   0  j
-0  Jh NULL   0  jh
+0  J# NULL   0  jh
+0  k# NULL   0  kh
+0  g# NULL   0  gh
 0  n. NULL   0  N
 0  n^ NULL   0  N
 0  j  NULL   0  y
 0  S  NULL   0  sh
 0  s. NULL   0  sh
 0  l. NULL   0  l
+0  w  NULL   0  v
+
 

phsource/ph_armenian

 
 
 phoneme k#
-  import_phoneme consonants/kh
+//  import_phoneme consonants/kh
+  import_phoneme base/k
 endphoneme
 
 

phsource/ph_irish

-// Version 2.4 January 2013
+// Irish Phonemes
+//Please contact [email protected]
+// Version 2.7  2013
 
 // short vowels
 
     Length 80
     FMT(vwl_af/r@)
   ENDIF
+  IF prevPh(i:) THEN
+    Length 60
+    FMT(vwl_af/r@)
+  ENDIF
+  
   FMT(vwl_af/@)
 endphoneme
 
   FMT(vowel/ii_2)
 endphoneme
 
+
 phoneme i   // non syllabic i for end of words
   vowel  starttype #i  endtype #i
+  unstressed
   ipa iU+032F
   length 45
   FMT(vowel/ii_7)

phsource/ph_slovenian

 phoneme O
   vowel starttype #o endtype #o
   length 170
-  FMT(vowel/0_2)
+  IF thisPh(isStressed) THEN
+    FMT(vowel/0_2)
+  ENDIF
+  FMT(vowel/oo_4)
 endphoneme
 
 
 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) AND prevPhW(isVowel) THEN
+    WAV(ustop/t_dnt, 40)
+  ENDIF
+  WAV(ustop/t_dnt, 60)
+endphoneme
+
+
+phoneme k
+  vls vel stop
+  voicingswitch g
+  lengthmod 2
+  Vowelin f1=0  f2=2300 200 300  f3=-200 80
+  Vowelout f1=0 f2=2300 300 400  f3=-200 80  rms=20
+
+  IF KlattSynth THEN
+    Vowelout f1=0 f2=2300 200 300  f3=-200 80  rms=20
+  ENDIF
+
+  IF nextPh(isPause2) AND prevPhW(isVowel) THEN
+    WAV(ustop/k_)
+  ELIF nextPh(r) OR nextPh(R) OR nextPh(R2) THEN
+    WAV(ustop/kr)
+  ELIF nextPh(#i) OR nextPh(;) THEN
+    WAV(ustop/ki)
+  ELIF nextPh(l) THEN
+    WAV(ustop/kl)
+  ELIF nextPh(@-) THEN
+    WAV(ustop/k_unasp, 70)
+  ENDIF
+  WAV(ustop/k)
+endphoneme
+
+
 // for foreign letters
 phoneme y
   vowel starttype #i endtype #i

phsource/ph_vietnam

 
 phoneme 1   //  ngang tone: level
   stress
-  Tone(28, 32, envelope/p_level, NULL)
+  Tone(28,32, envelope/p_level, NULL) // 28 29
 endphoneme
 
 
 phoneme 2   //  huyền tone: low falling
   stress
-  Tone(20,  8, envelope/p_fall, NULL) //20
+  Tone(20, 8, envelope/p_fall, NULL) //20 8
 endphoneme
 
 
 phoneme 3   //  sắc Tone(rising
   stress
-  Tone(30, 60, envelope/p_rise, NULL) // 25 50
+  Tone(20, 80, envelope/p_rise, NULL) // 30 60
 endphoneme
 
 
 phoneme 4   //  hỏi Tone(curve (dipping rising)
   stress
-  Tone(40,  5, envelope/p_fallrise, NULL) //30
+  Tone(30, 5, envelope/p_fallrise, NULL) //33 31
 endphoneme
 
 
 phoneme 6   //  nặng Tone(drop  (constricted)
   stress
   //length 150 // ignore because it make too short sound 75  // reduce the length of the vowel
-  Tone(40, 20, envelope/p_512, envelope/vi_6amp)
+  Tone(33, 21, envelope/p_512, envelope/vi_6amp) //40 20
 endphoneme
 
 
 phoneme a
   vowel starttype #@ endtype #@
   	length 140
-	  FMT(vowel/a_6)  //a_4)
+	  FMT(vowel/a_4)  //a_4)
 endphoneme
 
 phoneme a:
   vowel starttype #a endtype #a
-  length 240 //280
+  IF nextPh(n^) OR nextPh(c) THEN
+  length 100
+  ELSE
+  length 170 //280
+  ENDIF
     FMT(vowel/a_8)
 endphoneme
 
 
 phoneme E
   vowel starttype #e endtype #e
-  length 240
-  FMT(vowel/ee_3)
+  length 200
+  FMT(vowel/e_e)   //ee_3)
 endphoneme
 
 phoneme e
 
 phoneme i
   vowel  starttype #i  endtype #i
-  length 240
-  IfNextVowelAppend(;)
+    IfNextVowelAppend(;)
   IF prevPhW(w) THEN
     VowelStart(w/wi)
   ENDIF
   IF nextPh(n^) OR nextPh(c) THEN
+  length 100
   FMT(vnasal/ii_n)
-ELSE
+  ELSE
+  length 240
 FMT(vowel/i_4)
 ENDIF
 endphoneme
 	ELSE
 	length 200
 	ENDIF
-    FMT(vowel/0_2) //aa_4)
+    FMT(vowel/oo_2)
 endphoneme
 
 phoneme o
  IF nextPh(kh) OR nextPh(N) OR nextPh(n^) OR nextPh(c) THEN
 	length 120
 	ELSE
-	length 200
+	length 170
 	ENDIF
   FMT(vowel/V)   //vowel/@_2)
 endphoneme
 phoneme @:I
   vowel starttype #@ endtype #i
   length 200 //250
-  FMT(vdiph/@i)
+  FMT(vdiph/y#i)
 endphoneme
 
 
 
 phoneme OI
   vowel starttype #o endtype #i
-  length 200
-  FMT(vdiph/ooi_3)
+  length 150
+  FMT(vdiph/ooi_2)
 endphoneme
 
 
 
 phoneme aU
   vowel starttype #a endtype #u
-  length 200
+  length 150
   FMT(vdiph/aau_4)
 endphoneme
 
 
 phoneme a:U
   vowel starttype #a endtype #u
-  length 200 //270
+  length 150 //270
   FMT(vdiph/au)
 endphoneme
 
 
 phoneme eU
   vowel starttype #e endtype #u
-  length 200
+  length 150
   FMT(vdiph/eu)
 endphoneme
 
 
 phoneme EU
   vowel starttype #e endtype #u
-  length 200
+  length 150
   FMT(vdiph/eeu)
 endphoneme
 
 
 
 phoneme o@
-  vowel  starttype #o endtype #o
+  vowel  starttype #o endtype #a
   length 140
   FMT(vdiph2/oa)
 endphoneme
 
 phoneme l
   liquid
-  Vowelin f1=0  f2=1700 -300 300  f3=-100 80 len=30
+  Vowelin f1=0  f2=1700 -300 300  f3=-100 80 len=15
   //lengthmod 7
    //IF nextPh(isNotVowel) THEN
    // ChangePhoneme(l/2)
   vls alv stop
   //voicingswitch d
   lengthmod 2
-  Vowelin f1=0  f2=1700 -300 300  f3=-100 80 len=30
+  Vowelin f1=0  f2=1700 -300 300  f3=-100 80 len=15
   Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
 
   WAV(vietnam/th, 50)
   vls pla afr sibilant
   //voicingswitch dZ
   lengthmod 2
-  Vowelin f1=0  f2=2300 200 400  f3=-100 80 len=30
+  Vowelin f1=0  f2=2300 200 400  f3=-100 80 len=15
 
   
   WAV(vietnam/tr,10)
   vcd alv stop
     //	lengthmod 5
 	
- Vowelin f1=1  f2=1700 -300 300  f3=-100 80 len=30
+ Vowelin f1=1  f2=1700 -300 300  f3=-100 80 len=15
   Vowelout f1=2 f2=1700 -300 300  f3=-100 80 brk len=30
 WAV(vietnam/dd)
  endphoneme
   //voicingswitch J
   lengthmod 2
   length 2
-    Vowelin f1=0  f2=2700 400 600  f3=300 80 len=30 brk
-  Vowelout f1=1  f2=2700 400 600  f3=200 70 len=30 colr=1
+    Vowelin f1=0  f2=2700 400 600  f3=300 80 len=15 brk
+  Vowelout f1=1  f2=2700 400 600  f3=200 70 len=15 colr=1
 
   
   WAV(vietnam/ch,5)
 
 phoneme n
   vcd alv nasal
-  Vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 amp=11 brk len=30
-  Vowelout f1=2 f2=1700 -300 250  f3=-100 80  rms=20 brk len=30
+  Vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 amp=11 brk len=15
+  Vowelout f1=2 f2=1700 -300 250  f3=-100 80  rms=20 brk len=15
     lengthmod 4
 	length 75
 FMT(n/nr_)
   voicingswitch d[
   lengthmod 2
   length 5
-  Vowelin f1=1  f2=1500 -250 250  f3=-100 80  amp=16 len=30
-  Vowelout f1=0 f2=1500 -300 250  f3=-100 80  rms=20 len=30
+  Vowelin f1=1  f2=1500 -250 250  f3=-100 80  amp=16 len=15
+  Vowelout f1=0 f2=1500 -300 250  f3=-100 80  rms=20 len=15
 
   IF nextPh(isPause2) THEN
     WAV(ustop/t_unasp2, 5)
   ENDIF
   WAV(ustop/t_hi, 70)
 endphoneme
+

phsource/ph_vietnam_hue

 
 phoneme 1   //  ngang tone: level
   stress
-  Tone(40, 5, envelope/p_level, NULL) // similar Hue dialect tone
+  Tone(10 ,60, envelope/p_level, NULL) // 40 5 similar Hue dialect tone
 endphoneme
 
 
 phoneme O
  CALL vi/O
  length 150
- FMT(vowel/0)
+ FMT(vowel/oo_3)
 endphoneme
 
 phoneme Oi
  length 100
  FMT(vdiph/ooi_2)
 endphoneme
+
+// Redefine consonants
+
+phoneme n
+import_phoneme vi/n
+Vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 rms=5 brk len=15
+endphoneme
+
+phoneme @:I
+ CALL vi/@:I
+  FMT(vdiph/y#y)
+endphoneme

phsource/phonemes

 
 phonemetable kl base
 include ph_greenlandic
+
+
+//phonemetable en2 en
+//include ph_english_test

src/intonation.cpp

 			}
 
 			count_pitch_vowels(st_start, ix, n_st);
+			if((ix < n_st) || (clause_type == 0))
+			{
+				calc_pitches(option, st_start, ix, group_tone);   // split into > 1 tone groups
+
+				if((clause_type==1) || (clause_type==2))
+					group_tone = tr->langopts.tunes[1];  // , or ?  remainder has comma-tone
+				else
+					group_tone = tr->langopts.tunes[0];  // . or !  remainder has statement tone
+			}
+			else
+				calc_pitches(option, st_start, ix, group_tone);
+
+#ifdef deleted
 			if((ix < n_st) || (clause_type == 0))
 				calc_pitches(option, st_start, ix, group_tone_emph);   // split into > 1 tone groups, use emphatic tone
 			else
 				calc_pitches(option, st_start, ix, group_tone);
+#endif
 
 			st_start = ix;
 		}

src/readclause.cpp

 	wchar_t *name;
 	wchar_t *age;
 	wchar_t *variant;
+	int value;
 	const char *new_voice_id;
 	SSML_STACK *ssml_sp;
 
 
 		attrcopy_utf8(ssml_sp->language,lang,sizeof(ssml_sp->language));
 		attrcopy_utf8(ssml_sp->voice_name,name,sizeof(ssml_sp->voice_name));
-		ssml_sp->voice_variant_number = attrnumber(variant,1,0)-1;
+		if((value = attrnumber(variant,1,0)) > 0)
+			value--;    // variant='0' and variant='1' the same
+		ssml_sp->voice_variant_number = value;
 		ssml_sp->voice_age = attrnumber(age,0,0);
 		ssml_sp->voice_gender = attrlookup(gender,mnem_gender);
 		ssml_sp->tag_type = tag_type;
 				return(CLAUSE_EOF);
 			}
 
-			if((skip_characters > 0) && (count_characters > skip_characters))
+			if((skip_characters > 0) && (count_characters >= skip_characters))
 			{
 				// reached the specified start position
 				// don't break a word

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.47.11a  18.May.13";
+const char *version_string = "1.47.11b  28.May.13";
 const int version_phdata  = 0x014709;
 
 int option_device_number = -1;

src/tr_languages.cpp

 			static const short stress_lengths_hy[8] = {250, 200,  250, 250,  0, 0,  250, 250};
 			static const char hy_vowels[] = {0x31, 0x35, 0x37, 0x38, 0x3b, 0x48, 0x55, 0};
 			static const char hy_consonants[] = {0x32,0x33,0x34,0x36,0x39,0x3a,0x3c,0x3d,0x3e,0x3f,
-				0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,0x54,0x56,0};
+				0x40,0x41,0x42,0x43,0x44,   0x46,0x47,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,0x54,0x56,0};
+			static const char hy_consonants2[] = {0x45,0};
 
 			SetupTranslator(tr,stress_lengths_hy,NULL);
 			tr->langopts.stress_rule = STRESSPOSN_1R;  // default stress on final syllable
 			memset(tr->letter_bits,0,sizeof(tr->letter_bits));
 			SetLetterBits(tr,LETTERGP_A,hy_vowels);
 			SetLetterBits(tr,LETTERGP_VOWEL2,hy_vowels);
+			SetLetterBits(tr,LETTERGP_B,hy_consonants);    // not including 'j'
 			SetLetterBits(tr,LETTERGP_C,hy_consonants);
+			SetLetterBits(tr,LETTERGP_C,hy_consonants2);   // add 'j'
 			tr->langopts.max_initial_consonants = 6;
 			tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_ALLOW_SPACE | NUM_OMIT_1_HUNDRED;
 		//	tr->langopts.param[LOPT_UNPRONOUNCABLE] = 1;   // disable check for unpronouncable words

src/translate.cpp

 	int dict_flags = 0;        // returned from dictionary lookup
 	int word_flags;        // set here
 	int next_word_flags;
+	int new_sentence2;
 	int embedded_count = 0;
 	int letter_count = 0;
 	int space_inserted = 0;
 		if(clause_pause < 0)
 			clause_pause = 0;
 
-		terminator &= ~CLAUSE_BIT_SENTENCE;  // clear sentence bit
+		if(new_sentence)
+			terminator |= CLAUSE_BIT_SENTENCE;  // carry forward an end-of-sentence indicator
 		max_clause_pause += clause_pause;
+		new_sentence2 = 0;
 	}
 	else
 	{
 		max_clause_pause = clause_pause;
+		new_sentence2 = new_sentence;
 	}
 	tr->clause_terminator = terminator;
 
-	if(new_sentence)
+	if(new_sentence2)
 	{
 		count_sentences++;
 		if(skip_sentences > 0)
 		clause_pause = 10;
 	}
 
-	MakePhonemeList(tr, clause_pause, new_sentence);
+	MakePhonemeList(tr, clause_pause, new_sentence2);
 	phoneme_list[N_PHONEME_LIST].ph = NULL;   // recognize end of phoneme_list array, in Generate()
 	phoneme_list[N_PHONEME_LIST].sourceix = 1;
 

src/voices.cpp

 
 #define N_VOICE_VARIANTS   12
 const char variants_either[N_VOICE_VARIANTS] = {1,2,12,3,13,4,14,5,11,0};
-const char variants_male[N_VOICE_VARIANTS] = {1,2,3,4,5,0};
+const char variants_male[N_VOICE_VARIANTS] = {1,2,3,4,5,6,7,0};
 const char variants_female[N_VOICE_VARIANTS] = {11,12,13,14,0};
 const char *variant_lists[3] = {variants_either, variants_male, variants_female};
 
 	espeak_VOICE *voice_data;
 	int priority;
 	int age;
-	int n_variants = 3;    // default, number of variants of this voice before using another voice
+	int n_variants = 4;    // default, number of variants of this voice before using another voice
 	int gender;
 
 #ifdef PLATFORM_WINDOWS
 		if((ix = SelectPhonemeTableName(phonemes_name)) < 0)
 		{
 			fprintf(stderr,"Unknown phoneme table: '%s'\n",phonemes_name);
+			ix = 0;
 		}
 		voice->phoneme_tab_ix = ix;
 		new_translator->phoneme_tab_ix = ix;