Merge 6cfd15e into f6977fe

seanbudd · web-flow · commit 09ce145efd27 · 2022-12-29T11:09:50.000+10:00
diff --git a/include/espeak b/include/espeak
@@ -1 +1 @@
-Subproject commit b17ed2d682fa5cc1bbab3d20089ce781a0579a03
+Subproject commit a51235aaabdc15f76ed0f7f642f2c1efd562b373
diff --git a/nvdaHelper/espeak/sconscript b/nvdaHelper/espeak/sconscript
@@ -101,8 +101,8 @@ env.Append(
 		# errors when winsock2 is included by espeak\src\include\compat\endian.h
 		'/DWIN32_LEAN_AND_MEAN',
 		# Preprocessor definitions. Espeak Features
-		'/DINCLUDE_SPEECHPLAYER=1',
-		'/DINCLUDE_KLATT=1',
+		'/DUSE_SPEECHPLAYER=1',
+		'/DUSE_KLATT=1',
 		'/DHAVE_SONIC_H=1',
 	])
 
@@ -395,6 +395,7 @@ espeakLib=env.SharedLibrary(
 		"espeak_api.c",
 		"ieee80.c",
 		"intonation.c",
+		"langopts.c",
 		"klatt.c", # we do use KLATT, this is a compile option in espeak
 #		"mbrowrap.c", # we don't use MBROLA, this is a compile option in espeak
 		"mnemonics.c",
diff --git a/readme.md b/readme.md
@@ -88,7 +88,7 @@ If you aren't sure, run `git submodule update` after every git pull, merge or ch
 
 For reference, the following run time dependencies are included in Git submodules:
 
-* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.52-dev commit `b17ed2d6`
+* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.52-dev commit `a51235aa`
 * [Sonic](https://github.com/waywardgeek/sonic), commit 1d705135
 * [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit cbc1f29631780
 * [liblouis](http://www.liblouis.org/), version 3.23.0
diff --git a/source/synthDrivers/espeak.py b/source/synthDrivers/espeak.py
@@ -334,9 +334,7 @@ def speak(self, speechSequence: SpeechSequence):  # noqa: C901
 				textList.append(langChangeXML)
 				langChanged = True
 			elif isinstance(item, BreakCommand):
-				# Break commands are ignored at the start of speech unless strength is specified.
-				# Refer to eSpeak issue: https://github.com/espeak-ng/espeak-ng/issues/1232
-				textList.append(f'<break time="{item.time}ms" strength="1" />')
+				textList.append(f'<break time="{item.time}ms" />')
 			elif type(item) in self.PROSODY_ATTRS:
 				if prosody:
 					# Close previous prosody tag.
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -24,6 +24,9 @@ This can be used with text editors that do not support paragraph navigation nati
 == Changes ==
 - Updated Sonic rate boost library to commit ``1d70513``. (#14180)
 - CLDR has been updated to version 42.0. (#14273)
+- eSpeak NG has been updated to 1.52-dev commit ``a51235aa``. (#14281)
+  - Fixed reporting of large numbers. (#14241)
+  -
 - Java applications with controls using the selectable state will now announce when an item is not selected rather than when the item is selected. (#14336)
 -
 

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@ This can be used with text editors that do not support paragraph navigation nati`
`24`	`24`	`== Changes ==`
`25`	`25`	- Updated Sonic rate boost library to commit ``1d70513``. (#14180)
`26`	`26`	`- CLDR has been updated to version 42.0. (#14273)`
	`27`	+- eSpeak NG has been updated to 1.52-dev commit ``a51235aa``. (#14281)
	`28`	`+ - Fixed reporting of large numbers. (#14241)`
	`29`	`+ -`
`27`	`30`	`- Java applications with controls using the selectable state will now announce when an item is not selected rather than when the item is selected. (#14336)`
`28`	`31`	`-`
`29`	`32`