From 2a462e4afeb5cad3baf1779b9d5c58d457e3edff Mon Sep 17 00:00:00 2001
From: Juho Hiltunen <jaacoppi@kapsi.fi>
Date: Sun, 9 Oct 2022 14:56:29 +0300
Subject: [PATCH] cleanup: move stressAdd to LoadLanguageOptions()

---
 src/libespeak-ng/langopts.c | 18 ++++++++++++++++++
 src/libespeak-ng/voices.c   | 15 +--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/libespeak-ng/langopts.c b/src/libespeak-ng/langopts.c
index 1ec8ba2c..7a49f6ac 100644
--- a/src/libespeak-ng/langopts.c
+++ b/src/libespeak-ng/langopts.c
@@ -94,6 +94,24 @@ void LoadLanguageOptions(Translator *translator, int key, char *keyValue ) {
 			translator->langopts.lowercase_sentence = true;
 			break;
 			}
+
+		case V_STRESSADD: { // stressAdd
+                        if (CheckTranslator(translator, langopts_tab, key) != 0)
+                            break;
+
+                        int stress_add_set = 0;
+                        int stress_add[8];
+
+                        stress_add_set = Read8Numbers(keyValue, stress_add);
+
+                        for (ix = 0; ix < stress_add_set; ix++) {
+                            translator->stress_lengths[ix] += stress_add[ix];
+                        }
+
+                        break;
+                    }
+
+
 		case V_STRESSLENGTH: {
         			if (CheckTranslator(translator, langopts_tab, key) != 0)
         				break;
diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c
index 748ae95f..ad203636 100644
--- a/src/libespeak-ng/voices.c
+++ b/src/libespeak-ng/voices.c
@@ -122,6 +122,7 @@ enum {
 
 const MNEM_TAB langopts_tab[] = {
 	{ "lowercaseSentence",	V_LOWERCASE_SENTENCE },
+    { "stressAdd",    V_STRESSADD },
     { "stressLength", V_STRESSLENGTH },
 
 	{ "maintainer",   V_MAINTAINER },
@@ -141,7 +142,6 @@ static const MNEM_TAB keyword_tab[] = {
 	{ "phonemes",     V_PHONEMES },
 	{ "dictionary",   V_DICTIONARY },
 	{ "stressAmp",    V_STRESSAMP },
-	{ "stressAdd",    V_STRESSADD },
 	{ "intonation",   V_INTONATION },
 	{ "tunes",        V_TUNES },
 	{ "dictrules",    V_DICTRULES },
@@ -551,7 +551,6 @@ voice_t *LoadVoice(const char *vname, int control)
 	char buf[sizeof(path_home)+30];
 	char path_voices[sizeof(path_home)+12];
 
-	int stress_add[8];
 	char names[8][40];
 	char name1[40];
 	char name2[80];
@@ -730,19 +729,7 @@ voice_t *LoadVoice(const char *vname, int control)
                 break;
             }
 
-            case V_STRESSADD: { // stressAdd
-                if (CheckTranslator(translator, keyword_tab, key) != 0)
-                    break;
 
-                int stress_add_set = 0;
-                stress_add_set = Read8Numbers(p, stress_add);
-
-                for (ix = 0; ix < stress_add_set; ix++) {
-                    translator->stress_lengths[ix] += stress_add[ix];
-                }
-
-                break;
-            }
             case V_INTONATION: // intonation
                 sscanf(p, "%d", &option_tone_flags);
                 if ((option_tone_flags & 0xff) != 0) {