From 5c6a4c88043a1403970ac94f3708d0d40471cd74 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Tue, 15 May 2018 07:22:29 +0100 Subject: [PATCH] ru: format the ph_russian file and remove commented out lines --- phsource/ph_russian | 283 ++++++++++++++++++-------------------------- 1 file changed, 114 insertions(+), 169 deletions(-) diff --git a/phsource/ph_russian b/phsource/ph_russian index b9816fc3..5bb2f58f 100644 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -1,5 +1,3 @@ - - phoneme g vcd vel stp prevoice voicingswitch k @@ -23,15 +21,11 @@ phoneme p endphoneme - phoneme x vls vel frc lengthmod 3 Vowelin f1=0 f2=2300 200 400 f3=-100 80 Vowelout f1=0 f2=2300 300 400 f3=-100 80 rms=20 -// IF nextPh(isPause) THEN -// WAV(ufric/x, 120) -// ENDIF WAV(ufric/x_hr, 30) endphoneme @@ -41,9 +35,7 @@ phoneme k endphoneme - phoneme l - liquid rfx ipa ɭ lengthmod 7 @@ -51,56 +43,34 @@ phoneme l FMT(l^/l_rfx) endphoneme + phoneme l^ liquid rfx pzd ipa ɭ -// lengthmod 7 length 80 -// FMT(l^/l^) FMT(l^/l_rfx) endphoneme + phoneme s vls alv frc sib -// voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 -// IF nextPh(isPause) THEN -// WAV(ufric/s_) -// ELIF nextPh(p) OR nextPh(t) OR nextPh(k) THEN -// WAV(ufric/s!) -// ENDIF WAV(ufric/s) endphoneme phoneme s; import_phoneme en/s -//CALL en/s endphoneme - -//phoneme n -// vcd pal nas -// FMT(n/nru) -// -// import_phoneme en/n -// length 200 -//endphoneme - phoneme n_ -// vcd pal nas -// FMT(n/nru) - import_phoneme en/n -// length 200 endphoneme - - phoneme n# vcd pal nas pzd ipa ɲ @@ -108,28 +78,28 @@ phoneme n# lengthmod 4 IF KlattSynth THEN - VowelStart(klatt/n^@) - FMT(klatt/n^) + VowelStart(klatt/n^@) + FMT(klatt/n^) ENDIF NextVowelStarts - VowelStart(n^/n^@) - VowelStart(n^/n^a) - VowelStart(n^/n^e) - VowelStart(n^/n^i) - VowelStart(n^/n^o) - VowelStart(n^/n^u) + VowelStart(n^/n^@) + VowelStart(n^/n^a) + VowelStart(n^/n^e) + VowelStart(n^/n^i) + VowelStart(n^/n^o) + VowelStart(n^/n^u) EndSwitch IF prevPh(isPause) THEN - FMT(n^/_n^) + FMT(n^/_n^) ELIF nextPh(isNotVowel) THEN - IF nextPhW(n^) THEN - length 75 - ELIF prevPhW(n^) THEN - length 100 - ENDIF - FMT(n^/n^_) + IF nextPhW(n^) THEN + length 75 + ELIF prevPhW(n^) THEN + length 100 + ENDIF + FMT(n^/n^_) ENDIF endphoneme @@ -145,7 +115,6 @@ phoneme r endphoneme - phoneme ts import_phoneme consonants/ts endphoneme @@ -158,11 +127,11 @@ phoneme dZ; Vowelin f1=2 f2=2700 400 600 f3=300 80 rate len=70 IF PreVoicing THEN - FMT(dzh/xdzh) + FMT(dzh/xdzh) ENDIF IF nextPh(isPause2) THEN - FMT(dzh/dzh_) addWav(x/dzh_) + FMT(dzh/dzh_) addWav(x/dzh_) ENDIF endphoneme @@ -177,28 +146,28 @@ phoneme tS; endphoneme - // Palatalized versions of consonants + phoneme t import_phoneme pl/t endphoneme + phoneme t; import_phoneme pl/t; endphoneme + phoneme d import_phoneme pl/d endphoneme + phoneme d; import_phoneme pl/d; endphoneme -//phoneme m; -// import_phoneme ro/m; -//endphoneme phoneme m; vcd blb nas @@ -206,57 +175,41 @@ phoneme m; lengthmod 4 IF KlattSynth THEN - Vowelin f1=0 f2=1000 -50 -200 f3=-200 80 - IF nextPh(isPause2) THEN - FMT(klatt/m_) - ENDIF - FMT(klatt/m) + Vowelin f1=0 f2=1000 -50 -200 f3=-200 80 + IF nextPh(isPause2) THEN + FMT(klatt/m_) + ENDIF + FMT(klatt/m) ENDIF - VowelStart(m/mi) + VowelStart(m/mi) -// NextVowelStarts -// VowelStart(m/m@) -// VowelStart(m/ma) -// VowelStart(m/me) -// VowelStart(m/mi) -// VowelStart(m/mo) -// VowelStart(m/mu) -// EndSwitch - -// IF prevPh(isNotVowel) AND nextPhW(isLiquid) THEN - FMT(m/mj) -// ELIF prevPh(isPause) THEN -// FMT(m/_m) -// ELIF nextPh(isNotVowel) THEN -// FMT(m/m_) -// ENDIF + FMT(m/mj) endphoneme - -phoneme I^ // "silent i", palatilizes the preceding consonant +phoneme I^ // "silent i", palatilizes the preceding consonant vwl starttype #i endtype #i unstressed nsy length 70 IF nextPh(isVowel) THEN - ChangePhoneme(;) + ChangePhoneme(;) ENDIF IF prevPh(m;) THEN - FMT(vwl_ro/mi) + FMT(vwl_ro/mi) ENDIF FMT(vwl_ru/ii-) endphoneme - //******************************************************************* // VOWELS //******************************************************************* + phoneme i IF prevPh(Z) THEN - ChangePhoneme(y) + ChangePhoneme(y) ENDIF vwl starttype #i endtype #i length 50 @@ -268,10 +221,10 @@ phoneme I# vwl starttype #i endtype #i length 80 IF nextVowel(isMaxStress) THEN - ChangePhoneme(I) + ChangePhoneme(I) ENDIF IF thisPh(isMaxStress) THEN - ChangePhoneme(i) + ChangePhoneme(i) ENDIF FMT(vwl_ru/ii#) endphoneme @@ -289,11 +242,11 @@ phoneme I length 80 IF thisPh(isMaxStress) THEN - IF prevPhW(j) THEN - ChangePhoneme(a) - ELSE - ChangePhoneme(i) - ENDIF + IF prevPhW(j) THEN + ChangePhoneme(a) + ELSE + ChangePhoneme(i) + ENDIF ENDIF FMT(vwl_ru/ii) endphoneme @@ -303,10 +256,10 @@ phoneme I2 vwl starttype #i endtype #i length 80 IF thisPh(isMaxStress) THEN - ChangePhoneme(e) + ChangePhoneme(e) ENDIF IF prevPhW(isPalatal) THEN - ChangePhoneme(I) + ChangePhoneme(I) ENDIF FMT(vwl_ru/ii) endphoneme @@ -316,14 +269,14 @@ phoneme I3 vwl starttype #i endtype #i length 80 IF thisPh(isMaxStress) THEN - IF prevPhW(j) THEN - ChangePhoneme(e) - ELSE - ChangePhoneme(ja) - ENDIF + IF prevPhW(j) THEN + ChangePhoneme(e) + ELSE + ChangePhoneme(ja) + ENDIF ENDIF IF prevPhW(isPalatal) THEN - ChangePhoneme(I) + ChangePhoneme(I) ENDIF FMT(vwl_ru/ii) endphoneme @@ -340,11 +293,11 @@ phoneme E# vwl starttype #e endtype #e length 100 IF thisPh(isMaxStress) THEN - IF prevPhW(j) THEN - ChangePhoneme(e) - ELSE - ChangePhoneme(E) - ENDIF + IF prevPhW(j) THEN + ChangePhoneme(e) + ELSE + ChangePhoneme(E) + ENDIF ENDIF FMT(vwl_ru/E#) endphoneme @@ -354,19 +307,19 @@ phoneme E2 vwl starttype #e endtype #e length 80 IF nextVowel(isMaxStress) THEN - IF prevPh(j) THEN - ChangePhoneme(I3) - ELSE - ChangePhoneme(E#) - ENDIF + IF prevPh(j) THEN + ChangePhoneme(I3) + ELSE + ChangePhoneme(E#) + ENDIF ENDIF IF thisPh(isMaxStress) THEN - IF prevPhW(j) THEN - ChangePhoneme(e) - ELSE - ChangePhoneme(E) - ENDIF + IF prevPhW(j) THEN + ChangePhoneme(e) + ELSE + ChangePhoneme(E) + ENDIF ENDIF FMT(vwl_ru/E@) @@ -377,21 +330,19 @@ phoneme E3 vwl starttype #e endtype #e length 80 IF nextVowel(isMaxStress) THEN - ChangePhoneme(I) + ChangePhoneme(I) ENDIF IF thisPh(isMaxStress) THEN - ChangePhoneme(e) + ChangePhoneme(e) ENDIF IF prevPhW(isPalatal) THEN - ChangePhoneme(E2) + ChangePhoneme(E2) ENDIF FMT(vwl_ru/E@) endphoneme phoneme E% // е in prefix "интер" vwl - // starttype #e endtype #e - //ChangeIfNotStressed(y) ChangePhoneme(E#) endphoneme @@ -408,10 +359,10 @@ phoneme O vwl starttype #o endtype #o length 80 IF prevPhW(isPalatal) THEN - ChangePhoneme(8) + ChangePhoneme(8) ENDIF IF thisPh(isMaxStress) THEN - ChangePhoneme(o) + ChangePhoneme(o) ENDIF FMT(vwl_ru/oo) endphoneme @@ -423,18 +374,21 @@ phoneme u FMT(vwl_ru/u) endphoneme + phoneme u# vwl starttype #u endtype #u length 80 FMT(vwl_ru/u#) endphoneme + phoneme u" vwl starttype #u endtype #u length 150 FMT(vwl_ru/u#u) endphoneme + phoneme 8 vwl starttype #o endtype #o length 100 @@ -442,78 +396,72 @@ phoneme 8 FMT(vwl_ru/8) endphoneme + phoneme e vwl starttype #e endtype #e length 100 IF prevPh(Z) THEN - ChangeIfNotStressed(y) - ChangePhoneme(E) + ChangeIfNotStressed(y) + ChangePhoneme(E) ENDIF IF prevPh(S) THEN - ChangeIfNotStressed(y) - ChangePhoneme(E) + ChangeIfNotStressed(y) + ChangePhoneme(E) ENDIF IF prevPh(ts) THEN - ChangeIfNotStressed(y) - ChangePhoneme(E) + ChangeIfNotStressed(y) + ChangePhoneme(E) ENDIF ChangeIfNotStressed(i) FMT(vwl_ru/ee) endphoneme + phoneme ju vwl starttype #u endtype #u length 190 FMT(vwl_ru/ju) endphoneme + phoneme ja vwl starttype #i endtype #a IF thisPh(isMaxStress) THEN - length 200 - FMT(vwl_ru/ja) + length 200 + FMT(vwl_ru/ja) ELSE - FMT(vdiph2/ii@) + FMT(vdiph2/ii@) ENDIF endphoneme + phoneme ja# vwl starttype #i endtype #a IF thisPh(isMaxStress) THEN - FMT(vowel/&) - // ChangePhoneme(A) + FMT(vowel/&) ELSE - IF prevPhW(isPalatal) THEN - ChangePhoneme(I) - ENDIF + IF prevPhW(isPalatal) THEN + ChangePhoneme(I) + ENDIF ENDIF - -// length 200 -// FMT(vwl_ru/ja) endphoneme - - phoneme V# vwl starttype #a endtype #@ unstressed length 80 -// IF nextVowel(isMaxStress) THEN - // not needed? because V# is only used at end-of-word -// ChangePhoneme(I3) -// ENDIF IF thisPh(isMaxStress) THEN - IF prevPhW(j) THEN - ChangePhoneme(A) - ELSE - ChangePhoneme(ja) - ENDIF + IF prevPhW(j) THEN + ChangePhoneme(A) + ELSE + ChangePhoneme(ja) + ENDIF ENDIF IF prevPhW(isPalatal) THEN - ChangePhoneme(V) + ChangePhoneme(V) ENDIF FMT(vowel/V_2) @@ -541,21 +489,21 @@ phoneme a IF prevPhW(j) THEN ELSE - IF thisPh(isMaxStress) THEN - IF prevPhW(isPalatal) THEN - ChangePhoneme(ja) - ELSE - ChangePhoneme(A) - ENDIF - ELSE - IF prevPhW(isPalatal) THEN - ChangePhoneme(I) - ENDIF - ENDIF + IF thisPh(isMaxStress) THEN + IF prevPhW(isPalatal) THEN + ChangePhoneme(ja) + ELSE + ChangePhoneme(A) + ENDIF + ELSE + IF prevPhW(isPalatal) THEN + ChangePhoneme(I) + ENDIF + ENDIF ENDIF IF thisPh(isWordEnd) THEN - FMT(vowel/a#_3) + FMT(vowel/a#_3) ENDIF FMT(vwl_ru/aa) endphoneme @@ -567,17 +515,15 @@ phoneme V unstressed IF nextVowel(isMaxStress) THEN - ChangePhoneme(a) + ChangePhoneme(a) ENDIF IF thisPh(isMaxStress) THEN - IF prevPhW(j) THEN - ChangePhoneme(a) -// ELIF prevPhW(isPalatal) THEN -// ChangePhoneme(ja) - ELSE - ChangePhoneme(A) - ENDIF + IF prevPhW(j) THEN + ChangePhoneme(a) + ELSE + ChangePhoneme(A) + ENDIF ENDIF FMT(vowel/V_2) @@ -599,4 +545,3 @@ phoneme R4 FMT(r3/r_ru2) addWav(r3/r_ru, 50) endphoneme -