From e585de6c525a783d431dcd753681c94011853aa9 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 28 Jan 2017 19:28:50 +0000 Subject: [PATCH] Replace 'palatal' with 'pzd'. --- docs/phontab.md | 1 - phsource/ph_afrikaans | 2 +- phsource/ph_bulgarian | 2 +- phsource/ph_burmese | 4 ++-- phsource/ph_estonian | 6 +++--- phsource/ph_french | 2 +- phsource/ph_icelandic | 2 +- phsource/ph_irish | 2 +- phsource/ph_japanese | 2 +- phsource/ph_latvian | 2 +- phsource/ph_lithuanian | 8 ++++---- phsource/ph_malayalam | 2 +- phsource/ph_polish | 4 ++-- phsource/ph_russian | 4 ++-- phsource/ph_swahili | 4 ++-- phsource/ph_vietnam | 2 +- phsource/phonemes | 12 ++++++------ src/libespeak-ng/compiledata.c | 1 - 18 files changed, 30 insertions(+), 32 deletions(-) diff --git a/docs/phontab.md b/docs/phontab.md index 4127ef30..bfcd1fb1 100644 --- a/docs/phontab.md +++ b/docs/phontab.md @@ -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. | diff --git a/phsource/ph_afrikaans b/phsource/ph_afrikaans index 457dcdd0..d543eead 100644 --- a/phsource/ph_afrikaans +++ b/phsource/ph_afrikaans @@ -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 diff --git a/phsource/ph_bulgarian b/phsource/ph_bulgarian index 3898437b..47d6229e 100644 --- a/phsource/ph_bulgarian +++ b/phsource/ph_bulgarian @@ -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 diff --git a/phsource/ph_burmese b/phsource/ph_burmese index b3310238..4912fd10 100644 --- a/phsource/ph_burmese +++ b/phsource/ph_burmese @@ -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 diff --git a/phsource/ph_estonian b/phsource/ph_estonian index 13ba15b7..111b25af 100644 --- a/phsource/ph_estonian +++ b/phsource/ph_estonian @@ -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 diff --git a/phsource/ph_french b/phsource/ph_french index 7c2cd188..568df6a4 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -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 diff --git a/phsource/ph_icelandic b/phsource/ph_icelandic index a1870588..ca0479cb 100644 --- a/phsource/ph_icelandic +++ b/phsource/ph_icelandic @@ -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 diff --git a/phsource/ph_irish b/phsource/ph_irish index cf027d0c..8654a705 100644 --- a/phsource/ph_irish +++ b/phsource/ph_irish @@ -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 diff --git a/phsource/ph_japanese b/phsource/ph_japanese index 88d6372a..184a6ca2 100644 --- a/phsource/ph_japanese +++ b/phsource/ph_japanese @@ -24,7 +24,7 @@ phoneme : endphoneme phoneme _j - liquid palatal starttype #i + liquid pzd starttype #i ipa ʲ lengthmod 2 diff --git a/phsource/ph_latvian b/phsource/ph_latvian index 83203ac8..f570d143 100644 --- a/phsource/ph_latvian +++ b/phsource/ph_latvian @@ -226,7 +226,7 @@ phoneme k endphoneme phoneme c - vls pal stp palatal + vls pal stp pzd voicingswitch J WAV(ustop/c, 80) endphoneme diff --git a/phsource/ph_lithuanian b/phsource/ph_lithuanian index 88586c8c..9d6514a4 100644 --- a/phsource/ph_lithuanian +++ b/phsource/ph_lithuanian @@ -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 diff --git a/phsource/ph_malayalam b/phsource/ph_malayalam index b3021640..d263addc 100644 --- a/phsource/ph_malayalam +++ b/phsource/ph_malayalam @@ -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 diff --git a/phsource/ph_polish b/phsource/ph_polish index a4315a40..a63c5384 100644 --- a/phsource/ph_polish +++ b/phsource/ph_polish @@ -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 diff --git a/phsource/ph_russian b/phsource/ph_russian index bfcbc79b..47f78f69 100644 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -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 diff --git a/phsource/ph_swahili b/phsource/ph_swahili index c480db50..239c9ffe 100644 --- a/phsource/ph_swahili +++ b/phsource/ph_swahili @@ -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 diff --git a/phsource/ph_vietnam b/phsource/ph_vietnam index c91c4312..f0d2552a 100644 --- a/phsource/ph_vietnam +++ b/phsource/ph_vietnam @@ -411,7 +411,7 @@ WAV(vietnam/dd) endphoneme phoneme c - vls pal stp palatal + vls pal stp pzd //voicingswitch J lengthmod 2 length 2 diff --git a/phsource/phonemes b/phsource/phonemes index 1cf9418a..d253e288 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -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 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 diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c index 573450db..af6100b1 100644 --- a/src/libespeak-ng/compiledata.c +++ b/src/libespeak-ng/compiledata.c @@ -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