[1.25.19] lang=hu removed regressive voicing

lang=en-r  adjusted phonemes [a] [eI] [t#]


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

dictsource/dict_phonemes

@@ -66,14 +66,15 @@ Dictionary en_dict
 
 0    3    3:   @    @-   @2   @5   @L   
 a    a2   A:   A@   aa   aI   aI@  aU   
-aU@  E    e@   eI   I    i    I2   i:   
-i@   IR   O    O:   o:   O@   o@   OI   
-oU   O~   U    u:   U@   V    VR   
+aU@  E    e@   eI   I    I2   i:   i@   
+IR   O    O:   o:   O@   o@   OI   oU   
+O~   U    u:   U@   V    VR   
 
 :    ;    b    C    d    D    dZ   f    
 g    g-   h    j    k    l    L    m    
 n    N    p    Q    r    r-   s    S    
-t    T    tS   v    w    x    z    Z    
+t    T    t2   tS   v    w    x    z    
+Z    
 
 
 Dictionary eo_dict

dictsource/en_list

@@ -2351,6 +2351,9 @@ on               ,0n           $strend2
 into             ,IntU
 onto             ,0ntU         $strend2
 unto             ,VntU
+?3 into          ,Int2U
+?3 onto          ,0nt2U         $strend2
+?3 unto          ,Vnt2U
 upon             @p,0n
 from             %fr0m
 (from where)     %fr0m||w'e@   $pause

dictsource/hu_list

@@ -44,12 +44,13 @@ _dpt      v,Ess2Y:
 km	kilo:me:tER
 mm      milime:tER
 
+a.m	An^n^i||m'int  $dot
+gpu	$abbrev
 ill	illEdvE  $dot
+mta	$abbrev
+pl	pe:lda:ul  $dot
 stb	SAtYb:i  $dot
 vö	v'EZd||_'Yss2E
-pl	pe:lda:ul  $dot
-mta	$abbrev
-a.m	An^n^i||m'int  $dot
 
 
 
@@ -247,3 +248,13 @@ _.	pont
 // Main Exceptions List
 //=====================
 
+
+// Places
+oslo		oslo:
+osló		oslo:
+
+
+// Names
+ricárd		R'iCArd
+richard		R'iCARd
+

dictsource/hu_rules

@@ -65,6 +65,8 @@
      C) dj       J
      A) dj (A    J:
 
+   ren) d (szerint  d
+
 
 .group e
         e        E
@@ -211,9 +213,9 @@ _minde) gy (ik   J:
         tysz     ts
      A) tysz (A  ts:
         tz       dz
-     A) tz (A    d:z
+     A) tz (A    t:z
         tyz      dz
-     A) tyz (A   d:z
+     A) tyz (A   t:z
      C) tzs      dZ
      A) tzs (A   dZ:
      C) tyzs     dZ

phsource/compile_report

@@ -1,12 +1,12 @@
 34 phoneme tables
           new total
     base  96   96
-      en  52  143
-    en_n  29  143
-   en_us  37  143
-   en_sc  39  145
-   en_rp  34  143
-   en_wm  30  143
+      en  53  144
+    en_n  29  144
+   en_us  37  144
+   en_sc  39  146
+   en_rp  34  144
+   en_wm  30  144
       af  37  127
       cy  29  122
       de  29  120
@@ -252,12 +252,12 @@
   8  ustop/pr       base fi hi hu it ro
   7  ustop/p_unasp  base fi hi hu hr it ro
   6  ustop/p_unasp_ fi hi hu hr it ro
-  2  ustop/t        base hi
-  5  ustop/t_       base hi sk el
- 26  ustop/t_dnt    base fi fr hi hu pl hr ru it ro vi sw
+  3  ustop/t        base en hi
+  6  ustop/t_       base en hi sk el
+ 27  ustop/t_dnt    base en fi fr hi hu pl hr ru it ro vi ++
   2  ustop/t_dnt2   hi vi
   4  ustop/t_pzd    pl ru
-  5  ustop/tr       base hi ru
+  7  ustop/tr       base en hi ru
   8  ustop/ts       de eo hu pl ru it ro zh_yue
   2  ustop/tsh      base zh_yue
   2  ustop/tsh_     base zh_yue

phsource/ph_english

@@ -13,6 +13,19 @@ phoneme k
   before i@ ustop/ki
 endphoneme
 
+phoneme t2   // [t] which doesn't reduce
+  vls alv stop
+  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/t
+  before _ ustop/t_
+  before @- ustop/t_dnt%50
+  before r ustop/tr
+  before R ustop/tr
+  switchvoicing d
+endphoneme
+
 
 phoneme N
   vcd vel nasal

phsource/ph_english_us

@@ -95,7 +95,7 @@ endphoneme
 phoneme I2
   vowel  starttype (i)  endtype (i)
   unstressed
-  length 130
+  length 120
   formants vwl_en_us/ii
   linkout ;
 endphoneme
@@ -225,14 +225,14 @@ endphoneme
 
 phoneme aI
   vowel  starttype (a)  endtype (i)
-  length 210
+  length 220
   formants vdiph/ai_2
 endphoneme
 
 
 phoneme eI
   vowel  starttype (e)  endtype (i)
-  length 210
+  length 220
   formants vdiph/eei_3
 endphoneme
 
@@ -246,7 +246,7 @@ endphoneme
 
 phoneme e@
   vowel  starttype (e)  endtype (@)
-  length 250
+  length 260
   formants vwl_en_us/er
   appendph r
 endphoneme
@@ -298,10 +298,10 @@ endphoneme
 
 phoneme t#    // reduced [t] as in "city"
   vls alv stop
-  vowelin f1=2  f2=1700 -300 300  f3=-100 80
-  vowelout f1=2 f2=1700 -300 300  f3=-100 80
-  lengthmod 2
-  wave  x/d%70
+  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
 endphoneme
 
 

phsource/ph_hungarian

@@ -51,7 +51,7 @@ endphoneme
 
 phoneme o:
   vowel starttype (o) endtype (o)
-  length 240
+  length 270
   formants vowel/o_2
 endphoneme
 

src/phonemelist.cpp

@@ -412,7 +412,7 @@ void Translator::MakePhonemeList(int post_pause, int start_sentence)
 		{
 			if((ph->mnemonic == 't') && (plist2->sourceix == 0) && ((prev->type == phVOWEL) || (prev->mnemonic == 'n')))
 			{
-				if(((plist2+1)->sourceix == 0) && ((plist2+1)->stress < 4) && (next->type == phVOWEL))
+				if(((plist2+1)->sourceix == 0) && ((plist2+1)->stress < 3) && (next->type == phVOWEL))
 				{
 					ph = phoneme_tab[phonT_REDUCED];
 				}

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.25.18  06.Jun.07";
+const char *version_string = "1.25.19  06.Jun.07";
 const int version_phdata  = 0x012514;
 
 int option_device_number = -1;

src/tr_languages.cpp

@@ -328,7 +328,7 @@ Translator *SelectTranslator(const char *name)
 			tr->langopts.stress_rule = 0;
 			tr->langopts.stress_flags = 0x8036;
 			tr->langopts.unstressed_wd1 = 2;
-			tr->langopts.param[LOPT_REGRESSIVE_VOICING] = 0x4;  // don't propagate over word boundaries
+//			tr->langopts.param[LOPT_REGRESSIVE_VOICING] = 0x4;  // don't propagate over word boundaries
 			tr->langopts.param[LOPT_IT_DOUBLING] = 1;
 			tr->langopts.param[LOPT_COMBINE_WORDS] = 99;  // combine some prepositions with the following word
 			tr->langopts.long_stop = 130;