Skip to content

Update espeak to latest master #12449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feerrenrut merged 4 commits into from
May 21, 2021
Merged

Update espeak to latest master #12449

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af8acf9
Update espeak to latest master
feerrenrut May 21, 2021
434e397
insert actual PR number
feerrenrut May 21, 2021
c6edd43
Update espeak docs
feerrenrut May 21, 2021
ff5b2cf
Fix typo
feerrenrut May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/espeak
Open in desktop
Submodule espeak updated 63 files
+13 −1 CHANGELOG.md
+35 −21 Makefile.am
+14 −14 configure.ac
+0 −0 dictsource/cmn_emoji
+0 −0 dictsource/cmn_list
+30 −1 dictsource/cmn_rules
+3 −1 dictsource/de_list
+0 −0 dictsource/extra/cmn_listx
+1 −1 dictsource/extra/yue_listx
+21 −4 dictsource/it_list
+13 −3 dictsource/it_rules
+2,906 −0 dictsource/smj_list
+282 −0 dictsource/smj_rules
+0 −0 dictsource/yue_emoji
+0 −0 dictsource/yue_list
+0 −0 dictsource/yue_rules
+2 −2 docs/building.md
+2 −1 docs/languages.md
+5 −3 espeak-ng-data/lang/sit/cmn
+11 −0 espeak-ng-data/lang/sit/cmn-Latn-pinyin
+2 −2 espeak-ng-data/lang/sit/yue
+13 −0 espeak-ng-data/lang/sit/yue-Latn-jyutping
+4 −0 espeak-ng-data/lang/urj/smj
+0 −0 phsource/mbrola/cmn
+0 −0 phsource/ph_cmn
+427 −0 phsource/ph_lule_saami
+0 −0 phsource/ph_yue
+8 −7 phsource/phonemes
+30 −0 phsource/vowelcharts/smj
+2 −2 src/libespeak-ng/compiledata.c
+18 −9 src/libespeak-ng/readclause.c
+3 −1 src/libespeak-ng/speech.c
+22 −2 src/libespeak-ng/tr_languages.c
+26 −9 src/libespeak-ng/voices.c
+4 −0 src/ucd-tools/CHANGELOG.md
+29 −11 src/ucd-tools/COPYING.UCD
+5 −5 src/ucd-tools/src/case.c
+4 −4 src/ucd-tools/tools/case.py
+4 −4 src/windows/data.vcxproj
+6 −6 src/windows/installer/Product.wxs
+1 −1 tests/bom.test
+7 −28 tests/cmd_options.test
+113 −0 tests/common
+31 −51 tests/dictionary.test
+11 −45 tests/klatt.test
+15 −31 tests/language-numbers-cardinal.test
+9 −25 tests/language-numbers-ordinal.test
+70 −99 tests/language-phonemes.test
+176 −206 tests/language-pronunciation.test
+2 −15 tests/language-replace.test
+9 −36 tests/mbrola.test
+2 −1 tests/non-executable-files-with-executable-bit.test
+21 −1 tests/ssml-fuzzer.c
+4 −20 tests/ssml.test
+1 −0 tests/ssml/badly-escaped1.expected
+1 −0 tests/ssml/badly-escaped1.ssml
+1 −0 tests/ssml/badly-escaped2.expected
+1 −0 tests/ssml/badly-escaped2.ssml
+1 −0 tests/ssml/malformed-tag1.expected
+1 −0 tests/ssml/malformed-tag1.ssml
+36 −46 tests/translate.test
+8 −37 tests/variants.test
+4 −24 tests/voices.test
3 changes: 2 additions & 1 deletion include/espeak.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ Modifications will need to be made in `<nvda repo root>/nvdaHelper/espeak`
1. Modify the `<nvda repo root>/nvdaHelper/espeak/config.h` file as required.
1. Update our record of the version number and build.
1. Change back to the NVDA repo root
1. Update the package version in `<nvda repo root>/nvdaHelper/espeak/config.h`
1. Update the `/DPACKAGE_VERSION` in `espeak/sconscript`
- The preprocessor definition is used to create `<nvda repo root>/nvdaHelper/espeak/config.h`

@michaelDCurran michaelDCurran May 21, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this statement is quite correct. The preprocessor definitions are specified on the commandline instead of in config.h. config.h is empty and stays empty.

@feerrenrut feerrenrut May 21, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, "instead of" would be more clear. I guess config.h still has to exist, even if empty.

- Compare to espeak source info: `<nvda repo root>/include/espeak/src/windows/config.h`.
1. Update NVDA `readme.md` with espeak version and commit.
1. Build NVDA
Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,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.51-dev commit cad1c8e8
* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.51-dev commit f6d092a9c
* [Sonic](https://github.com/waywardgeek/sonic), commit 4f8c1d11
* [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit cbc1f29631780
* [liblouis](http://www.liblouis.org/), version 3.17.0
Expand Down
2 changes: 1 addition & 1 deletion user_docs/en/changes.t2t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This release also drops support for Adobe Flash.
- 'Attempt to cancel speech for expired focus events' option in the advanced settings panel now enabled by default. (#10885)
- This behaviour can be disabled by setting this option to "No".
- Web applications (E.G. Gmail) no longer speak outdated information when moving focus rapidly.
- Espeak-ng has been updated to 1.51-dev commit cad1c8e87fcccf677a445202e340f61980450a84. (#12202, #12280)
- Espeak-ng has been updated to 1.51-dev commit f6d092a9c13d864ede78c493f64a7d32cde41f09. (#12449, #12202, #12280)
- Updated liblouis braille translator to [3.17.0 https://github.com/liblouis/liblouis/releases/tag/v3.17.0]. (#12137)
- New braille tables: Belarusian literary braille, Belarusian computer braille, Urdu grade 1, Urdu grade 2.
- Support for Adobe Flash content has been removed from NVDA due to the use of Flash being actively discouraged by Adobe. (#11131)
Expand Down