mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[1.43.52]

Browse Source 
espeakedit --compile  also compiles the intonation data

Added feature to produce phonemes as International Phonetic Alphabet.
phoneme definitions: Added "ipa" instruction to specify IPA phoneme name.

When spelling as individual characters, calculate the stress position for each character name.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@249 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2010-07-05 09:01:28 +00:00
parent a9fedd94db
commit 3bf61040b9
76 changed files with 1085 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiledata.cpp
+61
View File
@@ -42,6 +42,7 @@
extern void FindPhonemesUsed(void);
extern void DisplayErrorFile(const char *fname);
extern int utf8_out(unsigned int c, char *buf);
char path_source[sizeof(path_home)+20];
@@ -290,6 +291,7 @@ static keywtab_t keywords[] = {
{"LengthAdd", tINSTRN1, i_ADD_LENGTH},
{"Lengthmod", tINSTRN1, i_LENGTH_MOD},
{"lengthmod", tINSTRN1, i_LENGTH_MOD},
{"ipa", tINSTRN1, i_IPA_NAME},
// flags
{"wavef", tPHONEME_FLAG, phWAVE},
@@ -392,6 +394,7 @@ static void DecompilePhoneme(FILE *f_out, PHONEME_TAB *ph, int compile_phoneme)
int ix;
int any;
const char *name;
char buf[120];
static const char *INV = "Invalid";
@@ -456,6 +459,18 @@ return;
fprintf(f_out,"%s",instn0_string[data1]);
}
else
if(type2 == i_IPA_NAME)
{
for(ix = 0; ix < data1; ix += 2)
{
instn = *pc++;
buf[ix] = instn >> 8;
buf[ix+1] = instn & 0xff;
}
buf[ix] = 0;
fprintf(f_out,"ipa %s",buf);
}
else
{
fprintf(f_out,"%s(",KeyToMnem(keywords, tINSTRN1, type2));
switch(instn1_paramtype[type2])
@@ -2541,6 +2556,11 @@ int CompilePhoneme(int compile_phoneme)
int keyword;
int value;
int phcode = 0;
int ix;
unsigned int c;
char *p;
char number_buf[12];
char ipa_buf[N_ITEM_STRING];
PHONEME_TAB phoneme_out2;
PHONEME_PROG_LOG phoneme_prog_log;
@@ -2657,6 +2677,42 @@ int CompilePhoneme(int compile_phoneme)
value = NextItem(tNUMBER);
phoneme_out->length_mod = value;
break;
case i_IPA_NAME:
NextItem(tSTRING);
if(strcmp(item_string,"NULL")==0)
strcpy(item_string," ");
// copy the string, recognize characters in the form U+9999
p = item_string;
ix = 0;
while((c = *p++) != 0)
{
if((c=='U') && (p[0]=='+'))
{
// U+9999
memcpy(number_buf,&p[1],4); // U+ should be followed by 4 hex digits
number_buf[4] = 0;
c = 0;
sscanf(number_buf,"%x",&c);
p += 5;
ix += utf8_out(c, &ipa_buf[ix]);
}
else
{
ipa_buf[ix++] = c;
}
}
ipa_buf[ix] = 0;
value = strlen(ipa_buf); // number of UTF-8 bytes
*prog_out++ = (i_IPA_NAME << 8) + value;
for(ix=0; ix < value; ix += 2)
{
*prog_out++ = (ipa_buf[ix] << 8) + (ipa_buf[ix+1] & 0xff);
}
break;
}
break;
@@ -2702,6 +2758,11 @@ int CompilePhoneme(int compile_phoneme)
case kSTRESSTYPE:
value = NextItem(tNUMBER);
phoneme_out->std_length = value;
if(prog_out > prog_buf)
{
error("stress phonemes can't contain program instructions",NULL);
prog_out = prog_buf;
}
break;
case kIF: