Merge tag '1.48.07' into android

This commit is contained in:
Reece H. Dunn
2014-08-09 13:29:39 +01:00
20 changed files with 408 additions and 265 deletions
+2 -1
View File
@@ -270,9 +270,10 @@ endphoneme
phoneme i // optional variant of [I] for end of words
vowel starttype #i endtype #i
ipa i
length 140
length 150
IfNextVowelAppend(;)
FMT(vowel/ii_7)
// FMT(vowel/ii_final)
endphoneme
+1 -1
View File
@@ -262,7 +262,7 @@ phoneme aI
IF nextPh(#a) OR nextPh(#o) THEN
AppendPhoneme(;)
ENDIF
FMT(vdiph/ai_6)
FMT(vwl_en_us/ai)
endphoneme
+2 -2
View File
@@ -228,8 +228,8 @@ endphoneme
phoneme a~
vowel long starttype #a endtype #a
length 220
FMT(vnasal/&_n)
length 240
FMT(vnasal/a_n)
endphoneme
phoneme V~
-1
View File
@@ -1813,7 +1813,6 @@ include ph_aragon
phonemetable eu base2
include ph_basque
phonemetable pt base2
include ph_pt_brazil
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.