mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-14 09:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.43.46]

Browse Source 
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:
jonsd
2010-06-20 13:15:35 +00:00
parent cec2c415da
commit 18240ae109
164 changed files with 9868 additions and 7302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/translate.cpp
+119 -14
View File
@@ -115,6 +115,7 @@ static const unsigned short brackets[] = {
'(',')','[',']','{','}','<','>','"','\'','`',
0xab,0xbb, // double angle brackets
0x300a,0x300b, // double angle brackets (ideograph)
0xe000+'<', // private usage area
0};
// other characters which break a word, but don't produce a pause
@@ -594,6 +595,73 @@ static char *SpeakIndividualLetters(Translator *tr, char *word, char *phonemes,
static int CheckDottedAbbrev(char *word1, WORD_TAB *wtab)
{//=====================================================
int wc;
int count = 0;
int nbytes;
int ok;
int ix;
char *word;
char *wbuf;
char word_buf[80];
word = word1;
wbuf = word_buf;
ix = 0;
for(;;)
{
ok = 0;
nbytes = utf8_in(&wc, word);
if((word[nbytes] == ' ') && IsAlpha(wc))
{
if(word[nbytes+1] == '.')
{
if(word[nbytes+2] == ' ')
ok = 1;
else
if(word[nbytes+2] =='\'')
{
nbytes += 2; // delete the final dot (eg. u.s.a.'s)
ok = 2;
}
}
else
if((count > 0) && (word[nbytes] == ' '))
ok = 2;
}
if(ok == 0)
break;
for(ix=0; ix < nbytes; ix++)
*wbuf++ = word[ix];
count++;
if(ok == 2)
{
word += nbytes;
break;
}
word += (nbytes + 3);
}
if(count > 1)
{
ix = wbuf - word_buf;
memcpy(word1, word_buf, ix);
while(&word1[ix] < word)
word1[ix++] = ' ';
dictionary_skipwords = (count - 1)*2;
}
return(count);
} // end of CheckDottedAbbrev
int TranslateWord(Translator *tr, char *word1, int next_pause, WORD_TAB *wtab)
{//===========================================================================
// word1 is terminated by space (0x20) character
@@ -677,6 +745,7 @@ int TranslateWord(Translator *tr, char *word1, int next_pause, WORD_TAB *wtab)
}
spell_word = 0;
if(option_sayas == SAYAS_KEY)
{
if(word_length == 1)
@@ -702,6 +771,7 @@ int TranslateWord(Translator *tr, char *word1, int next_pause, WORD_TAB *wtab)
if(!found)
found = LookupDictList(tr, &word1, phonemes, dictionary_flags, FLAG_ALLOW_TEXTMODE, wtab); // the original word
if((dictionary_flags[0] & (FLAG_ALLOW_DOT || FLAG_NEEDS_DOT)) && (wordx[1] == '.'))
{
wordx[1] = ' '; // remove a Dot after this word
@@ -740,6 +810,20 @@ int TranslateWord(Translator *tr, char *word1, int next_pause, WORD_TAB *wtab)
}
}
if((word_length == 1) && (dictionary_skipwords == 0))
{
// is this a series of single letters separated by dots?
if(CheckDottedAbbrev(word1, wtab))
{
dictionary_flags[0] = 0;
dictionary_flags[1] = 0;
spell_word = 1;
if(dictionary_skipwords)
dictionary_flags[0] = FLAG_SKIPWORDS;
}
}
// if textmode, LookupDictList() replaces word1 by the new text and returns found=0
if(phonemes[0] == phonSWITCH)
@@ -1604,7 +1688,7 @@ static int TranslateWord2(Translator *tr, char *word, WORD_TAB *wtab, int pre_pa
if(pre_pause < 1)
pre_pause = 1;
}
if((flags & FLAG_PREPAUSE) && ((word_flags && FLAG_LAST_WORD) == 0) && (tr->prepause_timeout == 0))
if((flags & FLAG_PREPAUSE) && !(word_flags && (FLAG_LAST_WORD | FLAG_FIRST_WORD)) && !(wtab[-1].flags & FLAG_FIRST_WORD) && (tr->prepause_timeout == 0))
{
// the word is marked in the dictionary list with $pause
if(pre_pause < 4) pre_pause = 4;
@@ -1667,6 +1751,13 @@ static int TranslateWord2(Translator *tr, char *word, WORD_TAB *wtab, int pre_pa
if((word_flags & FLAG_HYPHEN) && (phoneme_tab[*p]->type == phPAUSE))
p++;
if((p[0] == 0) && (embedded_flag))
{
// no phonemes. Insert a very short pause to carry an embedded command
p[0] = phonPAUSE_VSHORT;
p[1] = 0;
}
while(((ph_code = *p++) != 0) && (n_ph_list2 < N_PHONEME_LIST-4))
{
if(ph_code == 255)
@@ -1989,17 +2080,27 @@ static int TranslateChar(Translator *tr, char *ptr, int prev_in, unsigned int c,
switch(tr->translator_name)
{
case L('a','f'):
case L('n','l'):
// look for 'n and replace by a special character (unicode: schwa)
utf8_in(&next2, &ptr[1]);
if(!iswalpha(prev_in))
{
if((c == '\'') && (next_in == 'n') && IsSpace(next2))
utf8_in(&next2, &ptr[1]);
if((c == '\'') && IsSpace(next2))
{
// n preceded by either apostrophe or U2019 "right single quotation mark"
ptr[0] = ' '; // delete the n
return(0x0259); // replace ' by unicode schwa character
if((next_in == 'n') && (tr->translator_name == L('a','f')))
{
// n preceded by either apostrophe or U2019 "right single quotation mark"
ptr[0] = ' '; // delete the n
return(0x0259); // replace ' by unicode schwa character
}
if((next_in == 'n') || (next_in == 't'))
{
// Dutch, [@n] and [@t]
return(0x0259); // replace ' by unicode schwa character
}
}
}
break;
@@ -2090,7 +2191,6 @@ void *TranslateClause(Translator *tr, FILE *f_text, const void *vp_input, int *t
embedded_ix = 0;
embedded_read = 0;
option_phoneme_input &= ~2; // clear bit 1 (temporary indication)
pre_pause = 0;
any_stressed_words = 0;
@@ -2263,6 +2363,7 @@ void *TranslateClause(Translator *tr, FILE *f_text, const void *vp_input, int *t
c = towlower2(c);
}
if(phoneme_mode)
{
all_upper_case = FLAG_PHONEMES;
@@ -2374,11 +2475,15 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
}
}
if((c == '[') && (next_in == '[') && option_phoneme_input)
if(c == '[')
{
phoneme_mode = FLAG_PHONEMES;
source_index++;
continue;
if((next_in == '\002') || ((next_in == '[') && option_phoneme_input))
{
// "[\002" is used internally to start phoneme mode
phoneme_mode = FLAG_PHONEMES;
source_index++;
continue;
}
}
if(c == 0)
@@ -2536,9 +2641,9 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
else
if(c == '\'')
{
if(iswalnum(prev_in) && IsAlpha(next_in))
if(((prev_in == '.') || iswalnum(prev_in)) && IsAlpha(next_in))
{
// between two letters, consider apostrophe as part of the word
// between two letters, or in an abbreviation (eg. u.s.a.'s). Consider the apostrophe as part of the word
single_quoted = 0;
}
else
@@ -2720,7 +2825,7 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
words[0].flags |= FLAG_FIRST_WORD;
for(ix=0; ix<word_count; ix++)
for(ix=0; ix < word_count; ix++)
{
int nx;
int c_temp;