mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-17 18:40:50 +00:00
Merge branch 'upstream' into development
Conflicts: dictsource/bn_list dictsource/bn_rules dictsource/dict_phonemes phsource/compile_report phsource/ph_bengali
This commit is contained in:
+15
-4
@@ -128,13 +128,16 @@ void DisplayVoices(FILE *f_out, char *language)
|
||||
const char *p;
|
||||
int len;
|
||||
int count;
|
||||
int c;
|
||||
int j;
|
||||
const espeak_VOICE *v;
|
||||
const char *lang_name;
|
||||
char age_buf[12];
|
||||
char buf[80];
|
||||
const espeak_VOICE **voices;
|
||||
espeak_VOICE voice_select;
|
||||
|
||||
static char genders[4] = {' ','M','F',' '};
|
||||
static char genders[4] = {'-','M','F','-'};
|
||||
|
||||
if((language != NULL) && (language[0] != 0))
|
||||
{
|
||||
@@ -150,7 +153,7 @@ void DisplayVoices(FILE *f_out, char *language)
|
||||
voices = espeak_ListVoices(NULL);
|
||||
}
|
||||
|
||||
fprintf(f_out,"Pty Language Age/Gender VoiceName File Other Langs\n");
|
||||
fprintf(f_out,"Pty Language Age/Gender VoiceName File Other Languages\n");
|
||||
|
||||
for(ix=0; (v = voices[ix]) != NULL; ix++)
|
||||
{
|
||||
@@ -168,8 +171,16 @@ void DisplayVoices(FILE *f_out, char *language)
|
||||
|
||||
if(count==0)
|
||||
{
|
||||
fprintf(f_out,"%2d %-12s%s%c %-17s %-11s ",
|
||||
p[0],lang_name,age_buf,genders[v->gender],v->name,v->identifier);
|
||||
for(j=0; j < sizeof(buf); j++)
|
||||
{
|
||||
// replace spaces in the name
|
||||
if((c = v->name[j]) == ' ')
|
||||
c = '_';
|
||||
if((buf[j] = c) == 0)
|
||||
break;
|
||||
}
|
||||
fprintf(f_out,"%2d %-12s%s%c %-20s %-13s ",
|
||||
p[0],lang_name,age_buf,genders[v->gender],buf,v->identifier);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
+15
-4
@@ -160,13 +160,16 @@ void DisplayVoices(FILE *f_out, char *language)
|
||||
const char *p;
|
||||
int len;
|
||||
int count;
|
||||
int c;
|
||||
int j;
|
||||
const espeak_VOICE *v;
|
||||
const char *lang_name;
|
||||
char age_buf[12];
|
||||
char buf[80];
|
||||
const espeak_VOICE **voices;
|
||||
espeak_VOICE voice_select;
|
||||
|
||||
static char genders[4] = {' ','M','F',' '};
|
||||
static char genders[4] = {'-','M','F','-'};
|
||||
|
||||
if((language != NULL) && (language[0] != 0))
|
||||
{
|
||||
@@ -182,7 +185,7 @@ void DisplayVoices(FILE *f_out, char *language)
|
||||
voices = espeak_ListVoices(NULL);
|
||||
}
|
||||
|
||||
fprintf(f_out,"Pty Language Age/Gender VoiceName File Other Langs\n");
|
||||
fprintf(f_out,"Pty Language Age/Gender VoiceName File Other Languages\n");
|
||||
|
||||
for(ix=0; (v = voices[ix]) != NULL; ix++)
|
||||
{
|
||||
@@ -200,8 +203,16 @@ void DisplayVoices(FILE *f_out, char *language)
|
||||
|
||||
if(count==0)
|
||||
{
|
||||
fprintf(f_out,"%2d %-12s%s%c %-17s %-11s ",
|
||||
p[0],lang_name,age_buf,genders[v->gender],v->name,v->identifier);
|
||||
for(j=0; j < sizeof(buf); j++)
|
||||
{
|
||||
// replace spaces in the name
|
||||
if((c = v->name[j]) == ' ')
|
||||
c = '_';
|
||||
if((buf[j] = c) == 0)
|
||||
break;
|
||||
}
|
||||
fprintf(f_out,"%2d %-12s%s%c %-20s %-13s ",
|
||||
p[0],lang_name,age_buf,genders[v->gender],buf,v->identifier);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@
|
||||
#include "translate.h"
|
||||
#include "wave.h"
|
||||
|
||||
const char *version_string = "1.47.03a 21.Mar.13";
|
||||
const char *version_string = "1.47.03b 22.Mar.13";
|
||||
const int version_phdata = 0x014701;
|
||||
|
||||
int option_device_number = -1;
|
||||
|
||||
@@ -539,9 +539,10 @@ Translator *SelectTranslator(const char *name)
|
||||
tr->langopts.stress_flags = S_MID_DIM | S_FINAL_DIM; // use 'diminished' for unstressed final syllable
|
||||
tr->letter_bits_offset = OFFSET_BENGALI;
|
||||
SetIndicLetters(tr); // call this after setting OFFSET_BENGALI
|
||||
SetLetterBitsRange(tr,LETTERGP_B,0x01,0x01); // candranindu
|
||||
SetLetterBitsRange(tr,LETTERGP_F,0x3e,0x4c); // vowel signs, but not virama
|
||||
|
||||
tr->langopts.numbers = 0x1;
|
||||
tr->langopts.numbers = NUM_SWAP_TENS;
|
||||
tr->langopts.break_numbers = 0x24924aa8; // for languages which have numbers for 100,000 and 100,00,000, eg Hindi
|
||||
}
|
||||
break;
|
||||
|
||||
+28
-6
@@ -603,7 +603,7 @@ voice_t *LoadVoice(const char *vname, int control)
|
||||
static const char *voices_asia =
|
||||
"fa fa-pin hi hy hy-west id ka kn ku ml ne pa ta tr vi vi-hue zh zh-yue ";
|
||||
static const char *voices_europe =
|
||||
"an bg bs ca cs cy da el es et fi fr-be ga hr hu is it lt lv mk nl no pl pt-pt ro ru sk sq sr sv ";
|
||||
"an bg bs ca cs cy da de el en en-us es et fi fr fr-be ga hr hu is it lt lv mk nl no pl pt-pt ro ru sk sq sr sv ";
|
||||
|
||||
|
||||
strncpy0(voicename, vname, sizeof(voicename));
|
||||
@@ -1227,10 +1227,10 @@ static int ScoreVoice(espeak_VOICE *voice_spec, const char *spec_language, int s
|
||||
|
||||
p = voice->languages; // list of languages+dialects for which this voice is suitable
|
||||
|
||||
if(strcmp(spec_language,"mbrola")==0)
|
||||
if(spec_n_parts < 0)
|
||||
{
|
||||
// only list mbrola voices
|
||||
if(memcmp(voice->identifier,"mb/",3) == 0)
|
||||
// match on the subdirectory
|
||||
if(memcmp(voice->identifier, spec_language, spec_lang_len) == 0)
|
||||
return(100);
|
||||
return(0);
|
||||
}
|
||||
@@ -1363,6 +1363,7 @@ static int SetVoiceScores(espeak_VOICE *voice_select, espeak_VOICE **voices, int
|
||||
int lang_len=0;
|
||||
espeak_VOICE *vp;
|
||||
char language[80];
|
||||
char buf[sizeof(path_home)+80];
|
||||
|
||||
// count number of parts in the specified language
|
||||
if((voice_select->languages != NULL) && (voice_select->languages[0] != 0))
|
||||
@@ -1375,6 +1376,26 @@ static int SetVoiceScores(espeak_VOICE *voice_select, espeak_VOICE **voices, int
|
||||
n_parts++;
|
||||
}
|
||||
}
|
||||
|
||||
if((n_parts == 1) && (control & 1))
|
||||
{
|
||||
if(strcmp(language, "mbrola") == 0)
|
||||
{
|
||||
language[2] = 0; // truncate to "mb"
|
||||
lang_len = 2;
|
||||
}
|
||||
|
||||
sprintf(buf, "%s/voices/%s", path_home, language);
|
||||
if(GetFileLength(buf) == -2)
|
||||
{
|
||||
// A subdirectory name has been specified. List all the voices in that subdirectory
|
||||
language[lang_len++] = PATHSEP;
|
||||
language[lang_len] = 0;
|
||||
n_parts = -1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// select those voices which match the specified language
|
||||
nv = 0;
|
||||
for(ix=0; ix<n_voices_list; ix++)
|
||||
@@ -1891,11 +1912,12 @@ ESPEAK_API const espeak_VOICE **espeak_ListVoices(espeak_VOICE *voice_spec)
|
||||
}
|
||||
else
|
||||
{
|
||||
// list all: omit variant voices and mbrola voices
|
||||
// list all: omit variant voices and mbrola voices and test voices
|
||||
j = 0;
|
||||
for(ix=0; (v = voices_list[ix]) != NULL; ix++)
|
||||
{
|
||||
if((v->languages[0] != 0) && (strcmp(&v->languages[1],"variant") != 0) && (memcmp(v->identifier,"mb/",3) != 0))
|
||||
if((v->languages[0] != 0) && (strcmp(&v->languages[1],"variant") != 0)
|
||||
&& (memcmp(v->identifier,"mb/",3) != 0) && (memcmp(v->identifier,"test/",5) != 0))
|
||||
{
|
||||
voices[j++] = v;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user