From 6dd90020cec1a60152cdffd0ae0e62b927a48924 Mon Sep 17 00:00:00 2001 From: Sean Budd Date: Fri, 6 Jan 2023 18:59:38 +1100 Subject: [PATCH] Update eSpeak to a51235aa commit (#14517) #14483 was reverted via #14516 due to an issue with rate boost. eSpeak changed the compilation flag, and that change wasn't in the Makefile.am diff, so it was missed. This is fixed in 7e558da Link to issue number: Closes #14281 Closes #14241 Addresses #13875 (comment) Summary of the issue: Janitorial update of eSpeak. Removes a workaround added to handle a bug with eSpeaks BreakCommand implementation, tracked in espeak-ng/espeak-ng#1232, #13875 (comment) Description of user facing changes eSpeak is updated. Fixes pronunciation of large numbers (#14241). Description of development approach Dropped strength for eSpeak BreakCommand attribute per espeak-ng/espeak-ng#1232 being fixed in eSpeak. Janitorial update Followed instructions in include/espeak.md. Checked the following diffs. cd include/espeak git diff a51235aa b17ed2d6 src/windows/config.h git diff a51235aa b17ed2d6 Makefile.am Addressed the following eSpeak changes: Introduction of langopts.c: espeak-ng/espeak-ng@4a28902 Fix up of code standards: change DINCLUDE to DUSE: espeak-ng/espeak-ng@ca1f590 Note that eSpeak has changed MBROLA compilation, does not affect our build: espeak-ng/espeak-ng@78ac6c4 --- include/espeak | 2 +- nvdaHelper/espeak/sconscript | 7 ++++--- readme.md | 2 +- source/synthDrivers/espeak.py | 4 +--- user_docs/en/changes.t2t | 3 +++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/espeak b/include/espeak index b17ed2d682f..a51235aaabd 160000 --- a/include/espeak +++ b/include/espeak @@ -1 +1 @@ -Subproject commit b17ed2d682fa5cc1bbab3d20089ce781a0579a03 +Subproject commit a51235aaabdc15f76ed0f7f642f2c1efd562b373 diff --git a/nvdaHelper/espeak/sconscript b/nvdaHelper/espeak/sconscript index 1d11716317c..440eea3be70 100644 --- a/nvdaHelper/espeak/sconscript +++ b/nvdaHelper/espeak/sconscript @@ -101,9 +101,9 @@ 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', - '/DHAVE_SONIC_H=1', + '/DUSE_SPEECHPLAYER=1', + '/DUSE_KLATT=1', + '/DUSE_LIBSONIC=1', ]) env.Append( @@ -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 index 49c5e25f1a6..c7cda96a6fc 100644 --- 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.24.0 diff --git a/source/synthDrivers/espeak.py b/source/synthDrivers/espeak.py index 79fc5e6400f..eb73a6bcba9 100644 --- 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'') + textList.append(f'') 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 index cf658a015a3..9ec58b0a706 100644 --- a/user_docs/en/changes.t2t +++ b/user_docs/en/changes.t2t @@ -33,6 +33,9 @@ For example, when text has a comment and a footnote associated with it. (#14507, - - 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) -