Merge commit 'e20c295c75' into android

Conflicts:
	phsource/vowel/vowelchart.png
This commit is contained in:
Reece H. Dunn
2013-03-13 22:08:26 +00:00
21 changed files with 528 additions and 127 deletions
+8
View File
@@ -2493,6 +2493,7 @@ int TranslateRules(Translator *tr, char *p_start, char *phonemes, int ph_size, c
int ix;
unsigned int digit_count=0;
char *p;
ALPHABET *alphabet;
int dict_flags0=0;
MatchRecord match1;
MatchRecord match2;
@@ -2689,6 +2690,13 @@ int TranslateRules(Translator *tr, char *p_start, char *phonemes, int ph_size, c
match1.points = 1;
p += (wc_bytes-1);
}
if(((alphabet = AlphabetFromChar(letter)) != NULL) && (alphabet->language != 0) && (alphabet->offset != tr->letter_bits_offset))
{
// switch to the nominated language for this alphabet
sprintf(phonemes,"%c%s",phonSWITCH, WordToString2(alphabet->language));
return(0);
}
}
}