From c8023301f2b9860a449d7e410088e64b98685315 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 28 Jan 2017 15:32:44 +0000 Subject: [PATCH] Replace 'sibilant' with 'sib'. --- docs/phontab.md | 1 - phsource/ph_albanian | 4 ++-- phsource/ph_amhari | 2 +- phsource/ph_armenian | 4 ++-- phsource/ph_basque | 6 +++--- phsource/ph_bengali | 4 ++-- phsource/ph_burmese | 14 +++++++------- phsource/ph_consonants | 8 ++++---- phsource/ph_croatian | 12 ++++++------ phsource/ph_danish | 2 +- phsource/ph_english | 4 ++-- phsource/ph_estonian | 2 +- phsource/ph_french | 10 +++++----- phsource/ph_georgian | 2 +- phsource/ph_german | 2 +- phsource/ph_hindi_base | 6 +++--- phsource/ph_hungarian | 2 +- phsource/ph_italian | 8 ++++---- phsource/ph_japanese | 12 ++++++------ phsource/ph_korean | 4 ++-- phsource/ph_kyrgyz | 10 +++++----- phsource/ph_latvian | 8 ++++---- phsource/ph_macedonian | 2 +- phsource/ph_malayalam | 2 +- phsource/ph_manipuri | 4 ++-- phsource/ph_marathi | 2 +- phsource/ph_oriya | 4 ++-- phsource/ph_oromo | 2 +- phsource/ph_romanian | 10 +++++----- phsource/ph_russian | 6 +++--- phsource/ph_s_gaelic | 2 +- phsource/ph_serbian | 12 ++++++------ phsource/ph_setswana | 6 +++--- phsource/ph_slovak | 4 ++-- phsource/ph_spanish | 2 +- phsource/ph_spanish_la | 2 +- phsource/ph_swahili | 8 ++++---- phsource/ph_tibetan | 8 ++++---- phsource/ph_vietnam | 2 +- phsource/ph_zh | 16 ++++++++-------- phsource/ph_zh_yue | 4 ++-- phsource/phonemes | 32 ++++++++++++++++---------------- src/libespeak-ng/compiledata.c | 1 - 43 files changed, 128 insertions(+), 130 deletions(-) diff --git a/docs/phontab.md b/docs/phontab.md index 3b567395..4127ef30 100644 --- a/docs/phontab.md +++ b/docs/phontab.md @@ -157,7 +157,6 @@ must be present. | Property | Type | Description | |--------------|------|-------------| -| `sibilant` | (C) | e.g.: `s`, `z`, `S`, `Z`, `tS`, `dZ` | | `palatal` | (C) | A palatal or palatalized consonant. | | `rhotic` | (C) | An `r` type consonant. | | `unstressed` | (V) | This vowel is always unstressed, unless explicitly marked otherwise. | diff --git a/phsource/ph_albanian b/phsource/ph_albanian index ce68a3d7..4340fc13 100644 --- a/phsource/ph_albanian +++ b/phsource/ph_albanian @@ -267,7 +267,7 @@ endphoneme phoneme z - vcd alv frc sibilant + vcd alv frc sib voicingswitch s lengthmod 6 Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 @@ -280,7 +280,7 @@ endphoneme phoneme dZ; - vcd pla afr sibilant palatal + vcd pla afr sib palatal voicingswitch tS; ipa dʑ lengthmod 5 diff --git a/phsource/ph_amhari b/phsource/ph_amhari index 78e54143..351c712c 100644 --- a/phsource/ph_amhari +++ b/phsource/ph_amhari @@ -105,7 +105,7 @@ endphoneme phoneme tS` - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=1800 -200 200 f3=-100 80 gpaus diff --git a/phsource/ph_armenian b/phsource/ph_armenian index 3355e6c4..baca3c7d 100644 --- a/phsource/ph_armenian +++ b/phsource/ph_armenian @@ -116,7 +116,7 @@ endphoneme phoneme ts - vls alv afr sibilant + vls alv afr sib lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 @@ -125,7 +125,7 @@ endphoneme phoneme tS - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 diff --git a/phsource/ph_basque b/phsource/ph_basque index d64c6c7c..e0cf3794 100644 --- a/phsource/ph_basque +++ b/phsource/ph_basque @@ -66,7 +66,7 @@ endphoneme phoneme z - vls alv frc sibilant + vls alv frc sib ipa s̻ lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -79,7 +79,7 @@ endphoneme phoneme ts - vls alv afr sibilant + vls alv afr sib ipa ts̺ lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -92,7 +92,7 @@ endphoneme phoneme tz - vls alv afr sibilant + vls alv afr sib ipa ts̻ lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/ph_bengali b/phsource/ph_bengali index 35c89cf0..6d055e32 100644 --- a/phsource/ph_bengali +++ b/phsource/ph_bengali @@ -85,7 +85,7 @@ endphoneme phoneme tS - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -98,7 +98,7 @@ endphoneme phoneme tS# - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 diff --git a/phsource/ph_burmese b/phsource/ph_burmese index 54f67050..b3310238 100644 --- a/phsource/ph_burmese +++ b/phsource/ph_burmese @@ -490,17 +490,17 @@ phoneme th endphoneme phoneme tɕ - //vls pla afr sibilant + //vls pla afr sib import_phoneme base/tS endphoneme phoneme dʑ - //vcd pla afr sibilant + //vcd pla afr sib import_phoneme base/dZ endphoneme phoneme tɕh - vls pla afr sibilant + vls pla afr sib // aspirated endphoneme @@ -534,21 +534,21 @@ phoneme ð endphoneme phoneme s - //vls alv frc sibilant + //vls alv frc sib import_phoneme base/s endphoneme phoneme z - //vcd alv frc sibilant + //vcd alv frc sib import_phoneme base/z endphoneme phoneme sh //aspirated not palatal - vls alv frc sibilant + vls alv frc sib endphoneme phoneme ʃ - //vls pla frc sibilant + //vls pla frc sib import_phoneme base/S endphoneme diff --git a/phsource/ph_consonants b/phsource/ph_consonants index 44b97803..cce92f91 100644 --- a/phsource/ph_consonants +++ b/phsource/ph_consonants @@ -3,7 +3,7 @@ // import_phoneme consonants/ts phoneme ts - vls alv afr sibilant + vls alv afr sib voicingswitch dz lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -16,7 +16,7 @@ endphoneme phoneme dz - vcd alv afr sibilant + vcd alv afr sib voicingswitch ts lengthmod 5 Vowelin f1=1 f2=1700 -300 300 f3=-100 80 len=50 @@ -80,7 +80,7 @@ endphoneme phoneme c2 - vls pal afr sibilant + vls pal afr sib lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 Vowelout f1=0 f2=2700 400 600 f3=300 80 colr=1 @@ -139,7 +139,7 @@ phoneme k# endphoneme phoneme s2 // second part of a long [s:] - vls alv frc sibilant + vls alv frc sib Vowelin f1=0 f2=1700 -300 300 f3=-100 80 lengthmod 3 IF nextPh(isPause2) THEN diff --git a/phsource/ph_croatian b/phsource/ph_croatian index b6c5e194..244d75b1 100644 --- a/phsource/ph_croatian +++ b/phsource/ph_croatian @@ -1,7 +1,7 @@ phoneme S // this is letter š - vls pla frc sibilant + vls pla frc sib lengthmod 3 voicingswitch Z Vowelin f1=0 f2=2100 100 300 f3=-100 80 @@ -13,7 +13,7 @@ phoneme S // this is letter š endphoneme phoneme tS // this is letter č - vls pla afr sibilant + vls pla afr sib lengthmod 2 voicingswitch dZ Vowelin f1=0 f2=1900 100 200 f3=-100 80 @@ -24,7 +24,7 @@ phoneme tS // this is letter č endphoneme phoneme tS; // this is letter ć - vls pal afr sibilant palatal + vls pal afr sib palatal ipa tɕ lengthmod 2 voicingswitch dZ; @@ -37,7 +37,7 @@ endphoneme phoneme Z // letter ž - vcd pla frc sibilant + vcd pla frc sib lengthmod 6 voicingswitch S Vowelin f1=0 f2=2000 0 300 f3=-200 80 @@ -50,7 +50,7 @@ endphoneme phoneme dZ //letter dž - vcd pla afr sibilant + vcd pla afr sib lengthmod 5 voicingswitch tS Vowelin f1=2 f2=1900 100 300 f3=100 80 @@ -68,7 +68,7 @@ endphoneme phoneme dZ; // letter đ - vcd pla afr sibilant palatal + vcd pla afr sib palatal lengthmod 5 ipa dʑ voicingswitch tS; diff --git a/phsource/ph_danish b/phsource/ph_danish index ea35cc5d..d85b49a5 100644 --- a/phsource/ph_danish +++ b/phsource/ph_danish @@ -864,7 +864,7 @@ endphoneme // don't weaken consonants at end of word or before a stop phoneme s - vls alv frc sibilant + vls alv frc sib voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/ph_english b/phsource/ph_english index c7539730..646d1915 100644 --- a/phsource/ph_english +++ b/phsource/ph_english @@ -22,7 +22,7 @@ endphoneme phoneme z# // change to [z] or [s] depending on whether previous phoneme is voiced - vls alv frc sibilant + vls alv frc sib IF prevPh(isVoiced) THEN ChangePhoneme(z) ELSE @@ -76,7 +76,7 @@ endphoneme phoneme z/2 // used for 's suffix - vcd alv frc sibilant + vcd alv frc sib lengthmod 6 IF prevPh(isSibilant) THEN InsertPhoneme(I2) diff --git a/phsource/ph_estonian b/phsource/ph_estonian index ca935422..13ba15b7 100644 --- a/phsource/ph_estonian +++ b/phsource/ph_estonian @@ -368,7 +368,7 @@ endphoneme // Palatalized versions of consonants phoneme s^ - vls alv frc sibilant palatal + vls alv frc sib palatal voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/ph_french b/phsource/ph_french index cf41e62f..7c2cd188 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -820,7 +820,7 @@ endphoneme phoneme s - vls alv frc sibilant + vls alv frc sib voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -837,7 +837,7 @@ endphoneme phoneme S - vls pla frc sibilant + vls pla frc sib starttype #cFR endtype #cFR voicingswitch Z lengthmod 3 @@ -938,7 +938,7 @@ endphoneme phoneme z - vcd alv frc sibilant + vcd alv frc sib voicingswitch s lengthmod 6 Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 @@ -960,7 +960,7 @@ endphoneme phoneme z2 // silent unless followed by vowel - vcd alv frc sibilant + vcd alv frc sib IF nextPh(isVowel) OR nextPh(w/) OR nextPh(j) THEN length 70 FMT(voc/z) addWav(ufric/s, 40) @@ -971,7 +971,7 @@ endphoneme phoneme z3 // "six" and "dix". [s] before pause, [z] before vowel, else [] - vcd alv frc sibilant + vcd alv frc sib IF nextPh(isPause) THEN ChangePhoneme(s) ELIF nextPh(isVowel) OR nextPh(w/) THEN diff --git a/phsource/ph_georgian b/phsource/ph_georgian index 164137bb..36847477 100644 --- a/phsource/ph_georgian +++ b/phsource/ph_georgian @@ -102,7 +102,7 @@ endphoneme phoneme ts - vls alv afr sibilant + vls alv afr sib lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 diff --git a/phsource/ph_german b/phsource/ph_german index 99a32bb9..0b35be39 100644 --- a/phsource/ph_german +++ b/phsource/ph_german @@ -401,7 +401,7 @@ phoneme l2 // as [l] but devoice previous phoneme endphoneme phoneme b - vcd alv frc sibilant + vcd alv frc sib voicingswitch p IF nextPh(l2) THEN ChangePhoneme(p) diff --git a/phsource/ph_hindi_base b/phsource/ph_hindi_base index a08d08a4..98238aba 100644 --- a/phsource/ph_hindi_base +++ b/phsource/ph_hindi_base @@ -450,7 +450,7 @@ endphoneme // also try [tS] and [dZ] phoneme c - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -475,7 +475,7 @@ endphoneme phoneme J# - vcd pal afr sibilant + vcd pal afr sib lengthmod 5 voicingswitch c# Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 @@ -533,7 +533,7 @@ endphoneme //================ phoneme #X2 // click, use for indicating combining long vowels - vls alv frc sibilant + vls alv frc sib lengthmod 3 WAV(ustop/percus02, 60) endphoneme diff --git a/phsource/ph_hungarian b/phsource/ph_hungarian index db2ccaec..70d39823 100644 --- a/phsource/ph_hungarian +++ b/phsource/ph_hungarian @@ -96,7 +96,7 @@ endphoneme phoneme ts - vls alv afr sibilant + vls alv afr sib lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 diff --git a/phsource/ph_italian b/phsource/ph_italian index 8bab12ed..314e1790 100644 --- a/phsource/ph_italian +++ b/phsource/ph_italian @@ -197,7 +197,7 @@ phoneme l^ endphoneme phoneme ts - vls alv afr sibilant + vls alv afr sib voicingswitch s lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 60 len=60 @@ -209,7 +209,7 @@ phoneme ts endphoneme phoneme ts2 - vls alv afr sibilant + vls alv afr sib voicingswitch dz lengthmod 9 Vowelin f1=2 f2=1700 -300 300 f3=-200 120 len=10 @@ -229,7 +229,7 @@ phoneme dz endphoneme phoneme ss - vls alv frc sibilant + vls alv frc sib voicingswitch z lengthmod 6 Vowelin f1=2 f2=1700 -300 300 f3=-100 80 @@ -266,7 +266,7 @@ phoneme v endphoneme phoneme z - vcd alv frc sibilant + vcd alv frc sib voicingswitch s lengthmod 6 Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 diff --git a/phsource/ph_japanese b/phsource/ph_japanese index 0fbaca5c..31d67209 100644 --- a/phsource/ph_japanese +++ b/phsource/ph_japanese @@ -265,7 +265,7 @@ endphoneme // Sibilant Affricates phoneme t_s - vls alv afr sibilant + vls alv afr sib ipa ts lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -274,7 +274,7 @@ phoneme t_s endphoneme phoneme t_s\\ - vls pal afr sibilant palatal + vls pal afr sib palatal voicingswitch d_z\\ ipa tɕ lengthmod 2 @@ -284,7 +284,7 @@ phoneme t_s\\ endphoneme phoneme d_z\\ - vcd pla afr sibilant palatal + vcd pla afr sib palatal voicingswitch t_s\\ ipa dʑ lengthmod 5 @@ -297,7 +297,7 @@ endphoneme // Sibilant Fricatives phoneme s - vls alv frc sibilant + vls alv frc sib voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -307,7 +307,7 @@ phoneme s endphoneme phoneme z - vcd alv frc sibilant + vcd alv frc sib voicingswitch s lengthmod 6 Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 @@ -316,7 +316,7 @@ phoneme z endphoneme phoneme s\\ - vls pal frc sibilant palatal + vls pal frc sib palatal ipa ɕ lengthmod 3 Vowelin f1=1 f2=2700 400 600 f3=200 70 rate len=70 diff --git a/phsource/ph_korean b/phsource/ph_korean index 7ceddb98..75b10ccd 100644 --- a/phsource/ph_korean +++ b/phsource/ph_korean @@ -80,7 +80,7 @@ phoneme ph // /ㅍ/ endphoneme phoneme tS; // voiceless /ㅈ/ - vls pla afr sibilant palatal + vls pla afr sib palatal ipa tɕ lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3=300 80 @@ -88,7 +88,7 @@ phoneme tS; // voiceless /ㅈ/ endphoneme phoneme dZ; // voiced /ㅈ/ - vcd pla afr sibilant palatal + vcd pla afr sib palatal ipa dʑ lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3=300 80 diff --git a/phsource/ph_kyrgyz b/phsource/ph_kyrgyz index 15e85132..cd086700 100644 --- a/phsource/ph_kyrgyz +++ b/phsource/ph_kyrgyz @@ -453,7 +453,7 @@ endphoneme phoneme tS // **ch**urch ipa tS - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -466,7 +466,7 @@ endphoneme phoneme dZ // **j**udge ipa dZ - vcd pla afr sibilant + vcd pla afr sib voicingswitch tS lengthmod 5 Vowelin f1=2 f2=2300 200 400 f3=100 80 @@ -530,7 +530,7 @@ endphoneme phoneme z ipa z - vcd alv frc sibilant + vcd alv frc sib voicingswitch s lengthmod 6 Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 @@ -637,7 +637,7 @@ endphoneme phoneme s ipa s - vls alv frc sibilant + vls alv frc sib voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -654,7 +654,7 @@ endphoneme phoneme S // **sh**op ipa S - vls pla frc sibilant + vls pla frc sib voicingswitch Z lengthmod 3 Vowelin f1=0 f2=2100 100 300 f3=-100 80 diff --git a/phsource/ph_latvian b/phsource/ph_latvian index 6bb79b41..437725c9 100644 --- a/phsource/ph_latvian +++ b/phsource/ph_latvian @@ -151,7 +151,7 @@ phoneme ts endphoneme phoneme tS - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 length 80 @@ -254,7 +254,7 @@ endphoneme phoneme z` // Shortened version of z for diphthong dz - vcd alv frc sibilant + vcd alv frc sib voicingswitch s length 10 lengthmod 6 @@ -273,7 +273,7 @@ phoneme z` // Shortened version of z for diphthong dz endphoneme phoneme Z` // Shortened version of Z for diphthong dZ - vcd pla frc sibilant + vcd pla frc sib voicingswitch S length 30 lengthmod 6 @@ -316,7 +316,7 @@ endphoneme //endphoneme phoneme s - vls alv frc sibilant + vls alv frc sib voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/ph_macedonian b/phsource/ph_macedonian index d0981d05..bbdcc916 100644 --- a/phsource/ph_macedonian +++ b/phsource/ph_macedonian @@ -10,7 +10,7 @@ endphoneme phoneme dZ; - vcd pal afr sibilant palatal + vcd pal afr sib palatal lengthmod 5 ipa dʑ voicingswitch tS; diff --git a/phsource/ph_malayalam b/phsource/ph_malayalam index 3069b7b0..b3021640 100644 --- a/phsource/ph_malayalam +++ b/phsource/ph_malayalam @@ -229,7 +229,7 @@ endphoneme phoneme J# - vls pal afr sibilant palatal prevoice + vls pal afr sib palatal prevoice voicingswitch c# lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 diff --git a/phsource/ph_manipuri b/phsource/ph_manipuri index 095c22eb..93d28e4a 100644 --- a/phsource/ph_manipuri +++ b/phsource/ph_manipuri @@ -60,7 +60,7 @@ endphoneme phoneme tS - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -73,7 +73,7 @@ endphoneme phoneme tS# - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 diff --git a/phsource/ph_marathi b/phsource/ph_marathi index 90adef5b..d27ff619 100644 --- a/phsource/ph_marathi +++ b/phsource/ph_marathi @@ -49,7 +49,7 @@ endphoneme phoneme tS - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 diff --git a/phsource/ph_oriya b/phsource/ph_oriya index 8b231ab0..6b7455fc 100644 --- a/phsource/ph_oriya +++ b/phsource/ph_oriya @@ -70,7 +70,7 @@ endphoneme phoneme tS - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -83,7 +83,7 @@ endphoneme phoneme tS# - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 diff --git a/phsource/ph_oromo b/phsource/ph_oromo index 212fbb55..52e3b7d5 100644 --- a/phsource/ph_oromo +++ b/phsource/ph_oromo @@ -145,7 +145,7 @@ phoneme t` endphoneme phoneme tS` - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=1800 -200 200 f3=-100 80 gpaus diff --git a/phsource/ph_romanian b/phsource/ph_romanian index 7e594c81..be2076a2 100644 --- a/phsource/ph_romanian +++ b/phsource/ph_romanian @@ -221,7 +221,7 @@ phoneme t; // dental variant of /t/ endphoneme phoneme ts; - vls alv afr sibilant + vls alv afr sib lengthmod 2 CALL base2/ts Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 colr=1 @@ -238,7 +238,7 @@ endphoneme phoneme s; - vls alv frc sibilant + vls alv frc sib voicingswitch z; lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -248,7 +248,7 @@ endphoneme phoneme S; - vls pla frc sibilant + vls pla frc sib voicingswitch Z; lengthmod 3 Vowelin f1=0 f2=2100 100 300 f3=-100 80 @@ -306,7 +306,7 @@ endphoneme phoneme z; - vcd alv frc sibilant + vcd alv frc sib lengthmod 6 voicingswitch s; Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 colr=1 @@ -318,7 +318,7 @@ endphoneme phoneme Z; - vcd pla frc sibilant + vcd pla frc sib lengthmod 6 voicingswitch S; Vowelin f1=0 f2=2000 0 300 f3=-200 80 colr=1 diff --git a/phsource/ph_russian b/phsource/ph_russian index 647d48eb..5ed02a69 100644 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -61,7 +61,7 @@ length 80 endphoneme phoneme s - vls alv frc sibilant + vls alv frc sib // voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -153,7 +153,7 @@ endphoneme phoneme dZ; - vcd pal afr sibilant palatal + vcd pal afr sib palatal voicingswitch tS; lengthmod 5 Vowelin f1=2 f2=2700 400 600 f3=300 80 rate len=70 @@ -169,7 +169,7 @@ endphoneme phoneme tS; - vls pal afr sibilant palatal + vls pal afr sib palatal voicingswitch dZ; lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3=300 80 rate len=70 diff --git a/phsource/ph_s_gaelic b/phsource/ph_s_gaelic index 43a8c102..a875aebf 100644 --- a/phsource/ph_s_gaelic +++ b/phsource/ph_s_gaelic @@ -261,7 +261,7 @@ phoneme t; endphoneme phoneme S - vls pal frc sibilant palatal + vls pal frc sib palatal CALL base/S; ipa ʃ endphoneme diff --git a/phsource/ph_serbian b/phsource/ph_serbian index 6c472615..d768596f 100644 --- a/phsource/ph_serbian +++ b/phsource/ph_serbian @@ -93,7 +93,7 @@ endphoneme phoneme dZ - vcd pla afr sibilant + vcd pla afr sib lengthmod 5 voicingswitch tS Vowelin f1=2 f2=2300 200 400 f3=100 80 @@ -108,7 +108,7 @@ endphoneme phoneme dZ; - vcd pla afr sibilant palatal + vcd pla afr sib palatal lengthmod 5 ipa dʑ voicingswitch tS; @@ -123,7 +123,7 @@ endphoneme phoneme tS - vls pla afr sibilant + vls pla afr sib lengthmod 2 voicingswitch dZ Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -132,7 +132,7 @@ endphoneme phoneme tS; - vls pal afr sibilant palatal + vls pal afr sib palatal lengthmod 2 ipa tɕ voicingswitch dZ; @@ -142,7 +142,7 @@ endphoneme phoneme Z - vcd pla frc sibilant + vcd pla frc sib lengthmod 6 voicingswitch S Vowelin f1=0 f2=2000 0 300 f3=-200 80 @@ -155,7 +155,7 @@ endphoneme phoneme S - vls pla frc sibilant + vls pla frc sib lengthmod 3 voicingswitch Z Vowelin f1=0 f2=2100 100 300 f3=-100 80 diff --git a/phsource/ph_setswana b/phsource/ph_setswana index 723252e3..43556220 100644 --- a/phsource/ph_setswana +++ b/phsource/ph_setswana @@ -151,7 +151,7 @@ phoneme l endphoneme phoneme ts - vls alv afr sibilant + vls alv afr sib // voicingswitch dz lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -271,7 +271,7 @@ phoneme t // dental variant of /t/ endphoneme phoneme tS - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -283,7 +283,7 @@ phoneme tS endphoneme phoneme tS; - vls pal afr sibilant palatal + vls pal afr sib palatal voicingswitch dZ; ipa tɕ lengthmod 2 diff --git a/phsource/ph_slovak b/phsource/ph_slovak index 605fd231..6dbdecb9 100644 --- a/phsource/ph_slovak +++ b/phsource/ph_slovak @@ -124,7 +124,7 @@ endphoneme phoneme R^ // Czech r-caron - vcd pla frc sibilant + vcd pla frc sib ipa rU+031d lengthmod 6 Vowelin f1=0 f2=1700 -300 300 f3=-300 80 @@ -133,7 +133,7 @@ phoneme R^ // Czech r-caron endphoneme phoneme R^/ // Czech r-caron (weaker, for after p,f,t,k) - vcd pla frc sibilant + vcd pla frc sib ipa rU+031dU+030a lengthmod 6 Vowelin f1=0 f2=1700 -300 300 f3=-300 80 diff --git a/phsource/ph_spanish b/phsource/ph_spanish index bb13e6cd..1b969e1d 100644 --- a/phsource/ph_spanish +++ b/phsource/ph_spanish @@ -147,7 +147,7 @@ endphoneme phoneme s - vls alv frc sibilant + vls alv frc sib lengthmod 3 voicingswitch z Vowelin f1=0 f2=1700 -300 300 f3=-100 80 diff --git a/phsource/ph_spanish_la b/phsource/ph_spanish_la index 091ffbc9..dd3e3561 100644 --- a/phsource/ph_spanish_la +++ b/phsource/ph_spanish_la @@ -4,7 +4,7 @@ //==================================================== phoneme T - vls alv frc sibilant + vls alv frc sib ChangePhoneme(s) endphoneme diff --git a/phsource/ph_swahili b/phsource/ph_swahili index e79ab8f6..c480db50 100644 --- a/phsource/ph_swahili +++ b/phsource/ph_swahili @@ -50,7 +50,7 @@ phoneme d // dental variant of /d/ endphoneme phoneme z - vcd alv frc sibilant + vcd alv frc sib voicingswitch s lengthmod 6 Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 @@ -86,7 +86,7 @@ phoneme T endphoneme phoneme S - vls pla frc sibilant + vls pla frc sib voicingswitch Z lengthmod 3 Vowelin f1=0 f2=2100 100 300 f3=-100 80 @@ -97,7 +97,7 @@ phoneme S endphoneme phoneme s - vls alv frc sibilant + vls alv frc sib voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -213,7 +213,7 @@ endphoneme phoneme J - vcd pal afr sibilant palatal + vcd pal afr sib palatal voicingswitch c lengthmod 5 Vowelin f1=2 f2=2700 400 600 f3=300 80 rate len=70 diff --git a/phsource/ph_tibetan b/phsource/ph_tibetan index 7b8c6652..c27ea939 100644 --- a/phsource/ph_tibetan +++ b/phsource/ph_tibetan @@ -34,7 +34,7 @@ endphoneme phoneme ts - vls alv afr sibilant + vls alv afr sib voicingswitch dz lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -47,7 +47,7 @@ endphoneme phoneme dz - vcd alv afr sibilant + vcd alv afr sib voicingswitch ts lengthmod 5 Vowelin f1=1 f2=1700 -300 300 f3=-100 80 len=50 @@ -64,7 +64,7 @@ phoneme dz endphoneme phoneme ts# - vls alv afr sibilant + vls alv afr sib voicingswitch dz lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -77,7 +77,7 @@ endphoneme phoneme dz# - vcd alv afr sibilant + vcd alv afr sib voicingswitch ts lengthmod 5 Vowelin f1=1 f2=1700 -300 300 f3=-100 80 len=50 diff --git a/phsource/ph_vietnam b/phsource/ph_vietnam index c0314d4b..c91c4312 100644 --- a/phsource/ph_vietnam +++ b/phsource/ph_vietnam @@ -392,7 +392,7 @@ phoneme t endphoneme phoneme cr - vls pla afr sibilant + vls pla afr sib //voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 len=15 diff --git a/phsource/ph_zh b/phsource/ph_zh index 84a044f1..55c25534 100644 --- a/phsource/ph_zh +++ b/phsource/ph_zh @@ -198,7 +198,7 @@ phoneme kh endphoneme phoneme tS; - vls pal afr sibilant palatal + vls pal afr sib palatal ipa tɕ lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3=300 80 @@ -206,7 +206,7 @@ phoneme tS; endphoneme phoneme tS;h - vls pal afr sibilant palatal + vls pal afr sib palatal ipa tɕh lengthmod 2 Vowelin f1=0 f2=2700 400 600 f3=300 80 @@ -214,7 +214,7 @@ phoneme tS;h endphoneme phoneme S; - vls pla frc sibilant + vls pla frc sib lengthmod 2 ipa ɕ Vowelin f1=0 f2=2700 400 600 f3=300 80 @@ -222,7 +222,7 @@ phoneme S; endphoneme phoneme s. - vls pla frc sibilant + vls pla frc sib lengthmod 3 Vowelin f1=0 f2=1800 -100 300 f3=-300 80 Vowelout f1=0 f2=1800 -100 300 f3=-300 80 @@ -234,7 +234,7 @@ endphoneme phoneme ts - vls alv afr sibilant + vls alv afr sib lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 @@ -242,7 +242,7 @@ phoneme ts endphoneme phoneme tsh - vls alv afr sibilant + vls alv afr sib lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 @@ -250,7 +250,7 @@ phoneme tsh endphoneme phoneme ts. - vls pla frc sibilant + vls pla frc sib lengthmod 3 Vowelin f1=0 f2=1800 -100 300 f3=-300 80 Vowelout f1=0 f2=1800 -100 300 f3=-300 80 @@ -258,7 +258,7 @@ phoneme ts. endphoneme phoneme ts.h - vls pla frc sibilant + vls pla frc sib lengthmod 3 Vowelin f1=0 f2=1800 -100 300 f3=-300 80 Vowelout f1=0 f2=1800 -100 300 f3=-300 80 diff --git a/phsource/ph_zh_yue b/phsource/ph_zh_yue index 6c9336fb..f099f4a3 100644 --- a/phsource/ph_zh_yue +++ b/phsource/ph_zh_yue @@ -52,7 +52,7 @@ endphoneme phoneme z // [ts] - vls alv afr sibilant + vls alv afr sib lengthmod 2 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 Vowelout f1=0 f2=1700 -300 250 f3=-100 80 rms=20 @@ -61,7 +61,7 @@ endphoneme phoneme c // [tS] - vls pla afr sibilant + vls pla afr sib lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 IF nextPh(isPause2) THEN diff --git a/phsource/phonemes b/phsource/phonemes index 6d72c282..4f7ba0f2 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -240,7 +240,7 @@ endphoneme //******************************************************************* phoneme #X1 // click, use for indicating capital letters - vls alv frc sibilant + vls alv frc sib lengthmod 3 WAV(ustop/percus10, 60) endphoneme @@ -1013,7 +1013,7 @@ endphoneme phoneme dZ // **j**udge - vcd pla afr sibilant + vcd pla afr sib voicingswitch tS lengthmod 5 Vowelin f1=2 f2=2300 200 400 f3=100 80 @@ -1031,7 +1031,7 @@ endphoneme phoneme dZ; - vcd pla afr sibilant palatal + vcd pla afr sib palatal voicingswitch tS; ipa dʑ lengthmod 5 @@ -1057,7 +1057,7 @@ endphoneme phoneme J - vcd pal afr sibilant palatal + vcd pal afr sib palatal voicingswitch c lengthmod 5 Vowelin f1=2 f2=2700 400 600 f3=300 80 rate len=70 @@ -1183,7 +1183,7 @@ endphoneme phoneme z - vcd alv frc sibilant + vcd alv frc sib voicingswitch s lengthmod 6 Vowelout f1=0 f2=1700 -300 300 f3=-100 60 len=50 @@ -1201,7 +1201,7 @@ endphoneme phoneme Z // plea**s**ure - vcd pla frc sibilant + vcd pla frc sib voicingswitch S lengthmod 6 Vowelin f1=0 f2=2000 0 300 f3=-200 80 @@ -1222,7 +1222,7 @@ endphoneme phoneme z. - vcd pla frc sibilant + vcd pla frc sib ipa ʐ voicingswitch s. lengthmod 6 @@ -1244,7 +1244,7 @@ endphoneme phoneme z; - vcd pal frc sibilant palatal + vcd pal frc sib palatal ipa ʑ voicingswitch s; lengthmod 6 @@ -1259,7 +1259,7 @@ endphoneme phoneme Z; - vcd pal frc sibilant palatal + vcd pal frc sib palatal voicingswitch S; ipa ʑ lengthmod 6 @@ -1393,7 +1393,7 @@ endphoneme phoneme tS // **ch**urch - vls pla afr sibilant + vls pla afr sib voicingswitch dZ lengthmod 2 Vowelin f1=0 f2=2300 200 400 f3=-100 80 @@ -1406,7 +1406,7 @@ endphoneme phoneme tS; - vls pal afr sibilant palatal + vls pal afr sib palatal voicingswitch dZ; ipa tɕ lengthmod 2 @@ -1507,7 +1507,7 @@ endphoneme phoneme s - vls alv frc sibilant + vls alv frc sib voicingswitch z lengthmod 3 Vowelin f1=0 f2=1700 -300 300 f3=-100 80 @@ -1523,7 +1523,7 @@ endphoneme phoneme S // **sh**op - vls pla frc sibilant + vls pla frc sib voicingswitch Z lengthmod 3 Vowelin f1=0 f2=2100 100 300 f3=-100 80 @@ -1537,7 +1537,7 @@ endphoneme phoneme s. - vls pla frc sibilant + vls pla frc sib ipa ʂ voicingswitch z. lengthmod 3 @@ -1552,7 +1552,7 @@ endphoneme phoneme s; - vls pal frc sibilant palatal + vls pal frc sib palatal ipa ʂ voicingswitch z; lengthmod 3 @@ -1567,7 +1567,7 @@ endphoneme phoneme S; - vls pal frc sibilant palatal + vls pal frc sib palatal voicingswitch Z; ipa ɕ lengthmod 3 diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c index e907e505..bb16f5d2 100644 --- a/src/libespeak-ng/compiledata.c +++ b/src/libespeak-ng/compiledata.c @@ -279,7 +279,6 @@ static keywtab_t keywords[] = { // flags { "unstressed", tPHONEME_FLAG, phUNSTRESSED }, - { "sibilant", tPHONEME_FLAG, phSIBILANT }, // TODO (deprecated): use 'sib' instead { "nolink", tPHONEME_FLAG, phNOLINK }, { "trill", tPHONEME_FLAG, phTRILL }, // TODO (deprecated): use 'trl' instead { "palatal", tPHONEME_FLAG, phPALATAL }, // TODO (deprecated): use 'pzd' instead