Browse Source

cleanup: move langopts.params handling to LoadLanguageOptions()

These have no tests and should be refactore to be similar to other
langopts.
master
Juho Hiltunen 2 years ago
parent
commit
159ab0ee76
2 changed files with 16 additions and 12 deletions
  1. 9
    0
      src/libespeak-ng/langopts.c
  2. 7
    12
      src/libespeak-ng/voices.c

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

case V_MAINTAINER: case V_MAINTAINER:
case V_STATUS: case V_STATUS:
break; break;
default: {
if ((key & 0xff00) == 0x100) {
if (CheckTranslator(translator, langopts_tab, key) != 0)
break;

sscanf(keyValue, "%d", &translator->langopts.param[key &0xff]);
}
break;
}
} }
} }



+ 7
- 12
src/libespeak-ng/voices.c View File

const MNEM_TAB langopts_tab[] = { const MNEM_TAB langopts_tab[] = {
{ "dictrules", V_DICTRULES }, { "dictrules", V_DICTRULES },
{ "intonation", V_INTONATION }, { "intonation", V_INTONATION },
{ "l_dieresis", 0x100+LOPT_DIERESES },
{ "l_prefix", 0x100+LOPT_PREFIXES },
{ "l_regressive_v", 0x100+LOPT_REGRESSIVE_VOICING },
{ "l_unpronouncable", 0x100+LOPT_UNPRONOUNCABLE },
{ "l_sonorant_min", 0x100+LOPT_SONORANT_MIN },
{ "lowercaseSentence", V_LOWERCASE_SENTENCE }, { "lowercaseSentence", V_LOWERCASE_SENTENCE },
{ "numbers", V_NUMBERS }, { "numbers", V_NUMBERS },
{ "stressAdd", V_STRESSADD }, { "stressAdd", V_STRESSADD },
{ "speed", V_SPEED }, { "speed", V_SPEED },
{ "dict_min", V_DICTMIN }, { "dict_min", V_DICTMIN },


// these just set a value in langopts.param[]
{ "l_dieresis", 0x100+LOPT_DIERESES },
{ "l_prefix", 0x100+LOPT_PREFIXES },
{ "l_regressive_v", 0x100+LOPT_REGRESSIVE_VOICING },
{ "l_unpronouncable", 0x100+LOPT_UNPRONOUNCABLE },
{ "l_sonorant_min", 0x100+LOPT_SONORANT_MIN },

{ "apostrophe", 0x100+LOPT_APOSTROPHE }, { "apostrophe", 0x100+LOPT_APOSTROPHE },
{ "brackets", 0x100+LOPT_BRACKET_PAUSE }, { "brackets", 0x100+LOPT_BRACKET_PAUSE },
{ "bracketsAnnounced", 0x100+LOPT_BRACKET_PAUSE_ANNOUNCED }, { "bracketsAnnounced", 0x100+LOPT_BRACKET_PAUSE_ANNOUNCED },
case V_STATUS: case V_STATUS:
break; break;
default: default:
if ((key & 0xff00) == 0x100) {
if (CheckTranslator(translator, keyword_tab, key) != 0)
break;
sscanf(p, "%d", &translator->langopts.param[key &0xff]);
} else
fprintf(stderr, "Bad voice attribute: %s\n", buf);
fprintf(stderr, "Bad voice attribute: %s\n", buf);
break; break;
} }
} }

Loading…
Cancel
Save