Merge branch 'development'

Conflicts:
	phsource/phonemes
This commit is contained in:
Reece H. Dunn
2014-03-04 17:51:51 +00:00
46 changed files with 2386 additions and 1011 deletions
+4 -1
View File
@@ -294,7 +294,7 @@ static keywtab_t keywords[] = {
{"Continue", tSTATEMENT, kCONTINUE},
{"ChangePhoneme", tINSTRN1, i_CHANGE_PHONEME},
{"ReplaceNextPhoneme", tINSTRN1, i_REPLACE_NEXT_PHONEME},
{"ChangeNextPhoneme", tINSTRN1, i_REPLACE_NEXT_PHONEME},
{"InsertPhoneme", tINSTRN1, i_INSERT_PHONEME},
{"AppendPhoneme", tINSTRN1, i_APPEND_PHONEME},
{"IfNextVowelAppend", tINSTRN1, i_APPEND_IFNEXTVOWEL},
@@ -1133,6 +1133,9 @@ static unsigned int StringToWord(const char *string)
unsigned char c;
unsigned int word;
if(string==NULL)
return(0);
word = 0;
for(ix=0; ix<4; ix++)
{