[1.27.10] Added inverse conditional rules in *_list and *_rules. eg. ?!3 "if rule 3 is NOT set".

lang=en-r, adjusted vowels.
Moved single characters (eg. % @) from *_list to *_rules so they can be used in combinations (eg. %-).


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

phsource/compile_report

@@ -306,7 +306,7 @@
   1  vdiph/ae       fr_ca
   1  vdiph/ae_2     en_n
   8  vdiph/ai       base2 eo sk hr mk it pt vi
-  3  vdiph/ai_2     en_us cy
+  2  vdiph/ai_2     cy
   1  vdiph/ai_3     no
   1  vdiph/ai_4     af
   2  vdiph/ai_5     de la
@@ -320,8 +320,8 @@
   6  vdiph/au_4     base2 cy eo sk it is
   1  vdiph/ee-e     hi
   4  vdiph/eei      en de pt vi
-  2  vdiph/eei_2    eo fi
-  3  vdiph/eei_3    en_us en_rp sk
+  3  vdiph/eei_2    en_us eo fi
+  2  vdiph/eei_3    en_rp sk
   1  vdiph/eei_4    nl
   3  vdiph/eeu      pt vi zhy
   2  vdiph/eeu_2    la pt_pt
@@ -412,7 +412,7 @@
   4  vowel/&        en_rp fi hi sv
   4  vowel/0        base2 en hi pt
   4  vowel/0_2      en_n en_wm pt_pt sw
-  5  vowel/0_3      en_us en_sc en_rp hu
+  4  vowel/0_3      en_us en_sc en_rp hu
   2  vowel/@_2      fr
   6  vowel/@_3      en_sc de hi
   1  vowel/3_2      en_n
@@ -429,7 +429,7 @@
  12  vowel/a#_3     en en_n en_us en_wm de hi ru pt_pt vi zhy
   4  vowel/a_4      en_wm el vi
   3  vowel/a_5      it sv sw
-  7  vowel/aa       en_us fi fr_ca no zhy
+  5  vowel/aa       fi fr_ca no zhy
   1  vowel/aa#      fi
   3  vowel/aa_2     en cy
   1  vowel/aa_3     af
@@ -437,6 +437,7 @@
   2  vowel/aa_5     en_n
   2  vowel/aa_6     de
   1  vowel/aa_7     nl
+  2  vowel/aa_8     en_us
   3  vowel/a_en     en fr
   1  vowel/@_bck    hi
  15  vowel/e        base2 en en_n af cy eo fr hr mk it la pt ++
@@ -501,9 +502,8 @@
   5  vowel/u#       en en_sc
   6  vowel/u_2      fi fr sk hr mk ro
   1  vowel/u#_2     sv
-  1  vowel/u_3      ro
+  2  vowel/u_3      en_us ro
   1  vowel/u#_3     en_n
-  1  vowel/u_4      en_us
   2  vowel/u#_4     en_sc
   1  vowel/u_5      sw
   3  vowel/u_6      en_rp pt_pt
@@ -549,16 +549,18 @@
   1  vwl_en_rp/oo   en_rp
   1  vwl_en/u       en
   4  vwl_en/u_L     en en_n en_us en_rp
-  1  vwl_en_us/3_us en_us
+  2  vwl_en_us/3_us en_us
   2  vwl_en_us/a    en_us
-  2  vwl_en_us/ar2  en_us
+  1  vwl_en_us/aai  en_us
+  2  vwl_en_us/ar   en_us
   1  vwl_en_us/ee   en_us
   1  vwl_en_us/er   en_us
   1  vwl_en_us/i_final3 en_us
   2  vwl_en_us/ii   en_us
   2  vwl_en_us/ir   en_us en_sc
-  4  vwl_en_us/or   en_us en_sc
-  1  vwl_en_us/@r_us en_us
+  1  vwl_en_us/oo   en_us
+  1  vwl_en_us/oor  en_us
+  3  vwl_en_us/or   en_us en_sc
   1  vwl_en_us/ur   en_us
   1  vwl_en_us/V    en_us
   2  vwl_en_wm/aa   en_wm

phsource/ph_english_us

@@ -10,17 +10,18 @@ phoneme @    //  Schwa
   formants vowel/@
   unstressed
   linkout r-
-  length 140
+  length 130
 endphoneme
 
 
 phoneme 3    //  Schwa, used for rhotic schwa in American
   vowel   starttype (@)  endtype (@)
-  formants vwl_en_us/@r_us
+  formants vwl_en_us/3_us
+//  formants vowel/3_2
   unstressed
   linkout r-
   beforevowel @
-  length 175
+  length 180
 endphoneme
 
 
@@ -37,7 +38,7 @@ phoneme @5   //  Schwa, changes to U before a vowel
   formants vowel/@
   unstressed
   beforevowelpause U
-  length 140
+  length 130
 endphoneme
 
 
@@ -52,35 +53,33 @@ endphoneme
 
 phoneme a
   vowel  starttype (a)  endtype (@)
-  length 200
+  length 190
   formants vwl_en_us/a
   reduceto a2  0
 endphoneme
 
 
+phoneme aa   //   'bath' etc.
+  vowel  starttype (a)  endtype (@)
+  length 190
+  formants vwl_en_us/a
+  linkout r-
+endphoneme
+
+
 phoneme a2
   vowel  starttype (@)  endtype (@)
   unstressed
-  length 150
+  length 140
   formants vowel/a#_3
   linkout r-
 endphoneme
 
 
-phoneme aa   //   'bath' etc.
-  vowel  starttype (a)  endtype (@)
-  length 200
-  formants vwl_en_us/a
-//  formants vowel/a_2
-  linkout r-
-endphoneme
-
-
 phoneme E
   vowel  starttype (e)  endtype (e)
   length 160
   formants vwl_en_us/ee
-//  formants vowel/ee_2
   reduceto I  0
 endphoneme
 
@@ -92,6 +91,7 @@ phoneme I
   linkout ;
 endphoneme
 
+
 phoneme I2
   vowel  starttype (i)  endtype (i)
   unstressed
@@ -111,15 +111,15 @@ endphoneme
 
 phoneme 0
   vowel  starttype (o)   endtype (o)
-  length 190
-  formants vowel/aa
+  length 180
+  formants vowel/aa_8
   reduceto @  0
 endphoneme
 
 
 phoneme V
   vowel  starttype (a)  endtype (@)
-  length 150
+  length 170
   formants vwl_en_us/V
 //  formants vowel/V_2
   reduceto @  0
@@ -128,31 +128,32 @@ endphoneme
 
 phoneme U
   vowel  starttype (o)  endtype (o)
-  length 150
+  length 140
   formants vowel/8_2
 endphoneme
 
 
 phoneme A:
   vowel  starttype (a)  endtype (a)
-  length 210
-  formants vowel/aa
-  before r vwl_en_us/ar2
+  length 200
+  formants vowel/aa_8
+  before r vwl_en_us/ar
   linkout r-
 endphoneme
 
 
 phoneme A@      // Used for [A:] when followed by 'r', becomes [A:]+[r] in American
   vowel  starttype (a)  endtype (@)
-  length 250
-  formants vwl_en_us/ar2
+  length 240
+  formants vwl_en_us/ar
   appendph r
 endphoneme
 
 
 phoneme 3:
   vowel  starttype (@)  endtype (@)
-  length 230
+  length 220
+//  formants vwl_en_us/@r_us2
   formants vwl_en_us/3_us
 //  reduceto @  0
   linkout r-
@@ -161,7 +162,7 @@ endphoneme
 
 phoneme i:
   vowel  starttype (i)  endtype (i)
-  length 165
+  length 160
   formants vowel/i_en
   after w w/wi2
   linkout ;
@@ -170,7 +171,7 @@ endphoneme
 
 phoneme O:
   vowel  starttype (o)  endtype (o)
-  length 210
+  length 200
   formants vowel/0_3
   before r vwl_en_us/or
   reduceto @  0
@@ -180,7 +181,7 @@ endphoneme
 phoneme O@
   vowel  starttype (o)  endtype (@)
   length 240
-  formants vwl_en_us/or
+  formants vwl_en_us/oor
   appendph r
 endphoneme
 
@@ -196,57 +197,57 @@ endphoneme
 phoneme O
   vowel  starttype (o)  endtype (o)
   length 150
-  formants vowel/0_3
+  formants vwl_en_us/oo
   reduceto @  0
 endphoneme
 
 
 phoneme u:
   vowel  starttype (u)  endtype (u)
-  length 190
-  formants vowel/u_4
+  length 170
+  formants vowel/u_3
   before l/2 vwl_en/u_L-40+l/L2_uL
 endphoneme
 
 
 phoneme aU
   vowel  starttype (a)  endtype (u)
-  length 210
+  length 200
   formants vdiph/au_2
 endphoneme
 
 
 phoneme oU
   vowel  starttype (@)  endtype (u)
-  length 230
+  length 210
   formants vdiph/8u
 endphoneme
 
 
 phoneme aI
   vowel  starttype (a)  endtype (i)
-  length 220
-  formants vdiph/ai_2
+  length 210
+  formants vwl_en_us/aai
 endphoneme
 
 
 phoneme eI
   vowel  starttype (e)  endtype (i)
-  length 220
-  formants vdiph/eei_3
+  length 210
+  formants vdiph/eei_2
 endphoneme
 
 
 phoneme OI
   vowel  starttype (o)  endtype (i)
-  length 230
+  length 220
   formants vdiph/ooi
 endphoneme
 
 
 phoneme e@
   vowel  starttype (e)  endtype (@)
-  length 260
+  length 250
   formants vwl_en_us/er
   appendph r
 endphoneme
@@ -254,7 +255,7 @@ endphoneme
 
 phoneme i@
   vowel  starttype (i)  endtype (@)
-  length 240
+  length 220
   formants vwl_en_us/ir
   appendph r
 endphoneme
@@ -262,7 +263,7 @@ endphoneme
 
 phoneme U@
   vowel  starttype (@)  endtype (@)
-  length 240
+  length 220
   formants vwl_en_us/ur
   linkout r-
 endphoneme
@@ -301,7 +302,7 @@ phoneme t#    // reduced [t] as in "city"
   vowelin f1=0  f2=1700 -300 300  f3=-100 80
   vowelout f1=0 f2=1700 -300 300  f3=-100 80
   lengthmod 5
-  wave  x/d%80
+  wave  x/d%90
 endphoneme
 
 

phsource/ph_hungarian

@@ -62,7 +62,7 @@ endphoneme
 
 phoneme a:
   vowel starttype (a) endtype (a)
-  length 260
+  length 270
   formants vowel/a
 endphoneme