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

Merge branch 'upstream' into development

Browse Source 
Conflicts:
	dictsource/dict_phonemes
	espeak-data/voices/asia/fa-en-us
	phsource/compile_report
	phsource/mbrola/ir1
This commit is contained in:
Reece H. Dunn
2014-08-09 13:10:22 +01:00
parent ac2932cca1 bb057791f4
commit 54a8d7a9e9
26 changed files with 1254 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dictionary.cpp
+5 -6
View File
@@ -2570,12 +2570,6 @@ static void MatchRule(Translator *tr, char *word[], char *word_start, int group_
while(*rule++ != 0);
}
if((option_phonemes == 2) && ((word_flags & FLAG_NO_TRACE)==0))
{
if(group_length <= 1)
fprintf(f_trans,"\n");
}
/* advance input data pointer */
total_consumed += group_length;
if(total_consumed == 0)
@@ -2872,6 +2866,11 @@ int TranslateRules(Translator *tr, char *p_start, char *phonemes, int ph_size, c
return(0);
}
if((option_phonemes == 2) && ((word_flags & FLAG_NO_TRACE)==0))
{
fprintf(f_trans,"\n");
}
match1.end_type &= ~SUFX_UNPRON;
if((match1.end_type != 0) && (end_phonemes != NULL))
src/synthdata.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.48.09 20.Jul.14";
const char *version_string = "1.48.10 09.Aug.14";
const int version_phdata = 0x014801;
int option_device_number = -1;
src/tr_languages.cpp
+8 -5
View File
@@ -74,7 +74,7 @@
// character ranges must be listed in ascending order
ALPHABET alphabets [] = {
{"_el", OFFSET_GREEK, 0x380, 0x3ff, L('e','l'), AL_DONT_NAME | AL_NOT_LETTERS},
{"_el", OFFSET_GREEK, 0x380, 0x3ff, L('e','l'), AL_DONT_NAME | AL_NOT_LETTERS | AL_WORDS},
{"_cyr", OFFSET_CYRILLIC, 0x400, 0x52f, 0, 0},
{"_hy", OFFSET_ARMENIAN, 0x530, 0x58f, L('h','y'), AL_WORDS},
{"_he", OFFSET_HEBREW, 0x590, 0x5ff, 0, 0},
@@ -709,7 +709,8 @@ Translator *SelectTranslator(const char *name)
case L('e','o'):
{
static const short stress_lengths_eo[8] = {150, 150, 230, 180, 0, 0, 300, 320};
// static const short stress_lengths_eo[8] = {150, 150, 230, 180, 0, 0, 300, 320};
static const short stress_lengths_eo[8] = {150, 140, 180, 180, 0, 0, 200, 200};
static const unsigned char stress_amps_eo[] = {16,14, 20,20, 20,22, 22,21 };
static const wchar_t eo_char_apostrophe[2] = {'l',0};
@@ -735,7 +736,7 @@ Translator *SelectTranslator(const char *name)
case L('i','a'): // Interlingua
case L_pap: // Papiamento
{
static const short stress_lengths_es[8] = {180, 190, 230, 180, 0, 0, 240, 270};
static const short stress_lengths_es[8] = {156, 170, 170, 156, 0, 0, 163, 200}; //change for Leandro Benitez, 02.Aug.2014
static const unsigned char stress_amps_es[8] = {16,12, 18,18, 20,20, 20,20 }; // 'diminished' is used to mark a quieter, final unstressed syllable
static const wchar_t ca_punct_within_word[] = {'\'',0xb7,0}; // ca: allow middle-dot within word
@@ -1054,8 +1055,10 @@ SetLengthMods(tr,3); // all equal
case L('i','t'): // Italian
{
static const short stress_lengths_it[8] = {150, 140, 170, 170, 0, 0, 300, 330};
static const unsigned char stress_amps_it[8] = {15,14, 19,19, 20,22, 22,20 };
static const short stress_lengths_it[8] =
{165, 100, 170, 150, 0, 0, 215, 303};
static const unsigned char stress_amps_it[8] =
{16,15, 16,14, 20,22, 22,24 };
SetupTranslator(tr,stress_lengths_it,stress_amps_it);