mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-21 11:31:00 +00:00
[1.46.52]
klatt voices, Added nasal formant value to nasal vowels. Fixed bug: speaking "hyphen" between two words with $combine attribute. Language changes: an, pt, ta. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@318 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
+14
-1
@@ -745,6 +745,7 @@ static void CompileReport(void)
|
||||
REF_HASH_TAB **list;
|
||||
const char *data_path;
|
||||
int prev_table;
|
||||
int procedure_num;
|
||||
int prev_mnemonic;
|
||||
|
||||
if(f_report == NULL)
|
||||
@@ -802,7 +803,17 @@ static void CompileReport(void)
|
||||
j++;
|
||||
}
|
||||
|
||||
fprintf(f_report," [%s] %s",WordToString(prev_mnemonic = list[ix]->ph_mnemonic), phoneme_tab_list2[prev_table = list[ix]->ph_table].name);
|
||||
prev_mnemonic = list[ix]->ph_mnemonic;
|
||||
if((prev_mnemonic >> 24) == 'P')
|
||||
{
|
||||
// a procedure, not a phoneme
|
||||
procedure_num = atoi(WordToString(prev_mnemonic));
|
||||
fprintf(f_report," %s %s", phoneme_tab_list2[prev_table = list[ix]->ph_table].name, proc_names[procedure_num]);
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf(f_report," [%s] %s",WordToString(prev_mnemonic), phoneme_tab_list2[prev_table = list[ix]->ph_table].name);
|
||||
}
|
||||
fputc('\n',f_report);
|
||||
}
|
||||
|
||||
@@ -2761,6 +2772,8 @@ int CompilePhoneme(int compile_phoneme)
|
||||
}
|
||||
strcpy(proc_names[n_procs], item_string);
|
||||
phoneme_out = &phoneme_out2;
|
||||
sprintf(number_buf,"%.3dP", n_procs);
|
||||
phoneme_out->mnemonic = StringToWord(number_buf);
|
||||
}
|
||||
|
||||
phoneme_out->code = phcode;
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@
|
||||
#include "translate.h"
|
||||
#include "wave.h"
|
||||
|
||||
const char *version_string = "1.46.51 15.Mar.13";
|
||||
const char *version_string = "1.46.52 16.Mar.13";
|
||||
const int version_phdata = 0x014640;
|
||||
|
||||
int option_device_number = -1;
|
||||
|
||||
+1
-1
@@ -82,7 +82,7 @@ const char *WordToString(unsigned int word)
|
||||
int ix;
|
||||
static char buf[5];
|
||||
|
||||
for(ix=0; ix<3; ix++)
|
||||
for(ix=0; ix<4; ix++)
|
||||
buf[ix] = word >> (ix*8);
|
||||
buf[4] = 0;
|
||||
return(buf);
|
||||
|
||||
@@ -731,6 +731,7 @@ Translator *SelectTranslator(const char *name)
|
||||
if(name2 == L('a','n'))
|
||||
{
|
||||
tr->langopts.stress_flags = S_FINAL_SPANISH | S_FINAL_DIM_ONLY | S_FINAL_NO_2;
|
||||
tr->langopts.numbers2 = 0;
|
||||
}
|
||||
else
|
||||
if(name2 == L_pap)
|
||||
|
||||
@@ -1938,6 +1938,7 @@ static int TranslateWord2(Translator *tr, char *word, WORD_TAB *wtab, int pre_pa
|
||||
if(ok)
|
||||
{
|
||||
*p2 = '-'; // replace next space by hyphen
|
||||
wtab[0].flags &= ~FLAG_ALL_UPPER; // prevent it being considered an abbreviation
|
||||
flags = TranslateWord(translator, word, next_pause, wtab, NULL); // translate the combined word
|
||||
if((sylimit > 0) && (CountSyllables(p) > (sylimit & 0x1f)))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user