Merge branch 'development'

This commit is contained in:
Reece H. Dunn
2013-01-15 17:49:04 +00:00
14 changed files with 205 additions and 40 deletions
+1
View File
@@ -1586,6 +1586,7 @@ static int compile_lettergroup(char *input, FILE *f_out)
items[n_items] = p_start = p;
while((*p & 0xff) > ' ')
{
if (*p == '_') *p = ' '; // allow '_' for word break
p++;
}
*p++ = 0;
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.46.29 23.Nov.12";
const char *version_string = "1.46.30 15.Jan.13";
const int version_phdata = 0x014624;
int option_device_number = -1;
+2 -1
View File
@@ -1228,10 +1228,11 @@ SetLengthMods(tr,3); // all equal
tr->langopts.stress_rule = STRESSPOSN_2R; // Temporary
tr->langopts.stress_flags = 0x20;
tr->langopts.param[LOPT_REGRESSIVE_VOICING] = 0x103;
tr->langopts.param[LOPT_UNPRONOUNCABLE] = 0x76; // [v] don't count this character at start of word
tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_ALLOW_SPACE | NUM_SWAP_TENS | NUM_OMIT_1_HUNDRED | NUM_DFRACTION_2 | NUM_ORDINAL_DOT | NUM_ROMAN;
tr->langopts.numbers2 = 0x100; // plural forms of millions etc
tr->langopts.thousands_sep = ' '; // don't allow dot as thousands separator
SetLetterVowel(tr,'r');
// SetLetterVowel(tr,'r');
break;
case L('s','q'): // Albanian