diff --git a/phsource/ph_afrikaans b/phsource/ph_afrikaans index d1f64eac..457dcdd0 100644 --- a/phsource/ph_afrikaans +++ b/phsource/ph_afrikaans @@ -284,8 +284,7 @@ endphoneme phoneme r - liquid rhotic - trill + liquid rhotic trl lengthmod 6 Vowelin f1=2 f2=2700 -300 -200 f3=-1300 80 Vowelout f1=2 f2=1700 -300 -200 f3=-1300 80 diff --git a/phsource/ph_english_sc b/phsource/ph_english_sc index 25e6168b..893b5aef 100644 --- a/phsource/ph_english_sc +++ b/phsource/ph_english_sc @@ -398,9 +398,8 @@ phoneme r/ // used for [r] when not preceding a vowel endphoneme phoneme r - liquid rhotic + liquid rhotic trl lengthmod 7 - trill IF nextPh(isNotVowel) THEN ChangePhoneme(r/) ENDIF diff --git a/phsource/ph_finnish b/phsource/ph_finnish index 0f953ad6..9940ddda 100644 --- a/phsource/ph_finnish +++ b/phsource/ph_finnish @@ -243,8 +243,7 @@ endphoneme phoneme R2 // this is [R2], but shorter - liquid - trill + liquid trl lengthmod 6 ipa r Vowelin f1=0 f2=1700 -300 300 f3=-300 80 diff --git a/phsource/ph_french_ca b/phsource/ph_french_ca index 9f7b50d9..0e4c9501 100644 --- a/phsource/ph_french_ca +++ b/phsource/ph_french_ca @@ -77,7 +77,7 @@ endphoneme // uses the consonants in file "phonemes", unless overridden here phoneme R - liquid trill + liquid trl lengthmod 7 Vowelin f1=0 f2=1500 -400 400 f3=-400 80 IF nextPh(isNotVowel) THEN diff --git a/phsource/ph_kyrgyz b/phsource/ph_kyrgyz index cd086700..fe9ae50f 100644 --- a/phsource/ph_kyrgyz +++ b/phsource/ph_kyrgyz @@ -156,9 +156,8 @@ endphoneme // ========== // phoneme r + liquid trl ipa r - liquid - trill lengthmod 6 Vowelin f1=0 f2=1600 -300 300 f3=-200 80 Vowelout f1=2 f2=1600 -300 300 f3=-200 80 brk diff --git a/phsource/ph_latvian b/phsource/ph_latvian index 437725c9..83203ac8 100644 --- a/phsource/ph_latvian +++ b/phsource/ph_latvian @@ -167,8 +167,7 @@ phoneme n- endphoneme phoneme R // Latvian hard r - liquid - trill + liquid trl lengthmod 6 Vowelin f1=0 f2=1700 -300 300 f3=-300 80 Vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk @@ -176,8 +175,7 @@ FMT(r3/r_trill) addWav(r3/r_trill.wav, 60) endphoneme phoneme r // Latvian soft r - liquid - trill + liquid trl lengthmod 6 Vowelin f1=0 f2=1700 -300 300 f3=-300 80 Vowelout f1=2 f2=1700 -300 300 f3=-300 80 brk diff --git a/phsource/ph_lithuanian b/phsource/ph_lithuanian index ee910b26..88586c8c 100644 --- a/phsource/ph_lithuanian +++ b/phsource/ph_lithuanian @@ -215,8 +215,7 @@ endphoneme phoneme r - liquid rhotic nolink - alv trill + alv liquid trl rhotic nolink length 80 IF prevPhW(isVowel) THEN ELSE diff --git a/phsource/ph_polish b/phsource/ph_polish index 26e5232e..a4315a40 100644 --- a/phsource/ph_polish +++ b/phsource/ph_polish @@ -85,8 +85,7 @@ endphoneme //=========== phoneme R - liquid - trill + liquid trl ipa r lengthmod 6 Vowelin f1=0 f2=1700 -300 300 f3=-300 80 diff --git a/phsource/ph_portugal b/phsource/ph_portugal index 8c43e558..8dba3d8a 100644 --- a/phsource/ph_portugal +++ b/phsource/ph_portugal @@ -134,8 +134,7 @@ endphoneme phoneme x // [r] for Portugal - liquid - trill + liquid trl ipa ʁ lengthmod 7 Vowelin f1=0 f2=1500 -400 400 f3=-400 80 diff --git a/phsource/ph_romanian b/phsource/ph_romanian index be2076a2..f6ca9786 100644 --- a/phsource/ph_romanian +++ b/phsource/ph_romanian @@ -149,8 +149,7 @@ endphoneme // Consonants phoneme r - liquid - trill + liquid trl lengthmod 7 IF nextPh(isNotVowel) THEN ChangePhoneme(r/) diff --git a/phsource/ph_russian b/phsource/ph_russian index 5ed02a69..6312ed00 100644 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -135,8 +135,7 @@ endphoneme phoneme r - liquid rhotic nolink - alv trill + liquid rhotic alv trl nolink length 80 IF prevPhW(isVowel) THEN ELSE diff --git a/phsource/ph_serbian b/phsource/ph_serbian index d768596f..8a8e0d5e 100644 --- a/phsource/ph_serbian +++ b/phsource/ph_serbian @@ -20,8 +20,7 @@ endphoneme phoneme r* // this is [R] from Slovak/Czech - liquid - trill + liquid trl ipa r lengthmod 6 Vowelin f1=0 f2=1700 -300 300 f3=-300 80 diff --git a/phsource/ph_setswana b/phsource/ph_setswana index 43556220..76ccbc14 100644 --- a/phsource/ph_setswana +++ b/phsource/ph_setswana @@ -233,8 +233,7 @@ phoneme ph // aspirated endphoneme phoneme r - liquid rhotic - trill + liquid rhotic trl lengthmod 6 Vowelin f1=2 f2=2700 -300 -200 f3=-1300 80 Vowelout f1=2 f2=1700 -300 -200 f3=-1300 80 diff --git a/phsource/ph_turkish b/phsource/ph_turkish index aab39541..316632ab 100644 --- a/phsource/ph_turkish +++ b/phsource/ph_turkish @@ -201,7 +201,7 @@ endphoneme phoneme R - liquid trill + liquid trl lengthmod 6 IF prevPhW(isVowel) AND nextPhW(isVowel) THEN ChangePhoneme(*) diff --git a/phsource/ph_welsh b/phsource/ph_welsh index 67556477..e72d4987 100644 --- a/phsource/ph_welsh +++ b/phsource/ph_welsh @@ -213,8 +213,7 @@ endphoneme //=========== phoneme r - liquid - trill + liquid trl lengthmod 6 Vowelin f1=0 f2=1600 -300 300 f3=-200 80 Vowelout f1=2 f2=1600 -300 300 f3=-200 80 brk diff --git a/phsource/phonemes b/phsource/phonemes index 4f7ba0f2..554d888a 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -347,8 +347,7 @@ endphoneme phoneme R - liquid - trill + liquid trl lengthmod 6 ipa r IF nextPhW(R2) THEN @@ -360,8 +359,7 @@ phoneme R endphoneme phoneme R2 // this is [R] from Slovak/Czech - liquid - trill + liquid trl lengthmod 6 ipa r Vowelin f1=0 f2=1700 -300 300 f3=-300 80 @@ -370,8 +368,7 @@ phoneme R2 // this is [R] from Slovak/Czech endphoneme phoneme R3 // Afrikaans - liquid - trill + liquid trl lengthmod 6 length 60 ipa r diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c index bb16f5d2..573450db 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 }, - { "trill", tPHONEME_FLAG, phTRILL }, // TODO (deprecated): use 'trl' instead { "palatal", tPHONEME_FLAG, phPALATAL }, // TODO (deprecated): use 'pzd' instead { "long", tPHONEME_FLAG, phLONG }, // TODO (deprecated): use 'lng' instead { "brkafter", tPHONEME_FLAG, phBRKAFTER },