From 22935752fa52df874a4b15d1fa9b4e74580874b2 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 28 Jan 2017 14:16:33 +0000 Subject: [PATCH] Replace 'Length' with 'length'. --- phsource/ph_afrikaans | 4 +-- phsource/ph_english_sc | 8 ++--- phsource/ph_french | 6 ++-- phsource/ph_german | 2 +- phsource/ph_irish | 8 ++--- phsource/ph_italian | 4 +-- phsource/ph_lithuanian | 4 +-- phsource/ph_romanian | 2 +- phsource/ph_russian | 58 +++++++++++++++++----------------- phsource/ph_zh_yue | 2 +- phsource/phonemes | 6 ++-- src/libespeak-ng/compiledata.c | 1 - 12 files changed, 52 insertions(+), 53 deletions(-) diff --git a/phsource/ph_afrikaans b/phsource/ph_afrikaans index da136811..d1f64eac 100644 --- a/phsource/ph_afrikaans +++ b/phsource/ph_afrikaans @@ -16,7 +16,7 @@ phoneme @ // Schwa, but always unstressed unstressed length 140 IF nextPh(r/) THEN - Length 190 + length 190 FMT(vwl_af/r@) ENDIF FMT(vwl_af/@) @@ -42,7 +42,7 @@ phoneme I // short I, Schwa ipa ə length 140 IF nextPh(r/) THEN - Length 190 + length 190 FMT(vwl_af/r@) ENDIF FMT(vwl_af/I) diff --git a/phsource/ph_english_sc b/phsource/ph_english_sc index 31f997e4..25e6168b 100644 --- a/phsource/ph_english_sc +++ b/phsource/ph_english_sc @@ -168,7 +168,7 @@ phoneme A: ipa a: IfNextVowelAppend(r-) IF nextPh(r) THEN - Length 250 + length 250 FMT(vowelr/aa_r) ENDIF FMT(vowel/a_3) @@ -203,7 +203,7 @@ phoneme i: VowelStart(w/wi2) ENDIF IF nextPh(isVFricative) OR nextPh(isPause) THEN - Length 180 + length 180 ENDIF FMT(vowel/i_5) endphoneme @@ -254,10 +254,10 @@ phoneme u: ipa ʉː length 160 IF nextPh(isVFricative) THEN - Length 200 + length 200 ENDIF IF nextPh(isPause) THEN - Length 200 + length 200 FMT(vowel/u#_4) ENDIF FMT(vowel/u#) diff --git a/phsource/ph_french b/phsource/ph_french index 50b1ddf0..cf41e62f 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -921,9 +921,9 @@ phoneme v FMT(voc/v_) addWav(vocw/v) ENDIF IF thisPh(isWordStart) AND nextPhW(isLiquid) THEN - Length 70 + length 70 ELIF nextPhW(w/) OR nextPhW(#r) THEN - Length 60 + length 60 ENDIF FMT(voc/v) addWav(vocw/v, 60) endphoneme @@ -962,7 +962,7 @@ endphoneme phoneme z2 // silent unless followed by vowel vcd alv frc sibilant IF nextPh(isVowel) OR nextPh(w/) OR nextPh(j) THEN - Length 70 + length 70 FMT(voc/z) addWav(ufric/s, 40) ELSE ChangePhoneme(NULL) diff --git a/phsource/ph_german b/phsource/ph_german index d5e2840a..99a32bb9 100644 --- a/phsource/ph_german +++ b/phsource/ph_german @@ -25,7 +25,7 @@ phoneme 3 // open Schwa+r unstressed flag1 length 160 IF thisPh(isFinalVowel) THEN - Length 210 + length 210 ENDIF FMT(vowel/a#_3) // in eSpeak 1.44, this used vowel/V_3 at end-of-word endphoneme diff --git a/phsource/ph_irish b/phsource/ph_irish index dcf14d2d..cf027d0c 100644 --- a/phsource/ph_irish +++ b/phsource/ph_irish @@ -10,19 +10,19 @@ phoneme @ // Schwa, but always unstressed unstressed length 110 IF nextPh(i:) THEN - Length 80 + length 80 FMT(vwl_af/r@) ENDIF IF nextPh(I) THEN - Length 80 + length 80 FMT(vwl_af/r@) ENDIF IF nextPh(e:) THEN - Length 80 + length 80 FMT(vwl_af/r@) ENDIF IF prevPh(i:) THEN - Length 60 + length 60 FMT(vwl_af/r@) ENDIF diff --git a/phsource/ph_italian b/phsource/ph_italian index 31ace554..8bab12ed 100644 --- a/phsource/ph_italian +++ b/phsource/ph_italian @@ -193,7 +193,7 @@ endphoneme phoneme l^ import_phoneme base/l^ - Length 130 + length 130 endphoneme phoneme ts @@ -260,7 +260,7 @@ phoneme v FMT(voc/v_) addWav(vocw/v) ENDIF IF thisPh(isWordStart) AND nextPhW(isLiquid) THEN - Length 70 + length 70 ENDIF FMT(voc/v) addWav(vocw/v, 90) endphoneme diff --git a/phsource/ph_lithuanian b/phsource/ph_lithuanian index 1c02d97e..ee910b26 100644 --- a/phsource/ph_lithuanian +++ b/phsource/ph_lithuanian @@ -318,9 +318,9 @@ VowelStart(n^/n^u) FMT(n^/_n^) ELIF nextPh(isNotVowel) THEN IF nextPhW(n^) THEN -Length 75 +length 75 ELIF prevPhW(n^) THEN -Length 100 +length 100 ENDIF FMT(n^/n^_) ENDIF diff --git a/phsource/ph_romanian b/phsource/ph_romanian index 6276bf06..7e594c81 100644 --- a/phsource/ph_romanian +++ b/phsource/ph_romanian @@ -15,7 +15,7 @@ phoneme I^ // "silent i", palatilizes the preceding consonant ChangePhoneme(;) ENDIF IF prevPh(l;) THEN - Length 60 + length 60 FMT(vwl_ro/li) ENDIF IF prevPh(m;) THEN diff --git a/phsource/ph_russian b/phsource/ph_russian index 5543aae0..647d48eb 100644 --- a/phsource/ph_russian +++ b/phsource/ph_russian @@ -125,9 +125,9 @@ phoneme n# FMT(n^/_n^) ELIF nextPh(isNotVowel) THEN IF nextPhW(n^) THEN - Length 75 + length 75 ELIF prevPhW(n^) THEN - Length 100 + length 100 ENDIF FMT(n^/n^_) ENDIF @@ -239,7 +239,7 @@ endphoneme phoneme I^ // "silent i", palatilizes the preceding consonant vwl starttype #i endtype #i unstressed nonsyllabic - Length 70 + length 70 IF nextPh(isVowel) THEN ChangePhoneme(;) ENDIF @@ -260,14 +260,14 @@ phoneme i ChangePhoneme(y) ENDIF vwl starttype #i endtype #i - Length 50 + length 50 FMT(vwl_ru/ii) endphoneme phoneme I# vwl starttype #i endtype #i - Length 80 + length 80 IF nextVowel(isMaxStress) THEN ChangePhoneme(I) ENDIF @@ -280,14 +280,14 @@ endphoneme phoneme y vwl starttype #i endtype #i - Length 100 + length 100 FMT(vwl_ru/i#) endphoneme phoneme I vwl starttype #i endtype #i - Length 80 + length 80 IF thisPh(isMaxStress) THEN IF prevPhW(j) THEN @@ -302,7 +302,7 @@ endphoneme phoneme I2 vwl starttype #i endtype #i - Length 80 + length 80 IF thisPh(isMaxStress) THEN ChangePhoneme(e) ENDIF @@ -315,7 +315,7 @@ endphoneme phoneme I3 vwl starttype #i endtype #i - Length 80 + length 80 IF thisPh(isMaxStress) THEN IF prevPhW(j) THEN ChangePhoneme(e) @@ -332,14 +332,14 @@ endphoneme phoneme E vwl starttype #e endtype #e - Length 100 + length 100 FMT(vwl_ru/e) endphoneme phoneme E# vwl starttype #e endtype #e - Length 100 + length 100 IF thisPh(isMaxStress) THEN IF prevPhW(j) THEN ChangePhoneme(e) @@ -353,7 +353,7 @@ endphoneme phoneme E2 vwl starttype #e endtype #e - Length 80 + length 80 IF nextVowel(isMaxStress) THEN IF prevPh(j) THEN ChangePhoneme(I3) @@ -376,7 +376,7 @@ endphoneme phoneme E3 vwl starttype #e endtype #e - Length 80 + length 80 IF nextVowel(isMaxStress) THEN ChangePhoneme(I) ENDIF @@ -399,7 +399,7 @@ endphoneme phoneme o vwl starttype #o endtype #o - Length 100 + length 100 ChangeIfNotStressed(V) FMT(vwl_ru/o) endphoneme @@ -407,7 +407,7 @@ endphoneme phoneme O vwl starttype #o endtype #o - Length 80 + length 80 IF prevPhW(isPalatal) THEN ChangePhoneme(8) ENDIF @@ -420,32 +420,32 @@ endphoneme phoneme u vwl starttype #u endtype #u - Length 80 + length 80 FMT(vwl_ru/u) endphoneme phoneme u# vwl starttype #u endtype #u - Length 80 + length 80 FMT(vwl_ru/u#) endphoneme phoneme u" vwl starttype #u endtype #u - Length 150 + length 150 FMT(vwl_ru/u#u) endphoneme phoneme 8 vwl starttype #o endtype #o - Length 100 + length 100 ChangeIfNotStressed(V) FMT(vwl_ru/8) endphoneme phoneme e vwl starttype #e endtype #e - Length 100 + length 100 IF prevPh(Z) THEN ChangeIfNotStressed(y) ChangePhoneme(E) @@ -464,14 +464,14 @@ endphoneme phoneme ju vwl starttype #u endtype #u - Length 190 + length 190 FMT(vwl_ru/ju) endphoneme phoneme ja vwl starttype #i endtype #a IF thisPh(isMaxStress) THEN - Length 200 + length 200 FMT(vwl_ru/ja) ELSE FMT(vdiph2/ii@) @@ -489,7 +489,7 @@ phoneme ja# ENDIF ENDIF -// Length 200 +// length 200 // FMT(vwl_ru/ja) endphoneme @@ -499,7 +499,7 @@ endphoneme phoneme V# vwl starttype #a endtype #@ unstressed - Length 80 + length 80 // IF nextVowel(isMaxStress) THEN // not needed? because V# is only used at end-of-word // ChangePhoneme(I3) @@ -524,21 +524,21 @@ endphoneme phoneme Y // will not be used in future vwl starttype #u endtype #u unstressed - Length 140 + length 140 FMT(vowel/ii#) endphoneme phoneme A vwl starttype #a endtype #a - Length 100 + length 100 FMT(vwl_ru/a) endphoneme phoneme a vwl starttype #a endtype #a - Length 100 + length 100 IF prevPhW(j) THEN ELSE @@ -564,7 +564,7 @@ endphoneme phoneme V vwl starttype #a endtype #@ - Length 80 + length 80 unstressed IF nextVowel(isMaxStress) THEN @@ -587,7 +587,7 @@ endphoneme phoneme a# vwl starttype #a endtype #a - Length 100 + length 100 FMT(vowel/a#_3) endphoneme diff --git a/phsource/ph_zh_yue b/phsource/ph_zh_yue index da0ccb63..6c9336fb 100644 --- a/phsource/ph_zh_yue +++ b/phsource/ph_zh_yue @@ -202,7 +202,7 @@ phoneme i IfNextVowelAppend(;) IF nextPhW(k) OR nextPhW(N) THEN - Length 150 + length 150 FMT(vowel/ii) ENDIF diff --git a/phsource/phonemes b/phsource/phonemes index 10ceb38e..6d72c282 100644 --- a/phsource/phonemes +++ b/phsource/phonemes @@ -820,9 +820,9 @@ phoneme n^ // Spanish **ñ** FMT(n^/_n^) ELIF nextPh(isNotVowel) THEN IF nextPhW(n^) THEN - Length 75 + length 75 ELIF prevPhW(n^) THEN - Length 100 + length 100 ENDIF FMT(n^/n^_) ENDIF @@ -1145,7 +1145,7 @@ phoneme v FMT(voc/v_) addWav(vocw/v) ENDIF IF thisPh(isWordStart) AND nextPhW(isLiquid) THEN - Length 70 + length 70 ENDIF FMT(voc/v) addWav(vocw/v) endphoneme diff --git a/src/libespeak-ng/compiledata.c b/src/libespeak-ng/compiledata.c index 62b57765..e907e505 100644 --- a/src/libespeak-ng/compiledata.c +++ b/src/libespeak-ng/compiledata.c @@ -271,7 +271,6 @@ static keywtab_t keywords[] = { { "PauseBefore", tINSTRN1, i_PAUSE_BEFORE }, { "PauseAfter", tINSTRN1, i_PAUSE_AFTER }, - { "Length", tINSTRN1, i_SET_LENGTH }, // TODO (deprecated): use 'length' instead { "length", tINSTRN1, i_SET_LENGTH }, { "LongLength", tINSTRN1, i_LONG_LENGTH }, { "LengthAdd", tINSTRN1, i_ADD_LENGTH },