Skip to content

Update espeak to ab11439b18 #12568

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
seanbudd merged 2 commits into from
Jun 22, 2021
Merged

Update espeak to ab11439b18 #12568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e26f59
Revert "Downgrade espeak to aafd2e720 (PR #12495)"
seanbudd Jun 21, 2021
a3f8e15
update espeak to ab11439b18238b7a08b965d1d5a6ef31cbb05cbb
seanbudd Jun 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 207 files
20 changes: 17 additions & 3 deletions nvdaHelper/espeak/sconscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ env.Append(
'#nvdaHelper/espeak', # ensure that nvdaHelper/espeak/config.h is found first.
espeakIncludeDir,
espeakIncludeDir.Dir('compat'),
espeakSrcDir.Dir('speechPlayer/include'),
sonicSrcDir,
espeakSrcDir.Dir('ucd-tools/src/include')
])
Expand Down Expand Up @@ -154,6 +155,7 @@ espeakDictionaryCompileList: typing.Dict[
"bs_dict": ("bs", ["bs_list", "bs_rules", ]),
"ca_dict": ("ca", ["ca_list", "ca_rules", ]),
"chr_dict": ("chr", ["chr_list", "chr_rules", ]),
"cmn_dict": ("cmn", ["cmn_listx", "cmn_list", "cmn_rules"]),
"cs_dict": ("cs", ["cs_list", "cs_rules", ]),
"cv_dict": ("cv", ["cv_list", "cv_rules", ]),
"cy_dict": ("cy", ["cy_list", "cy_rules", ]),
Expand Down Expand Up @@ -181,8 +183,9 @@ espeakDictionaryCompileList: typing.Dict[
"ht_dict": ("ht", ["ht_list", "ht_rules", ]),
"hu_dict": ("hu", ["hu_list", "hu_rules", ]),
"hy_dict": ("hy", ["hy_list", "hy_rules", ]),
"ia_dict": ("ia", ["ia_list", "ia_rules"]),
"ia_dict": ("ia", ["ia_listx", "ia_list", "ia_rules"]),
"id_dict": ("id", ["id_list", "id_rules", ]),
"io_dict": ("io", ["io_list", "io_rules", ]),
"is_dict": ("is", ["is_list", "is_rules", ]),
"it_dict": ("it", ["it_listx", "it_list", "it_rules"]),
"ja_dict": ("ja", ["ja_list", "ja_rules", ]),
Expand Down Expand Up @@ -215,9 +218,11 @@ espeakDictionaryCompileList: typing.Dict[
"or_dict": ("or", ["or_list", "or_rules", ]),
"pap_dict": ("pap", ["pap_list", "pap_rules", ]),
"pa_dict": ("pa", ["pa_list", "pa_rules", ]),
"piqd_dict": ("piqd", ["piqd_list", "piqd_rules", ]),
"pl_dict": ("pl", ["pl_list", "pl_rules", ]),
"pt_dict": ("pt", ["pt_list", "pt_rules", ]),
"py_dict": ("py", ["py_list", "py_rules", ]),
"qdb_dict": ("qdb", ["qdb_list", "qdb_rules", ]),
"quc_dict": ("quc", ["quc_list", "quc_rules", ]),
"qu_dict": ("qu", ["qu_list", "qu_rules", ]),
"ro_dict": ("ro", ["ro_list", "ro_rules", ]),
Expand All @@ -227,6 +232,7 @@ espeakDictionaryCompileList: typing.Dict[
"si_dict": ("si", ["si_list", "si_rules", ]),
"sk_dict": ("sk", ["sk_list", "sk_rules", ]),
"sl_dict": ("sl", ["sl_list", "sl_rules", ]),
"smj_dict": ("smj", ["smj_list", "smj_rules", ]),
"sq_dict": ("sq", ["sq_list", "sq_rules", ]),
"sr_dict": ("sr", ["sr_list", "sr_rules", ]),
"sv_dict": ("sv", ["sv_list", "sv_rules", ]),
Expand All @@ -243,8 +249,7 @@ espeakDictionaryCompileList: typing.Dict[
"ur_dict": ("ur", ["ur_list", "ur_rules", ]),
"uz_dict": ("uz", ["uz_list", "uz_rules", ]),
"vi_dict": ("vi", ["vi_list", "vi_rules", ]),
"zh_dict": ("cmn", ["zh_list", "zh_listx", "zh_rules"]),
"zhy_dict": ("yue", ["zhy_list", "zhy_listx", "zhy_rules"]),
"yue_dict": ("yue", ["yue_list", "yue_listx", "yue_rules"]),
}

def espeak_compileDict_buildAction(
Expand Down Expand Up @@ -359,6 +364,7 @@ espeakLib=env.SharedLibrary(
"phonemelist.c",
"readclause.c",
"setlengths.c",
"soundIcon.c",
"spect.c",
"speech.c",
"ssml.c",
Expand All @@ -370,6 +376,14 @@ espeakLib=env.SharedLibrary(
"voices.c",
"wavegen.c",
sonicLib,
# espeak OPT_SPEECHPLAYER block
"sPlayer.c",
"../speechPlayer/src/frame.cpp",
"../speechPlayer/src/speechPlayer.cpp",
"../speechPlayer/src/speechWaveGenerator.cpp",
#"../speak-ng.cpp",
# if not OPT_SPEECHPLAYER
# "../speak-ng.c",
# espeak does not need to handle its own audio output so dont include:
# pcaudiolib\src\audio.c
# pcaudiolib\src\windows.c
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 aafd2e720
* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.51-dev commit ab11439b18238b7
* [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.18.0
Expand Down
2 changes: 2 additions & 0 deletions user_docs/en/changes.t2t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ What's New in NVDA


== Changes ==
- Espeak-ng has been updated to 1.51-dev commit `ab11439b18238b7a08b965d1d5a6ef31cbb05cbb`. (#12449, #12202, #12280, #12568)
-


== Bug Fixes ==
Expand Down