mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-08 07:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'nasal' with 'nas'.

Browse Source
This commit is contained in:
Reece H. Dunn
2017-01-28 13:58:57 +00:00
parent fe74d0b41b
commit bcc639fcfc
16 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/phontab.md
-1
View File
@@ -149,7 +149,6 @@ must be present.
| Type | Description |
|-----------|-------------|
| `liquid` | semi-vowels, such as: `r`, `l`, `j`, `w` |
| `nasal` | nasal e.g.: `m`, `n`, `N` |
| `pause` | |
| `stress` | Used for stress symbols, eg: `'` `,` `=` `%` |
| `virtual` | Used to represent a class of phonemes. |
phsource/ph_basque
+2 -2
View File
@@ -138,7 +138,7 @@ phoneme g
endphoneme
phoneme n
vcd alv nasal
vcd alv nas
lengthmod 4
IF prevPhW(#i) AND nextPhW(isVowel) THEN
@@ -149,7 +149,7 @@ phoneme n
endphoneme
phoneme n2 // doesn't palatalise, used for exceptions
vcd alv nasal
vcd alv nas
lengthmod 4
CALL base/n
endphoneme
phsource/ph_burmese
+8 -8
View File
@@ -420,25 +420,25 @@ endphoneme
//===========
phoneme mh //voiceless
vls blb nasal
vls blb nas
endphoneme
phoneme m
//vcd blb nasal
//vcd blb nas
import_phoneme base/m
endphoneme
phoneme nh
vls alv nasal
vls alv nas
endphoneme
phoneme n
//vcd alv nasal
//vcd alv nas
import_phoneme base/n
endphoneme
phoneme ɲh
vls pal nasal
vls pal nas
endphoneme
phoneme ɲ
@@ -447,16 +447,16 @@ phoneme ɲ
endphoneme
phoneme ŋh
vls vel nasal
vls vel nas
endphoneme
phoneme ŋ
//vcd vel nasal
//vcd vel nas
import_phoneme base/N
endphoneme
//phoneme ɴ
// vcd glt nasal
// vcd glt nas
//endphoneme
phoneme p
phsource/ph_english_n
+1 -1
View File
@@ -1,6 +1,6 @@
phoneme N
vcd vel nasal
vcd vel nas
lengthmod 8 // longer than 'n'
IfNextVowelAppend(g)
CALL base/N
phsource/ph_english_wm
+1 -1
View File
@@ -1,6 +1,6 @@
phoneme N
vcd vel nasal
vcd vel nas
lengthmod 8 // longer than 'n'
IfNextVowelAppend(g)
CALL base/N
phsource/ph_french
+2 -2
View File
@@ -744,7 +744,7 @@ endphoneme
phoneme n
vcd alv nasal
vcd alv nas
Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk
lengthmod 4
@@ -774,7 +774,7 @@ endphoneme
phoneme n2
vcd alv nasal
vcd alv nas
IF nextPh(w) OR nextPh(isVowel) THEN
ChangePhoneme(n)
ELSE
phsource/ph_icelandic
+4 -4
View File
@@ -221,7 +221,7 @@ endphoneme
//===========
phoneme m#
vcd blb nasal
vcd blb nas
lengthmod 6
ipa m#
Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk
@@ -230,7 +230,7 @@ endphoneme
phoneme n#
vcd alv nasal
vcd alv nas
lengthmod 6
ipa n#
Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk
@@ -249,7 +249,7 @@ endphoneme
phoneme n^#
vcd pal nasal palatal
vcd pal nas palatal
lengthmod 6
ipa ɲ#
Vowelout f1=3 f2=2300 300 400 f3=100 80 brk rate
@@ -259,7 +259,7 @@ endphoneme
phoneme N#
vcd vel nasal
vcd vel nas
lengthmod 6
ipa ŋ#
Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk
phsource/ph_japanese
+4 -4
View File
@@ -102,7 +102,7 @@ endphoneme
// Consonants /////////////////////////////////////////////////////////////////
phoneme m
vcd blb nasal
vcd blb nas
Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk
lengthmod 4
@@ -121,7 +121,7 @@ phoneme m
endphoneme
phoneme n
vcd alv nasal
vcd alv nas
Vowelout f1=2 f2=1500 -300 250 f3=-100 80 rms=20 brk
lengthmod 4
@@ -140,7 +140,7 @@ phoneme n
endphoneme
phoneme N
vcd vel nasal
vcd vel nas
ipa ŋ
Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk
lengthmod 3
@@ -168,7 +168,7 @@ phoneme N
endphoneme
phoneme N\\
vcd uvl nasal
vcd uvl nas
ipa ɴ
// FIXME: Stub phoneme.
CALL jp/n
phsource/ph_kyrgyz
+3 -3
View File
@@ -265,7 +265,7 @@ endphoneme
phoneme m
ipa m
vcd blb nasal
vcd blb nas
Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk
lengthmod 4
@@ -298,7 +298,7 @@ endphoneme
phoneme n
ipa n
vcd alv nasal
vcd alv nas
Vowelout f1=2 f2=1500 -300 250 f3=-100 80 rms=20 brk
lengthmod 4
@@ -328,7 +328,7 @@ endphoneme
phoneme N // si**ng**
ipa N
vcd vel nasal
vcd vel nas
Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk
lengthmod 8 // longer than 'n'
phsource/ph_romanian
+2 -2
View File
@@ -186,7 +186,7 @@ phoneme l;
phoneme m;
vcd blb nasal
vcd blb nas
lengthmod 4
CALL base/m
@@ -195,7 +195,7 @@ endphoneme
phoneme n;
vcd alv nasal
vcd alv nas
lengthmod 4
CALL base/n
phsource/ph_russian
+4 -4
View File
@@ -83,7 +83,7 @@ endphoneme
//phoneme n
// vcd pal nasal
// vcd pal nas
// FMT(n/nru)
//
// import_phoneme en/n
@@ -91,7 +91,7 @@ endphoneme
//endphoneme
phoneme n_
// vcd pal nasal
// vcd pal nas
// FMT(n/nru)
import_phoneme en/n
@@ -102,7 +102,7 @@ endphoneme
phoneme n#
vcd pal nasal palatal
vcd pal nas palatal
ipa ɲ
Vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate
lengthmod 4
@@ -202,7 +202,7 @@ endphoneme
//endphoneme
phoneme m;
vcd blb nasal
vcd blb nas
Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk
lengthmod 4
phsource/ph_swahili
+2 -2
View File
@@ -123,7 +123,7 @@ endphoneme
phoneme n^
vcd pal nasal palatal
vcd pal nas palatal
ipa ɲ
Vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate
lengthmod 4
@@ -148,7 +148,7 @@ phoneme n^
endphoneme
phoneme N
vcd vel nasal
vcd vel nas
Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk
lengthmod 8 // longer than 'n'
phsource/ph_vietnam
+1 -1
View File
@@ -434,7 +434,7 @@ phoneme p
endphoneme
phoneme n
vcd alv nasal
vcd alv nas
Vowelin f1=0 f2=1000 -50 -100 f3=-200 80 amp=11 brk len=15
Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk len=15
lengthmod 4
phsource/ph_zh
+2 -2
View File
@@ -59,7 +59,7 @@ endphoneme
phoneme n
vcd alv nasal
vcd alv nas
Vowelout f1=2 f2=1700 -300 250 f3=-100 80 rms=20 brk
lengthmod 2
@@ -80,7 +80,7 @@ endphoneme
phoneme N
vcd vel nasal
vcd vel nas
Vowelout f1=2 f2=1900 0 300 f3=400 80 len=50 rms=15 brk
lengthmod 7
phsource/phonemes
+5 -5
View File
@@ -705,7 +705,7 @@ endphoneme
phoneme m
vcd blb nasal
vcd blb nas
Vowelout f1=2 f2=1000 -500 -350 f3=-200 80 brk
lengthmod 4
@@ -737,7 +737,7 @@ endphoneme
phoneme n
vcd alv nasal
vcd alv nas
Vowelout f1=2 f2=1500 -300 250 f3=-100 80 rms=20 brk
lengthmod 4
@@ -766,7 +766,7 @@ endphoneme
phoneme n.
vcd rfx nasal
vcd rfx nas
ipa ɳ
starttype n endtype n
Vowelin f1=2 f2=1700 -300 300 f3=-500 80 rms=20 colr=2
@@ -797,7 +797,7 @@ endphoneme
phoneme n^ // Spanish **ñ**
vcd pal nasal palatal
vcd pal nas palatal
ipa ɲ
Vowelout f1=3 f2=2500 300 500 f3=100 80 len=45 brk rate
lengthmod 4
@@ -830,7 +830,7 @@ endphoneme
phoneme N // si**ng**
vcd vel nasal
vcd vel nas
Vowelout f1=3 f2=2300 300 400 f3=-200 80 len=40 rms=20 brk
lengthmod 8 // longer than 'n'
src/libespeak-ng/compiledata.c
-4
View File
@@ -219,12 +219,8 @@ static keywtab_t keywords[] = {
{ "pause", tPHONEME_TYPE, phPAUSE },
{ "stress", tPHONEME_TYPE, phSTRESS },
{ "virtual", tPHONEME_TYPE, phVIRTUAL },
{ "delete_phoneme", tPHONEME_TYPE, phDELETED },
// type of consonant
{ "nasal", tPHONEME_TYPE, phNASAL }, // TODO (deprecated): use 'nas' instead
// keywords
{ "phonemetable", tSTATEMENT, kPHONEMETABLE },
{ "include", tSTATEMENT, kINCLUDE },