Browse Source

corrected my impossed interuption of estonian that fellthrough to finnish

master
Andras Eliassen 1 year ago
parent
commit
4a64b6d1a1
2 changed files with 9 additions and 9 deletions
  1. 8
    8
      src/libespeak-ng/tr_languages.c
  2. 1
    1
      tests/language-phonemes.test

+ 8
- 8
src/libespeak-ng/tr_languages.c View File

@@ -826,6 +826,14 @@ Translator *SelectTranslator(const char *name)
case L('e', 't'): // Estonian
tr->encoding = ESPEAKNG_ENCODING_ISO_8859_4;
// fallthrough:
case L('f', 'i'): // Finnish
{
tr->langopts.long_stop = 130;

tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_ALLOW_SPACE | NUM_DFRACTION_2 | NUM_ORDINAL_DOT;
SetLetterVowel(tr, 'y');
}
break;
case L('f', 'o'): // Faroese
{
//static const short stress_lengths_da[8] = { 160, 140, 200, 200, 0, 0, 220, 230 };
@@ -837,14 +845,6 @@ Translator *SelectTranslator(const char *name)
tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_SWAP_TENS | NUM_HUNDRED_AND | NUM_OMIT_1_HUNDRED | NUM_ORDINAL_DOT | NUM_1900 | NUM_ROMAN | NUM_ROMAN_CAPITALS | NUM_ROMAN_ORDINAL;
}
break;
case L('f', 'i'): // Finnish
{
tr->langopts.long_stop = 130;

tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_ALLOW_SPACE | NUM_DFRACTION_2 | NUM_ORDINAL_DOT;
SetLetterVowel(tr, 'y');
}
break;
case L('f', 'r'): // french
{
SetupTranslator(tr, stress_lengths_fr, stress_amps_fr);

+ 1
- 1
tests/language-phonemes.test View File

@@ -48,7 +48,7 @@ test_phwav en-US-nyc 09858d35ec3a09647beee153cbac7de881c9062d "ma na Na pa ta ka
test_phwav eo cc2f7f352c6d299c81f6f95e730883f052dbc597 "ma na pa ta ka ba da ga fa sa Sa xa ha va za Za tsa tSa dza dZa la ja wa ra _:_ ma me mo mi mu maU meU maI meI moU muI"
test_phwav es 4758bff06486f6a37666f050ada0f04f0b762fad "ma na n^a pa ta ka ba da ga fa Ta sa Sa J^a xa Da tSa la l^a *a Ra ra v#a _:_ ma ma/ me me/ mE mi mo mo/ mu moI"
test_phwav es-419 7025e7baeb4b68cd856777a1173a07e06bfd900a "ma na n^a pa ta ka ba da ga fa Ta sa Sa J^a xa Da tSa la l^a *a Ra ra v#a _:_ ma ma/ me me/ mE mi mo mo/ mu moI"
test_phwav et 87f2944a0f1ee94f09dfb6a34f41c8f47bfa908b "ma na n^a pa ta t^a ka p:a t:a t^:a k:a fa va sa s^a Sa ha f:a s:a s^:a S:a h:a la l^a ja ra Ra _:_ ma ma: mA1 me me: mE1 mi mi: mI1 mi1 mo mo: mO1 mu mu: mU1 m8 m8: m& m&: mY mY: my my: m&i mYi myi"
test_phwav et 8ba1a1dedf0e531f6f06ce02cb54419ac0f88083 "ma na n^a pa ta t^a ka p:a t:a t^:a k:a fa va sa s^a Sa ha f:a s:a s^:a S:a h:a la l^a ja ra Ra _:_ ma ma: mA1 me me: mE1 mi mi: mI1 mi1 mo mo: mO1 mu mu: mU1 m8 m8: m& m&: mY mY: my my: m&i mYi myi"
test_phwav eu 804e3829faa40e6e48aa43ad5a372372808d66f6 "ma na n^a pa ta ca ka ba da Ja ga fa za sa Sa ha tza tsa tSa ja xa la l^a Ra **a n2a _:_ ma me mi mo mu my ma2"
test_phwav fa d2bdd62b68a21cea12d095b5032c7eb19759c133 "ma na Na pa ba ta da ka ga qa ?a fa va sa za Sa Za xa Qa ha tSa dZa Ra la ja _:_ mA mi mu ma me mo meI moU"
test_phwav fa-Latn d2bdd62b68a21cea12d095b5032c7eb19759c133 "ma na Na pa ba ta da ka ga qa ?a fa va sa za Sa Za xa Qa ha tSa dZa Ra la ja _:_ mA mi mu ma me mo meI moU"

Loading…
Cancel
Save