[1.46.10]

Add --version command-line option.

Allow hexadecimal numbers for UTF-8 bytes in rules in *_rules files.

wave_pulse.cpp, ensure wave_close is not called again while waiting.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@278 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2011-12-21 15:43:20 +00:00
parent 0617cc4750
commit 5ac192df81
35 changed files with 2347 additions and 1710 deletions
+5 -4
View File
@@ -715,14 +715,14 @@ if(stress <= 1)
if(stress >= 7)
{
// tonic syllable, include a constant component so it doesn't decrease directly with speed
length_mod += 20;
length_mod += tr->langopts.lengthen_tonic;
if(emphasized)
length_mod += 10;
length_mod += (tr->langopts.lengthen_tonic/2);
}
else
if(emphasized)
{
length_mod += 20;
length_mod += tr->langopts.lengthen_tonic;
}
if((len = tr->stress_lengths[stress]) == 0)
@@ -739,7 +739,8 @@ if(stress <= 1)
}
}
if(end_of_clause == 2)
if((end_of_clause == 2) && !(tr->langopts.stress_flags & S_NO_EOC_LENGTHEN))
{
// this is the last syllable in the clause, lengthen it - more for short vowels
len = (p->ph->std_length * 2);