Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	dictsource/tn_list
	dictsource/tn_rules
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2012-09-11 15:02:53 +01:00
18 changed files with 701 additions and 265 deletions
+3 -3
View File
@@ -19,7 +19,7 @@ endphoneme
phoneme E
vowel starttype #e endtype #e
length 190
FMT(vowel/e_mid)
FMT(vowel/e_mid2)
endphoneme
phoneme i
@@ -32,7 +32,7 @@ endphoneme
phoneme o
vowel starttype #o endtype #o
length 190
FMT(vowel/o)
FMT(vowel/oo)
endphoneme
phoneme O
@@ -149,7 +149,7 @@ phoneme r
ipa ɾ
lengthmod 3
IF nextPhW(isVowel) OR nextPhW(t) THEN
IF nextPhW(isVowel) THEN
ChangePhoneme(**)
ENDIF
+93
View File
@@ -0,0 +1,93 @@
phoneme i
vowel starttype #i endtype #i
length 180
FMT(vowel/i)
endphoneme
phoneme y
vowel starttype #u endtype #u
length 180
FMT(vowel/y)
endphoneme
phoneme u
vowel starttype #u endtype #u
length 180
FMT(vowel/u)
endphoneme
phoneme e
vowel starttype #@ endtype #@
length 100
FMT(vowel/ii#)
endphoneme
phoneme W
vowel starttype #@ endtype #@
length 100
FMT(vowel/oe)
endphoneme
phoneme o
vowel starttype #o endtype #o
length 100
FMT(vowel/o_mid)
endphoneme
phoneme V
vowel starttype #@ endtype #@
length 100
FMT(vowel/o-_3)
endphoneme
phoneme a
vowel starttype #a endtype #a
length 180
FMT(vowel/&_2)
endphoneme
phoneme A
vowel starttype #a endtype #a
length 180
IF thisPh(isFirstVowel) THEN
ChangePhoneme(0)
ENDIF
IF thisPh(isSeqFlag1) THEN
ChangePhoneme(0)
ENDIF
FMT(vowel/aa)
endphoneme
phoneme 0
vowel starttype #o endtype #o
flag1
length 180
FMT(vowel/0_3)
endphoneme
phoneme I
vowel starttype #i endtype #i
length 100
FMT(vowel/ii)
endphoneme
// Consonants
phoneme r
import_phoneme base/R2
endphoneme
phoneme t
import_phoneme base/t[
endphoneme
phoneme d
import_phoneme base/d[
endphoneme
+3
View File
@@ -1897,3 +1897,6 @@ include ph_farsi
phonemetable ga base
include ph_irish
phonemetable tt base
include ph_tatar
Binary file not shown.