lang=en, changes to [r]

lang=en-r, added version of [aI@] phoneme


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@98 d46cf337-b52f-0410-862d-fd96e6ae7743

src/compiledict.cpp

@@ -556,16 +556,17 @@ int compile_dictlist_file(const char *path, const char* filename)
 	char *p;
 	int  count=0;
 	FILE *f_in;
-	char buf[sizeof(path_home)+45];
+	char buf[200];
+	char fname[sizeof(path_home)+45];
 	char dict_line[128];
 	
 	text_mode = 0;
 
-	sprintf(buf,"%s%s",path,filename);
-	if((f_in = fopen(buf,"r")) == NULL)
+	sprintf(fname,"%s%s",path,filename);
+	if((f_in = fopen(fname,"r")) == NULL)
 		return(-1);
 
-	fprintf(f_log,"Compiling: '%s'\n",buf);
+	fprintf(f_log,"Compiling: '%s'\n",fname);
 
 	linenum=0;
 	
@@ -1224,7 +1225,7 @@ static int compile_dictrules(FILE *f_in, FILE *f_out, char *fname_temp)
 	unsigned int char_code;
 	int compile_mode=0;
 	char *buf;
-	char buf1[120];
+	char buf1[200];
 	char *rules[N_RULES];
 
 	int n_rgroups = 0;

src/extras.cpp

@@ -298,7 +298,7 @@ void Lexicon_De()
 	int start;
 	int matched=0;
 	int defer_stress = 0;
-	char buf[120];
+	char buf[200];
 	char word[80];
 	char word2[80];
 	char type[80];
@@ -488,7 +488,7 @@ void Lexicon_Ru()
 	int counts[20][20][10];
 
 	char phonemes[N_WORD_PHONEMES];
-	char buf[120];
+	char buf[200];
 	char fname[sizeof(path_dsource)+20];
 
 	// KOI8-R codes for Russian vowels

src/synthdata.cpp

@@ -620,7 +620,7 @@ void LoadConfig(void)
 	int ix;
 	char c1;
 	char *p;
-	char string[120];
+	char string[200];
 
 	sprintf(buf,"%s%c%s",path_home,PATHSEP,"config");
 	if((f = fopen(buf,"r"))==NULL)

src/transldlg.cpp

@@ -298,7 +298,7 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
 	#define N_PH_LIST  N_PHONEME_LIST
 
 	void *vp;
-	char buf[500];
+	char buf[1000];
 	char phon_out[N_PH_LIST*2];
 	int clause_tone;
 	int clause_count;
@@ -321,6 +321,7 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
 		}
 	case T_TRANSLATE:
 	case MENU_SPEAK_TRANSLATE:
+		option_multibyte = espeakCHARS_AUTO;
 		SpeakNextClause(NULL,NULL,2);  // stop speaking file
 
 		strncpy0(buf,t_source->GetValue().mb_str(wxConvUTF8),sizeof(buf));

src/voices.cpp

@@ -222,7 +222,7 @@ static espeak_VOICE *ReadVoiceFile(FILE *f_in, const char *fname, const char*lea
 // Read a Voice file, allocate a VOICE_DATA and set data from the
 // file's  language, gender, name  lines
 
-	char linebuf[80];
+	char linebuf[120];
 	char vname[80];
 	char vgender[80];
 	char vlanguage[80];

src/vowelchart.cpp

@@ -274,7 +274,7 @@ static int VowelChartList(wxDC *dc, wxBitmap *bitmap, char *fname)
 	int count=0;
 	wxFileName filename;
 	char name[40];
-	char buf[120];
+	char buf[200];
 	wxString path;
 
 	if(fname != NULL)