[1.36.12]

lang=hr: adjust phonemes [S tS tS; Z dZ dZ;]


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

phsource/compile_report

@@ -24,7 +24,7 @@
       pl  15  109
       sk  29  127
       cs   6  127
-      hr  20  132
+      hr  26  132
       mk   3  133
       sr  14  132
       ru  39  129
@@ -47,8 +47,8 @@
       tr  18  122
       ku  17  121
       id  15  119
-      rw  12  122
-      ko  18  114
+      rw  15  124
+      ko  18  145
 
 Data file      Used by
 b/b             [b] base
@@ -172,8 +172,12 @@ dzh/dzh_        [dZ] base
                 [dZ;] base
                 [dz;] base
                 [J] hi
+                [dZ] hr
+                [dZ;] hr
                 [dZ;] mk
                 [dZ;] ru
+dzh/dzh2        [dZ] hr
+                [dZ;] hr
 dzh/dz_pzd      [J] base
                 [J2] hi
                 [J] tr
@@ -184,11 +188,14 @@ dzh/xdzh        [dZ] base
                 [dZ;] base
                 [dz;] base
                 [J] hi
+                [dZ] hr
+                [dZ;] hr
                 [dZ;] mk
                 [dZ;] ru
 dzh/xdz_pzd     [J] base
                 [J2] hi
 envelope/i_risefall  [11] zh
+envelope/i_risefall2  [+2] rw
 envelope/p_214  [214] zh
 envelope/p_512  [8] vi
 envelope/p_fall  [2] vi
@@ -200,6 +207,7 @@ envelope/p_fall  [2] vi
                 [22] zh
                 [33] zh
                 [53] zh
+                [+] rw
 envelope/p_fallrise  [4] vi
 envelope/p_level  [1] vi
                 [3] zhy
@@ -602,8 +610,11 @@ ufric/sh        [S] base
 ufric/sh_       [S] base
                 [S] fr
                 [s#] pt_pt
+ufric/sh3       [S] hr
+                [Z] hr
 ufric/sh_pzd    [S;] base
                 [S;] ro
+                [s`] ko
 ufric/sh_pzd_   [S;] base
                 [Z;] base
 ufric/sh_pzd2   [S] sr
@@ -801,6 +812,8 @@ ustop/tsh       [tS] base
                 [c] zhy
 ustop/tsh_      [tS] base
                 [c] zhy
+ustop/tsh2      [tS] hr
+                [dZ] hr
 ustop/t_short   [t.] hi
                 [t] sk
                 [t] el
@@ -811,11 +824,13 @@ ustop/ts_pzd    [tS;] base
                 [ts;] base
                 [ch] hi
                 [tS;] ru
-                [tS`] ko
 ustop/ts_pzd_   [c] hi
                 [c] hu
 ustop/ts_pzd2   [c] hi
                 [c] hu
+                [c`] ko
+ustop/ts_pzd3   [tS;] hr
+                [dZ;] hr
 ustop/t_sr      [d] sr
                 [t] sr
 ustop/ts_rfx    [ts.] zh
@@ -1135,10 +1150,12 @@ voc/z_          [z] base
 voc/zh          [Z] base
                 [z.] base
                 [R^] sk
+                [Z] hr
                 [Z] sr
                 [Z;] ro
 voc/zh_         [Z] base
                 [z.] base
+                [Z] hr
                 [Z;] ro
 voc/zh_2        [R^/] sk
 voc/z_pzd       [Z;] base

phsource/mbrola/en1

@@ -29,3 +29,5 @@
 0  aI@ NULL  60 aI  @
 0  aU@ NULL  75 aU  @
 0  x  NULL   0  k
+0  t2 NULL   0  t
+

phsource/mbrola/ro1

@@ -13,6 +13,7 @@
 0  a  e      15  a  _
 0  a  NULL   0   a
 0  @- NULL   0   NULL
+0  j  NULL   0   i
 0  j/ NULL   0   j
 0  I^ _      0   I
 0  I^ NULL   20  I  _

phsource/mbrola/us

@@ -44,3 +44,4 @@
 0  p   NULL   0  p_h
 0  t   NULL   0  t_h
 0  k   NULL   0  k_h
+0  t2  NULL   0  t

phsource/mbrola/us3

@@ -40,5 +40,6 @@
 0  U@  NULL   50  U  r
 0  i@  NULL   50  I  @
 0  i@3 NULL   60  i  r
+0  t2  NULL   0  t
 
 

phsource/ph_croatian

@@ -1,3 +1,74 @@
+
+
+phoneme S  // this is letter š
+  vls pla frc sibilant
+  vowelin  f1=0  f2=2100 100 300  f3=-100 80
+  vowelout f1=0  f2=2100 100 300  f3=-100 80
+  length 30
+  lengthmod 3
+  wave ufric/sh3%220
+  before _ ufric/sh3%160
+  switchvoicing Z
+endphoneme
+
+phoneme tS  // this is letter č
+  vls pla afr sibilant
+  vowelin f1=0  f2=1900 100 200  f3=-100 80
+  length 90
+  lengthmod 2
+  wave ustop/tsh2
+  before _ ustop/tsh2%70
+  switchvoicing dZ
+endphoneme
+
+phoneme tS;  // this is letter ć
+  vls pal afr sibilant palatal
+  vowelin f1=0  f2=2500 300 500  f3=300 80 rate len=70
+  lengthmod 2
+  wave ustop/ts_pzd3
+  before _ ustop/ts_pzd3%80
+  switchvoicing dZ;
+endphoneme
+
+
+phoneme Z    // letter ž
+  vcd pla frc sibilant
+  vowelin  f1=0  f2=2000 0 300  f3=-200 80
+  vowelout f1=2  f2=2000 0 300  f3=-200 80 brk
+  formants voc/zh+ufric/sh3%240
+  before _ voc/zh_+ufric/sh3%170
+  lengthmod 6
+  switchvoicing S
+endphoneme
+
+phoneme dZ    //letter dž
+  vcd pla afr sibilant
+  vowelin f1=2  f2=1900 100 300  f3=100 80
+  vowelout f1=2  f2=1900 100 300  f3=100 80 brk
+  formants dzh/dzh2+ustop/tsh2%140
+  before _ dzh/dzh_+ustop/tsh2%100
+  after _ NULL
+  after @ dzh/xdzh
+  lengthmod 5
+  switchvoicing tS
+endphoneme
+
+phoneme dZ;    // letter đ
+  vcd pla afr sibilant palatal
+  vowelin f1=2  f2=2500 300 500  f3=300 80 rate len=70
+  formants dzh/dzh2+ustop/ts_pzd3%140
+  before _ dzh/dzh_+ustop/ts_pzd3%80
+  after _ NULL
+  after @ dzh/xdzh
+  lengthmod 5
+  switchvoicing tS;
+endphoneme
+
+
+
+
+
+
 phoneme @    //  Schwa
   vowel   starttype (@)  endtype (@)
   formants vowel/@_hgh
@@ -155,3 +226,4 @@ phoneme r*
   length 50
 endphoneme
 
+

phsource/ph_kinyarwanda

@@ -0,0 +1,115 @@
+
+//******************************
+// Phonemes for Kinyarwanda (rw), inherits "base2"
+//******************************
+ 
+phoneme a
+  vowel starttype (a) endtype (a)
+  length 180
+  formants vowel/a_2
+  reduceto a/  4
+  beforepause a#
+  beforevowel NULL
+endphoneme
+
+
+phoneme a/
+  vowel starttype (@) endtype (@)
+  length 180
+  formants vowel/a#
+  beforepause a#
+  beforevowel NULL
+endphoneme
+
+
+phoneme e
+  vowel starttype (e) endtype (e)
+  length 170
+  formants vowel/e
+  beforepause e#
+  beforevowel NULL
+endphoneme
+
+
+phoneme i
+  vowel starttype (i) endtype (i)
+  length 150
+  formants vowel/i
+  beforepause i#
+  beforevowel NULL
+endphoneme
+
+
+phoneme o
+  vowel starttype (o) endtype (o)
+  length 170
+  formants vowel/o
+  beforepause o#
+  beforevowel NULL
+endphoneme
+
+
+phoneme u
+  vowel starttype (u) endtype (u)
+  length 160
+  formants vowel/u_bck
+  beforepause u#
+  beforevowel NULL
+endphoneme
+
+
+phoneme a#
+  vowel starttype (@) endtype (@)
+  length 100
+  formants vowel/a#
+  beforevowel NULL
+endphoneme
+
+phoneme e#
+  vowel starttype (e) endtype (e)
+  length 100
+  formants vowel/e
+  beforevowel NULL
+endphoneme
+
+
+phoneme i#
+  vowel starttype (i) endtype (i)
+  length 100
+  formants vowel/i
+  linkout ;
+  beforevowel NULL
+endphoneme
+
+
+phoneme o#
+  vowel starttype (o) endtype (o)
+  length 170
+  formants vowel/o
+  beforevowel NULL
+endphoneme
+
+
+phoneme u#
+  vowel starttype (u) endtype (u)
+  length 100
+  formants vowel/u_bck
+  beforevowel NULL
+endphoneme
+
+
+phoneme :   // Lengthen previous vowel by "length"
+  virtual
+  length 120
+endphoneme
+
+phoneme +   // high tone, use after a vowel
+  stress
+  tone 0 30 envelope/p_fall NULL
+endphoneme
+
+phoneme +2  // high tone, use after a vowel
+  stress
+  tone 0 30 envelope/i_risefall2 NULL
+endphoneme
+

phsource/ph_korean

@@ -0,0 +1,129 @@
+ 
+ 
+phoneme a
+  vowel starttype (a) endtype (a)
+  length 190
+  formants vowel/a
+endphoneme
+ 
+phoneme E
+  vowel starttype (e) endtype (e)
+  length 180
+  formants vowel/e_mid2
+endphoneme
+ 
+phoneme e
+  vowel starttype (e) endtype (e)
+  length 180
+  formants vowel/e
+endphoneme
+ 
+phoneme i
+  vowel starttype (i) endtype (i)
+  length 160
+  formants vowel/i
+endphoneme
+ 
+phoneme o
+  vowel starttype (o) endtype (o)
+  length 180
+  formants vowel/o_2
+endphoneme
+ 
+phoneme V
+  vowel starttype (a) endtype (a)
+  length 180
+  formants vowel/aa_8
+endphoneme
+ 
+phoneme Y
+  vowel starttype (@) endtype (@)
+  length 180
+  formants vowel/y#
+endphoneme
+ 
+phoneme u
+  vowel starttype (u) endtype (u)
+  length 180
+  formants vowel/u_bck
+endphoneme
+
+phoneme y
+  vowel starttype (i) endtype (u)
+  length 180
+  formants vowel/u#_6
+endphoneme
+
+phoneme u-
+  vowel starttype (u) endtype (u)
+  length 180
+  formants vowel/u_unr
+endphoneme
+
+
+phoneme ji
+  vowel starttype (i) endtype (i)
+  length 220
+  formants vdiph/yi_fr
+endphoneme
+
+
+phoneme p`
+  vls blb stop
+  vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 amp=31
+  vowelout f1=0  f2=1000 -500 -350  f3=-300 80 rms=30
+  lengthmod 2
+  wave ustop/p_unasp%130
+endphoneme
+
+
+phoneme t`       // dental variant of /t/
+  vls dnt stop
+  vowelin f1=0  f2=1600 -300 300  f3=-100 80 amp=31
+  vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
+  lengthmod 2
+  wave  ustop/t_dnt
+  switchvoicing d
+endphoneme
+
+phoneme c`
+  vls pal afr sibilant palatal
+  vowelin f1=0  f2=2700 400 600  f3=300 80 rate len=70 amp=31
+  lengthmod 2
+  wave ustop/ts_pzd2%120
+  switchvoicing dZ;
+endphoneme
+
+
+phoneme k`
+  vls vel stop
+  vowelin f1=0  f2=2300 200 400  f3=-100 80 amp=31
+  vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
+  lengthmod 2
+  wave ustop/k_unasp%130
+endphoneme
+
+
+phoneme s`
+  vls alv frc sibilant
+  vowelin  f1=0  f2=1700 -300 300  f3=-100 80 amp=31
+  vowelout f1=0  f2=1700 -300 250  f3=-100 80  rms=20
+  lengthmod 3
+  wave ufric/s%120
+  before j ufric/sh_pzd%120
+  before i ufric/sh_pzd%120
+endphoneme
+
+
+phoneme r    //   flap [**]
+  liquid alv
+  beforenotvowel l
+  vowelout f1=3 f2=1600 -300 300  f3=-300 80 rms=35 len=15
+  vowelin f1=2  f2=1600 -300 300  f3=-100 80 len=20
+  formants r3/@tap
+  after (e) r3/@tap2
+  after (i) r3/@tap2
+  lengthmod 3
+endphoneme
+
+

phsource/phonemes

@@ -1278,5 +1278,5 @@ include ph_indonesian
 phonemetable rw base2
 include ph_kinyarwanda
 
-phonemetable ko base
+phonemetable ko hi
 include ph_korean