Merge branch 'development'

dictsource/bn_rules

         ক        kV
         ক (B     k
 
-        
+        ক্ষ        k#k#V   // or [k#:] ?
+        ক্ষ (B     k#k#
+
+
 .group খ
         খ        k#V
         খ (B     k#

dictsource/en_list

-
+
 // You can use the en_extra file, rather than this one
 // to add your own pronunciation definitions.
 
 // ?7  Scottish
 // ?8  Use full vowel, not schwa in some word endings
 
-// $alt1   use strong ending (-table, -inal)
+// $alt1   use strong ending (-table, -inal, -ier)
 // $alt2   use weak ending
 // $alt3   use weak first vowel, a->[a#], e->[@], o->[0#]
 // $alt6   'to'
 i.e	aIi:_!   $pause
 imo	$abbrev
 inlb	$abbrev
+ios	$abbrev
 irc	$abbrev
 irs	$abbrev
 itx	$abbrev
 ablaut		ablaUt
 aborigine	ab@r'IdZ@ni
 abracadabra	abr@k@d'abr@
-absence		abs@ns
-absent		$1
+absentee	$3
 absent		abs'Ent       $verb
 absentia	abs'Ent2i:@
 absinthe	absInT
 alm		A:m
 almost		O:lmoUst
 allspice	$1
-alt		0lt  //not abbrev
+alt		0lt   // not abbrev
 alternate	O:lt'3:n@t     $only
 alternate	O:lt3neIt      $verb
 alternately	O:lt'3:n@tlI   $verbf
 attribute	$alt3             $verb
 au		,oU
 aubergine	oUb3Zi:n
+audi		aUdi
 auger		O:g3
 augmentation O:gmEnt'eIS@n
 august		O:g@st
 boing		bOIN
 bolognese	b0l@n'eIz
 bombard		$2
+bombardier	b0mb3d'i@3
 (bon voyage)	b0n||vOI'A:Z
 bonbon		b0nb0n
 bonhomie	b0n@mi:
 capitol		kapIt@L
 caprice		ka#pri:s
 carafe		ka#raf
-caramel		kar@mEl
+?!3 caramel	kar@mEl $onlys
 caravan		kar@van
 carburetor	kA@b@r'Et3
 ?3 carburetor	kA@b@reIt3
 catholic	kaTlIk
 carotid		$alt3
 cartel		kA@t'El
-cavalier	$3
+cavalier	$alt1
 caveat		kavIat
 ?3 caveat	kavIA:t
 caviar		kavIA@
 censure		sEnS3
 ceres		si@ri:z
 certificate	s3tIfIk@t
+c'est		seI $u
 chagrin		SagrIn
 ?3 chagrin	Sa#grIn
 chalet		SaleI
 cojones		k@hoUneIs
 coliseum	k0l@s'i:@m
 collage		k0l'A:Z
+collarbone	k0l3boUn
 college		k0lI2dZ
 collegiate	k@li:dZI@t
 colloquial	k@loUkwI@L
 efile		i:faIl
 egg		Eg	// egging 
 egregious	Igr'i:dZ@s
+?!3 egret	i:gr@t
 eh		eI
 eid		i:d
 el		,El $only
 haggis		hagIs
 haha		hA:h'A:
 halation	$alt3  // in-
+halberdier	$alt1
 halleluiah	halI2'lu:j@
 hallelujah	halI2'lu:j@
 halloween	$3
 kowtow		kaUt2aU
 
 la		,la           $only
+(la vie)	la||v'i:
 laboratory	la#b'0r@trI
 ?3 laboratory	labr@tO:ri
 labor		leIb3
 ?3 modem		moUd@m
 moderate	m0d@reIt      $verb
 mogul		moUg@L
+moi		mwA:
 mojito		moUh'i:toU
 molass		$alt3
 molybdenum	$2
 perspex		p3:spEks
 perus		p@ru:z
 peruse		p@ru:z
+petit		p@ti:
 petite		p@ti:t
 petroleum	p@troUli:@m
 petunia		$alt3
 plicate		$2
 plumber		plVm3
 plus		plVs
+pois		pwA:
 poly		p0lI
 politer		p@l'aIt3
 politic		p0l@tIk   $onlys
 settee		$2
 severe		sI2v'i@3        $only
 severely	sI2v'i@3lI      $verbf
+sewn		soUn
 sex		sEks		// sexism
 several		sEvr@L
 shallow		SaloU
 utan		u:t'an
 utensil		ju:t'Ens@L
 
-valentine	val@ntaIn
 valet		valeI
 ?3 valet	val'eI
 valise		va#li:s
 Eire		e@r@
 Elysee		eIl'i:zeI
 Elysée		eIl'i:zeI
+Erebus		ErI#b@s
 Erie		i@ri
 Euphrates	ju:fr'eIti:z
 Eyjafjalla	eIja#fjatla#
 Andrea		$2
 Adrian		eIdri@n
 Agatha		aga#T@
+Angelika	$2
 Aggie		agi
 Agnes		agn@s
 Aguilera	agi:l'e@r@
 Anton		ant0n
 Aoife		i:f@
 Aoiffe		i:f@
+Aphrodite	afr@d'aIti
 Archibald	A@tSIbO:ld
 Archie		A@tSi
 Ares		e@ri:z
 Graeme		greI@m
 Graham		greI@m
 Guido		gwi:doU
+Guinevere	gwInI#vi@3
 Hadrian		heIdri:@n
 Hamish		heImIS
 Harriet		hari@t

dictsource/en_rules

             ab (ruc      ab
             ab (sce      ab
             ab (sei      ab
-            absen (t     ,abs@n
+         _) ab (sen      ab
+         _) abse (ntC    ,abs@
             ab (solu     ab
             ab (sti      ab
             ab (ular     'ab
          f) ac (ilit     @s
         _m) ace (d       asI
          m) achi (nA#    @Si:
-         m) achina (t    aSI2neI
+         m) achina (t    akI2neI
             ach (rom     ak
             ac (id_      as
          _) ac (i        a#s
          _) alber (tA    alb'3:
          _) al (c        al
             alco (h      alk@
+         &) al (cy_      @l
          _) al (d        O:l
             alde (hy     'aldI
             ale (_       eIl
             ale (h       eIl
          X) al (ed       al
          k) alei (d      @laI
+        _v) alen (t      al@n
             aleph        alEf
          _) alexan       alIgz'aan
          _) alfa         alf@
          t) all (e       O:l
        thr) all          O:l
         Av) al (en       @l
-         w) all (A       0l
+         w) all (A+      0l
          w) alle         O:l
-         w) all (et      0l
          w) all          O:l
          w) all (a       0l
             al (tAr      0l
             amer (ic     a#mEr
          c) am (ero      am
          c) am (el       am
+       car) am (el       @m
             am (i_       'A:m
             ami (g       a#mi:
         _d) am (i        eIm
         sp) ar (enC      ar
             ar' (nt      A@
             ar (et       ar
-            ar (iaC_     'e@
+            ar (iaB_     'e@
             ar (ia_      'e@
          @) arily (_     'Er@l%I
 ?3       @) arily (_     'e@r@l%I
       bron) ch           k
             ch (ute      S
             ch (ure      S
+        za) ch           k
 
 .group co
          _) co (ag       k%oU
         st) ea (k        eI
          w) eapo         Ep@
             eager        i:g3
-         j) ealou        El@
+         j) ea (lou      E
          &) eal (_       i@l
          z) ea (lo       E
          C) ea (lt       E
             iza (tion    aIzeI
 ?3          iza (tion    @zeI
             ize (_       aIz
-       ial) ize (_S3     aIz
+        &l) ize (_S3     aIz
+        &l) ized (_S4    aIzd
+        &l) izing (_S5   ,aIzIN
             ize (d_      aIz
             i (zen       I
             iz (er_      aIz
             ier          i@3
             ier (a       I'e@r
          &) ier (_NS2i   3
+            ier (_$w_alt1  'i@3
         _h) ie (r        aI3
         pl) ier (_       aI3
        _Cr) ier          aI3
          v) ine (g       InI#
             in (ea       In
             in (ee       In
+            in (esc      In
          c) in (e        In
        inc) in (e        In
          g) in (e        In
          t) omb (K       u:m
          w) omb (_       u:m
          c) ombe (_      u:m
+       _tr) ombo (n      %0mboU
          c) om (e        Vm
          c) omm (e       Vm
         _d) om (a        @m
       pers) on (i        '0n
      postp) on           'oUn
        _sp) on           0n
+        &s) on (an       @n
             on (ald      0n
          &) on (age_     @n
          d) on (at       %oUn
         nt) or (_        o@
       vent) or (_        3
          y) or (k        O@
+         &) or (ant_     3r
             or (arL02    3r
          &) or (ation    3r
          _) ora (to      0r@
             prede (ces   pri:dI
          _) pre (diP3    pr%i:
          _) pre (dic     pr%I
+         _) predi (lec   pr,i:dI2
+?3       _) predi (lec   prEd@
          _) pre (em      pr%i:
          _) pre (fec     pri:
          _) pre (feren   prE
          @) tu (lat      =tSU
 ?3          tu (Ant      tSu:
 ?3          tu (Ancy     tSu:
-            tu (ous      tSu:
+            tu (ous      =tSu:
          @) tur (A       tS@r
          @) tur (al_     tS=@r
          &) tur (y       tS@r
 ?3       _) vibra (t     v'aIbreI
             vivi (@      vIvI
             viv (_       vaIv
+         _) vo (lC       v0
 
 .group w
             w            w

dictsource/hi_rules

 
 .group ा
         ा          a:
+        ा (ँ       a~
         ाँ (_      a~
         ां (_      a~
         ाव         aU
 .group ी
         ी          i:
         ी (_       i
+        ी (ँ       i~
         ीँ (_      i~
         ीं (_      i~
 
 .group ु
         ु          U
+        ु (ँ       u~
         ुं (_      u~
         ुँ (_      u~
 
 .group ू
         ू          u:
+        ू (ँ       u~
         ूं (_      u~        // or O~   ??
         ूँ (_      u~
 
 
 .group ॆ
         ॆ          e
+        ॆ (ँ       e~
         ॆं (_      e~
         ॆँ (_      e~
 
 .group े
         े          e:
+        े (ँ       e~
         ें (_      e~:
         ेँ (_      e~:
 
 .group ै
         ै          E:        // ?? [aI] [E:] [&:]
+        ै (ँ       E~ 
         ैं (_      E~
         ैँ (_      E~
 ?2      ै          aI        // ?? [aI] [E:] [&:]
 
 .group ॊ
         ॊ          o
+        ॊ (ँ       o~
         ॊं (_      o~
         ॊँ (_      o~
 
 .group ो
         ो          o:
+        ो (ँ       o~
         ों (_      o~
         ोँ (_      o~
 
 .group ौ
         ौ          O:        //  [O:] or [aU] ??
+        ौ (ँ       O~        //  [O:] or [aU] ??
         ौं (_      O~
         ौँ (_      O~
 ?3      ौ          aU        //  [O:] or [aU] ??

dictsource/hu_rules

 _huszone) gy (e    J:
  száze) gy (edik   J:
  védje) gy (straté J
+    na) gy (sor    J
 
 .group h
         h          h
   diva) t (cirk    t
   álla) t (cirk    t
   szen) t (szob    t
+koncer) t (jeg     t
 
 .group tj
      C) tj         c

dictsource/pt_list

 dra	$dot
 mr	$dot
 mrs	$dot
-prof	pr'Of	$dot
+prof	pR'Of	$dot
 profº	pR,ofes'or
 profª	pR,ofes'o*&
 sr	$dot
 adorno		$alt  $verb
 aeroporto	$alt2
 aeroportos	$alt
-albatrozes	$alt
 alcateia	$alt
 alcova		$alt2
 alferes		$alt
-algozes		$alt
 almoço		$alt $verb
 ameba		$alt
 amores		$alt2
 aterro		$alt2
 aterro		$alt $verb
 atmosfera	$alt
-atrozes		$alt
 autora		$alt2
 avesso		$alt2
 axé		aSE
 caibro		k'aIbRU
 camelha		$alt
 camelo		$alt2
-caminhonete	$alt
 camiseta	$alt2
 cantora		$alt2
 capacete	$alt2
 cerca		$alt
 cerca		$alt2 $noun
 cerco		$alt $verb
+cerda		$alt
 cetro		$alt
 chamego		$alt2
 chefe		$alt
 dobro		$alt2 $noun
 doce		$alt2
 doutora		$alt2
+doze		$alt2
 droga		$alt
 dueto		$alt2
 elixir		eliSir
 enredo		$alt  $verb
 enrosco		$alt  $verb
 enterro		$alt2 $noun
-enumerem	$alt
 envelope	$alt
 envolto		$alt2
 enxaqueca	$alt2
 febre		$alt
 fera		$alt
 feitora		$alt2
-ferozes		$alt
 fezes		$alt
 filete		$alt2
 ?1 fixe		fiSy
 galera		$alt
 galileia	$alt
 gangorra	$alt2
-garçonete	$alt
 geleia		$alt
 gelo		$alt2
 gelo		$alt $verb
 golpe		$alt
 gonorreia	$alt
 gorda		$alt2
+gorjeta		$alt2
 gosto		$alt $verb
 gota		$alt2
-governo		$alt2 $noun
+governo		$alt2
+governo		$alt $verb
 gozo		$alt2 $noun
 graveto		$alt2
 grelha		$alt
 joguete		$alt2
 lagosta		$alt2
 lambreta	$alt2
-lanchonete	$alt
 lebre		$alt
 leitora		$alt2
 lembrete	$alt2
 maior		$alt
 maleta		$alt2
 maniçoba	$alt
-marionete	$alt
 marreta		$alt2
 megera		$alt
 melhor		$alt
 mortos		$alt
 motora		$alt2
 mui		mwi
-muito		mw'iNtU	// -s is included as a suffix
-muita		mw'iNt&
-mulher		$alt
-mulheres	$alt
 mureta		$alt2
 mutreta		$alt2
 namoro		$alt2 $noun
 pantera		$alt
 parede		$alt2
 pastora		$alt2
-patinete	$alt
 pedra		$alt
 pela		$alt $verb
 pelo		$alt2
 rego		$alt2 $noun
 reitora		$alt2
 relevo		$alt2 $noun
+remoem		$alt
 remorso		$alt
 renovo		$alt $verb
 retorno		$alt $verb
 rota		$alt2
 rota		$alt $noun
 rumores		$alt2
+sabonete	$alt2
 saibro		s'aIbRU
 saleta		$alt2
 sarjeta		$alt2
 tumores		$alt2
 valeta		$alt2
 vanessa		$alt2
-velozes		$alt
 vera		$alt
 verbete		$alt2
 violeta		$alt2
 violoncelo	$alt
 voga		$alt
-vozes		$alt
 xarope		$alt
 zelo		$alt2 $noun
 zorra		$alt2
 ?1 dj         d,i:dZ'eI
 ?1 down       d'a,wn
 ?1 download   d'a,wnl'oud
-?2 download        daUNl'owd
+?2 download		daUNl'owd
+?2 downloads		daUNl'owds
 ?3 download        dau~Nl'owd
 drive	dR'aIv
 driver	dR'aIver
-drivers  dR'aIveRs?1 end        'end
+drivers  dR'aIveRs
+?1 end        'end
 ?2 esc     'Esk
 ?3 esc     'EskI
 ?1 explorer   ,ekspl'O:*&r-
 laptop lEptOp
 ?1 line       l'ain
    layout     l'eI,aUt
-?2        logo        l'OgU
+?2 logo        l'OgU
 ?1 lock       l'Ok
    mail       m'eIl
-        mails        m'eIls
-?2        mouse        m'aUzi
+   mails        m'eIls
+?2 mouse        m'aUzi
 ?1 menu       menu
 ?1 next       n'Ekst
    ok         Ok'eI
 darwin        d'Arwin
 dijkstra      d'ijkstrA:
 einstein      _!'aInSt,aIn
+?2   einstein      _!'aInst,aIn
 feynman       f'ainm@n
-freud         fr'OId
-friedrich     fr'i:driS
+freud         fR'OId
+friedrich     fR'i:dRiS
 gauss         g'aUs
 geisel        g'aIzEU
 gottfried     g'Otfri:t
 valter	v'aUter
 vogel       f'o:g@l
 volkmann    f'Olkman
+washington	w'OSinton
 wellington	w'Elynton
 wilton	w'Iwton
 
 
-
-
-
-
-
-
-

dictsource/pt_rules

      m) e (tam_    e
      m) e (to_     e
     An) e (tA_     e
+    on) e (te_     E
    gaz) e (ta_     e
         e (tAm_    E
 
 
 //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
    pus) e (L05_    E         // com- im- de-
    tiv) e (L05_    E         // es-
   _com) e (L05_    e
   _pud) e (L05_    E
-  _tem) e (L05_    e
  _coub) e (L05_    E
  _exag) e (L05_    E
  _houv) e (L05_    E
- _perd) e (L05_    e
+ _mulh) e (L05_    E
  _quis) e (L05_    E
  _soub) e (L05_    E
  _talh) e (L05_    E
- _trem) e (L05_    e
+_escond) e (L05_   e
 _troux) e (L05_    E
+respond) e (L05_   e
   diss) e (L06_    E         // contra-
-  fend) e (L06_    e         // de- o-
-  tend) e (L06_    e         // a- con- en- es-
-  vend) e (L06_    e         // re-
- _mord) e (L06_    e
- _rend) e (L06_    e
- prend) e (L06_    e         // a- rea- des- desa-
-_arrepend) e (L06_ e
-_depend) e (L06_   e
-_escond) e (L06_   e
-preend) e (L06_    e         // com- a- re- sur-
-respond) e (L06_   e         // cor-
+     m) e (L07_    e         // comeste, etc.
+    eb) e (L07_    e         // recebeste, etc.
+    ec) e (L07_    e         // pareceram, etc.
+    eg) e (L07_    e         // elegeste, etc.
+   _do) e (L07_    e
+   _mo) e (L07_    e
+   _ro) e (L07_    e
    bat) e (L07_    e         // re- com-
-   ceb) e (L07_    e         // re- per- con-
    ced) e (L07_    e         // pro- con- su-
+   end) e (L07_    e         // vendeste, etc.
+   esc) e (L07_    e         // cresceste, etc.
    met) e (L07_    e         // co- pro- arre- re- intro- compro- sub-
    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-
-  _beb) e (L07_    e
-  _com) e (L07_    e
-  _tem) e (L07_    e
+  _ard) e (L07_    e
   colh) e (L07_    e         // & es-
-  corr) e (L07_    e         // per- con- in- so- dis-
   ench) e (L07_    e         // pre-
-  fend) e (L07_    e         // de- o-
   nasc) e (L07_    e         // re-
-  tend) e (L07_    e         // en-  con- a- es-
   torc) e (L07_    e         // con-
   venc) e (L07_    e         // con-
-  vend) e (L07_    e         // re-
   vert) e (L07_    e         // in- re- con-
-  volv) e (L07_    e         // de- en- re-
- _desc) e (L07_    e
- _eleg) e (L07_    e
  _ergu) e (L07_    e
  _mord) e (L07_    e
- _morr) e (L07_    e
  _perd) e (L07_    e
  _sofr) e (L07_    e
- _trem) e (L07_    e
- merec) e (L07_    e         // des-
- padec) e (L07_    e         // com-
- parec) e (L07_    e         // a- rea- com- desa-
- prend) e (L07_    e         // a- rea- des-
  screv) e (L07_    e         // e- in- ree- pre- de-
-_aborrec) e (L07_  e
-_absolv) e (L07_   e
-_acontec) e (L07_  e
-_adoec) e (L07_    e
-_adormec) e (L07_  e
-_agradec) e (L07_  e
-_amanhec) e (L07_  e
-_amolec) e (L07_   e
-_anoitec) e (L07_  e
-_apodrec) e (L07_  e
-_arrepend) e (L07_ e
 _atrev) e (L07_    e
-_cresc) e (L07_    e
-_depend) e (L07_   e
-_desguarnec) e (L07_ e
-_emagrec) e (L07_  e
-_endurec) e (L07_  e
-_enlouquec) e (L07_ e
-_enraivec) e (L07_ e
-_entorpec) e (L07_ e
-_entristec) e (L07_ e
-_envaidec) e (L07_ e
-_envelhec) e (L07_ e
-_esclarec) e (L07_ e
-_escond) e (L07_   e
-_escurec) e (L07_  e
-_espairec) e (L07_ e
-_esquec) e (L07_   e
-_estremec) e (L07_ e
 _interromp) e (L07_ e
-_perec) e (L07_    e
-_rejuvenec) e (L07_ e
-_resolv) e (L07_   e
-_suspend) e (L07_  e
 _troux) e (L07_    E
-abastec) e (L07_   e         // re-
-conhec) e (L07_    e         // & re- des-
-estabelec) e (L07_ e         // re-
-favorec) e (L07_   e         // des-
-obedec) e (L07_    e         // des-
-preend) e (L07_    e         // sur- com-
-proteg) e (L07_    e         // des-
-respond) e (L07_   e         // cor-
     qu) e (brL04_  E
   _cel) e (brL04_  E
    _ex) e (crL04_  E
   acel) e (rL04_   E         // des-
  _apod) e (rL04_   E
  _coop) e (rL04_   E
+ _enum) e (rL04_   E
  _temp) e (rL04_   E
 _recup) e (rL04_   E
 _refrig) e (rL04_  E
 ?2      o (x_      O
 ?1      oz (_      Os#
 ?2      oz (_      Oz
-        o (zes_    O
+        o (ze_     O
         o (rA_     O
      b) o (re_     o
      c) o (re_     o
    _af) o (bL04_   O
   _esn) o (bL04_   O
  _engl) o (bL04_   O
+  _sal) o (brL03_  o
      _) o (cL03_   o
     br) o (chL04_  O
   _deb) o (chL04_  O
         unh        u~n^
 
      g) u (Y 
+    _m) ui (tA_    'wiN
 
 
 .group ú

espeak-data/voices/other/en-n

-name lancashire
+name english-north
 language en-uk-north
 language en-uk  3
 language en 5
 
 replace 00 i@3 i@
 replace 03 N n
-//replace 03 I  i
-//replace 03 I2 i
+replace 03 i  I2
+
 

phsource/ph_hindi

   length 130
 
   ChangeIfDiminished(@-)
-  IF nextPh(H) THEN
+  IF nextPh(H) OR prevPh(H) THEN
     FMT(vowel/@_low)
   ENDIF
   FMT(vowel/@_bck)
     ENDIF
 
     IF prev2PhW(isVowel) AND NOT nextVowel(isFlag1) THEN
-      IF thisPh(isSeqFlag1) THEN
-        // delete the last inherent vowel of a sequence
-        ChangePhoneme(NULL)
+      IF nextPhW(isNotVowel) AND nextPh(isWordEnd) THEN
+        // don't delete schwa before a word-final consonant
       ELSE
-        IF NOT thisPh(isFirstVowel) THEN
-          // delete if not the first vowel, and is an isolated 'a'
-          ChangePhoneme(NULL)
-        ENDIF
+        ChangePhoneme(NULL)
       ENDIF
     ENDIF
   ENDIF
       ChangePhoneme(@)
     ENDIF
 
-    IF nextPh(H) THEN
+    IF nextPh(H) OR prevPh(H) THEN
       FMT(vowel/@_low)
     ENDIF
   ENDIF
 phoneme a:
   vowel long starttype #a endtype #a
   length 190
+  IF nextPhW(j) THEN
+    FMT(vowel/a_5)
+  ENDIF
   FMT(vowel/aa_9)
 endphoneme
 
 
 phoneme E~
   vowel long starttype #e  endtype #e
-  length 230
+  length 220
   FMT(vnasal/ee_n2)
 endphoneme
 
 phoneme a~
   vowel long starttype #a endtype #a
-  length 250
-  FMT(vnasal/aa_n)
+  length 220
+  FMT(vnasal/&_n)
 endphoneme
 
 phoneme V~
   vowel long starttype #@ endtype #@
-  length 250
+  length 220
   FMT(vnasal/V_n)
 endphoneme
 
 phoneme O~
   vowel long starttype #o endtype #o
-  length 230
+  length 220
   FMT(vnasal/oo_n2)
 endphoneme
 
 
 phoneme u~
   vowel long starttype #u endtype #u
-  length 230
+  length 220
   FMT(vnasal/u_n)
 endphoneme
 

src/numbers.cpp

 }  // end of LookupLetter
 
 
-static const char *hex_letters[] = {"'e:j","b'i:","s'i:","d'i:","'i:","'Ef"};  // using phonemes available to all languages
+// unicode ranges for non-ascii digits 0-9
+static const int number_ranges[] = {
+	0x660, 0x6f0,  // arabic
+	0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xbe6, 0xc66, 0xce6, 0xd66,  // indic
+	0xe50, 0xed0, 0xf20, 0x1040, 0x1090,
+	0 };  // these must be in ascending order
+
+
+int NonAsciiNumber(int letter)
+{//============================
+// Change non-ascii digit into ascii digit '0' to '9', (or -1 if not)
+	const int *p;
+	int base;
+
+	for(p=number_ranges; (base = *p) != 0; p++)
+	{
+		if(letter < base)
+			break;  // not found
+		if(letter < (base+10))
+			return(letter-base+'0');
+	}
+	return(-1);
+}
+
+
+static const char *hex_letters[] = {"'e:j","b'i:","s'i:","d'i:","'i:","'ef"};  // names, using phonemes available to all languages
 
 int TranslateLetter(Translator *tr, char *word, char *phonemes, int control)
 {//=========================================================================
 	int al_offset;
 	int al_flags;
 	int language;
+	int number;
 	int phontab_1;
 	int speak_letter_number;
 	char capital[20];
 		return(0);
 	}
 
+	if((ph_buf[0] == 0) && ((number = NonAsciiNumber(letter)) > 0))
+	{
+		// convert a non-ascii number to 0-9
+		LookupLetter(tr, number, 0, ph_buf, control & 1);
+	}
+
 	al_offset = 0;
 	al_flags = 0;
 	if((alphabet = AlphabetFromChar(letter)) != NULL)
 				speak_letter_number = 0;
 			}
 
-			if((ph_alphabet[0] != 0) && speak_letter_number)
-				ph_buf[0] = 0;  // don't speak "letter" if we speak alphabet name
+//			if((ph_alphabet[0] != 0) && speak_letter_number)
+//				ph_buf[0] = 0;  // don't speak "letter" if we speak alphabet name
 
 			if(speak_letter_number)
 			{

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.47.05  08.Apr.13";
+const char *version_string = "1.47.05a  10.Apr.13";
 const int version_phdata  = 0x014701;
 
 int option_device_number = -1;

src/voices.cpp

 	int c;
 	unsigned int value = 0;
 
-	for(ix=0; (ix<4) & ((c = string[ix]) != 0); ix++)
+	for(ix=0; (ix<4) && ((c = string[ix]) != 0); ix++)
 	{
 		value = (value << 8) | (c & 0xff);
 	}