Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vwl_en_us/ai3
This commit is contained in:
Reece H. Dunn
2014-06-23 11:47:31 +01:00
20 changed files with 409 additions and 266 deletions
+3 -2
View File
@@ -213,7 +213,7 @@ enum {
kTUNE_SPLIT,
};
static const char utf8_bom[] = {0xef,0xbb,0xbf,0};
static unsigned const char utf8_bom[] = {0xef,0xbb,0xbf,0};
static keywtab_t k_intonation[] = {
{"tune", 0, kTUNE},
@@ -255,7 +255,7 @@ static keywtab_t keywords[] = {
{"phonemenumber",tSTATEMENT, kPHONEMENUMBER},
{"phonemetable",tSTATEMENT, kPHONEMETABLE},
{"include", tSTATEMENT, kINCLUDE},
{utf8_bom, tSTATEMENT, kUTF8_BOM},
{(const char *)utf8_bom, tSTATEMENT, kUTF8_BOM},
{"phoneme", tSTATEMENT, kPHONEMESTART},
{"procedure", tSTATEMENT, kPROCEDURE},
@@ -3498,6 +3498,7 @@ static void CompilePhonemeFiles()
f_in = f;
strncpy0(current_fname,item_string,sizeof(current_fname));
linenum = 1;
}
else
{
+2 -2
View File
@@ -118,7 +118,7 @@ bool MyApp::OnInit(void)
{//=====================
int j;
wxChar *p;
const wxChar *p;
char param[120];
@@ -744,7 +744,7 @@ void MyFrame::OnTools(wxCommandEvent& event)
int debug_flag=0;
char fname_log[sizeof(path_dsource)+12];
char err_fname[sizeof(path_home)+15];
static const char utf8_bom[] = {0xef,0xbb,0xbf,0};
static unsigned const char utf8_bom[] = {0xef,0xbb,0xbf,0};
switch(event.GetId())
{