Merge branch 'development'

Conflicts:
	src/wave.cpp
This commit is contained in:
Reece H. Dunn
2013-10-22 15:57:24 +01:00
41 changed files with 2156 additions and 1265 deletions
+2
View File
@@ -1486,6 +1486,7 @@ SetLengthMods(tr,3); // all equal
SetupTranslator(tr,stress_lengths_ta, NULL);
tr->letter_bits_offset = OFFSET_TAMIL;
tr->langopts.numbers = NUM_OMIT_1_THOUSAND ;
tr->langopts.numbers2 = NUM2_ORDINAL_AND_THOUSANDS;
tr->langopts.param[LOPT_WORD_MERGE] = 1; // don't break vowels betwen words
}
else
@@ -1582,6 +1583,7 @@ SetLengthMods(tr,3); // all equal
break;
case L('u','r'): // Urdu
case L('s','d'): // Sindhi
{
tr->letter_bits_offset = OFFSET_ARABIC;
tr->langopts.param[LOPT_UNPRONOUNCABLE] = 1; // disable check for unpronouncable words