From 3b2557cfddaf0336d0f73e9e7f5470d2ec8772ef Mon Sep 17 00:00:00 2001 From: Juho Hiltunen Date: Sun, 9 Oct 2022 20:40:03 +0300 Subject: [PATCH] et: fi: move configuration from code to language file --- espeak-ng-data/lang/urj/et | 5 +++++ espeak-ng-data/lang/urj/fi | 6 ++++++ src/libespeak-ng/tr_languages.c | 7 ------- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/espeak-ng-data/lang/urj/et b/espeak-ng-data/lang/urj/et index 81aaf5a9..1b524c1d 100644 --- a/espeak-ng-data/lang/urj/et +++ b/espeak-ng-data/lang/urj/et @@ -1,4 +1,9 @@ name Estonian language et +stressAmp 18 16 22 22 20 22 22 22 +stressLength 150 180 200 200 0 0 210 250 stressOpt 1 2 4 6 // (S_NO_DIM + S_FINAL_DIM = S_FINAL_DIM_ONLY), S_FINAL_NO_2, S_2_TO_HEAVY +stressRule 0 + +intonation 3 diff --git a/espeak-ng-data/lang/urj/fi b/espeak-ng-data/lang/urj/fi index 4ae57a9d..285b9c47 100644 --- a/espeak-ng-data/lang/urj/fi +++ b/espeak-ng-data/lang/urj/fi @@ -1,4 +1,10 @@ name Finnish language fi + +stressAmp 18 16 22 22 20 22 22 22 +stressLength 150 180 200 200 0 0 210 250 stressOpt 1 2 4 6 // (S_NO_DIM + S_FINAL_DIM = S_FINAL_DIM_ONLY), S_FINAL_NO_2, S_2_TO_HEAVY +stressRule 0 + +intonation 3 \ No newline at end of file diff --git a/src/libespeak-ng/tr_languages.c b/src/libespeak-ng/tr_languages.c index c278bb66..f02e64d8 100644 --- a/src/libespeak-ng/tr_languages.c +++ b/src/libespeak-ng/tr_languages.c @@ -799,19 +799,12 @@ Translator *SelectTranslator(const char *name) // fallthrough: case L('f', 'i'): // Finnish { - static const unsigned char stress_amps_fi[8] = { 18, 16, 22, 22, 20, 22, 22, 22 }; - static const short stress_lengths_fi[8] = { 150, 180, 200, 200, 0, 0, 210, 250 }; - - SetupTranslator(tr, stress_lengths_fi, stress_amps_fi); - - tr->langopts.stress_rule = STRESSPOSN_1L; tr->langopts.param[LOPT_IT_DOUBLING] = 1; tr->langopts.long_stop = 130; tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_ALLOW_SPACE | NUM_DFRACTION_2 | NUM_ORDINAL_DOT; SetLetterVowel(tr, 'y'); tr->langopts.spelling_stress = 1; - tr->langopts.intonation_group = 3; // less intonation, don't raise pitch at comma } break; case L('f', 'r'): // french