Browse Source

Revert "code cleanup: remove unnecessary voice option translator"

This reverts commit 23a4d88f6b.

Breaks tests for cmn.
master
Juho Hiltunen 4 years ago
parent
commit
d260562b7e

+ 1
- 0
espeak-ng-data/lang/bat/ltg View File

@@ -2,6 +2,7 @@ name Latgalian
language ltg
maintainer Valdis Vitolins <[email protected]>
status testing
translator lv // Reuse pronunciation rules from Latvian
phonemes lv
dictionary lv
dictrules 2 // Setting for Latgalian pronunciation

+ 2
- 0
espeak-ng-data/lang/poz/ms View File

@@ -3,6 +3,8 @@ name Malay
language ms
phonemes id

translator id

stressLength 160 200 180 180 0 0 220 240
stressAmp 16 18 18 18 0 0 22 21
intonation 3 // Less intonation, and comma does not raise the pitch.

+ 1
- 0
espeak-ng-data/lang/sit/cmn View File

@@ -3,6 +3,7 @@ language cmn
language zh-cmn
language zh

translator zh
phonemes zh
dictionary zh
words 1

+ 1
- 0
espeak-ng-data/lang/sit/hak View File

@@ -2,5 +2,6 @@ name Hakka Chinese
language hak
maintainer Chen Chien-ting <[email protected]>
status testing
translator hak
phonemes hak
dictionary hak

+ 1
- 0
espeak-ng-data/lang/sit/yue View File

@@ -3,6 +3,7 @@ language yue
language zh-yue
language zh 8

translator zhy
phonemes zhy
dictionary zhy


+ 1
- 0
espeak-ng-data/voices/mb/mb-ma1 View File

@@ -3,5 +3,6 @@ language ms 1
gender female
pitch 140 260
phonemes id
translator id
mbrola ma1 ma1_phtrans


+ 0
- 1
src/libespeak-ng/tr_languages.c View File

@@ -1169,7 +1169,6 @@ Translator *SelectTranslator(const char *name)
}
break;
case L('l', 'v'): // latvian
case L3('l', 't', 'g'): // latgalian
{
static const unsigned char stress_amps_lv[8] = { 14, 10, 10, 8, 0, 0, 20, 15 };
static const short stress_lengths_lv[8] = { 180, 180, 180, 160, 0, 0, 230, 180 };

+ 13
- 0
src/libespeak-ng/voices.c View File

@@ -72,6 +72,7 @@ enum {
V_NAME = 1,
V_LANGUAGE,
V_GENDER,
V_TRANSLATOR,
V_PHONEMES,
V_DICTIONARY,
V_VARIANTS,
@@ -126,6 +127,7 @@ static MNEM_TAB keyword_tab[] = {
{ "formant", V_FORMANT },
{ "pitch", V_PITCH },
{ "phonemes", V_PHONEMES },
{ "translator", V_TRANSLATOR },
{ "dictionary", V_DICTIONARY },
{ "stressLength", V_STRESSLENGTH },
{ "stressAmp", V_STRESSAMP },
@@ -647,6 +649,17 @@ voice_t *LoadVoice(const char *vname, int control)
current_voice_selected.age = age;
}
break;
case V_TRANSLATOR:
if (tone_only) break;

sscanf(p, "%s", translator_name);

if (new_translator != NULL)
DeleteTranslator(new_translator);

new_translator = SelectTranslator(translator_name);
langopts = &new_translator->langopts;
break;
case V_DICTIONARY: // dictionary
sscanf(p, "%s", new_dictionary);
break;

Loading…
Cancel
Save