[1.48.13]

Changes to:
en, pt,
it,  implement ordinal numbers.
eu, stress positions.
es,  revert change to [t] and [k]
de, change to sounds "pr" and "kr".


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

phsource/compile_report

@@ -48,10 +48,10 @@ consonants  11  119
       bg  14  124
       it  21  130
       la  21  126
-      es  17  125
+      es  15  125
    es-la   2  125
       ca  11  127
-      an   5  126
+      an   7  126
       eu  21  129
       pt  29  140
    pt-pt  20  140
@@ -957,7 +957,7 @@ ustop/k_        [k] base
                 [k] base2
                 [k] fr
                 [k] lv
-                [k] es
+                [k] an
                 [k] el
                 [k] sw
                 [k] sq
@@ -992,7 +992,7 @@ ustop/ki        [k] base
                 [k] sl
                 [k;] gd
 ustop/ki_ejc    [g;] gd
-ustop/ki_unasp2  [k] es
+ustop/ki_unasp2  [k] an
 ustop/kl        [k] base
                 [kh] consonants
                 [k] base2
@@ -1021,7 +1021,7 @@ ustop/k_unasp   [k] base
                 [k-] tn
 ustop/k_unasp_  [k] zh
                 [k-] ko
-ustop/k_unasp2  [k] es
+ustop/k_unasp2  [k] an
 ustop/null      [?] base
                 [?] en-us
                 [t2] hu
@@ -1106,6 +1106,7 @@ ustop/t_dnt     [t] base
                 [t] lt
                 [t] pl
                 [t] hr
+                [t] an
                 [t[] ar
                 [t] sl
 ustop/t_dnt2    [t] base2
@@ -1200,7 +1201,7 @@ ustop/t_unasp   [t-] ko
 ustop/t_unasp2  [t] el
                 [t[] vi
                 [t] zh
-ustop/t_unasp3  [t] es
+ustop/t_unasp3  [t] an
 vdiph/0i        [OI] pt
                 [OI] grc
 vdiph/0i_2      [OI] en-sc

phsource/ph_aragon

@@ -28,3 +28,38 @@ phoneme O
   FMT(vowel/oo_4)
 endphoneme
 
+
+
+phoneme k
+  vls vel stop
+  lengthmod 2
+  voicingswitch g
+  Vowelin f1=0  f2=2300 200 400  f3=-100 80
+  Vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
+
+  IF nextPh(isPause2) THEN
+    WAV(ustop/k_)
+  ELIF nextPh(#i) OR nextPh(;) THEN
+    WAV(ustop/ki_unasp2, 30)
+//  ELIF nextPh(isRhotic) THEN
+//    WAV(ustop/kr)
+//  ELIF nextPh(l) THEN
+//    WAV(ustop/kl)
+  ENDIF
+  WAV(ustop/k_unasp2, 25)
+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) THEN
+    WAV(ustop/t_dnt, 25)
+  ENDIF
+  WAV(ustop/t_unasp3, 50)
+endphoneme
+
+

phsource/ph_english_us

@@ -137,7 +137,7 @@ endphoneme
 
 phoneme 0
   vowel  starttype #a   endtype #a
-  length 200
+  length 220
   ipa ɑː
   ChangeIfDiminished(@)
   IF nextPh(r) THEN
@@ -171,7 +171,7 @@ endphoneme
 
 phoneme A:
   vowel  starttype #a  endtype #a
-  length 200
+  length 220
   IF nextPhW(r) THEN
     FMT(vwl_en_us/aar)
   ENDIF
@@ -208,7 +208,7 @@ endphoneme
 
 phoneme i:
   vowel  starttype #i  endtype #i
-  length 170
+  length 180
   IfNextVowelAppend(;)
   FMT(vowel/i_en)
 endphoneme
@@ -216,7 +216,7 @@ endphoneme
 
 phoneme O:
   vowel  starttype #o  endtype #o
-  length 200
+  length 220
   ChangeIfDiminished(@)
   IF nextPhW(r) THEN
     FMT(vwl_en_us/oor)

phsource/ph_german

@@ -344,9 +344,9 @@ phoneme r   // note, following consonant must be 'ustop/t_' not 'ustop/tr' etc.
       IF prevPhW(isVowel) THEN
         ChangePhoneme(R)
       ELSE
-        IF prevPhW(t) OR prevPhW(p) OR prevPhW(k) THEN
-          PauseBefore 40
-        ELSEIF prevPhW(d) OR prevPhW(b) OR prevPhW(g) THEN
+        IF prevPhW(t) THEN
+          PauseBefore 30
+        ELSEIF prevPhW(d) OR prevPhW(b) OR prevPhW(g) OR prevPhW(k) OR prevPhW(p) THEN
           PauseBefore 15
         ELSE
           InsertPhoneme(@-)

phsource/ph_spanish

@@ -157,38 +157,3 @@ phoneme r
 endphoneme
 
 
-
-
-phoneme k
-  vls vel stop
-  lengthmod 2
-  voicingswitch g
-  Vowelin f1=0  f2=2300 200 400  f3=-100 80
-  Vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
-
-  IF nextPh(isPause2) THEN
-    WAV(ustop/k_)
-  ELIF nextPh(#i) OR nextPh(;) THEN
-    WAV(ustop/ki_unasp2, 50)
-//  ELIF nextPh(isRhotic) THEN
-//    WAV(ustop/kr)
-//  ELIF nextPh(l) THEN
-//    WAV(ustop/kl)
-  ENDIF
-  WAV(ustop/k_unasp2, 50)
-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) THEN
-    WAV(ustop/t_unasp3, 30)
-  ENDIF
-  WAV(ustop/t_unasp3, 60)
-endphoneme
-
-