mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-15 18:04:26 +00:00
Merge branch 'master' into build
This commit is contained in:
+1
-1
@@ -7,7 +7,7 @@ BINDIR=$(PREFIX)/bin
|
||||
INCDIR=$(PREFIX)/include/espeak
|
||||
LIBDIR=$(PREFIX)/lib
|
||||
|
||||
RELEASE = 1.44
|
||||
RELEASE = 1.45
|
||||
BIN_NAME = speak
|
||||
BIN2_NAME = espeak
|
||||
LIB_NAME = libespeak.so
|
||||
|
||||
+14
-4
@@ -202,18 +202,18 @@ const int param_defaults[N_SPEECH_PARAM] = {
|
||||
0, // voice type
|
||||
};
|
||||
|
||||
|
||||
#ifdef NEED_WCHAR_FUNCTIONS
|
||||
|
||||
// additional Latin characters beyond the Latin1 character set
|
||||
#define MAX_WALPHA 0x233
|
||||
// indexed by character - 0x100
|
||||
// 0=not alphabetic, 0xff=lower case, other=value to add to upper case to convert to lower case
|
||||
// 0=not alphabetic, 0xff=lower case, 0xfe=special case
|
||||
// other=value to add to upper case to convert to lower case
|
||||
static unsigned char walpha_tab[MAX_WALPHA-0xff] = {
|
||||
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 100
|
||||
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 110
|
||||
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 120
|
||||
0xff,0xff, 1,0xff, 1,0xff, 1,0xff,0xff, 1,0xff, 1,0xff, 1,0xff, 1, // 130
|
||||
0xfe,0xff, 1,0xff, 1,0xff, 1,0xff,0xff, 1,0xff, 1,0xff, 1,0xff, 1, // 130
|
||||
0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff,0xff, 1,0xff, 1,0xff, 1,0xff, // 140
|
||||
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 150
|
||||
1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, 1,0xff, // 160
|
||||
@@ -264,6 +264,12 @@ int towlower(int c)
|
||||
return(tolower(c));
|
||||
if((c > MAX_WALPHA) || ((x = walpha_tab[c-0x100])==0xff))
|
||||
return(c); // already lower case
|
||||
if(x == 0xfe)
|
||||
{
|
||||
// special cases
|
||||
if(c == 0x130) // uppercase i-dot
|
||||
return('i');
|
||||
}
|
||||
return(c + x); // convert to lower case
|
||||
}
|
||||
|
||||
@@ -358,7 +364,11 @@ int towlower2(unsigned int c)
|
||||
{
|
||||
c = 0x131; // I -> ı
|
||||
}
|
||||
}
|
||||
}
|
||||
#ifdef __WIN32__
|
||||
if(c == 0x130) // uppercase i-dot
|
||||
return('i');
|
||||
#endif
|
||||
return(towlower(c));
|
||||
}
|
||||
|
||||
|
||||
+23
-6
@@ -109,7 +109,7 @@ void unload_MBR()
|
||||
|
||||
static MBROLA_TAB *mbrola_tab = NULL;
|
||||
static int mbrola_control = 0;
|
||||
|
||||
static int mbr_name_prefix = 0;
|
||||
|
||||
espeak_ERROR LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int srate)
|
||||
{//===================================================================================
|
||||
@@ -123,6 +123,7 @@ espeak_ERROR LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int
|
||||
|
||||
mbrola_name[0] = 0;
|
||||
mbrola_delay = 0;
|
||||
mbr_name_prefix = 0;
|
||||
|
||||
if(mbrola_voice == NULL)
|
||||
{
|
||||
@@ -200,16 +201,22 @@ static int GetMbrName(PHONEME_LIST *plist, PHONEME_TAB *ph, PHONEME_TAB *ph_prev
|
||||
{//==========================================================================================================================================
|
||||
// Look up a phoneme in the mbrola phoneme name translation table
|
||||
// It may give none, 1, or 2 mbrola phonemes
|
||||
int mnem = ph->mnemonic;
|
||||
MBROLA_TAB *pr;
|
||||
PHONEME_TAB *other_ph;
|
||||
int found = 0;
|
||||
static int mnem;
|
||||
|
||||
// control
|
||||
// bit 0 skip the next phoneme
|
||||
// bit 1 match this and Previous phoneme
|
||||
// bit 2 only at the start of a word
|
||||
// bit 3 don't match two phonemes across a word boundary
|
||||
// bit 4 add this phoneme name as a prefix to the next phoneme name (used for de4 phoneme prefix '?')
|
||||
|
||||
*name2=0;
|
||||
*split=0;
|
||||
*control=0;
|
||||
mnem = ph->mnemonic;
|
||||
|
||||
pr = mbrola_tab;
|
||||
while(pr->name != 0)
|
||||
@@ -249,15 +256,25 @@ static int GetMbrName(PHONEME_LIST *plist, PHONEME_TAB *ph, PHONEME_TAB *ph_prev
|
||||
*name2 = pr->mbr_name2;
|
||||
*split = pr->percent;
|
||||
*control = pr->control;
|
||||
return(pr->mbr_name);
|
||||
|
||||
if(pr->control & 0x10)
|
||||
{
|
||||
mbr_name_prefix = pr->mbr_name;
|
||||
return(0);
|
||||
}
|
||||
mnem = pr->mbr_name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
pr++;
|
||||
}
|
||||
*name2=0;
|
||||
*split=0;
|
||||
*control=0;
|
||||
|
||||
if(mbr_name_prefix != 0)
|
||||
{
|
||||
mnem = (mnem << 8) | (mbr_name_prefix & 0xff);
|
||||
}
|
||||
mbr_name_prefix = 0;
|
||||
return(mnem);
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -35,8 +35,8 @@
|
||||
#include "translate.h"
|
||||
#include "wave.h"
|
||||
|
||||
const char *version_string = "1.44.42 12.Mar.11";
|
||||
const int version_phdata = 0x014415;
|
||||
const char *version_string = "1.45.02 15.Mar.11";
|
||||
const int version_phdata = 0x014500;
|
||||
|
||||
int option_device_number = -1;
|
||||
FILE *f_logespeak = NULL;
|
||||
|
||||
+1
-1
@@ -411,7 +411,7 @@ void VoiceReset(int tone_only)
|
||||
voice->samplerate = 22050;
|
||||
memset(voice->klattv,0,sizeof(voice->klattv));
|
||||
|
||||
speed.fast_settings[0] = 400;
|
||||
speed.fast_settings[0] = 450;
|
||||
speed.fast_settings[1] = 800;
|
||||
speed.fast_settings[2] = 175;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user