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

[1.30.15] lang=es,pt: Fix bug where accented vowels cause intonation to go low pitch for the rest of the clause.

Browse Source 
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@127 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-01-17 21:10:26 +00:00
parent 0b70e7e6c3
commit 8f4c6ebd1e
21 changed files with 306 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intonation.cpp
+24 -21
View File
@@ -39,6 +39,7 @@ typedef struct {
char stress;
char env;
char flags; //bit 0=pitch rising, bit1=emnphasized
char nextph_type;
short pitch1;
short pitch2;
} SYLLABLE;
@@ -901,6 +902,28 @@ void Translator::CalcPitches(int clause_type)
SYLLABLE syllable_tab2[N_PHONEME_LIST];
syllable_tab = syllable_tab2; // don't use permanent storage. it's only needed during the call of CalcPitches()
n_st = 0;
n_primary = 0;
for(ix=0; ix<(n_phoneme_list-1); ix++)
{
p = &phoneme_list[ix];
if(p->synthflags & SFLAG_SYLLABLE)
{
syllable_tab[n_st].flags = 0;
syllable_tab[n_st].env = PITCHfall;
syllable_tab[n_st].nextph_type = phoneme_list[ix+1].type;
syllable_tab[n_st++].stress = p->tone; // stress level
if(p->tone >= 4)
n_primary++;
}
}
syllable_tab[n_st].stress = 0; // extra 0 entry at the end
if(n_st == 0)
return; // nothing to do
if(langopts.tone_language == 1)
{
@@ -921,26 +944,6 @@ void Translator::CalcPitches(int clause_type)
else
no_tonic = 0;
n_st = 0;
n_primary = 0;
for(ix=0; ix<n_phoneme_list; ix++)
{
p = &phoneme_list[ix];
if(p->synthflags & SFLAG_SYLLABLE)
{
syllable_tab[n_st].flags = 0;
syllable_tab[n_st].env = PITCHfall;
syllable_tab[n_st++].stress = p->tone; // stress level
if(p->tone >= 4)
n_primary++;
}
}
syllable_tab[n_st].stress = 0; // extra 0 entry at the end
if(n_st == 0)
return; // nothing to do
st_start = 0;
count_primary=0;
for(st_ix=0; st_ix<n_st; st_ix++)
@@ -952,7 +955,7 @@ void Translator::CalcPitches(int clause_type)
if(syl->stress == 6)
{
// reduce the stress of the previous stressed syllable
// reduce the stress of the previous stressed syllable (review only the previous few syllables)
for(ix=st_ix-1; ix>=st_start && ix>=(st_ix-3); ix--)
{
if(syllable_tab[ix].stress == 6)