mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-22 03:42:03 +00:00
[1.43.46]
Fix: Speak punctuation option also caused text after [[ to be spoken as phoneme codes even if espeakPHONEMES flag is not set. Speak sequences of letters and dots as individual letters, and don't speak 'dot', eg. "u.s.a." Don't announce punctuation in the alternative text inside <audio ... </audio> Vowelcharts, show the positions of multiple FMT() in vowel phonemes definitions. Phoneme definitions: New attributes: flag1, flag2, flag3 New attribute: nopause. Prevents the insertion of a short pause when this phoneme starts a word which follows a vowel. New conditions: isFlag1, isFlag2, isFlag3, isSibilant. New statement: InsertPhoneme() Phonemes: improve syllablic [m-] [n-] [N-] *_rules: add attributes $p_alt .. $p_alt3, $w_alt .. $w_alt3 *_list: add attributes: $sentence, $atstart klatt synthesizer: implement echo. espeakedit, Prosody display: Indicate stressed and secondary-stress syllables. espeakedit: remember window size and position. Intonation: New file, 'phsource/intonation' to define 'tunes' which can be used from voice files. espeakedit: add Compile -> Intonationm data Speed: Increase range to 80 to 450, with default=175. Improve speaking at high speeds. lang=en: Reduce consecutive unstressed syllables to 'diminished' stress, only in unstressed words. lang=de: Change 'r' phoneme. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@244 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
+32
-1
@@ -92,6 +92,7 @@ enum {
|
||||
// these override defaults set by the translator
|
||||
V_WORDGAP,
|
||||
V_INTONATION,
|
||||
V_TUNES,
|
||||
V_STRESSLENGTH,
|
||||
V_STRESSAMP,
|
||||
V_STRESSADD,
|
||||
@@ -116,7 +117,6 @@ enum {
|
||||
static MNEM_TAB options_tab[] = {
|
||||
{"reduce_t", LOPT_REDUCE_T},
|
||||
{"bracket", LOPT_BRACKET_PAUSE},
|
||||
{"fastLongVowel", LOPT_MIN_LONG_VOWEL},
|
||||
{NULL, -1} };
|
||||
|
||||
static MNEM_TAB keyword_tab[] = {
|
||||
@@ -133,6 +133,7 @@ static MNEM_TAB keyword_tab[] = {
|
||||
{"stressAmp", V_STRESSAMP},
|
||||
{"stressAdd", V_STRESSADD},
|
||||
{"intonation", V_INTONATION},
|
||||
{"tunes", V_TUNES},
|
||||
{"dictrules", V_DICTRULES},
|
||||
{"stressrule", V_STRESSRULE},
|
||||
{"charset", V_CHARSET},
|
||||
@@ -194,6 +195,20 @@ static char *fgets_strip(char *buf, int size, FILE *f_in)
|
||||
}
|
||||
|
||||
|
||||
static int LookupTune(const char *name)
|
||||
{//====================================
|
||||
int ix;
|
||||
|
||||
for(ix=0; ix<n_tunes; ix++)
|
||||
{
|
||||
if(strcmp(name, tunes[ix].name) == 0)
|
||||
return(ix);
|
||||
}
|
||||
return(-1);
|
||||
} // end of LookupTune
|
||||
|
||||
|
||||
|
||||
static void SetToneAdjust(voice_t *voice, int *tone_pts)
|
||||
{//=====================================================
|
||||
int ix;
|
||||
@@ -539,6 +554,7 @@ voice_t *LoadVoice(const char *vname, int control)
|
||||
int stress_amps[8];
|
||||
int stress_lengths[8];
|
||||
int stress_add[8];
|
||||
char names[8][40];
|
||||
|
||||
int pitch1;
|
||||
int pitch2;
|
||||
@@ -761,6 +777,21 @@ voice_t *LoadVoice(const char *vname, int control)
|
||||
langopts->intonation_group = option_tone_flags & 0xff;
|
||||
break;
|
||||
|
||||
case V_TUNES:
|
||||
n = sscanf(p,"%s %s %s %s %s %s",names[0],names[1],names[2],names[3],names[4],names[5]);
|
||||
langopts->intonation_group = 0;
|
||||
for(ix=0; ix<n; ix++)
|
||||
{
|
||||
if(strcmp(names[ix],"NULL")==0)
|
||||
continue;
|
||||
|
||||
if((value = LookupTune(names[ix])) < 0)
|
||||
fprintf(stderr,"Unknown tune '%s'\n",names[ix]);
|
||||
else
|
||||
langopts->tunes[ix] = value;
|
||||
}
|
||||
break;
|
||||
|
||||
case V_DICTRULES: // conditional dictionary rules and list entries
|
||||
while(*p != 0)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user