From e38142acd16e985360f908a18b9e96482e1c0dc9 Mon Sep 17 00:00:00 2001
From: Juho Hiltunen <jaacoppi@kapsi.fi>
Date: Mon, 3 Oct 2022 21:25:42 +0300
Subject: [PATCH] cleanup: moved intonation to LoadLanguageOptions()

---
 src/libespeak-ng/langopts.c | 11 ++++++++++-
 src/libespeak-ng/voices.c   | 11 +----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libespeak-ng/langopts.c b/src/libespeak-ng/langopts.c
index 79b0124a..6cd2ae90 100644
--- a/src/libespeak-ng/langopts.c
+++ b/src/libespeak-ng/langopts.c
@@ -87,6 +87,16 @@ void LoadLanguageOptions(Translator *translator, int key, char *keyValue ) {
         int ix;
 
 		switch (key) {
+		case V_INTONATION: {
+			sscanf(keyValue, "%d", &option_tone_flags);
+			if ((option_tone_flags & 0xff) != 0) {
+				if (CheckTranslator(translator, langopts_tab, key) != 0)
+					break;
+
+				translator->langopts.intonation_group = option_tone_flags & 0xff;
+			}
+			break;
+		}
 		case V_LOWERCASE_SENTENCE: {
 			if (CheckTranslator(translator, langopts_tab, key) != 0)
 				break;
@@ -94,7 +104,6 @@ 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;
diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c
index 13cecfc3..fb4a3e16 100644
--- a/src/libespeak-ng/voices.c
+++ b/src/libespeak-ng/voices.c
@@ -121,6 +121,7 @@ enum {
 };
 
 const MNEM_TAB langopts_tab[] = {
+	{ "intonation",   V_INTONATION },
 	{ "lowercaseSentence",	V_LOWERCASE_SENTENCE },
     { "stressAdd",    V_STRESSADD },
     { "stressAmp",    V_STRESSAMP },
@@ -144,7 +145,6 @@ static const MNEM_TAB keyword_tab[] = {
 	{ "pitch",        V_PITCH },
 	{ "phonemes",     V_PHONEMES },
 	{ "dictionary",   V_DICTIONARY },
-	{ "intonation",   V_INTONATION },
 	{ "tunes",        V_TUNES },
 	{ "dictrules",    V_DICTRULES },
 	{ "replace",      V_REPLACE },
@@ -715,15 +715,6 @@ voice_t *LoadVoice(const char *vname, int control)
                 break;
 
 
-            case V_INTONATION: // intonation
-                sscanf(p, "%d", &option_tone_flags);
-                if ((option_tone_flags & 0xff) != 0) {
-                    if (CheckTranslator(translator, keyword_tab, key) != 0)
-                        break;
-
-                    translator->langopts.intonation_group = option_tone_flags & 0xff;
-                }
-                break;
             case V_TUNES:
                 if (CheckTranslator(translator, keyword_tab, key) != 0)
                     break;