Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

dictsource/en_list

 hooah		h'u:'A:
 hopi		hoUpi:
 horizontal	$3
+(hors d'oeuvres) O@'d3:vz
 hospitable	h0sp'It@b@L
 hostage		h0stI2dZ
 hostess		hoUstEs

dictsource/hy_list

 +	գումարած $text
 =	հավասար $text
 
+_-	gits
+_«	tSak,ert#@||b'ats#
+_»	tSak,ert#@||p#'ak
+_(	p#akag,its@||b'ats#
+_)	p#akag,its@||p#'ak
 
 _՝	b'ut#
 _՞	harts#ak'an
 _,	storak'et
 _.	midZak'et
 _֊	jent#amn'a  // hyphen
-_՜	bats#akantSut#j'un
+_՜	bats#akantSak'an
 _՟	pat'iw
 
 

dictsource/hy_rules

 // ?1  West Armenian
 
 .L01 բ գ թ կ պ տ ք
-.L02 ու այ իւ իյ ոյ    ա ե ը ի ո օ     //  vowel sounds
+.L02 ու այ իւ իյ ոյ    ա ե ը ի ո օ  ույ   //  vowel sounds
 
 // ligature
 .replace
 
 .group ա
         ա        a
-        այ (K    aI
-        այ (_    a
+        այ       aI
+?1      այ (_    a
 
 .group բ
         բ        b
 .group է
         է        e
         էօ       W
-        էյ (K    eI
+        էյ       eI
 
 .group ը
         ը        @
         ու (A    v
         ոյ       uj   // ?? uj or uy
      A) ոյ       oj   // ?? oj or oy
-        ոյ (_    o
+?1      ոյ (_    o
 
 .group չ
         չ        tS
 .group ռ
         ռ        R2
      _) ռ (C     R2@
+?1 L02) ռ (L02   *
 
 .group ս
         ս        s
 
 .group ր
         ր        r
-   L02) ր (L02   *
+?1 L02) ր (L02   r
      _) ր (C     r@
      C) ր (_     @r
    L02) ր (_     r

dictsource/pl_list

 p	pE
 q	ku
 r	ER
-s	ES
+s	Es
 ś	S;i
 t	tE
 _u	u

dictsource/pt_list

 
 // character names
 
-á	$accent
+_á	$accent
 _à	$accent   // à can be a word
 â	$accent
 ã	$accent
 nesse	n'esy	$u+ $nounf
 aquela	$u+ $nounf
 aquele	$alt2 $nounf
+àquela	$u+ $nounf
+àquele	$alt2 $nounf
 daquela $u+ $nounf
 daquele	$alt2 $nounf
+praquela $u+ $nounf
+praquele	$alt2 $nounf
 	que	$u      // pronunciation is in pt_rules
 
 // possessive adjectives
 
 // prepositions
 de	$u	$nounf // of,from
-do	du	$u	$nounf
+do	dU	$u	$nounf
 da	$u	$nounf
 dos	$u	$nounf
 das	$u	$nounf
 cebola		$alt2
 cedro		$alt
 cefaleia	$alt
-cerebelo	$alt2
 centopeia	$alt
-cerca		$alt
+cerebelo	$alt2
 cerca		$alt2 $noun
 cerco		$alt $verb
 cerda		$alt
 dez		$alt
 diarreia	$alt
 diego		$alt2
+diogo		$alt2
 discordo	$alt
 dissabores	$alt2
 dispneia	dZIspyn'EI&
 doze		$alt2
 dueto		$alt2
 elixir		eliSir
+emprego		$alt2
 emprego		$alt2 $noun
-empregos	$alt2
 encosto		$alt  $verb
 endereço	$alt  $verb
 enforco		$alt
 flerte		$alt2 $noun
 foda		$alt2 $verb
 fodo		$alt2
+fogo		$alt2
 fogos		$alt
 foguete		$alt2
 foice		$alt2
 horrores	$alt2
 humores		$alt2
 ideia		$alt
+inovo		$alt
 interesse	$alt2
 interesse	$alt $verb
 iodo		$alt2
 leste		$alt2 $verb
 ?2   lhe	l^y
 lingueta	$alt2
-lisboeta		$alt2
+lisboeta	$alt2
 lodo		$alt2
 logro		$alt
 lopes		$alt
 tenores		$alt2
 terrores	$alt2
 teta		$alt2
-toga		$alt
+togo		$alt2
 topo		$alt2 $noun
 torno		$alt  $verb
 tornozelo	$alt2
 
 
 // foreign words
+?2 álcool	'aUkow
 ?1 alt        'alt
 ?2        agosto        ag'ostU
 ?1 back       b'Ek
 ?2  backup        bEk'&p
 ?2  backups     bEk'&ps
+bad  bEd
 beatle  b'itow
 beatles  b'itows
+black  blEk
 blind      bl'aind
-book  buk
 ?1 braille    b:r'aily
 ?2        Braille        bR'aili
 ?1 cancel     k'&ns'El
 ?1 explorer   ,ekspl'O:*&r-
 ?2        Explorer        ekspl'O*er
 ?1 eyes       'aiz
+?2 eyes       'aIs
 ?1 frame      fr'eImy
 ?2 frame      fR'eImi
+game	g'eImy
 ?1 gmail      g,em'eIl
 ?2 Gmail      Zem'eIl
 ?1 google     g'u:g&l 
 ?2 google     g'ugol
 ?1 hardware   'ard,w'Er-
 ?2 hardware   h'ardwe@-
+happy  x'Epy
 ?1 home       'omy
 ?2 home       h'owmi
 ?1 hotmail    h'Otm'eIl
 ?2 microsoft   m'aIkRows'Oft
 ?1 movie       m'uvi
 ?1 nero        n'Eru
-?2  netbook   nEtbUk
 ?2  netbooks   nEtbUks
 ?2  notebook   nowtbUk
 ?2  notebooks   nowtbUks
 ?2        Outlook        ,aUtl'uk
 ?1 paint       p'aint
 ?1 player      pl'eI&r-
-playstation	_^_EN
-?1 point       p'oint
+?1   playstation	_^_EN
+?2   playstation	pleIst'eIS&~N
+ point       p'oint
 ?1 power       p'aU&r-
 ?1 product     p:r'&d&kt
 ?1 Publisher   p'&bl,iS&r-
 krueger     kR'iZer
 krüger      kR'iZer
 kühl        k'il
+?2 juan  xu&~N
 mueler      m'iler
 mueller     m'iler
 müler       m'iler

dictsource/pt_rules

 ?1      a (lK      ,A        // Algarve, Almerinda, etc...
 ?2      al (K      aU
         a (lh+     a
+        a (ll+     a
         a (m       &~
         a (mAr_    &
         a (mA@     &
         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...
    óCC) a (CA_     &
     óC) a (CCA_    &
     úC) a (CA_     &
-?2      ation (_   'eIS&~N
-?2      action (_  'EkS&~N
+        ation (_   'eIS&~N
 
 
 .group â
 
 ?2      el (K      EU
         e (lh+     e
+        e (ll+     E
      v) e (lhA_    E
 
         e (bL02_   E
 
         e (ssL04_  E
         e (ss_     E         // stress and english words
-?2      ection (_  'EkS&~N
-?2      ee (n_     i
+?2   C) ee (_      i
+?2      ee (C_     i
+?2   C) e (em_     e
         e (stL04_  E
 
         e (strL04_ E
         e (rvL04_  E
 
         e (tL04_   E
-     m) e (tL04_   e
+     m) e (tL03_   e
     An) e (tA_     e
     on) e (te_     E
    gaz) e (ta_     e
   _dec) e (pL04_   E
    _in) e (ptL03_  E
     ad) e (quL04_  E
+  _dig) e (rL02_   E
+  _ing) e (rL02_   E
   _sev) e (rL03_   E
  _reit) e (rL03_   E
  _sinc) e (rL03_   E
  _exub) e (rL04_   E
  _temp) e (rL04_   E
 _adult) e (rL04_   E
+_incin) e (rL04_   E
 _persev) e (rL04_  E
 _recup) e (rL04_   E
 _refrig) e (rL04_  E
+    _c) e (rcL02_  E
    _ex) e (rcL02_  E
  _alic) e (rcL02_  E
     _p) e (rdL02_  E
      _) e (rgL03_  e
    _re) e (rgL03_  e
    _so) e (rgL03_  e
+    _c) e (rquL02_ E
   _bez) e (rrL03_  e
      v) e (rtL03_  e         // con- re- in-
     _f) e (rvL03_  e
 .group h
      _) h (_       ag'a
         h                    // silent
+?1   _) help       _^_En
+?2   _) hel (p     x'EU
 
 
 .group i
 
 ?2      il (K      iU
         i (lh+     i
+        i (ll+     i
 
         im (_      iN
         im (C      im
 ?1   @) ings (_    _^_EN
 ?2      il (ton_   'iU
 ?2      i (rton_   'i
+?1      ight (_    _^_EN
+?1      ights (_   _^_EN
 
 
 .group í
         oi (de_    OI
         oi (s      oI
         o (iCK     o
+        oo (C_     U
+        o (os_     o
 ?1   C) oo (_      ow        // eg: voo, enjoo, etc...
         oy         OI
 
 
         o (g_      O
         o (gs_     O
-
-        o (gL02_   O
-
+        o (gL04_   O
+     g) o (gL03_   o
         o (jL04_   O
 
         o (ldL04_  O
    óCC) o (CA_     o
     úC) o (CA_     o
    úCC) o (CA_     o
-?2      otion (_   'owS&~N
 
 //sort
     _f) o (L05_    o
      _) o (cL03_   o
     _m) o (fL01_   O
     _m) o (fL02_   O
+   _af) o (fL04_   O
     _s) o (frL02_  O
-     l) o (gL04_   O         // dialoga, etc.
-     r) o (gL04_   O         // inter-
-     v) o (gL04_   O         // advoga, etc.
-    _j) o (gL04_   O
-    af) o (gL04_   O         // des-
-  _ref) o (gL04_   O
    _ap) oi (L01_   OI
    _ap) oi (L02_   OI
     _b) oi (L04_   OI
         qü         kw
         qu (Y      k
         qu (K      ku
-?2   _) que (_K    ke
      _) que (_     ky
 ?1   _) qua        kwa       // quatro, etc.
 ?1   _) que        ke        // quente, etc.
 ?1   _) quei (C    k'eI      // queira, queima, etc
-     A) quên       kw'eIN    // frequência, etc.
-     C) quên       kw'eIN    // delinquência, etc.
+     @) quên       kw'eIN    // frequência, etc.
    ade) qu (e      kw
      A) qu (idade_ kw
     _a) qu (ífero_ kw
 
      _) sobre (@P5 sob*e
  _tran) s (A       z
+?1      ssion (_   _^_EN
 
 
 .group t
         uy         uI
         ul (K      uw
         u (lh+     u
-
+        u (ll+     u
         um (_      u~N
         um (C      u~m
 ?4      um (C      u~N
 
      g) u (Y 
     _m) ui (tA_    'wiN
-?2      ution (_   'uS&~N
 
 
 .group ú

dictsource/sl_list

 // translation rules for Slovenian
 // This file is UTF-8 encoded
  
+// $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
 
+ 
 // letter names
 b	b@
 c	ts@
 e	e
 f	f@
 g	g@
-h	h@
+_h	h@
 j	j@
 _k	k@
 l	l@
 _3	tR'i
 _4	St'i*i
 _5	p'et
-_6	S'Est
-_7	s'edEm
-_8	'Os@m
-_9	d@v'Et
-_10	d@s'Et
-_11	'e'najst
+_6	S'est
+_7	s'ed@m
+_8	'os@m
+_9	dEv'et
+_10	dEs'et
+_11	'E'najst
 _12	dv#'anajst
 _13	tR'inajst
 _14	St'iRinajst
 _15	p'etnajst
 _16	S'estnajst
-_17	s'edemnajst
-_18	'Osemnajst
+_17	s'ed@mnajst
+_18	'os@mnajst
 _19	d'evEtnajst
-_2X	dv#'ajsEt
-_3X	tR'id@sEt
-_4X	St'i*id@sEt
-_5X	p'etd@sEt
-_6X	S'estd@sEt
-_7X	s'edemd@sEt
-_8X	'Os@md@sEt
-_9X	d'evEtd@sEt
+_2X	dv#'ajset
+_3X	tR'idEset
+_4X	St'i*idEset
+_5X	p'etdEset
+_6X	S'estdEset
+_7X	s'ed@mdEset
+_8X	'os@mdEset
+_9X	dEv'etdEset
 _2C	dv'esto
 _0C	sto
 _0M1	t'isotS
 
 // Function words (unstressed)
 
-	// verb: to be
-sem	$u
+bom	bo+m $u   // example of unstressed [o]
+
+//pronouns
+
+
+// prepositions
+skozi	sko+zi $u+
+za	$u+
+
+
+// verb: to be
+sem	s@m $u
 si	$u
 je	$u
 sva	$u
 bila	$u
 bili	$u
 
+
+// exceptions
+
+deset	$2
+devet	$2
+dim	$alt3
+oba	$2
+žena	$alt1
+šel	S@w
+

dictsource/sl_rules

 
 .L01 b d g j l m n v z ž   // voiced consonants
 
+.L04 l v
+
 
 .group a
-        a        a
+        a        a:
+        a (X$w_alt3+  'a
 
 .group b
         b        b
 
 
 .group e
-        e        e
-        e (_     E      // ??
-        e (C_    E
-        e (l_    e
-     _) e        E
+        e        e:
+        e (X$w_alt3+  'E
+        
+     @) e (n_    E#
+    @C) e (r_    E#
+
+     _) e (m@    E
 
 
 .group f
 
 
 .group i
-        i        i
+        i        i:
+        i (X$w_alt3+  'i
         i (A     j
+     @) i (ja_   =i
 
 
 .group j
      K) l (K     @l
      K) l (rK    l
      K) l (_     u
-     @) l (_     =w
+     @) l (_     w
         lj       l^
         lj (A    lj
         lj (i    l^
 
 
 .group o
-        o        o
-     _) o        O
-     _) o (l     o
-     _) o (v     o
-
+        o        o:
+        o (X$w_alt3+  'O
+        
+        o (Co    O:
+        o (CCo   O:
+        o (L04+  o:
 
+        
 .group p
         p        p
 
 .group r
         r        R
         rr       R
-     A) r (A     *
 
      K) r (K     @R
 
 
 
 .group u
-        u        u
+        u        u:
+        u (X$w_alt3+  'u
+
         u (A     w
      A) u (K     w
 
 	á	'a:
 	é	'e:
 	ê	'E:
-	è	E
+	è	'E
 	í	'i:
 	ó	'o:
 	ô	'O:
-	ò	O
+	ò	'O
 	ú	'u:
         đ        dZ
         ř        R^
-        ä        E
+        ä        E:
         ö        @:
-        ü        y
+        ü        y:
         ß        _^_DE
 
         $        d'olaR

phsource/ph_hindi

   lengthmod 5
   ipa ɖU+02B0
   voicingswitch t.#
-  Vowelin f1=1  f2=1800 -300 300  f3=-400 80
+  Vowelin f1=1  f2=1800 -300 300  f3=-150 80
   Vowelout f1=1 f2=1800 -300 300  f3=-400 80 colr=2
 
   IF PreVoicing THEN
     FMT(d/xdr)
   ENDIF
 
-  FMT(d/dr) addWav(ustop/t)
-//  FMT(d/dr) addWav(ustop/th_rfx)
+  FMT(d/dr2, 50) addWav(ustop/th_rfx2, 80)
 endphoneme
 
 

phsource/ph_malayalam

 endphoneme
 
 
+phoneme t.#
+  vls rfx stop
+  lengthmod 2
+  ipa ʈU+02B0
+  voicingswitch d.#
+  Vowelin f1=0  f2=1800 -300 300  f3=-200 80
+  Vowelout f1=0 f2=1800 -300 250  f3=-400 80  rms=20 colr=2
+  
+  IF nextPhW(t.#) THEN
+    ChangePhoneme(t.)
+  ENDIF
+  WAV(ustop/th_rfx2, 80)
+endphoneme
+
+
 phoneme d.#
   vls rfx stop prevoice
   lengthmod 2
   ipa ʈU+02B0
-  Vowelin f1=0  f2=1800 -300 300  f3=-400 80
+  Vowelin f1=0  f2=1800 -300 300  f3=-200 80
   Vowelout f1=0 f2=1800 -300 250  f3=-400 80  rms=20 colr=2
 
   IF PreVoicing THEN
   ENDIF
 
   voicingswitch d.#
-  WAV(ustop/t)
+  WAV(ustop/th_rfx2, 80)
 endphoneme
 
 

phsource/ph_slovenian

 
+
+phoneme : //  lengthen previous vowel by "length"
+  virtual
+  length 40   // only a small increase for "long stress" because we probably put the stress on the wrong syllable
+endphoneme
+
+
 phoneme @    //  Schwa, can be stressed
   vowel   starttype #@  endtype #@
-  length 140
+  length 160
   FMT(vowel/@)
 endphoneme
 
 phoneme i
   vowel starttype #i endtype #i
-  length 140
+  length 160
   IfNextVowelAppend(;)
   IF thisPh(isStressed) AND NOT nextPhW(isRhotic) THEN
     FMT(vowel/ii_6)
 
 phoneme u
   vowel starttype #u endtype #u
-  length 140
+  length 160
   FMT(vowel/u_2)
 endphoneme
 
 
-
 phoneme a
   vowel starttype #a endtype #a
   length 170
+  IF thisPh(isUnstressed) THEN
+    FMT(vowel/a_8)
+  ENDIF
   FMT(vowel/a)
 endphoneme
 
 
 phoneme e
   vowel starttype #e endtype #e
-  length 160
+  length 170
+  ChangeIfUnstressed(E)
   FMT(vowel/e_2)
 endphoneme
 
-phoneme e:
+phoneme e+   // doesn't reduce to [e]
   vowel starttype #e endtype #e
-  length 240
-  FMT(vowel/e)
-endphoneme
-
+  ChangePhoneme(e)
+  endphoneme
 
 phoneme E
   vowel starttype #e endtype #e
   FMT(vowel/e_mid)
 endphoneme
 
+phoneme E#
+  vowel starttype #e endtype #e
+  length 160
+  IF thisPh(isNotStressed) THEN
+    ChangePhoneme(@)
+  ENDIF
+  FMT(vowel/e_mid)
+endphoneme
 
 
 phoneme o
   vowel starttype #o endtype #o
-  length 160
+  length 170
+  ChangeIfUnstressed(O)
   FMT(vowel/o_8)
 endphoneme
 
+phoneme o+   // doesn't reduce to [O]
+  vowel starttype #o endtype #o
+  ChangePhoneme(o)
+  endphoneme
 
 phoneme O
   vowel starttype #o endtype #o
 phoneme v
   import_phoneme base/v#
 endphoneme
+
+
+// for foreign letters
+phoneme y
+  vowel starttype #i endtype #i
+  length 170
+  FMT(vowel/y)
+endphoneme
+
+phoneme R^       // Czech r-caron
+  import_phoneme sk/R^
+endphoneme
+
+

phsource/ph_telugu

 phoneme r
   import_phoneme base/R2
 endphoneme
+
+
+phoneme t.#
+  vls rfx stop
+  lengthmod 2
+  ipa ʈU+02B0
+  voicingswitch d.#
+  Vowelin f1=0  f2=1800 -300 300  f3=-200 80
+  Vowelout f1=0 f2=1800 -300 250  f3=-400 80  rms=20 colr=2
+  
+  IF nextPhW(t.#) THEN
+    ChangePhoneme(t.)
+  ENDIF
+  WAV(ustop/th_rfx2, 80)
+endphoneme
+
+phoneme d.#
+  vcd rfx stop
+  lengthmod 5
+  ipa ɖU+02B0
+  voicingswitch t.#
+  Vowelin f1=1  f2=1800 -300 300  f3=-150 80
+  Vowelout f1=1 f2=1800 -300 300  f3=-400 80 colr=2
+
+  IF PreVoicing THEN
+    FMT(d/xdr)
+  ENDIF
+
+  FMT(d/dr2, 50) addWav(ustop/th_rfx2, 80)
+
+endphoneme
+
+

phsource/ph_turkish

 phoneme a
   vowel starttype #a endtype #a
   length 200
-  FMT(vowel/a#_4)
+  IF thisPh(isUnstressed) AND thisPh(isWordEnd) THEN
+    FMT(vowel/a#_2)
+  ENDIF
+  FMT(vowel/aa_6)
 endphoneme
 
 
 
 
 phoneme R
-  vcd alv flp rhotic
+  liquid trill rhotic
+  lengthmod 6
   IF prevPhW(isVowel) AND nextPhW(isVowel) THEN
-    CALL base/*
-//  ELIF prevPhW(isNotVowel) THEN
-//    CALL base/R
-  ELSE
-    CALL base/r
+    ChangePhoneme(*)
   ENDIF
-  ipa ɾ
+  CALL base/R
 endphoneme
+

phsource/phonemes

 
 
 phoneme R
-  liquid
+  liquid rhotic
   trill
   lengthmod 6
   ipa r
 endphoneme
 
 phoneme R2   // this is [R] from Slovak/Czech
-  liquid
+  liquid rhotic
   trill
   lengthmod 6
   ipa r
 endphoneme
 
 phoneme R3  // Afrikaans
-  liquid
+  liquid rhotic
   trill  
   lengthmod 6
   length 60
 
 
 phoneme r"     // uvular trill
-  vcd uvl frc
+  vcd uvl frc rhotic
   ipa ʀ
   lengthmod 6
   IF nextPh(isNotVowel) THEN
 phonemetable prs base
 include ph_dari
 
-phonemetable sl sk
+phonemetable sl pl
 include ph_slovenian
 
 phonemetable gd base
 phonemetable kl base
 include ph_greenlandic
 
-phonemetable ar base
-include ph_arabic
-
-phonemetable gu hi
-include ph_gujarati
-

src/synthdata.cpp

 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.47.09  29.Apr.13";
+const char *version_string = "1.47.10a  03.May.13";
 const int version_phdata  = 0x014709;
 
 int option_device_number = -1;

src/tr_languages.cpp

 			tr->langopts.stress_flags = S_NO_AUTO_2;
 			tr->langopts.param[LOPT_REGRESSIVE_VOICING] = 0x103;
 			tr->langopts.param[LOPT_UNPRONOUNCABLE] = 0x76;    // [v]  don't count this character at start of word
+			tr->langopts.param[LOPT_ALT] = 2;      // call ApplySpecialAttributes2() if a word has $alt or $alt2
+			tr->langopts.param[LOPT_IT_LENGTHEN] = 1;    // remove lengthen indicator from unstressed syllables
 			tr->letter_bits['r'] |= 0x80;    // add 'r' to letter group 7, vowels for Unpronouncable test
 			tr->langopts.numbers =  NUM_DECIMAL_COMMA | NUM_ALLOW_SPACE | NUM_SWAP_TENS | NUM_OMIT_1_HUNDRED | NUM_DFRACTION_2 | NUM_ORDINAL_DOT | NUM_ROMAN;
 			tr->langopts.numbers2 = 0x100;   // plural forms of millions etc

src/voices.cpp

 
 		case V_OPTION:
 			value2 = 0;
-			if((sscanf(p,"%s %d %d",option_name,&value,&value2) >= 2) && ((ix = LookupMnem(options_tab, option_name)) >= 0))
+			if(((sscanf(p,"%s %d %d",option_name,&value,&value2) >= 2) && ((ix = LookupMnem(options_tab, option_name)) >= 0)) ||
+				((sscanf(p,"%d %d %d",&ix,&value,&value2) >= 2) && (ix < N_LOPTS)))
 			{
 				langopts->param[ix] = value;
 				langopts->param2[ix] = value2;