[1.25.11] Fix problem with temporary language change when using a voice-variant.

lang=hu  Merge "nem" with next word.
lang=ro  Many additions to ro_list.  Change phoneme [o].
lang=af  Update phoneme [R], which also appears as [R3] in general consonants.


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

phsource/compile_report

@@ -474,11 +474,12 @@
   2  vowel/o_3      en_sc
   1  vowel/o-_3     en_rp
   1  vowel/o_4      en_n
+  1  vowel/o-_4     ro
   1  vowel/o_6      nl
   4  vowel/oe       en af de fr
   1  vowel/oe_2     no
   1  vowel/oe_4     sv
-  3  vowel/o_mid    fr hu ro
+  2  vowel/o_mid    fr hu
   8  vowel/oo       en_sc de eo es el sv no zh_yue
  11  vowel/oo_1     en_n en_rp en_wm af fi sk hr vi
   3  vowel/oo_2     en_sc cy cs

phsource/ph_af

@@ -280,11 +280,12 @@ endphoneme
 
 phoneme R
   liquid
-  vowelin  f1=2  f2=70 -300 300  f3=-300 80 dnt
-  vowelout f1=2  f2=70 -300 300  f3=-300 80 brk
-  formants r3/r_trill+r3/r_trill3.wav%55
-  before _ r3/r_trill+r3/r_trill3.wav%50
-  trill
+  length 60
+  vowelin  f1=2  f2=2700 -300 -200  f3=-1300 80  
+  vowelout f1=2  f2=1700 -300 -200  f3=-1300 80
+  formants r3/r_trill+r3/r_trill3.wav%99
+  before _ r3/r_trill+r3/r_trill3.wav%99
+  trill  
   lengthmod 6
 endphoneme
 

phsource/ph_romanian

@@ -53,7 +53,7 @@ endphoneme
 phoneme o
   vowel starttype (o) endtype (o)
   length 170
-  formants vowel/o_mid
+  formants vowel/o-_4
 endphoneme
 
 phoneme u

phsource/phonemes

@@ -397,13 +397,14 @@ phoneme R2   // this is [R] from Slovak/Czech
   lengthmod 6
 endphoneme
 
-phoneme R3   // Afrikaans
+phoneme R3  // Afrikaans
   liquid
-  vowelin  f1=2  f2=70 -300 300  f3=-300 80 dnt
-  vowelout f1=2  f2=70 -300 300  f3=-300 80 brk
-  formants r3/r_trill+r3/r_trill3.wav%55
-  before _ r3/r_trill+r3/r_trill3.wav%50
-  trill
+  length 60
+  vowelin  f1=2  f2=2700 -300 -200  f3=-1300 80  
+  vowelout f1=2  f2=1700 -300 -200  f3=-1300 80
+  formants r3/r_trill+r3/r_trill3.wav%99
+  before _ r3/r_trill+r3/r_trill3.wav%99
+  trill  
   lengthmod 6
 endphoneme