Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-02-11 10:35:20 +00:00
11 changed files with 327 additions and 162 deletions
+13 -1
View File
@@ -113,10 +113,22 @@ phoneme k
import_phoneme consonants/k-
endphoneme
phoneme q
vls uvl stop
lengthmod 2
Vowelin f1=1 f2=1700 0 200 f3=-300 80 gpaus f4 rms=30
Vowelout f1=1 f2=1700 -100 200 f3=-300 80 f4 rms=35
IF nextPh(#i) THEN
WAV(ustop/q2_i, 40)
ENDIF
WAV(ustop/q2, 48)
endphoneme
phoneme Q
import_phoneme base/Q"
import_phoneme base/r"
endphoneme
phoneme r