Merge branch 'master' into android

Conflicts:
	README.md

src/voices.cpp

@@ -111,6 +111,7 @@ enum {
 	V_SPEED,
 	V_DICTMIN,
 	V_ALPHABET2,
+	V_DICTDIALECT,
 
 // these need a phoneme table to have been specified
 	V_REPLACE,
@@ -163,6 +164,7 @@ static MNEM_TAB keyword_tab[] = {
 	{"speed",      V_SPEED},
 	{"dict_min",   V_DICTMIN},
 	{"alphabet2",  V_ALPHABET2},
+	{"dictdialect",   V_DICTDIALECT},
 
 	// these just set a value in langopts.param[]
 	{"l_dieresis", 0x100+LOPT_DIERESES},
@@ -176,6 +178,13 @@ static MNEM_TAB keyword_tab[] = {
 	{NULL,   0}
 };
 
+static MNEM_TAB dict_dialects[] = {
+	{"en-us",   DICTDIALECT_EN_US},
+	{"es-la",   DICTDIALECT_ES_LA},
+	{NULL,   0}
+};
+
+
 #define N_VOICE_VARIANTS   12
 const char variants_either[N_VOICE_VARIANTS] = {1,2,12,3,13,4,14,5,11,0};
 const char variants_male[N_VOICE_VARIANTS] = {1,2,3,4,5,6,0};
@@ -873,6 +882,7 @@ voice_t *LoadVoice(const char *vname, int control)
 				}
 				while(isalnum(*p)) p++;
 			}
+			ProcessLanguageOptions(langopts);
 			break;
 
 		case V_REPLACE:
@@ -1029,6 +1039,21 @@ voice_t *LoadVoice(const char *vname, int control)
 			}
 			break;
 
+		case V_DICTDIALECT:
+			// specify a dialect to use for foreign words, eg, en-us for _^_EN
+			if(sscanf(p, "%s", name1) == 1)
+			{
+				if((ix = LookupMnem(dict_dialects, name1)) > 0)
+				{
+					langopts->dict_dialect |= (1 << ix);
+				}
+				else
+				{
+					fprintf(stderr, "dictdialect name '%s' not recognized\n", name1);
+				}
+			}
+			break;
+
 		default:
 			if((key & 0xff00) == 0x100)
 			{
@@ -1068,6 +1093,7 @@ voice_t *LoadVoice(const char *vname, int control)
 		if((ix = SelectPhonemeTableName(phonemes_name)) < 0)
 		{
 			fprintf(stderr,"Unknown phoneme table: '%s'\n",phonemes_name);
+			ix = 0;
 		}
 		voice->phoneme_tab_ix = ix;
 		new_translator->phoneme_tab_ix = ix;