ar: improve sound of A (Ain) and H (Hah)

phsource/ph_arabic

@@ -2,34 +2,32 @@ phoneme #r  virtual
 // Used for "r" sounds
 endphoneme
 
-
-phoneme H	// arabic Hah
+phoneme H       // arabic Hah
   vls phr frc
   ipa ħ
-  lengthmod 5 
-  WAV(vwl_ar/hah) 
+  lengthmod 5
+  WAV(vwl_ar/hah,80)
 endphoneme
 
-phoneme Z // arabic ZAH .Todo
+phoneme Z      // arabic ZAH
   vls phr frc
   ipa ðˤ
-  lengthmod 5 
-  voicingswitch z  
+  lengthmod 5
+  voicingswitch z
   ChangePhoneme (D) // FIXME: vwl_ar/zah wav file is wrong, therefore English D is used
 endphoneme
 
-phoneme A	// arabic Ain
+phoneme A       // arabic Ain
   vcd frc
   ipa ʕ
-  voicingswitch a  
-  length 160  
-  Vowelin  f1=2  f2=2300 -400 500  f3=300 80 
-  Vowelout f1=2  f2=2300 -300 450  f3=-100 10  
-  FMT(r/rr) addWav(ufric/x_) // TODO actual voiced part should be adjusted
+  voicingswitch a
+  length 160
+  Vowelin  f1=2  f2=2300 -400 500  f3=300 80
+  Vowelout f1=2  f2=2300 -300 450  f3=-100 10
+  FMT(r/xr,25) addWav(h/h_,30)
 endphoneme
 
-phoneme gH    // arabic ghain, 
-// the phoneme is derived from Q
+phoneme gH      // arabic Ghain, the phoneme is derived from Q
   vcd vel frc
   voicingswitch R2
   ipa ɣ
@@ -38,22 +36,17 @@ phoneme gH    // arabic ghain,
   FMT(g/g) addWav(vwl_ar/dhad)
 endphoneme
 
-
-phoneme dH	//arabic Dhad TODO this probably should be simple d from standard phonemes
+phoneme dH      //arabic Dhad TODO this probably should be simple d from standard phonemes
   vcd alv stp
   ipa dˤ
-
   Vowelin f1=1  f2=1700 -300 300  f3=-100 80
   Vowelout f1=2 f2=1700 -300 300  f3=-100 80 brk
-
   IF PreVoicing THEN
     FMT(d/xd)
   ENDIF
-
   IF nextPh(isPause2) THEN
     FMT(d/d_)  addWav(x/d_)
   ENDIF
-
   FMT(d/d) addWav(x/d)
 endphoneme
 
@@ -69,50 +62,47 @@ phoneme X
   vls uvl frc
   voicingswitch Q
   lengthmod 7
-   Vowelin f1=0  f2=2300 200 400  f3=-100 80
+  Vowelin f1=0  f2=2300 200 400  f3=-100 80
   Vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
-    WAV(ufric/xx, 70)
-
+  WAV(ufric/xx, 70)
 endphoneme
 
 // vowels
 phoneme a
   vwl starttype #a endtype #a
-  IF nextPhW(isPause) THEN 
-	length 80
-  ELSE  
-	length 140
+  IF nextPhW(isPause) THEN
+    length 80
+  ELSE
+    length 140
   ENDIF
   IF nextPhW(a) THEN
-  length 200
+    length 200
   ENDIF
-  FMT(vowel/a)
+  FMT(vowel/a_2)
 endphoneme
 
-
 phoneme i
   vwl starttype #i endtype #i
- IF nextPhW(isPause) THEN 
-	length 80
-  ELSE  
-	length 140
+  IF nextPhW(isPause) THEN
+    length 80
+  ELSE
+    length 140
   ENDIF
-    IF nextPhW(i) THEN
-  length 200
+  IF nextPhW(i) THEN
+    length 200
   ENDIF
   FMT(vowel/i)
 endphoneme
 
-
 phoneme u
   vwl starttype #u endtype #u
-  IF nextPhW(isPause) THEN 
-	length 80
-  ELSE  
-	length 140
+  IF nextPhW(isPause) THEN
+    length 80
+  ELSE
+    length 140
   ENDIF
-    IF nextPhW(u) THEN
-  length 200
+  IF nextPhW(u) THEN
+    length 200
   ENDIF
   FMT(vowel/u)
 endphoneme

tests/language-phonemes.test

@@ -36,7 +36,7 @@ test_lang() {
 test_lang af c71ab424d045d9fa82d2a23b9be4542aee3ed15e "ma na Na pa ta ka tSa ba da ga dZa fa sa x2a Sa va za Za ca la ja ra r/a _:_ m@ ma mE mI mO mW mu m& m&: m@L mA: me@ mi mo@ my miu m@U maI mAI meI mOI moI muI mYy mY@ maU me: mO: m3: mA~ me~ mo~"
 test_lang am 4fcdb9bb68b72c06e4cadf91b2c1e244ea14ac21 "ma na Na pa ta ka ?a ba da ga p\`a t\`a k\`a tSa dZa tS\`a Ba sa za Sa Za xa ha la ja wa ra _:_ mi me my ma m@ mo mu"
 test_lang an 33304ad847d920652c74e1c51d12bbe6de9a182d "ma na Na pa ta tSa ka ba da ga fa Ta sa Sa ja wa la l^a ra Ra _:_ ma ma/ me me/ mi mo mo/ mu"
-test_lang ar 0f289933c1898c03151c3b2546116399a642f4c7 "ma na pa ta ka qa ?a ba da dHa fa va Ta Da s[a sa za Sa Za xa Xa gHa Ha Aa dZa ra la l/2a ja wa _:_ ma mi mu ma: mi: mu: maw maj"
+test_lang ar 6664f2d3541bf72e41d819785625cc2c88223172 "ma na pa ta ka qa ?a ba da dHa fa va Ta Da s[a sa za Sa Za xa Xa gHa Ha Aa dZa ra la l/2a ja wa _:_ ma mi mu ma: mi: mu: maw maj"
 test_lang as 05d4cca91fc3447ae8b6acd7892790dd364e8e23 "ma na Na pa ta ka p#a t#a k#a ba da ga b#a d#a g#a sa xa Xa ha tSa tS#a za wa ra ja la _:_ ma mi mu me m& mo mO mV ma~ mi~ mu~ me~ m&~ mo~ mO~ moj mo~j mow mo~w mew maV m@"
 test_lang az 7bdb78c37433a47fb3b15808071b1a916202400c "ma na pa ba ta da tSa dZa tsa dza ca Ja Ca ka ga fa va sa za Sa Za xa Qa ha la ja wa Ra *a _:_ mi me m& my mW mu mo ma m@"
 test_lang bg 3020acb23ac0f93d5479de3b305b71fc07b5e738 "ma na n^a Na m;a pa ba ta da ka ga p;a b;a t;a d;a ca Ja tsa dza tSa dZa ts;a dz;a fa va sa za Sa Za xa Qa f;a v;a s;a z;a x;a Ra R;a wa ja l/2a la l^a _:_ mi me m@ ma mo mu"