From c28412db7859b9a928aab3abf6ebe77f2ba56496 Mon Sep 17 00:00:00 2001
From: Juho Hiltunen <jaacoppi@kapsi.fi>
Date: Tue, 27 Jul 2021 21:56:41 +0300
Subject: [PATCH] Don't set stress_flags with language option "stressRule".

Language option "stressOpt" already handles separate flags instead of a
single integer. There's no reason to have two ways of setting the same
option.
---
 docs/voices.md             | 5 ++---
 espeak-ng-data/lang/itc/la | 4 ++--
 src/libespeak-ng/voices.c  | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/voices.md b/docs/voices.md
index dba224bd..b264456f 100644
--- a/docs/voices.md
+++ b/docs/voices.md
@@ -427,12 +427,11 @@ language. (values are defined as bit numbers starting with "S_*" in [translate.h
 
 ### stressRule
 
-	stressRule <4 integer values>
+	stressRule <3 integer values>
 
-Four integer parameters. These correspond to:
+Three integer parameters. These correspond to:
 
 1. langopts->stress_rule (values in [translate.h](../src/libespeak-ng/translate.h))
-2. langopts->stress_flags
 3. langopts->unstressed_wd1 (stress for $u word of 1 syllable)
 4. langopts->unstressed_wd2 (stress for $u word of >1 syllable) 
 
diff --git a/espeak-ng-data/lang/itc/la b/espeak-ng-data/lang/itc/la
index cd1093e5..c57270f9 100644
--- a/espeak-ng-data/lang/itc/la
+++ b/espeak-ng-data/lang/itc/la
@@ -1,10 +1,10 @@
 name Latin
 language la
-stressRule 2 33 0 2
+stressRule 2 0 2
 // rule=penultimate
-// flags=0100001 (no automatic secondary stress + don't stres monosyllables)
 // unstressed_wd1=0
 // unstressed_wd2=2
+stressOpt 0 5 // flags=0100001 (no automatic secondary stress + don't stres monosyllables)
 
 // short gap between words
 words 2
diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c
index 3914187a..856fc638 100644
--- a/src/libespeak-ng/voices.c
+++ b/src/libespeak-ng/voices.c
@@ -819,8 +819,7 @@ voice_t *LoadVoice(const char *vname, int control)
 			if (CheckTranslator(translator, keyword_tab, key) != 0)
 				break;
 
-			sscanf(p, "%d %d %d %d", &translator->langopts.stress_rule,
-			       &translator->langopts.stress_flags,
+			sscanf(p, "%d %d %d", &translator->langopts.stress_rule,
 			       &translator->langopts.unstressed_wd1,
 			       &translator->langopts.unstressed_wd2);