Merge branch 'master' into build

Conflicts:
	src/Makefile.espeakedit

phsource/compile_report

@@ -53,7 +53,7 @@ consonants   9  115
       id  15  125
       sq  33  126
       hy  23  117
-      da  23  119
+      da  24  120
       rw  15  130
       ml  13  150
       ne  18  156
@@ -82,6 +82,7 @@ b/bu            [b] base
 b/xb            [b] base
                 [b] fr
                 [bh] hi
+b/xbr           [b] fr
 d/d             [d] base
                 [d[] base
                 [d] base2
@@ -139,6 +140,7 @@ d/xd            [d] base
                 [d] sq
 d/xd3           [dh] hi
 d/xd_pzd        [d;] pl
+d/xdr           [d] fr
 d/xdz           [dz] consonants
 d/x_tap         [t#] en
                 [*] pt
@@ -220,6 +222,7 @@ g/xg            [g] base
                 [g] cy
                 [g] fr
                 [g] es
+g/xgr           [g] fr
 h/h_            [h] base
                 [h] fi
                 [<h>] la
@@ -338,7 +341,7 @@ l/l_            [l/] base
 l/l_@           [l/3] base
                 [l/] fr
 l/l@            [l#] base
-                [ߵ] base
+                [߸] base
                 [l] fr
                 [l/2] fr
 l/L1_aL         [l/] base
@@ -364,13 +367,13 @@ l/L2_uL         [l/2] base
 l/l_3           [l/] de
 l/l_4           [ll] sq
 l/la            [l#] base
-                [ߵ] base
+                [߸] base
                 [l] fr
                 [l/2] fr
 l/l_a           [l/3] base
                 [l/] fr
 l/le            [l#] base
-                [ߵ] base
+                [߸] base
                 [l] fr
                 [l/2] fr
 l/l_e           [l/3] base
@@ -380,7 +383,7 @@ l/L_eL_af       [&] af
 l/l_front       [L] sq
 l/l_front_      [l/4] sq
 l/li            [l#] base
-                [ߵ] base
+                [߸] base
                 [l] fr
                 [l/2] fr
                 [l] zh
@@ -392,14 +395,14 @@ ll/_ll          [L] bg
 l/l_long        [l] base
                 [l] fr
 l/lo            [l#] base
-                [ߵ] base
+                [߸] base
                 [l] fr
                 [l/2] fr
 l/l_o           [l/3] base
                 [l/] fr
 l^/l_rfx        [l.] base
 l/lu            [l#] base
-                [ߵ] base
+                [߸] base
                 [l] fr
                 [l/2] fr
 l/l_u           [l/3] base
@@ -617,8 +620,8 @@ ufric/f         [f] base
 ufric/f_        [f] base
                 [f] fr
                 [f] pl
-ufric/l#        [l#] is
-ufric/ll        [l#] base
+ufric/l#        [l#] base
+                [l#] is
 ufric/s         [s] base
                 [s] fr
                 [z2] fr
@@ -923,6 +926,7 @@ vdiph/ai        [aI] base2
                 [a:I] vi
                 [aI] id
                 [aI] hy
+                [aI] da
 vdiph/ai_2      [aI] en
                 [aI] cy
                 [aY] cy
@@ -1939,51 +1943,51 @@ vwl_en_us/oor   [0] en-us
 vwl_en_us/or    [o@] en-us
                 [O:] en-sc
 vwl_en_us/ur    [U@] en-us
-vwl_fr/@2r      [ߵ] fr
-vwl_fr/a2r      [ߵ] fr
-vwl_fr/aa2r     [ߵ] fr
+vwl_fr/@2r      [߸] fr
+vwl_fr/a2r      [߸] fr
+vwl_fr/aa2r     [߸] fr
 vwl_fr/br       [r/2] fr
-vwl_fr/e2r      [ߵ] fr
-vwl_fr/e_2r     [ߵ] fr
-vwl_fr/ee2r     [ߵ] fr
-vwl_fr/i2r      [ߵ] fr
+vwl_fr/e2r      [߸] fr
+vwl_fr/e_2r     [߸] fr
+vwl_fr/ee2r     [߸] fr
+vwl_fr/i2r      [߸] fr
 vwl_fr/j        [j/] fr
-vwl_fr/o2r      [ߵ] fr
-vwl_fr/oo2r     [ߵ] fr
+vwl_fr/o2r      [߸] fr
+vwl_fr/oo2r     [߸] fr
 vwl_fr/r        [r] fr
                 [r/2] fr
 vwl_fr/r_       [r/] fr
 vwl_fr/r_@      [r/] fr
-vwl_fr/r@       [ߵ] fr
+vwl_fr/r@       [߸] fr
 vwl_fr/@R       [x] pt-pt
-vwl_fr/r@2      [ߵ] fr
+vwl_fr/r@2      [߸] fr
 vwl_fr/@R2      [R] fr-ca
-vwl_fr/ra       [ߵ] fr
+vwl_fr/ra       [߸] fr
 vwl_fr/r_a      [r/] fr
-vwl_fr/raa      [ߵ] fr
-vwl_fr/re       [ߵ] fr
+vwl_fr/raa      [߸] fr
+vwl_fr/re       [߸] fr
 vwl_fr/r_e      [r/] fr
-vwl_fr/re2      [ߵ] fr
-vwl_fr/ree      [ߵ] fr
-vwl_fr/ri       [ߵ] fr
+vwl_fr/re2      [߸] fr
+vwl_fr/ree      [߸] fr
+vwl_fr/ri       [߸] fr
 vwl_fr/r_i      [r/] fr
-vwl_fr/rj       [ߵ] fr
+vwl_fr/rj       [߸] fr
 vwl_fr/r_n      [r/] fr
-vwl_fr/ro       [ߵ] fr
+vwl_fr/ro       [߸] fr
 vwl_fr/r_o      [r/] fr
-vwl_fr/roo      [ߵ] fr
+vwl_fr/roo      [߸] fr
 vwl_fr/rr       [r/] fr
-vwl_fr/ru       [ߵ] fr
+vwl_fr/ru       [߸] fr
 vwl_fr/r_u      [r/] fr
-vwl_fr/rw       [ߵ] fr
-vwl_fr/ry       [ߵ] fr
+vwl_fr/rw       [߸] fr
+vwl_fr/ry       [߸] fr
 vwl_fr/r_y      [r/] fr
 vwl_fr/tr       [r/2] fr
 vwl_fr/trr      [r/] fr
-vwl_fr/u2r      [ߵ] fr
+vwl_fr/u2r      [߸] fr
 vwl_fr/wa       [w] fr
                 [w/] fr
-vwl_fr/y2r      [ߵ] fr
+vwl_fr/y2r      [߸] fr
 vwl_hi/l-voc    [l-] base
                 [l-] sk
                 [l:] sk

phsource/envelope/i_risefall

@@ -0,0 +1,11 @@
+ENVELOPE
+0	60
+5	63
+22	92
+31	100
+41	95
+85	12
+90	5
+100	0
+
+

phsource/envelope/i_risefall2

@@ -0,0 +1,6 @@
+ENVELOPE
+0	0
+45	95
+100	0
+
+

phsource/intonation

@@ -0,0 +1,124 @@
+tune s1
+prehead   46 57
+headenv   fall 16
+head       4 80 50 -8 -5
+headextend 0 63 38 13 0
+nucleus0 fall 64 8
+nucleus  fall 70 18 24 12
+endtune
+
+tune c1
+prehead   46 57
+headenv   fall 16
+head       4 80 46 -8 -5
+headextend 0 63 38 13 0
+nucleus0 fall-rise  80 18
+nucleus  fall-rise2 78 22 34 52
+endtune
+
+tune q1
+prehead   46 57
+headenv   fall 16
+head       4 75 43 -7 0
+headextend 25 63 38 13 0
+nucleus0 fall-rise  88 22
+nucleus  fall-rise2 82 22 34 66
+endtune
+
+tune e1
+prehead   46 57
+headenv   fall 16
+head       3 90 50 -9 0
+headextend 16 82 50 32 16
+nucleus0 fall  92 8
+nucleus  fall  92 80 76 8
+endtune
+
+
+// PB Tunes for the Danish intonation
+// full-stop "." - punktum
+tune s2
+prehead   46 57
+headenv   fall 16
+head       4 65 60 -8 -5
+headextend 0 53 38 13 0
+nucleus0 fall 44 28
+nucleus  fall 50 42 34 28 // sidste ord før punktu
+
+onset 75 -5 -5
+endtune
+
+// comma "," - komma
+tune c2
+prehead   46 57
+headenv   fall 16
+head       4 65 50 -8 -5
+headextend 0 63 38 13 0
+nucleus0 rise  60 42
+nucleus  rise 55 42 34 52 // sidste tal: slutniveau
+endtune
+
+// question mark "?" - spørgsmålste
+
+tune q2
+prehead   40 75
+headenv   fall 16
+head       4 75 43 -7 0 //head       4 35 43 -7 0
+headextend 25 63 38 13 0
+nucleus0 rise  70 50 // første tal: slutniveaue
+
+nucleus  rise 35 45 60 70 // sidste tal: slutniveau
+endtune
+
+// exclamation mark "!" - udråbsteg
+
+tune e2
+prehead   46 57
+headenv   fall 16
+head       3 90 50 -9 0
+headextend 16 82 50 32 16
+nucleus0 fall  92 8
+nucleus  fall  92 80 76 8
+endtune
+
+
+
+// Tunes for the French intonation
+// full-stop "." - point
+tune s3
+prehead   46 57
+headenv   fall 16
+head       4 80 50 -8 -5
+headextend 0 63 38 13 0
+nucleus0 fall 64 8
+nucleus  fall 70 18 24 12
+endtune
+
+// comma "," - virgule
+tune c3
+prehead   46 57
+headenv   fall 16
+head       4 80 30 -5 -15
+headextend 25 63 38 13 0
+nucleus0 fall-rise  75 40
+endtune
+
+// question mark "?" - point d'interrogation
+tune q3
+prehead   46 57
+headenv   fall 16
+head       4 75 43 -7 0
+headextend 25 63 38 13 0
+nucleus0 fall-rise  88 22
+nucleus  fall-rise2 82 22 34 66
+endtune
+
+// exclamation mark "!" - point d'exclamation
+tune e3
+prehead   46 57
+headenv   fall 16
+head       3 90 50 -9 0
+headextend 16 82 50 32 16
+nucleus0 fall  92 8
+nucleus  fall  92 80 76 8
+endtune

phsource/ph_danish

@@ -114,6 +114,13 @@ phoneme W#
   FMT(vowel/V)
 endphoneme
 
+phoneme aI
+  vowel starttype #a endtype #i
+  length 250
+  FMT(vdiph/ai)
+endphoneme
+
+
 // CONSONANTS
 
 // PB added l/3

phsource/ph_english

@@ -383,7 +383,7 @@ endphoneme
 
 phoneme aI@
   vowel  starttype #a  endtype #@
-  length 270
+  length 280
   IfNextVowelAppend(r-)
   FMT(vwl_en/aI@)
 endphoneme
@@ -391,7 +391,7 @@ endphoneme
 
 phoneme aU@
   vowel  starttype #a   endtype #@
-  length 270
+  length 280
   IfNextVowelAppend(r-)
   FMT(vwl_en/aU@)
 endphoneme

phsource/ph_english_n

@@ -239,7 +239,7 @@ endphoneme
 
 phoneme aI@
   vowel  starttype #a  endtype #@
-  length 270
+  length 280
   IfNextVowelAppend(r-)
   FMT(vwl_en/aI@)
 endphoneme
@@ -247,7 +247,7 @@ endphoneme
 
 phoneme aU@
   vowel  starttype #a   endtype #@
-  length 270
+  length 280
   IfNextVowelAppend(r-)
   FMT(vwl_en/aU@)
 endphoneme

phsource/ph_english_wm

@@ -222,7 +222,7 @@ endphoneme
 
 phoneme aI@
   vowel  starttype #a  endtype #@
-  length 270
+  length 280
   IfNextVowelAppend(r-)
   FMT(vwl_en/ooi@)
 endphoneme
@@ -230,7 +230,7 @@ endphoneme
 
 phoneme aU@
   vowel  starttype #a   endtype #@
-  length 270
+  length 280
   IfNextVowelAppend(r-)
   FMT(vwl_en/aU@)
 endphoneme

phsource/ph_french

@@ -1,7 +1,7 @@
 //====================================================
 //  French
 //====================================================
-// Updated 2010-06-12 Michel Such  <michel.such@free.fr>
+// Updated 2010-06-16 Michel Such  <michel.such@free.fr>
 
 phoneme #l  virtual
 // Used for l and l/
@@ -80,8 +80,7 @@ phoneme r
     vcd uvl frc nopause
     rhotic
   starttype #r  endtype #r
-  Vowelin f1=1  f2=1600 -500 500  f3=-200 100 len=65
-  Vowelout f1=1  f2=1200 -400 800  f3=200 100 len=60
+  Vowelin f1=0  f2=1500 -400 400  f3=-400 80
   lengthmod 7
 
   IF nextPh(isNotVowel) THEN
@@ -148,7 +147,7 @@ endphoneme
 phoneme r/2
   liquid rhotic uvl nopause
   starttype #r  endtype #r
-  Vowelin f1=1  f2=1600 -500 500  f3=-200 100 len=65 amp=8
+  Vowelin f1=0  f2=1500 -400 400  f3=-400 80
 
   CALL post_r
   IF prevPhW(f) OR prevPhW(k) OR prevPhW(p) OR prevPhW(s) OR prevPhW(t) OR prevPhW(S) THEN
@@ -163,7 +162,7 @@ endphoneme
 
 
 phoneme l
-  liquid nopause
+  liquid
   starttype #l endtype #l
   lengthmod 7
 
@@ -639,7 +638,11 @@ phoneme b
   ENDIF
 
   IF PreVoicing THEN
-   FMT(b/xb)
+    IF nextPhW(#r) THEN
+      FMT(b/xbr)
+    ELSE
+      FMT(b/xb)
+    ENDIF
   ENDIF
 
   IF nextPh(isPause2) OR nextPh(l) THEN
@@ -663,7 +666,11 @@ phoneme d
   Vowelout f1=2 f2=1700 -300 300  f3=-100 80
 
   IF PreVoicing THEN
-    FMT(d/xd)
+    IF nextPhW(#r) THEN
+      FMT(d/xdr)
+    ELSE
+      FMT(d/xd)
+    ENDIF
   ENDIF
 
   IF nextPh(isPause2) THEN
@@ -699,7 +706,11 @@ phoneme g
   Vowelout f1=1  f2=2300 250 300  f3=-300 80 brk
 
   IF PreVoicing THEN
-    FMT(g/xg)
+    IF nextPhW(#r) THEN
+      FMT(g/xgr)
+    ELSE
+      FMT(g/xg)
+    ENDIF
   ENDIF
 
   IF nextPh(isPause2) THEN

phsource/ph_nahuatl

@@ -0,0 +1,16 @@
+
+//====================================================
+//  Nahuatl (classical)
+//====================================================
+
+phoneme :   // lengthens the previous vowel by 'length'
+  virtual
+  length 300
+endphoneme
+
+phoneme e
+  vowel starttype #e endtype #e
+  length 170
+  FMT(vowel/e_mid2)
+endphoneme
+

phsource/ph_tamil

@@ -80,7 +80,10 @@ endphoneme
 phoneme u
   vowel  starttype #u  endtype #u
   length 110
-  ChangeIfNotStressed(U)
+  IF prevPhW(isVel) THEN
+  ELSE
+    ChangeIfNotStressed(U)
+  ENDIF
   FMT(vowel/u_6)
 endphoneme
 

phsource/phonemes

@@ -1487,7 +1487,7 @@ phoneme l#   // Lateral fricative (eg. Welsh "ll")
     VowelEnding(l/xl, -40)
   ENDIF
 
-  WAV(ufric/ll, 60)
+  WAV(ufric/l#, 60)
 endphoneme
 
 
@@ -1720,6 +1720,12 @@ phonemetable da base
 include ph_danish
 
 
+
+
+// The following lines are experimental, for future additions.
+// These langauges are not in a usable state.
+// These lines can be deleted.
+
 phonemetable rw base2
 include ph_kinyarwanda
 
@@ -1738,7 +1744,6 @@ include ph_nepali
 //phonemetable mr hi
 //include ph_marathi
 
-
 //phonemetable eu base2
 //include ph_basque