diff --git a/phsource/ph_ipa b/phsource/ph_ipa index 9e1494d9..c6e0fb39 100644 --- a/phsource/ph_ipa +++ b/phsource/ph_ipa @@ -15,7 +15,7 @@ // | sib frc | | | | | | | | | | | | | | | | | | | | | | | | | // | frc | | | | | | | | | | | | | | | | | | | | | | | | | // | lat frc | | | | | | | | | | | | | | | | | | | | | | | | | -// | apr | | | | | | | | | | | | | | | | | | | | | | | | | +// | apr | | | | | | | | r\ | | | | | | | | | | | | | | | | | // | lat apr | | | | | | | | | | | | | | | | | | | | | | | | | // | flp | | | | | | | | | | | | | | | | | | | | | | | | | // | lat flp | | | | | | | | | | | | | | | | | | | | | | | | | @@ -178,3 +178,44 @@ phoneme N FMT(nn/nn_) ENDIF endphoneme + +// approximant + +phoneme r\\ + vcd alv apr liquid rhotic + ipa ɹ + lengthmod 7 + + IF nextPh(isNotVowel) THEN + lengthmod 2 + + IF nextPh(n) THEN + FMT(r3/r_n) addWav(r3/rx) + ELIF prevPh(isUStop) THEN + FMT(r/trr) + ELIF prevPh(isNotVowel) THEN + FMT(r/rr) + ENDIF + + FMT(r3/r_) addWav(r3/rx) + ENDIF + + NextVowelStarts + VowelStart(r/r@, -15) + VowelStart(r/ra, -15) + VowelStart(r/re, -15) + VowelStart(r/ri, -15) + VowelStart(r/ro, -15) + VowelStart(r/ru, -15) + EndSwitch + + IF prevPh(isVowel) THEN + VowelEnding(r/xr, -50) + ELIF prevPh(isPause) THEN + FMT(r/_r) + ELIF prevPh(isUStop) THEN + FMT(r/tr) + ENDIF + + FMT(r/r) +endphoneme diff --git a/phsource/phonemes b/phsource/phonemes index 3a9de388..05c87802 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -303,55 +303,11 @@ endphoneme phoneme r // **r**ed (Omitted if not immediately followed by a vowel) - liquid rhotic - ipa ɹ - lengthmod 7 - - IF nextPh(isNotVowel) THEN - ChangePhoneme(r/) - ENDIF - - NextVowelStarts - VowelStart(r/r@, -15) - VowelStart(r/ra, -15) - VowelStart(r/re, -15) - VowelStart(r/ri, -15) - VowelStart(r/ro, -15) - VowelStart(r/ru, -15) - EndSwitch - - IF prevPh(isVowel) THEN - VowelEnding(r/xr, -50) - ENDIF - - IF prevPh(isPause) THEN - FMT(r/_r) - ELIF prevPh(t) OR prevPh(p) OR prevPh(k) THEN - FMT(r/tr) - ENDIF - - FMT(r/r) + import_phoneme ipa/r\\ endphoneme - - phoneme r/ // used for [r] when not preceding a vowel - liquid rhotic - lengthmod 2 - - IF nextPh(n) THEN - FMT(r3/r_n) addWav(r3/rx) - ENDIF - - IF prevPh(t) OR prevPh(p) OR prevPh(k) THEN - FMT(r/trr) - ENDIF - - IF prevPh(isNotVowel) THEN - FMT(r/rr) - ENDIF - - FMT(r3/r_) addWav(r3/rx) + import_phoneme ipa/r\\ endphoneme