mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-02 06:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
Conflicts:
	docs/speak_lib.h
	src/main.h
	src/speak_lib.cpp
	src/spect.h
This commit is contained in:
Reece H. Dunn
2013-11-29 23:43:03 +00:00
parent 72af75701d 6e9bc0e97e
commit 693c9a9966
43 changed files with 8028 additions and 2084 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dictionary.cpp
+22 -9
View File
@@ -527,7 +527,7 @@ unsigned short ipa1[96] = {
};
#define N_PHON_OUT 500 // realloc increment
static char *phon_out_buf = NULL;
static char *phon_out_buf = NULL; // passes the result of GetTranslatedPhonemeString()
static int phon_out_size = 0;
@@ -664,6 +664,16 @@ const char *GetTranslatedPhonemeString(int phoneme_mode)
use_ipa = phoneme_mode & 0x10;
use_tie = phoneme_mode & 0x0f;
if(phon_out_buf == NULL)
{
phon_out_size = N_PHON_OUT;
if((phon_out_buf = (char *)realloc(phon_out_buf, phon_out_size)) == NULL)
{
phon_out_size = 0;
return("");
}
}
if(use_tie >= 3)
{
// separate individual phonemes with underscores
@@ -671,6 +681,7 @@ const char *GetTranslatedPhonemeString(int phoneme_mode)
use_tie = 0;
}
for(ix=1; ix<(n_phoneme_list-2); ix++)
{
buf = phon_buf;
@@ -2916,9 +2927,10 @@ int TransposeAlphabet(Translator *tr, char *text)
int acc;
int pairs_start;
const short *pairs_list;
char buf[N_WORD_BYTES];
int bufix;
char buf[N_WORD_BYTES+1];
p2 = buf;
offset = tr->transpose_min - 1;
min = tr->transpose_min;
max = tr->transpose_max;
@@ -2926,6 +2938,7 @@ int TransposeAlphabet(Translator *tr, char *text)
pairs_start = max - min + 2;
bufix = 0;
do {
p += utf8_in(&c,p);
if(c != 0)
@@ -2934,30 +2947,30 @@ int TransposeAlphabet(Translator *tr, char *text)
{
if(map == NULL)
{
*p2++ = c - offset;
buf[bufix++] = c - offset;
}
else
{
// get the code from the transpose map
if(map[c - min] > 0)
{
*p2++ = map[c - min];
buf[bufix++] = map[c - min];
}
else
{
p2 += utf8_out(c,p2);
all_alpha=0;
break;
}
}
}
else
{
p2 += utf8_out(c,p2);
all_alpha=0;
break;
}
}
} while (c != 0);
*p2 = 0;
} while ((c != 0) && (bufix < N_WORD_BYTES));
buf[bufix] = 0;
if(all_alpha)
{