Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	dictsource/tn_list
	dictsource/tn_rules
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2012-09-11 15:02:53 +01:00
18 changed files with 701 additions and 265 deletions
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.46.22 09.Aug.12";
const char *version_string = "1.46.23 09.Sep.12";
const int version_phdata = 0x014600;
int option_device_number = -1;
+16 -6
View File
@@ -309,12 +309,12 @@ static void SetCyrillicLetters(Translator *tr)
tr->letter_bits_offset = OFFSET_CYRILLIC;
memset(tr->letter_bits,0,sizeof(tr->letter_bits));
SetLetterBits(tr,LETTERGP_A,(char *)ru_vowels);
SetLetterBits(tr,1,ru_soft);
SetLetterBits(tr,2,(char *)ru_consonants);
SetLetterBits(tr,3,ru_hard);
SetLetterBits(tr,4,ru_nothard);
SetLetterBits(tr,5,ru_voiced);
SetLetterBits(tr,6,ru_ivowels);
SetLetterBits(tr,LETTERGP_B,ru_soft);
SetLetterBits(tr,LETTERGP_C,(char *)ru_consonants);
SetLetterBits(tr,LETTERGP_H,ru_hard);
SetLetterBits(tr,LETTERGP_F,ru_nothard);
SetLetterBits(tr,LETTERGP_G,ru_voiced);
SetLetterBits(tr,LETTERGP_Y,ru_ivowels);
SetLetterBits(tr,LETTERGP_VOWEL2,(char *)ru_vowels);
} // end of SetCyrillicLetters
@@ -1356,6 +1356,16 @@ SetLengthMods(tr,3); // all equal
}
break;
case L('t','t'): // Tatar
{
SetCyrillicLetters(tr);
SetupTranslator(tr,stress_lengths_fr,stress_amps_fr);
tr->langopts.stress_rule = STRESSPOSN_1R; // stress on final syllable
tr->langopts.stress_flags = 0x20; //no automatic secondary stress
tr->langopts.numbers = NUM_SINGLE_STRESS | NUM_DECIMAL_COMMA | NUM_OMIT_1_HUNDRED | NUM_OMIT_1_THOUSAND | NUM_DFRACTION_4;
}
break;
case L('u','k'): // Ukrainian
{
SetCyrillicLetters(tr);