Update eSpeak to 1.52.0 stable (#17583)

Closes #17056 Summary of the issue: Janitorial update of eSpeak Description of user facing changes None Description of development approach Followed instructions in espeak.md, no changes to eSpeak required.
nvaccess · Jan 13, 2025 · f3163b9 · f3163b9
1 parent 98455b0
commit f3163b9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/include/espeak b/include/espeak
diff --git a/include/espeak.md b/include/espeak.md
@@ -36,10 +36,10 @@ Modifications will need to be made in [`nvdaHelper/espeak/sconscript`](../nvdaHe
 1. Update our record of the version number and build.
    1. Change back to the NVDA repo root
    1. Update the `/DPACKAGE_VERSION` in [`nvdaHelper/espeak/sconscript`](../nvdaHelper/espeak/sconscript)
-      *-* The preprocessor definition is used to supply these definitions instead of [`nvdaHelper/espeak/config.h`](../nvdaHelper/espeak/config.h)
-      *-* [`nvdaHelper/espeak/config.h`](../nvdaHelper/espeak/config.h) must exist (despite being empty) since a "config.h" is included within eSpeak.
-      *-* Compare to eSpeak source config: [`include/espeak/src/windows/config.h`](./espeak/src/windows/config.h).
-      *-* Diff `src/windows/config.h` with the previous commit.
+      * The preprocessor definition is used to supply these definitions instead of [`nvdaHelper/espeak/config.h`](../nvdaHelper/espeak/config.h)
+      * [`nvdaHelper/espeak/config.h`](../nvdaHelper/espeak/config.h) must exist (despite being empty) since a "config.h" is included within eSpeak.
+      * Compare to eSpeak source config: [`include/espeak/src/windows/config.h`](./espeak/src/windows/config.h).
+      * Diff `src/windows/config.h` with the previous commit.
    1. Update NVDA's [dev environment documentation](../projectDocs/dev/createDevEnvironment.md#git-submodules) and [changelog](../user_docs/en/changes.md) with eSpeak version and commit.
    1. Build NVDA: `scons source`
       * Expected warnings from eSpeak compilation:

diff --git a/nvdaHelper/espeak/sconscript b/nvdaHelper/espeak/sconscript
@@ -100,7 +100,7 @@ env.Append(
 		# Ignore all warnings as the code is not ours.
 		"/W0",
 		# Preprocessor definitions. Migrated from 'nvdaHelper/espeak/config.h'
-		'/DPACKAGE_VERSION=\\"1.52-dev 961454ff\\"',  # See 'include/espeak/src/windows/config.h'
+		'/DPACKAGE_VERSION=\\"1.52.0\\"',  # See 'include/espeak/src/windows/config.h'
 		"/DHAVE_STDINT_H=1",
 		"/D__WIN32__#1",
 		"/DLIBESPEAK_NG_EXPORT",

diff --git a/projectDocs/dev/createDevEnvironment.md b/projectDocs/dev/createDevEnvironment.md
@@ -81,7 +81,7 @@ If you aren't sure, run `git submodule update` after every git pull, merge or ch
 
 #### Run time dependencies
 
-* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.52-dev commit `961454ffaa894d981526f4d424daef1d3bc4175f`
+* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.52.0
 * [Sonic](https://github.com/waywardgeek/sonic), commit `8694c596378c24e340c09ff2cd47c065494233f1`
 * [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit `3d8c7f0b833453f761ded6b12d8be431507bfe0b`
 * [liblouis](http://www.liblouis.io/), version 3.31.0

diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -30,6 +30,7 @@ To use this feature, "allow NVDA to control the volume of other applications" mu
 
 ### Changes
 
+* eSpeak NG has been updated to 1.52.0. (#17056)
 * The Report link destination, Character formatting information, and Speak selection dialogs, now include "Close" and "Copy" buttons for user convenience. (#17018, @XLTechie)
 * The exit dialog now allows you to restart NVDA with add-ons disabled and debug logging enabled simultaneously. (#11538, @CyrilleB79)
 * Unicode Normalization is now enabled by default for speech output. (#17017, @LeonarddeR).
+13 −0		.github/dependabot.yml
+3 −3		.github/workflows/android.yml
+4 −4		.github/workflows/autoconf.yml
+11 −7		.github/workflows/ci.yml
+5 −5		.github/workflows/dist.yml
+6 −6		.github/workflows/fuzzing.yml
+2 −2		.github/workflows/gradle-wrapper-validation.yml
+43 −0		.github/workflows/windows-msbuild.yml
+2 −2		.github/workflows/windows.yml
+3 −0		.gitignore
+0 −18		.travis.yml
+1 −1		CMakeLists.txt
+12 −1		ChangeLog.md
+6 −0		README.md
+2 −2		android/AndroidManifest.xml
+1 −1		android/build.gradle
+1 −1		android/jni/include/config.h
+1 −1		configure.ac
+1 −0		dictsource/ca_emoji
+18,839 −211		dictsource/ca_list
+1,141 −159		dictsource/ca_rules
+50 −50		dictsource/cs_emoji
+2 −0		dictsource/de_list
+80 −0		dictsource/en_list
+53 −1		dictsource/en_rules
+466 −14		dictsource/extra/ru_listx
+32 −1		dictsource/fa_list
+10 −4		dictsource/he_list
+31 −0		dictsource/he_listx
+447 −32		dictsource/he_rules
+473 −40		dictsource/hu_rules
+31 −2		dictsource/nl_list
+625 −76		dictsource/pt_list
+1 −0		dictsource/ru_list
+0 −7		docs/add_language.md
+1 −1		docs/building.md
+5 −0		espeak-ng-data/lang/gmw/en-Shaw
+2 −0		espeak-ng-data/lang/roa/ca
+7 −0		espeak-ng-data/lang/roa/ca-ba
+6 −0		espeak-ng-data/lang/roa/ca-nw
+7 −0		espeak-ng-data/lang/roa/ca-va
+4 −0		phsource/mbrola/de6
+457 −12		phsource/ph_catalan
+490 −0		phsource/ph_catalan_ba
+160 −0		phsource/ph_catalan_nw
+282 −0		phsource/ph_catalan_va
+9 −1		phsource/phonemes
+1 −1		src/espeak-ng.c
+1 −1		src/include/espeak-ng/speak_lib.h
+36 −2		src/libespeak-ng/dictionary.c
+1 −0		src/libespeak-ng/dictionary.h
+2 −0		src/libespeak-ng/encoding.c
+21 −0		src/libespeak-ng/mbrowrap.c
+2 −0		src/libespeak-ng/readclause.c
+5 −0		src/libespeak-ng/spect.c
+1 −1		src/libespeak-ng/speech.h
+9 −1		src/libespeak-ng/ssml.c
+11 −5		src/libespeak-ng/synthesize.c
+3 −1		src/libespeak-ng/tr_languages.c
+3 −2		src/libespeak-ng/translate.c
+1 −1		src/libespeak-ng/translate.h
+2 −1		src/libespeak-ng/voices.c
+1 −1		src/libespeak-ng/wavegen.c
+3 −0		src/ucd-tools/CMakeLists.txt
+1 −1		src/windows/config.h
+4 −1		src/windows/data.vcxproj
+2 −2		tests/api.c
+5 −1		tests/language-phonemes.test
+9 −4		tests/language-pronunciation.test
+0 −1		tests/ssml/external-entity.expected
+0 −1		tests/ssml/spec-example-1.expected
+6 −0		tests/translate.test