| @@ -157,7 +157,6 @@ must be present. | |||
| | Property | Type | Description | | |||
| |--------------|------|-------------| | |||
| | `palatal` | (C) | A palatal or palatalized consonant. | | |||
| | `rhotic` | (C) | An `r` type consonant. | | |||
| | `unstressed` | (V) | This vowel is always unstressed, unless explicitly marked otherwise. | | |||
| | `nolink` | | Prevent any linking from the previous phoneme. | | |||
| @@ -323,7 +323,7 @@ endphoneme | |||
| phoneme c // used in -tjie | |||
| vls pal stp palatal | |||
| vls pal stp pzd | |||
| voicingswitch g | |||
| lengthmod 2 | |||
| Vowelin f1=0 f2=2700 400 600 f3= 200 80 | |||
| @@ -94,7 +94,7 @@ endphoneme | |||
| phoneme g; | |||
| vcd vel stp | |||
| palatal | |||
| pzd | |||
| voicingswitch k | |||
| lengthmod 5 | |||
| Vowelin f1=1 f2=2300 300 300 f3=300 80 | |||
| @@ -442,7 +442,7 @@ phoneme ɲh | |||
| endphoneme | |||
| phoneme ɲ | |||
| //vcd pal nasal palatal | |||
| //vcd pal nasal pzd | |||
| import_phoneme base/n^ | |||
| endphoneme | |||
| @@ -543,7 +543,7 @@ phoneme z | |||
| import_phoneme base/z | |||
| endphoneme | |||
| phoneme sh //aspirated not palatal | |||
| phoneme sh //aspirated not pzd | |||
| vls alv frc sib | |||
| endphoneme | |||
| @@ -368,7 +368,7 @@ endphoneme | |||
| // Palatalized versions of consonants | |||
| phoneme s^ | |||
| vls alv frc sib palatal | |||
| vls alv frc sib pzd | |||
| voicingswitch z | |||
| lengthmod 3 | |||
| Vowelin f1=0 f2=1700 -300 300 f3=-100 80 | |||
| @@ -378,7 +378,7 @@ phoneme s^ | |||
| endphoneme | |||
| phoneme t^ | |||
| vls pal stp palatal | |||
| vls pal stp pzd | |||
| lengthmod 5 | |||
| voicingswitch d^ | |||
| Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 | |||
| @@ -390,7 +390,7 @@ phoneme t^ | |||
| endphoneme | |||
| phoneme d^ | |||
| vcd alv stp palatal | |||
| vcd alv stp pzd | |||
| lengthmod 5 | |||
| voicingswitch t^ | |||
| Vowelin f1=2 f2=2700 400 600 f3=200 80 rate len=80 | |||
| @@ -352,7 +352,7 @@ endphoneme | |||
| phoneme i | |||
| vwl starttype #i endtype #i | |||
| palatal | |||
| pzd | |||
| IF prevPhW(r/2) OR prevPhW(l/2) THEN | |||
| IF nextPhW(isVowel) THEN | |||
| @@ -249,7 +249,7 @@ endphoneme | |||
| phoneme n^# | |||
| vcd pal nas palatal | |||
| vcd pal nas pzd | |||
| lengthmod 6 | |||
| ipa ɲ# | |||
| Vowelout f1=3 f2=2300 300 400 f3=100 80 brk rate | |||
| @@ -221,7 +221,7 @@ endphoneme | |||
| phoneme ; // linking j, used between (i) vowels and a following vowel | |||
| // also to palatalize consonants | |||
| liquid palatal | |||
| liquid pzd | |||
| lengthmod 0 | |||
| IF prevPh(#i) THEN | |||
| @@ -24,7 +24,7 @@ phoneme : | |||
| endphoneme | |||
| phoneme _j | |||
| liquid palatal starttype #i | |||
| liquid pzd starttype #i | |||
| ipa ʲ | |||
| lengthmod 2 | |||
| @@ -226,7 +226,7 @@ phoneme k | |||
| endphoneme | |||
| phoneme c | |||
| vls pal stp palatal | |||
| vls pal stp pzd | |||
| voicingswitch J | |||
| WAV(ustop/c, 80) | |||
| endphoneme | |||
| @@ -248,7 +248,7 @@ endphoneme | |||
| phoneme t; | |||
| vls pal stp palatal | |||
| vls pal stp pzd | |||
| lengthmod 2 | |||
| voicingswitch d; | |||
| Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 | |||
| @@ -282,7 +282,7 @@ endphoneme | |||
| phoneme d; | |||
| vcd alv stp palatal | |||
| vcd alv stp pzd | |||
| lengthmod 5 | |||
| voicingswitch t; | |||
| Vowelin f1=2 f2=2700 400 600 f3=200 80 rate len=80 | |||
| @@ -303,7 +303,7 @@ endphoneme | |||
| phoneme n; | |||
| liquid palatal | |||
| liquid pzd | |||
| NextVowelStarts | |||
| VowelStart(n^/n^@) | |||
| VowelStart(n^/n^a) | |||
| @@ -327,7 +327,7 @@ endphoneme | |||
| phoneme l; | |||
| liquid rfx palatal | |||
| liquid rfx pzd | |||
| ipa ɭ | |||
| // lengthmod 7 | |||
| length 80 | |||
| @@ -229,7 +229,7 @@ endphoneme | |||
| phoneme J# | |||
| vls pal afr sib palatal prevoice | |||
| vls pal afr sib pzd prevoice | |||
| voicingswitch c# | |||
| lengthmod 2 | |||
| Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 | |||
| @@ -108,7 +108,7 @@ endphoneme | |||
| phoneme t; | |||
| vls pal stp palatal | |||
| vls pal stp pzd | |||
| lengthmod 2 | |||
| voicingswitch d; | |||
| Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 | |||
| @@ -142,7 +142,7 @@ endphoneme | |||
| phoneme d; | |||
| vcd alv stp palatal | |||
| vcd alv stp pzd | |||
| lengthmod 5 | |||
| voicingswitch t; | |||
| Vowelin f1=2 f2=2700 400 600 f3=200 80 rate len=80 | |||
| @@ -52,7 +52,7 @@ phoneme l | |||
| endphoneme | |||
| phoneme l^ | |||
| liquid rfx palatal | |||
| liquid rfx pzd | |||
| ipa ɭ | |||
| // lengthmod 7 | |||
| length 80 | |||
| @@ -102,7 +102,7 @@ endphoneme | |||
| phoneme n# | |||
| vcd pal nas palatal | |||
| vcd pal nas pzd | |||
| ipa ɲ | |||
| Vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate | |||
| lengthmod 4 | |||
| @@ -123,7 +123,7 @@ endphoneme | |||
| phoneme n^ | |||
| vcd pal nas palatal | |||
| vcd pal nas pzd | |||
| ipa ɲ | |||
| Vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate | |||
| lengthmod 4 | |||
| @@ -213,7 +213,7 @@ endphoneme | |||
| phoneme J | |||
| vcd pal afr sib palatal | |||
| vcd pal afr sib pzd | |||
| voicingswitch c | |||
| lengthmod 5 | |||
| Vowelin f1=2 f2=2700 400 600 f3=300 80 rate len=70 | |||
| @@ -411,7 +411,7 @@ WAV(vietnam/dd) | |||
| endphoneme | |||
| phoneme c | |||
| vls pal stp palatal | |||
| vls pal stp pzd | |||
| //voicingswitch J | |||
| lengthmod 2 | |||
| length 2 | |||
| @@ -666,7 +666,7 @@ endphoneme | |||
| phoneme ; // linking j, used between (i) vowels and a following vowel | |||
| // also to palatalize consonants | |||
| liquid palatal | |||
| liquid pzd | |||
| lengthmod 0 | |||
| IF prevPh(#i) THEN | |||
| @@ -794,7 +794,7 @@ endphoneme | |||
| phoneme n^ // Spanish **ñ** | |||
| vcd pal nas palatal | |||
| vcd pal nas pzd | |||
| ipa ɲ | |||
| Vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate | |||
| lengthmod 4 | |||
| @@ -1054,7 +1054,7 @@ endphoneme | |||
| phoneme J | |||
| vcd pal afr sib palatal | |||
| vcd pal afr sib pzd | |||
| voicingswitch c | |||
| lengthmod 5 | |||
| Vowelin f1=2 f2=2700 400 600 f3=300 80 rate len=70 | |||
| @@ -1271,7 +1271,7 @@ endphoneme | |||
| phoneme J^ // palatal fricative (Kirshenbaum C<vcd>) | |||
| vcd pal frc palatal | |||
| vcd pal frc pzd | |||
| ipa ʝ | |||
| voicingswitch C | |||
| lengthmod 6 | |||
| @@ -1417,7 +1417,7 @@ endphoneme | |||
| phoneme c | |||
| vls pal stp palatal | |||
| vls pal stp pzd | |||
| voicingswitch J | |||
| lengthmod 2 | |||
| Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 | |||
| @@ -1549,7 +1549,7 @@ endphoneme | |||
| phoneme s; | |||
| vls pal frc sib palatal | |||
| vls pal frc sib pzd | |||
| ipa ʂ | |||
| voicingswitch z; | |||
| lengthmod 3 | |||
| @@ -280,7 +280,6 @@ static keywtab_t keywords[] = { | |||
| // flags | |||
| { "unstressed", tPHONEME_FLAG, phUNSTRESSED }, | |||
| { "nolink", tPHONEME_FLAG, phNOLINK }, | |||
| { "palatal", tPHONEME_FLAG, phPALATAL }, // TODO (deprecated): use 'pzd' instead | |||
| { "long", tPHONEME_FLAG, phLONG }, // TODO (deprecated): use 'lng' instead | |||
| { "brkafter", tPHONEME_FLAG, phBRKAFTER }, | |||
| { "rhotic", tPHONEME_FLAG, phRHOTIC }, // TODO (deprecated): use 'rzd' instead | |||