mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'Length' with 'length'.

Browse Source
This commit is contained in:
Reece H. Dunn
2017-01-28 14:16:33 +00:00
parent bcc639fcfc
commit 22935752fa
12 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
phsource/ph_afrikaans
+2 -2
View File
@@ -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)
phsource/ph_english_sc
+4 -4
View File
@@ -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#)
phsource/ph_french
+3 -3
View File
@@ -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)
phsource/ph_german
+1 -1
View File
@@ -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
phsource/ph_irish
+4 -4
View File
@@ -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
phsource/ph_italian
+2 -2
View File
@@ -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
phsource/ph_lithuanian
+2 -2
View File
@@ -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
phsource/ph_romanian
+1 -1
View File
@@ -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
phsource/ph_russian
+29 -29
View File
@@ -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
phsource/ph_zh_yue
+1 -1
View File
@@ -202,7 +202,7 @@ phoneme i
IfNextVowelAppend(;)
IF nextPhW(k) OR nextPhW(N) THEN
Length 150
length 150
FMT(vowel/ii)
ENDIF
phsource/phonemes
+3 -3
View File
@@ -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
src/libespeak-ng/compiledata.c
-1
View File
@@ -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 },