[1.31.08]

Fixed bug of missed character after & sequence when --punct option is used.
lang=ta:  First attempt at phoneme [l.] retroflex-l.
lang=no:  Use phoneme [R] for all cases of "r".


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@138 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2008-02-09 00:26:34 +00:00
parent 39e8e1dcb6
commit c3d666f15c
12 changed files with 154 additions and 86 deletions
+1 -1
View File
@@ -279,7 +279,7 @@ static TONE_NUCLEUS tone_nucleus_table[N_TONE_NUCLEUS_TABLE] = {
{PITCHfrise, 35, 8, PITCHfrise2, 35,10, NULL, 15, 23, 0}, // 1 comma
{PITCHfrise, 39,10, PITCHfrise2, 36,10, NULL, 15, 28, 0}, // 2 question
// {PITCHfall, 41, 4, PITCHfall, 41,27, NULL, 16, 4, T_EMPH}, // 3 exclamation
{PITCHfall, 43, 3, PITCHfall, 45,35, NULL, 35, 4, T_EMPH}, // 3 exclamation
{PITCHfall, 43, 3, PITCHfall, 43,35, NULL, 35, 4, T_EMPH}, // 3 exclamation
// {PITCHrisefall,47, 8, PITCHrise, 48,30, NULL, 48, 5, T_EMPH}, // 3 exclamation
{PITCHfall, 38, 2, PITCHfall, 42,30, NULL, 15, 5, 0}, // 4 statement, emphatic
{PITCHfall, 28, 5, PITCHfall, 28, 9, NULL, 12, 7, 0}, // 5 statement, less intonation
+3 -3
View File
@@ -723,7 +723,7 @@ int Translator::AnnouncePunctuation(int c1, int c2, char *buf, int bufix)
UngetC(c2);
if(option_ssml)
{
if(c1 == '<')
if((c1 == '<') || (c1 == '&'))
ssml_ignore_l_angle = c1; // this was &lt; which was converted to <, don't pick it up again as <
}
ungot_char2 = c1;
@@ -1791,7 +1791,7 @@ f_input = f_in; // for GetC etc
if((option_ssml) && (phoneme_mode==0))
{
if((c1 == '&') && ((c2=='#') || ((c2 >= 'a') && (c2 <= 'z'))))
if((ssml_ignore_l_angle != '&') && (c1 == '&') && ((c2=='#') || ((c2 >= 'a') && (c2 <= 'z'))))
{
n_xml_buf = 0;
c1 = c2;
@@ -1829,7 +1829,7 @@ f_input = f_in; // for GetC etc
}
}
else
if((c1 == '<') && !ssml_ignore_l_angle)
if((c1 == '<') && (ssml_ignore_l_angle != '<'))
{
// SSML Tag
n_xml_buf = 0;
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.31.07 08.Feb.08";
const char *version_string = "1.31.08 08.Feb.08";
const int version_phdata = 0x013105;
int option_device_number = -1;