Merge tag '1.48.10' into android

This commit is contained in:
Reece H. Dunn
2014-08-09 13:31:47 +01:00
33 changed files with 1256 additions and 462 deletions
+5 -6
View File
@@ -2579,12 +2579,6 @@ static void MatchRule(Translator *tr, char *word[], char *word_start, int group_
while(*rule++ != 0);
}
if((option_phonemes == 2) && ((word_flags & FLAG_NO_TRACE)==0))
{
if(group_length <= 1)
fprintf(f_trans,"\n");
}
/* advance input data pointer */
total_consumed += group_length;
if(total_consumed == 0)
@@ -2881,6 +2875,11 @@ int TranslateRules(Translator *tr, char *p_start, char *phonemes, int ph_size, c
return(0);
}
if((option_phonemes == 2) && ((word_flags & FLAG_NO_TRACE)==0))
{
fprintf(f_trans,"\n");
}
match1.end_type &= ~SUFX_UNPRON;
if((match1.end_type != 0) && (end_phonemes != NULL))