Browse Source

cleanup: move stressRule to LoadLanguageOptions()

master
Juho Hiltunen 2 years ago
parent
commit
8e3399bb98
2 changed files with 10 additions and 11 deletions
  1. 9
    1
      src/libespeak-ng/langopts.c
  2. 1
    10
      src/libespeak-ng/voices.c

+ 9
- 1
src/libespeak-ng/langopts.c View File

} }
break; break;
} }

case V_STRESSOPT: { case V_STRESSOPT: {
if (CheckTranslator(translator, langopts_tab, key) != 0) if (CheckTranslator(translator, langopts_tab, key) != 0)
break; break;
ReadNumbers(keyValue, &translator->langopts.stress_flags, 32, langopts_tab, key); ReadNumbers(keyValue, &translator->langopts.stress_flags, 32, langopts_tab, key);
break; break;
} }
case V_STRESSRULE: {
if (CheckTranslator(translator, langopts_tab, key) != 0)
break;


sscanf(keyValue, "%d %d %d", &translator->langopts.stress_rule,
&translator->langopts.unstressed_wd1,
&translator->langopts.unstressed_wd2);

break;
}


case V_MAINTAINER: case V_MAINTAINER:
case V_STATUS: case V_STATUS:

+ 1
- 10
src/libespeak-ng/voices.c View File

{ "stressAmp", V_STRESSAMP }, { "stressAmp", V_STRESSAMP },
{ "stressLength", V_STRESSLENGTH }, { "stressLength", V_STRESSLENGTH },
{ "stressOpt", V_STRESSOPT }, { "stressOpt", V_STRESSOPT },
{ "stressRule", V_STRESSRULE },


{ "maintainer", V_MAINTAINER }, { "maintainer", V_MAINTAINER },
{ "status", V_STATUS }, { "status", V_STATUS },
{ "intonation", V_INTONATION }, { "intonation", V_INTONATION },
{ "tunes", V_TUNES }, { "tunes", V_TUNES },
{ "dictrules", V_DICTRULES }, { "dictrules", V_DICTRULES },
{ "stressRule", V_STRESSRULE },
{ "replace", V_REPLACE }, { "replace", V_REPLACE },
{ "words", V_WORDGAP }, { "words", V_WORDGAP },
{ "echo", V_ECHO }, { "echo", V_ECHO },
break; break;


sscanf(p, "%d %d", &translator->langopts.word_gap, &translator->langopts.vowel_pause); sscanf(p, "%d %d", &translator->langopts.word_gap, &translator->langopts.vowel_pause);
break;
case V_STRESSRULE:
if (CheckTranslator(translator, keyword_tab, key) != 0)
break;

sscanf(p, "%d %d %d", &translator->langopts.stress_rule,
&translator->langopts.unstressed_wd1,
&translator->langopts.unstressed_wd2);

break; break;
case V_ECHO: case V_ECHO:
// echo. suggest: 135mS 11% // echo. suggest: 135mS 11%

Loading…
Cancel
Save