Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-05-04 09:30:42 +01:00
7 changed files with 75 additions and 62 deletions
BIN
View File
Binary file not shown.
+5 -5
View File
@@ -2,7 +2,7 @@
phoneme : // lengthen previous vowel by "length"
virtual
length 40 // only a small increase for "long stress" because we probably put the stress on the wrong syllable
length 50 // only a small increase for "long stress" because we probably put the stress on the wrong syllable
endphoneme
@@ -15,10 +15,10 @@ endphoneme
phoneme i
vowel starttype #i endtype #i
length 160
IfNextVowelAppend(;)
IF thisPh(isStressed) AND NOT nextPhW(isRhotic) THEN
FMT(vowel/ii_6)
ENDIF
// IfNextVowelAppend(;)
// IF thisPh(isStressed) AND NOT nextPhW(isRhotic) THEN
// FMT(vowel/ii_6)
// ENDIF
FMT(vowel/ii_3)
endphoneme
+3
View File
@@ -829,6 +829,9 @@ phoneme N
IF KlattSynth THEN
Vowelin f1=0 f2=2100 50 300 f3=0 80
IF nextPh(isPause2) THEN
FMT(klatt/nn_)
ENDIF
FMT(klatt/nn)
ENDIF