Merge branch 'development' into build

dictsource/da_list

 _2Xo   t'yv@n@ // 25.
 _3Xo   tr'&#ft@ //36.
 _4Xo   fWV'tyv@n@ // 42.
-_5Xo   halt*'Esenstyv@n@ // 52.
+_5Xo   h&lt*'Esenstyv@n@ // 52.
 _6Xo   tr'Esenstyv@n@ // 62.
 _7Xo    h&lfj'&rsenstyv@n@ // 72.
 _8Xo    firsenstyv@n@ // 82.
-_9Xo   half'Emsenstyv@n@ // 95.
+_9Xo   h&lf'Emsenstyv@n@ // 95.
 
 // function words
 
 
 // PB names
 august OgOsd $capital
-austin      _^_EN $alt
-bailey      _^_EN $alt
-bbc		    _^_EN $alt
-boston      _^_EN $alt
-bronx       _^_EN $alt
-boyle       _^_EN $alt
+austin      _^_EN
+bailey      _^_EN
+bbc		    _^_EN
+boston      _^_EN
+bronx       _^_EN
+boyle       _^_EN
 cyrus       _^_EN
-cia         _^_EN $alt
+cia         _^_EN
 fox         _^_EN
-leroy        _^_EN $alt
-luke       _^_EN $alt
-mansfield   _^_EN $alt
-mahoney     _^_EN $alt
-montreal    _^_EN $alt
-oregon      _^_EN $alt
+leroy        _^_EN
+luke       _^_EN
+mansfield   _^_EN
+mahoney     _^_EN
+montreal    _^_EN
+oregon      _^_EN
 piccadilly  _^_EN
-reynolds    _^_EN $alt
-//purvis      _^_EN
-white       _^_EN $alt
+reynolds    _^_EN
+white       _^_EN
 
 // PB French words
 croquis     _^_FR
 ignorant  $alt
 immigrant  $alt
 imposant  $alt
-//infant  $alt
 informant  $alt
 injuriant  $alt
 insinuant  $alt
 morian $alt2
 mytoman $alt2
 narkoman $alt2
-//norman $alt2
 nymfoman $alt2
 obsidian $alt2
 ocean $alt2
 oktan $alt2
-Oman $alt2
+oman $alt2
 organ $alt2
 orkan $alt2
 osman $alt2
 talisman $alt2
 tarlatan $alt2
 tartan $alt2
-//timian $alt2
 titan $alt2
 tukan $alt2
 tulipan $alt2
 excellens $alt
 filipens $alt
 fluorescens $alt
+flatulens $alt
 fosforescens $alt
 frekvens $alt
 imens $alt
 eugenik  $alt
 excentrik  $alt
 fabrik  $alt
-//falkeblik  $alt
 folkloristik  $alt
 fonetik  $alt
 fysik  $alt
 origami oreg'ami  $alt
 pandemi  $alt
 polygami  $alt
-salami sal'&mi  $alt
+salami s&l'&mi  $alt
 socionomi  $alt
 sodomi  $alt
 stomi $alt
 dioxin  $alt
 disciplin  $alt
 doktrin  $alt
-//(drive-in) drajv'in  $alt
 dusin  $alt
 endokrin  $alt
 endorfin  $alt
 ærefrygtig   $alt
 ærgerrig   $alt
 ærværdig   $alt 
+øjeblikkelig $alt
 ømfindtlig   $alt
 ømtålelig   $alt
 ømtålig   $alt
 amputer   $alt
 analogiser   $alt
 analysere   $alt
+psykoanalysere  $alt
 angliser   $alt
 animer   $alt
 annekter   $alt
 inventer   $alt
 inverter   $alt
 invester   $alt
+geninvester   $alt
 inviter   $alt
 involver   $alt
 ioniser   $alt
 rationaliser   $alt
 rationere   $alt
 reager   $alt
+afreager   $alt
 reaktiver   $alt
 realiser   $alt
 reassumer   $alt
 benediktion   $alt
 billion   $alt
 centralisation   $alt
+centurion $alt
 cirkulation   $alt
 citation   $alt
 civilisation   $alt
 protektor  $alt
 radiator  $alt
 reaktor  $alt
+rektor $alt
 receptor  $alt
 recitator  $alt
 reflektor  $alt
 enter	entV
 ide	id'e	// idea
 idé	id'e	// idea
-//igen	igen
+tune tun3 $capital // PB Tune lufthavn - not "tune a car" [tjune]
 ny	ny	// new
 også	Vs@	// also
 idet	id'e	// in so far as
 (rub og stub)  R'Ob||V||sd'Ob
-slags	sl'ags	// sort, type
 tre	tr'e	// the number 3
 rejicere rejis'eV          // PB should not be pronounced [raje]
 rejicerer rejis'eV         // PB

dictsource/de_list

 association	_^_EN
 baseball	_^_EN
 bbc		_^_EN
-beat		_^_EN
+beat		_^_EN  $only
 browser         _^_EN
 byte		_^_EN
 camcorder	_^_EN

dictsource/dict_phonemes

 x    z    
 
 
-Dictionary da_dict  2011-07-21
+Dictionary da_dict  2011-10-24
 
 &    &#   0    3    @    @-   a    A    
 aI   e    E    i    o    O    u    V    
 dZ   f    g    h    j    J    k    l    
 l/2  l/3  m    n    N    p    r    R    
 R3   s    S    t    T    tS   v    w    
-x    z    Z    
+x    Z    
 
 
-Dictionary hu_dict  2011-10-13
+Dictionary hu_dict  2011-10-24
 
 a    A    a:   E    e:   i    i:   o    
 o:   u    u:   Y    y    y:   Y:   
 
 -    :    b    c    C    d    dZ   dz   
-f    g    h    j    J    k    l    m    
-n    n^   p    r    R    R2   s    S    
-s2   t    t2   tS   ts   v    w    z    
-Z    
+f    g    h    j    J    k    l    l^   
+m    n    n^   p    r    R    R2   s    
+S    s2   t    t2   tS   ts   v    w    
+z    Z    
 
 
-Dictionary de_dict  2011-06-14
+Dictionary de_dict  2011-10-16
 
 3    @    @-   a    A    A:   aI   aU   
 A~   E    E2   E:   e:   EI   i    I    
 ts   v    x    z    
 
 
-Dictionary en_dict  2011-09-27
+Dictionary en_dict  2011-10-24
 
 0    3    3:   @    @-   @2   @5   @L   
-a    a#   A:   A@   aa   aI   aI@  aU   
-aU@  A~   E    e:   e@   eI   i    I    
-I#   I2   i:   i@   i@3  IR   O    O:   
-o:   O@   o@   OI   oU   O~   U    u:   
-U@   V    VR   
+a    a#   A:   A@   aa   aI   aI3  aI@  
+aU   aU@  A~   E    e:   e@   eI   i    
+I    I#   I2   i:   i@   i@3  IR   O    
+O:   o:   O@   o@   OI   oU   O~   U    
+u:   U@   V    VR   
 
 :    ;    ?    b    C    d    D    d#   
 dZ   f    g    h    j    k    l    l#   
 
 Dictionary fi_dict  2011-10-14
 
-&    &i   &y   a    a2   ai   au   e    
-ei   eu   ey   i    I    ie   iu   iy   
-o    oi   ou   u    ui   uo   Y    y    
-Yi   yi   Yy   yY   
+&    &i   &y   a    ai   au   e    ei   
+eu   ey   i    I    ie   iu   iy   o    
+oi   ou   u    ui   uo   Y    y    Yi   
+yi   Yy   yY   
 
 :    b    d    f    g    h    j    k    
 l    m    n    N    p    r    R    s    
 t    tS   v    w    x    
 
 
-Dictionary nl_dict  2011-10-13
+Dictionary nl_dict  2011-10-14
 
 8    @    @-   a    A    a:   A~   e    
 E    e#   E2   e:   EI   eU   i    I    
 z;   Z;   
 
 
-Dictionary ru_dict  2011-03-25
+Dictionary ru_dict  2011-10-24
 
 8    @-   a    A    e    E    E#   E%   
 E2   i    I    I#   I3   I^   ja   ju   

dictsource/en_list

 U+303	tIld@_
 U+304	makr0n_
 U+306	brEv_
-U+308	daI@ri:sI2s
+U+308	daI3ri:sI2s
 U+30a	rINg_
 U+31e	a#pr'0ksIm@nt_
 U+325	rINg_
 fi               f,aI		// as in "hi-fi"
 fiasco           fi:'askoU
 fiat             fi:@t
-fiery            faI@rI
+fiery            faI3rI
 finale           fI2nA:li
 finance          faInans       $only
 finance                        $verb
 insert           Ins3:t        $onlys
 insert           Ins'3:t       $verb
 insightful        $2
-inspire          Insp'aI@
+inspire          Insp'aI3
 instal           Inst'O:l	// instalment
 installation     Inst@l'eIS@n
 instinctive       $2
 intro             $1
 irate            aIr'eIt
 iris             aIrIs
-iron             aI@n
+iron             aI3n
 irony            aIr@nI
 isosceles        aIs'0s@li:z
 itinerary        aIt'In@r@rI
 pious            paI@s
 pipette          pIp'Et
 piquant          pi:k@nt
-piracy           paI@r@si
+piracy           paI3r@si
 piranha          p@rA:n@
 pirate           paIr@t
 pisces           paIsi:z
 twilight         twaIlaIt
 twos             tu:z
 typo             taIpoU
-tyr              taI@
+tyr              taI3
 
 ukulele          ju:k@l'eIli
 ultraviolet                    $3
 vinyl            vaInI2l
 viola            vaI'oUl@
 violin                         $2
-virus            vaI@r@s
-viral            vaI@r@L
+virus            vaI3r@s
+viral            vaI3r@L
 visa             vi:z@
 visit            vIzI2t
 voila            vwal'a
 ?3 current	k'3@nt
 ?3 depot        di:poU
 ?3 detail       $2
-?3 dialog	daI@lO:g
+?3 dialog	daI|@lO:g
 ?3 envelope	A:nv@loUp
 ?3 err		e@
 ?3 fortune	fO@tS@n
 ?3 garage	ga#rA:Z
 ?3 herb		3:b
 ?3 hurricane	h3:@keIn
+?3 inquiry      Inkw@ri
 ?3 investigative Inv,EstI2g'eItIv
 ?3 laboratory	labr@tO:ri
 ?3 launch	lA:ntS

dictsource/en_rules

         or) ch (i        k
             chlo (r      klo@
             chloro       kl,o@roU
-            choir        kwaI@
+            choir        kwaI3
             ch (ol       k
             choly        k@l%I
             ch (ond      k
             dged (_      dZd
             dg (i        dZ
             dg (y        dZ
-         _) dir (_       daI@
+         _) dir (_       daI3
         we) dne (sd      n
             dt (_        t
 ?3       &) du (CA       dZu:
 .group ia
         XC) ia           aI|@
          &) iac (_       =Iak
-         C) iar          aI@
+         C) iar          aI3
 ?8       C) iar          aIa#
             iar (iC      Iar
          &) iary         =j@r%I
          @) ian (cy      I|@n
          l) iais         I|eIz
          p) ia (no       Ia
-         f) ia (b        aI@
+         f) ia (b        aI|@
          r) ia (b        I2@
          t) ia (b        I2@
          &) iage (_      I2dZ
        ill) ia (nt       I@
         al) ia (nt       I@
         _p) ia (nA       i@
-            iar          aI@
+            iar          aI3
         @l) iar (_       i@3
             iara (_      I'A:r@
             iarch        I2A@k
             ier (a       I'e@r
          &) ier (_NS2i   3
          &) ier's (_NS4i   3z
-        _h) ie (r        aI@
-        pl) ier (_       aI@
-       _Cr) ier          aI@
+        _h) ie (r        aI3
+        pl) ier (_       aI3
+       _Cr) ier          aI3
             ier (c       i@3
             ierre (_     I2e@
             ie (t        aI@
 .group ir
          _) ir (a        I2r
             ir (a_       'i@r
-            ir (able     'aI@
+            ir (able     'aI3
          m) ir (ac       Ir
-        sp) iral         aI@r@L
+        sp) iral         aI3r@L
          @) ir (ation    Ir
             ir (at       %aIr
             ir (ate      =i@r
-            ire          aI@
-            ir (ee       aI@
+            ire          aI3
+            ir (ee       aI3
 ?8          ire          aIa#
-         s) ir (en       aI@
+         s) ir (en       aI3
          c) ire (n       aIr@
             ir (ect      %aIr
             ir (ety      aIr
-            irer (_      aI@r3
+            irer (_      aI3r3
             ir           3:
 ?5          ir           IR
         @C) ir (_        i@3
          g) ir (o        aIr
         _C) ir (o_       aIr
          @) ir (o_       'i@r
-         _) iron         aI@n
+         _) iron         aI3n
             iron (A      aIr'0n
          v) iro (n       aIr@
          p) ir           Ir
-        _p) ira (c       aI@
-         p) ire          aI@
-       des) ir           aI@
+        _p) ira (c       aI3
+         p) ire          aI3
+       des) ir           aIr
          _) irre (C      ,IrI
             irr (econ    I2r
          _) irr (egu     I2r
          _) ir (rA       I
             ir (ro       I
             ir (ru       I
-            iry (_       aI@rI
+            iry (_       aI3rI
 
 
 .group is

dictsource/hu_rules

    _ná) d (söv     d         //for example nádsövénnyé word
         dt (sz     t:
 miliár) d (szor    d
+   tér) d (sérül   d
 
 .group dz
   fogó) dz (kod    ts
     _o) ttj (ár    tj
  _spor) t (cél     t
     pó) t (selejt  t
+  diva) t (cikk    t
 
 .group tj
      C) tj         c
     ro) zszs (em   Z:
    _gő) z (süvölt  z
   ezkö) z (sor     z
+   wal) z (er      ts
 
 .group
         $          dolla:R2

dictsource/nl_rules

           &) e (ment      @
           &) e (nissen_   @
 
-          &) en (_S2qd    @n   // double the previous vowel
-        KAC) en (_S2e     @n
+          &) en (_S2qd    @n
+        KAC) en (_S2e     @n   // flag 'e' means double the previous vowel
         and) en (_S2      @n
          el) en (_+S2qd   @n
          er) en (_+S2qd   @n
 
-          &) en (e_$p_altS3  =@n@
-          &) en (en_$p_altS4 =@n@n
-          &) en (t_$p_altS3  =@nt
+          &) en (e_$p_altS3e  =@n@   // flag 'e' means double the previous vowel
+          &) en (en_$p_altS4e =@n@n
+          &) en (t_$p_altS3e  =@nt
 
           &) ens (_S3q    @ns
          ll) en (_S3      @n

dictsource/ru_list

 _11	Od;'innVttsVt;
 _12	dv;In'AttsVt;
 _13	tR;In'AttsVt;
-_14	tS;It'y@-*nVttsVt;
+_14	ts;It'y@-*nVttsVt;
 _15	p;Itn'AttsVt;
 _16	SE#stn'AttsVt;
 _17	s;Imn'AttsVt;
 _6X	SE2z;d;d;Is;'jat
 _7X	s;'emd;E2s;Vt
 _8X	v'os;E2md;E2s;Vt
-_9X	d;evIn'ostO
+_9X	d;E2v;In'ostO
 _0C	st'o
 _2C	dv;'es;t;I
 _3C	tr;'ista
-_4C	tS;It'yr;E2sta
+_4C	ts;It'yr;E2sta
 _5C	p;,It;s'ot
 _6C	S,E#s;t;s'ot
 _7C	s;,Ims'ot
 _8C	vOs;Ims'ot
-_9C	devits'ot
-_1MA1	t'ys;ItS;V     // no '1' before thousand
-_0MA1	t'ys;ItS;i
-_0M1	t'ys;VtS;
+_9C	dev;Vts'ot
+_1MA1	t'ys;Its;V     // no '1' before thousand
+_0MA1	t'ys;Its;i
+_0M1	t'ys;Vts;
 _1MA2	m;,IlI;'on
 _0MA2	m;,IlI;'ona
 _0M2	m;,IlI;'onof
 _1MA3	m;,IlI;'art
 _0MA3	m;,IlI;'arda
-_0M3	m;,IlI;'artof
+_0M3	m;,IlI;'ardof
 _dpt	_:'i_:        // start of decimal fraction
 _dpt2	_d;Is;'atYx   // end of decimal fraction
 
-// characters
-№	 номер	$text
+
+// symbols
+@ sob'aka
+# reS'Etka  $max3
+$ d'ollar
+% prVts'Ent  $max3
+^ kr'ySka
+& ampers'and
+* zvezd'a  $max3
++ pl'jus  $max3
+= ravn'o  $max3
+/ sl'ES  $max3
+\ bEksl'ES  $max3
+_- def'is
+_ podtS;'8rk  $max3
+~ t'ilda
+№ n'omer
+
+
+_( 'otkrkrug
+_) z'akrkrug
+_| v'ert
+_{ 'otkrfigur
+_} z'akrfigur
+_[ 'otkrkvadrat
+_] z'akrkvadrat
+_> b'ol;SE
+_< m'en;SE
+_« 'otkr uglof
+_» z'akr uglof
+_! v'oskl;
+_? vopr'os
+_. t'otS;ka
+_, zVpit'aja
+_` akts'Ent
+_" kVv'ytS;ka
+_' ap'ostrVf
+_; t'otS;kzap
+_: dvVet'otS;ie
 
 
 // prepositions
 
 // exceptions
 радио         r'ad;Io
+

espeak-data/voices/fr

-language fr
 name french
+language fr-fr
+language fr
 gender male
 
 dictrules 1

phsource/compile_report

     base 107  107
 consonants  10  116
    base2  26  123
-      en  52  152
-    en-n  32  152
-   en-us  38  153
-   en-sc  39  154
-   en-rp  33  152
-   en-wm  30  152
-   en-wi  30  152
+      en  53  153
+    en-n  33  153
+   en-us  39  154
+   en-sc  40  155
+   en-rp  34  153
+   en-wm  31  153
+   en-wi  30  153
       af  39  136
       cy  29  132
       de  41  139
                 [l/] fr
 l/l_@           [l/3] base
                 [l/] fr
-l/l@            [hæx] base
+l/l@            [haþ] base
                 [l#] base
                 [l] fr
                 [l/2] fr
 l/L2_uL         [l/2] base
 l/l_3           [l/] de
 l/l_4           [ll] sq
-l/la            [hæx] base
+l/la            [haþ] base
                 [l#] base
                 [l] fr
                 [l/2] fr
                 [K] tn
 l/l_a           [l/3] base
                 [l/] fr
-l/le            [hæx] base
+l/le            [haþ] base
                 [l#] base
                 [l] fr
                 [l/2] fr
                 [&:] af
 l/l_front       [L] sq
 l/l_front_      [l/4] sq
-l/li            [hæx] base
+l/li            [haþ] base
                 [l#] base
                 [l] fr
                 [l/2] fr
 ll/_ll          [L] bg
 l/l_long        [l] base
                 [l] fr
-l/lo            [hæx] base
+l/lo            [haþ] base
                 [l#] base
                 [l/2] fr
                 [K] nso
 l^/l_rfx        [l.] base
                 [l] ru
                 [l^] ru
-l/lu            [hæx] base
+l/lu            [haþ] base
                 [l#] base
                 [l] fr
                 [l/2] fr
 vwl_en_us/3_us2  [3:] en-us
 vwl_en_us/a     [a] en-us
 vwl_en_us/ai@   [aI@] en-us
+vwl_en_us/ai3   [aI3] en-us
 vwl_en_us/ar    [A:] en-us
                 [A@] en-us
 vwl_en_us/aU@   [aU@] en-us

phsource/mbrola/us

 0  g-  NULL   0  NULL
 0  x   NULL   0  k_h
 0  @-  NULL   0  NULL
-0  aI@ NULL   60 AI  r
+0  aI@ NULL   60 AI  @
+0  aI3 NULL   60 AI  r=
 0  aU@ NULL   75 aU  r
 
 

phsource/mbrola/us3

 0  g-  NULL   0  NULL
 0  x   NULL   0  k
 0  @-  NULL   0  NULL
-0  aI@ NULL   60 AI  r
+0  aI@ NULL   60 AI  @
+0  aI3 NULL   60 AI  r=
 0  aU@ NULL   75 aU  r
 
 

phsource/ph_english

 endphoneme
 
 
+phoneme aI3
+  vowel  starttype #a  endtype #@
+  length 280
+  ChangePhoneme(aI@)
+endphoneme
+
+
 phoneme aU@
   vowel  starttype #a   endtype #@
   length 280

phsource/ph_english_n

 endphoneme
 
 
+phoneme aI3
+  vowel  starttype #a  endtype #@
+  length 280
+  ChangePhoneme(aI@)
+endphoneme
+
+
 phoneme aU@
   vowel  starttype #a   endtype #@
   length 280

phsource/ph_english_rp

 endphoneme
 
 
+phoneme aI3
+  vowel  starttype #a  endtype #@
+  length 280
+  ChangePhoneme(aI@)
+endphoneme
+
+
 phoneme aU@
   vowel  starttype #a   endtype #@
   length 270

phsource/ph_english_sc

 endphoneme
 
 
+phoneme aI3
+  vowel  starttype #a  endtype #@
+  length 280
+  ChangePhoneme(aI@)
+endphoneme
+
+
 phoneme @L
   vowel  starttype #@  endtype l
   ipa əl

phsource/ph_english_us

 phoneme aI@
   vowel  starttype #a  endtype #@
   length 300
-  ipa aɪəɹ
-  IF nextPhW(r-) THEN
-    ipa aɪə
-  ENDIF
+  ipa aɪə
   IfNextVowelAppend(r-)
   FMT(vwl_en_us/ai@)
 endphoneme
 
 
+phoneme aI3
+  vowel  starttype #a  endtype #@
+  length 300
+  ipa aɪɚ
+  IfNextVowelAppend(r-)
+  FMT(vwl_en_us/ai3)
+endphoneme
+
+
 phoneme aU@
   vowel  starttype #a   endtype #@
   length 300

phsource/ph_english_wm

 endphoneme
 
 
+phoneme aI3
+  vowel  starttype #a  endtype #@
+  length 280
+  ChangePhoneme(aI@)
+endphoneme
+
+
+
 phoneme aU@
   vowel  starttype #a   endtype #@
   length 280

phsource/ph_german

 
 phoneme b
   vcd alv frc sibilant
+  voicingswitch p
   IF nextPh(l2) THEN
     ChangePhoneme(p)
   ENDIF
 
 phoneme d
   vcd alv stop
+  voicingswitch t
   IF nextPh(l2) THEN
     ChangePhoneme(t)
   ENDIF
 
 phoneme g
   vcd vel stop
+  voicingswitch k
   IF nextPh(l2) THEN
     ChangePhoneme(k)
   ENDIF

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.45.46  04.Oct.11";
+const char *version_string = "1.45.47  24.Oct.11";
 const int version_phdata  = 0x014500;
 
 int option_device_number = -1;

src/translate.cpp

 		// lang=Hungarian, If the last two words of a clause have capital letters (eg. a person name), unstress the last word.
 		if((wflags & (FLAG_LAST_WORD | FLAG_FIRST_UPPER | FLAG_ALL_UPPER | FLAG_FIRST_WORD)) == (FLAG_LAST_WORD | FLAG_FIRST_UPPER))
 		{
-			if((wtab[-1].flags & (FLAG_FIRST_UPPER | FLAG_ALL_UPPER)) == FLAG_FIRST_UPPER)
+			if(((wtab[-1].flags & (FLAG_FIRST_UPPER | FLAG_ALL_UPPER)) == FLAG_FIRST_UPPER) && ((tr->clause_terminator != 0x90028) || (wflags & FLAG_HAS_DOT)))
 			{
 				ChangeWordStress(tr,word_phonemes,3);
 			}

src/translate.h

 
 // Punctuation types  returned by ReadClause()
 // bits 0-7 pause x 10mS, bits 12-14 intonation type,
+// bits12-14 intonation type
 // bit 15- don't need space after the punctuation
 // bit 19=sentence, bit 18=clause,  bits 17=voice change
 // bit 16 used to distinguish otherwise identical types