Tidy up phsource.

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

phsource/envelope/p_512

@@ -0,0 +1,9 @@
+ENVELOPE
+0    100
+25    44
+55     0
+65    10
+100   25
+
+
+

phsource/mbrola/pt1

@@ -0,0 +1,95 @@
+0   l/  NULL   0   w
+0   l/2 w      0   l
+0   l/2 j      0   l
+0   l/2 NULL   0   w
+0   r/  NULL   0   r
+0   r-  NULL   0   r
+0   w/  NULL   0   w
+0   j/  NULL   0   j
+0   ;   NULL   0   NULL
+0   g-  NULL   0   NULL
+0   @-  NULL   0   NULL
+8   *   j      0   r
+0   *   VWL    0   r
+0   *   NULL   0   r
+0   :   NULL   0   NULL
+
+
+0   tS  NULL   0   t
+0   dZ  NULL   0   d
+0   l^  NULL   0   L
+0   n^  NULL   0   J
+0   N   NULL   0   n
+0   x   NULL   0   R
+0   s#  NULL   0   S
+8   r   VWL    0   r
+0   r   NULL   0   r
+0   R   NULL   0   r
+
+0   a/  NULL   0   a
+0   A   NULL   0   a
+0   &   NULL   0   6
+0   &/  NULL   0   6
+9   &~  N      0   6~
+0   &~  NULL   0   6~
+0   E   NULL   0   E
+9   eI  m      0   6~j~
+9   eI  N      0   6~j~
+
+0   i/  NULL   0   i
+9   i~  N      0   i~
+0   i~  NULL   0   i~
+9   o~  j/     60  o~ i
+9   o~  N      0   o~
+0   o~  NULL   0   o~
+0   O   NULL   0   oo
+9   u~  j/     60  u~ i
+9   u~  N      0   u~
+0   u~  NULL   0   u~
+0   U   NULL   0   u
+0   y   NULL   0   @
+0   I   NULL   0   @
+
+0   aI  NULL  60   a  j
+0   eI  NULL  60   e  j
+0   EI  NULL  60   E  j
+0   oI  NULL  60   o  j
+0   OI  NULL  60   O  j
+0   uI  NULL  60   u  j
+0   aU  NULL  55   a  w
+0   &U~ NULL  0    @
+0   eU  NULL  55   e  w
+0   EU  NULL  55   ee w
+0   iU  NULL  55   i  w
+
+
+// English phonemes
+0   @   NULL   0   @
+0   T   NULL   0   t
+0   D   NULL   0   z
+0   0   NULL   0   o
+0   V   NULL   0   a
+0   I2  NULL   0   @
+0   A:  NULL   0   a
+0   A@  NULL  60   a r
+0   o:  NULL   0   o
+0   O:  NULL   0   o
+0   O@  NULL  60   o r
+0   o@  NULL  60   o r
+0   i:  NULL   0   i
+0   i@  NULL  60   i a
+0   i@3 NULL  60   i r
+0   u:  NULL   0   u
+0   U@  NULL  60   u r
+0   3   NULL  60   e r
+0   3:  NULL  60   e r
+0   @L  NULL  40   e l
+0   a2  NULL   0   a
+0   aa  NULL   0   a
+0   e@  NULL   0   e r
+0   oU  NULL   0   o
+0   OI  NULL  60   o i
+0   aI@ NULL  60   a e
+0   aU@ NULL   0   a
+0   t2  NULL   0   t
+

phsource/ph_albanian

@@ -0,0 +1,296 @@
+
+
+phoneme @    //  Schwa
+  length 150
+  vowel   starttype (@)  endtype (@)
+  formants vowel/@_2
+//  formants vowel/8_6
+endphoneme
+
+phoneme @/    //  Schwa at end of word (silent)
+  length 100
+  vowel   starttype (@)  endtype (@)
+  formants vowel/@_2
+endphoneme
+
+phoneme V
+  vowel   starttype (@)  endtype (@)
+  length 170
+  formants vowel/@_2
+  before h  vowel/8_6
+  reduceto @  3
+endphoneme
+
+phoneme I#        // use for [V] after [n^]
+  vowel   starttype (@)  endtype (@)
+  length 170
+  formants vowel/ii
+  reduceto @  3
+endphoneme
+
+
+phoneme a
+  vowel  starttype (a)  endtype (a)
+  length 170
+  formants vowel/a_3
+  reduceto a/  0
+endphoneme
+
+phoneme a/
+  vowel  starttype (a)  endtype (a)
+  length 170
+  formants vowel/a#_3
+endphoneme
+
+phoneme A
+  vowel  starttype (a)  endtype (a)
+  length 170
+  formants vowel/aa_3
+  reduceto a/  0        // but nor "ar_" ??
+endphoneme
+
+
+phoneme E
+  vowel  starttype (e)  endtype (e)
+  length 170
+  formants vowel/ee_4
+endphoneme
+
+phoneme E#
+  vowel  starttype (@)  endtype (@)
+  length 170
+  formants vowel/ee#_2
+endphoneme
+
+phoneme e
+  vowel  starttype (e)  endtype (e)
+  length 170
+  formants vowel/e
+  reduceto e#  3
+endphoneme
+
+phoneme e#
+  vowel  starttype (@)  endtype (@)
+  length 170
+  formants vowel/e_mid2
+endphoneme
+
+
+phoneme i
+  vowel  starttype (i)  endtype (i)
+  length 140
+  formants vowel/i_7
+  before l/2 vowel/ii#-50+l/L2_iL
+  before l/3 vowel/ii_en-30+l/l_i
+endphoneme
+
+phoneme I
+  vowel  starttype (i)  endtype (i)
+  length 140
+  formants vowel/ii_6
+endphoneme
+
+phoneme y
+  vowel starttype (u) endtype (u)
+  length 160
+  formants vowel/y
+endphoneme
+
+
+
+phoneme O
+  vowel  starttype (o)  endtype (o)
+  length 170
+  formants vowel/oo_5
+//  formants vowel/oo_4
+  reduceto O/ 3
+endphoneme
+
+phoneme O/
+  vowel  starttype (o)  endtype (o)
+  length 170
+  formants vowel/oo_1
+endphoneme
+
+phoneme u
+  vowel starttype (u) endtype (u)
+  length 160
+  formants vowel/u_bck
+endphoneme
+
+
+
+phoneme aI
+  vowel  starttype (a)  endtype (i)
+  length 220
+  formants vdiph/aai
+endphoneme
+
+phoneme eI
+  vowel  starttype (e)  endtype (i)
+  length 220
+  formants vdiph2/ei_4
+endphoneme
+
+phoneme OI
+  vowel  starttype (o)  endtype (i)
+  length 220
+  formants vdiph/ooi_4
+endphoneme
+
+phoneme yE
+  vowel starttype (u) endtype (e)
+  length 240
+  formants vdiph2/ye
+endphoneme
+
+
+phoneme l/4    // used for [l] when not before a vowel
+  liquid
+  length 100
+  lengthmod 7
+  formants l/l_front_
+//  before (r) l/_l
+  beforevowel l
+endphoneme
+
+
+
+phoneme L
+  liquid   endtype l^ starttype l^
+  length 100
+  lengthmod 7
+  beforenotvowel l/4
+  formants l/l_front  // this is not being used??
+//  after _  l/_l
+//  after t  l/tl
+//  after l/ l/l_long    // double l, make it longer
+endphoneme
+
+
+phoneme ll
+  liquid starttype 1 endtype l
+  length 100
+  lengthmod 7
+  beforenotvowel l/2       // use 'dark' [l] after a vowel
+  formants l/l_4
+//  after _ l/_l
+endphoneme
+
+
+phoneme w
+  starttype w  endtype w
+  liquid
+  length 100
+  beforenotvowel w/
+  lengthmod 7
+  formants w/w2
+  after _  w/w2
+endphoneme
+
+
+
+phoneme p
+  vls blb stop
+  vowelin  f1=0  f2=1000 -50 -100  f3=-200 80
+  vowelout f1=0  f2=1000 -500 -350  f3=-300 80 rms=30
+  lengthmod 2
+  wave ustop/p_unasp%120
+  before _ ustop/p_unasp_%80
+  before l ustop/pl
+  switchvoicing b
+endphoneme
+
+
+phoneme d
+  vcd alv stop
+  vowelin f1=2  f2=1700 -300 300  f3=-200 80 amp=16
+  vowelout f1=2 f2=1700 -300 300  f3=-100 80
+  formants d/d+x/d%50
+  before _ d/d_+x/d_
+  before r d/dr+x/d%50
+  after _ NULL
+  after @ d/xd
+  lengthmod 5
+  switchvoicing t
+endphoneme
+
+
+phoneme t
+  vls dnt stop
+  vowelin f1=1  f2=1500 -250 250  f3=-100 80  amp=16
+  vowelout f1=0 f2=1500 -300 250  f3=-100 80  rms=20
+  lengthmod 2
+  wave  ustop/t_hi%70
+  before _ ustop/t_dnt%35 
+  switchvoicing d
+endphoneme
+
+
+
+
+phoneme ts
+  vls alv afr sibilant
+  vowelin f1=0  f2=1700 -300 300  f3=-100 80
+  vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
+  lengthmod 2
+  wave ustop/ts
+  before _ ustop/ts_
+endphoneme
+
+
+phoneme dz
+  vcd alv afr sibilant
+  vowelin f1=1  f2=1700 -300 300  f3=-100 80 len=50
+  vowelout f1=2 f2=1700 -300 300  f3=-100 80
+  formants d/xdz+ustop/ts%140
+  before _ voc/z_+ustop/ts_%70
+  after _ NULL
+  after @ d/xd
+  lengthmod 5
+  switchvoicing ts
+endphoneme
+
+
+
+phoneme z
+  vcd alv frc sibilant
+  vowelout f1=0  f2=1700 -300 300  f3=0 60  len=50 
+  formants voc/z+ufric/s
+  before _ voc/z_+ufric/s_
+  lengthmod 6
+  switchvoicing s
+endphoneme
+
+
+phoneme dZ;
+  vcd pla afr sibilant palatal
+  vowelin f1=2  f2=2700 400 600  f3=300 80 rate len=70
+  formants dzh/dzh+ustop/ts_pzd%150
+  before _ dzh/dzh_+ustop/ts_pzd
+  after _ NULL
+  after @ dzh/xdzh
+  lengthmod 5
+  switchvoicing tS;
+endphoneme
+
+phoneme c   // This is [tS;]
+  vls pal afr sibilant palatal
+  vowelin f1=0  f2=2700 400 600  f3=300 80 rate len=70
+  lengthmod 2
+  wave ustop/ts_pzd
+  before _ ustop/ts_pzd
+  switchvoicing dZ;
+endphoneme
+
+
+phoneme k
+  vls vel stop
+  vowelin f1=0  f2=2300 200 400  f3=-100 80
+  vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
+  lengthmod 2
+  wave ustop/k_unasp
+  before _ ustop/k_
+  switchvoicing g
+endphoneme
+

phsource/ph_armenian

@@ -0,0 +1,185 @@
+
+
+phoneme @
+  vowel  starttype (@)  endtype (@)
+  length 160
+  formants vowel/@
+  unstressed
+endphoneme
+
+phoneme i
+  vowel  starttype (i)  endtype (i)
+  length 160
+  formants vowel/i
+endphoneme
+
+phoneme y
+  vowel  starttype (i)  endtype (i)
+  length 160
+  formants vowel/yy_4
+endphoneme
+
+phoneme e
+  vowel  starttype (e)  endtype (e)
+  length 180
+  formants vowel/e_mid
+endphoneme
+
+phoneme a
+  vowel  starttype (a)  endtype (a)
+  length 200
+  formants vowel/aa
+endphoneme
+
+phoneme o
+  vowel  starttype (e)  endtype (e)
+  length 180
+  formants vowel/o
+endphoneme
+
+phoneme u
+  vowel  starttype (u)  endtype (u)
+  length 180
+  formants vowel/u_bck
+endphoneme
+
+phoneme W
+  vowel starttype (@) endtype (@)
+  length 180
+  formants vowel/oe
+endphoneme
+
+phoneme aI
+  vowel  starttype (a)  endtype (i)
+  length 240
+  formants vdiph/ai
+endphoneme
+
+phoneme eI
+  vowel  starttype (e)  endtype (i)
+  length 240
+  formants vdiph/eei
+endphoneme
+
+phoneme i@
+  vowel  starttype (i)  endtype (@)
+  length 240
+  formants vdiph2/i@
+endphoneme
+
+
+
+phoneme p#   // more aspiration
+  vls blb stop
+  vowelin  f1=0  f2=1000 -50 -100  f3=-200 80
+  vowelout f1=0  f2=1000 -500 -350  f3=-300 80 rms=30
+  lengthmod 2
+  wave ustop/p_asp
+  before _ ustop/p_
+  before r ustop/pr
+  before l ustop/pl
+  switchvoicing b
+endphoneme
+
+phoneme t#
+  import_phoneme t base
+endphoneme
+
+phoneme ts#
+  vls alv afr sibilant
+  vowelin f1=0  f2=1700 -300 300  f3=-100 80
+  vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
+  lengthmod 2
+  wave ustop/ts
+  before _ ustop/ts_
+endphoneme
+
+phoneme k#
+  import_phoneme k base
+endphoneme
+
+
+phoneme dz
+  vcd alv afr sibilant
+  vowelin f1=1  f2=1700 -300 300  f3=-100 80 len=50
+  vowelout f1=2 f2=1700 -300 300  f3=-100 80
+  formants d/xdz+ustop/ts%140
+  before _ voc/z_+ustop/ts_%70
+  after _ NULL
+  after @ d/xd
+  lengthmod 5
+  switchvoicing ts
+endphoneme
+
+
+
+phoneme p
+  vls blb stop
+  vowelin  f1=1  f2=1000 -50 -100  f3=-200 80
+  vowelout f1=1  f2=1000 -500 -350  f3=-300 80 rms=30
+  lengthmod 2
+  wave ustop/p_unasp
+  before _ ustop/p_unasp_%80
+  before r ustop/pr
+  before l ustop/pl
+  switchvoicing b
+endphoneme
+
+phoneme t
+  vls dnt stop
+  vowelin f1=1  f2=1500 -250 250  f3=-100 80  amp=16
+  vowelout f1=0 f2=1500 -300 250  f3=-100 80  rms=20
+  lengthmod 2
+  wave  ustop/t_hi%60
+  before _ ustop/t_dnt%35 
+  switchvoicing d
+endphoneme
+
+phoneme ts
+  vls alv afr sibilant
+  vowelin f1=0  f2=1700 -300 300  f3=-100 80
+  vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
+  lengthmod 2
+  wave ustop/ts2
+endphoneme
+
+phoneme c
+  vls pal afr sibilant
+  vowelin f1=0  f2=2700 400 600  f3=300 80 rate len=70
+  vowelout f1=0 f2=2700 400 600  f3=300 80 colr=1
+  lengthmod 2
+  wave ustop/ts_pzd2%90
+  before _ ustop/ts_pzd_
+  switchvoicing J
+endphoneme
+
+phoneme k
+  vls vel stop
+  vowelin f1=0  f2=2300 200 300  f3=-150 80
+  vowelout f1=0 f2=2300 300 400  f3=-150 80  rms=20
+  lengthmod 2
+  wave ustop/k_unasp%60   // weaker
+  before _ ustop/k_unasp%50
+  switchvoicing g
+endphoneme
+
+
+
+phoneme Q
+  import_phoneme Q" base
+endphoneme
+
+
+phoneme Q2
+  liquid starttype (r) endtype (r)
+  vowelin  f1=0  f2=1600 -300 300  f3=-200 80
+  vowelout f1=2  f2=1600 -300 300  f3=-200 80 brk
+  length 100
+  lengthmod 7
+//   beforenotvowel r/2
+  formants vwl_fr/@R3+r3/rx%30
+  after @  vwl_fr/@R5+r3/rx%40
+  after (u) vwl_fr/@R5+r3/rx%30
+  after (e) vwl_fr/@R4+r3/rx%20
+endphoneme
+

phsource/ph_base2

@@ -170,13 +170,14 @@ phoneme t        // dental variant of /t/
   vowelin f1=0  f2=1600 -300 300  f3=-100 80
   vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave  ustop/t_dnt%50
-  before _ ustop/t_dnt%35
+//  wave  ustop/t_dnt%50
+//  before _ ustop/t_dnt%35
+  wave  ustop/t_dnt2%60
+  before _ ustop/t_dnt%30 
   switchvoicing d
 endphoneme
 
 
-
 phoneme d       // dental variant of /d/
   vcd dnt stop
   vowelin f1=2  f2=1500 -300 300  f3=-150 80

phsource/ph_english_rp

@@ -52,7 +52,7 @@ endphoneme
 
 phoneme a
   vowel  starttype (a)  endtype (a)
-  length 170
+  length 175
   formants vowel/&
   reduceto a2  0
 endphoneme

phsource/ph_hindi

@@ -379,7 +379,6 @@ phoneme th        // dental variant of /t/
   lengthmod 2
   wave  ustop/t_dnt%50
   before _ ustop/t_dnt%35
-//  wave  ustop/t_hi%50+h/h@
   switchvoicing d
 endphoneme
 

phsource/ph_polish

@@ -151,10 +151,10 @@ endphoneme
 
 phoneme dz
   vcd alv afr sibilant
-  vowelin f1=1  f2=1700 -300 300  f3=-100 80
+  vowelin f1=1  f2=1700 -300 300  f3=-100 80 len=50
   vowelout f1=2 f2=1700 -300 300  f3=-100 80
-  formants d/xd+ustop/ts
-  before _ d/xd+ustop/ts_
+  formants d/xdz+ustop/ts%140
+  before _ voc/z_+ustop/ts_%70
   after _ NULL
   after @ d/xd
   lengthmod 5
@@ -163,7 +163,6 @@ endphoneme
 
 
 
-
 phoneme w
   liquid
   length 100

phsource/ph_vi

@@ -270,17 +270,6 @@ endphoneme
 
 
 
-phoneme t[        // dental variant of /t/
-  vls dnt stop
-  vowelin f1=1  f2=1600 -300 300  f3=-100 80
-  vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
-  lengthmod 2
-  wave  ustop/t_dnt2%60
-  before _ ustop/t_dnt%30 
-  switchvoicing d
-endphoneme
-
-
 phoneme kh
   vls vel frc
   vowelin f1=0  f2=2300 200 400  f3=200 80

phsource/phonemes

@@ -904,8 +904,8 @@ endphoneme
 
 phoneme Q"       // voiced velar fricative
   vcd uvl frc
-  formants voc/Q_ulv+ufric/xx3%80
-  before _ voc/Q_ulv+ufric/xx3%60
+  formants voc/Q_ulv+ufric/xx%80
+  before _ voc/Q_ulv+ufric/xx%60
   lengthmod 6
 endphoneme
 
@@ -948,17 +948,17 @@ endphoneme
 
 phoneme t[        // dental variant of /t/
   vls dnt stop
-  vowelin f1=0  f2=1600 -300 300  f3=-100 80
-  vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
+  vowelin f1=1  f2=1500 -250 250  f3=-100 80  amp=16
+  vowelout f1=0 f2=1500 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave  ustop/t_dnt%50
-  before _ ustop/t_dnt%35
-  before r ustop/tr
+  wave  ustop/t_hi%60
+  before _ ustop/t_dnt%35 
   switchvoicing d[
 endphoneme
 
 
 
+
 phoneme tS
   vls pla afr sibilant
   vowelin f1=0  f2=2300 200 400  f3=-100 80
@@ -992,12 +992,13 @@ endphoneme
 
 
 phoneme c
-  vls pal stop
-  vowelin f1=0  f2=2700 200 400  f3=300 80 rate len=80
-  vowelout f1=0  f2=2700 300 500  f3=300 80
+  vls pal stop palatal
+  vowelin f1=0  f2=2700 400 600  f3=300 80 rate len=70
+  vowelout f1=1  f2=2700 400 600  f3=200 70 len=50 colr=1
   lengthmod 2
   wave ustop/c%130
-  before _ ustop/ki%80
+  before _ ustop/t_pzd%30
+  switchvoicing J
 endphoneme
 
 
@@ -1153,11 +1154,19 @@ endphoneme
 phoneme X
   vls uvl frc
   lengthmod 3
-  wave ufric/xx3
-  before _ ufric/xx3%70
+  wave ufric/xx
+  before _ ufric/xx%70
 endphoneme
 
 
+//phoneme H
+//  vls phr frc
+//  lengthmod 3
+//  wave h/h_phr%90
+//  before _ h/h_phr%60
+//endphoneme
+
+
 phoneme h
   vls glt apr
   length 100
@@ -1332,37 +1341,3 @@ phonemetable hy base
 include ph_armenian
 
 
-
-phonemetable rw base2
-include ph_kinyarwanda
-
-phonemetable ko hi
-include ph_korean
-
-phonemetable da is
-include ph_danish
-
-phonemetable ml hi
-include ph_malayalam
-
-phonemetable kn hi
-include ph_kannada
-
-phonemetable bn hi
-include ph_bengali
-
-phonemetable ne hi
-include ph_nepali
-
-phonemetable om base
-include ph_oromo
-
-phonemetable en_klatt en
-include ph_english_klatt
-
-phonemetable ga base
-include ph_irish
-
-phonemetable mr hi
-include ph_mathari
-