Skip to content

Commit

Permalink
Update eSpeak to a51235aa commit (#14517)
Browse files Browse the repository at this point in the history
#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
  • Loading branch information
seanbudd committed Jan 6, 2023
1 parent 578ef98 commit 6dd9002
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion include/espeak
Submodule espeak updated 350 files
7 changes: 4 additions & 3 deletions nvdaHelper/espeak/sconscript
Expand Up @@ -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(
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions source/synthDrivers/espeak.py
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions user_docs/en/changes.t2t
Expand Up @@ -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)
-

Expand Down

0 comments on commit 6dd9002

Please sign in to comment.