Merge branch 'master' into android

This commit is contained in:
Reece H. Dunn
2013-03-17 11:48:39 +00:00
67 changed files with 2387 additions and 2099 deletions
+2 -2
View File
@@ -3182,7 +3182,7 @@ static const char *LookupDict2(Translator *tr, const char *word, const char *wor
continue;
}
if((dictionary_flags2 & FLAG_ATEND) && (word_end < tr->clause_end))
if((dictionary_flags2 & FLAG_ATEND) && (word_end < translator->clause_end))
{
// only use this pronunciation if it's the last word of the clause
continue;
@@ -3194,7 +3194,7 @@ static const char *LookupDict2(Translator *tr, const char *word, const char *wor
continue;
}
if((dictionary_flags2 & FLAG_SENTENCE) && !(tr->clause_terminator & CLAUSE_BIT_SENTENCE))
if((dictionary_flags2 & FLAG_SENTENCE) && !(translator->clause_terminator & CLAUSE_BIT_SENTENCE))
{
// only uis this clause is a sentence , i.e. terminator is {. ? !} not {, : :}
continue;