Update espeak#7385
Merged
Merged
Conversation
This is to see if it resolves issues with pronunciation in Italian
zhy has been excluded as it wont compile.
Update to commit eb3c9a9bbd186ec3ead40059fbe865eed1cd3772 of Espeak-ng See https://github.com/espeak-ng/espeak-ng/commits/eb3c9a9bbd186ec3ead40059fbe865eed1cd3772
Fixes part of #7167 selecting Norwegian Bokmål no longer causes an error.
Clarified comment
To commit c5afdbe0d1292a6f1d95e3794b62e4be93d7a6cd
Update to espeak-ng commit f946c6e2278d6b76f7a3c59cf1aa3753365527f8 had to exclude dictionary 'an' since it was causing a crash in python when building nvda.
Compiling mbrowrap was causing an issue, and we dont use mbrola anyway, so this was removed. It was noticed that a bunch of mbrola voices were listed in espeak but did not seem to do anything. The sconscript has been modified to exclude the 'espeak-ng-data/voice/mb' directory. This means that we can no longer recursively install espeak-ng-data and must instead manually install the files, and then recursive install for lang and voices/!v subfolders.
Espeak-ng has been updated to 01919cd48a566cdf34347784b2e74554b376e900 This fixes several issues with compiling dictionary files. See espeak-ng/espeak-ng#287
62b7527 to
a546abb
Compare
Contributor
Author
|
Locking the comments on this PR, since this is expected to be a long running PR. The goal is to regularly integrate the newest espeak-ng changes into the If you encounter a problem with espeak-ng or this PR, please raise a separate issue. |
michaelDCurran
approved these changes
Aug 21, 2017
Contributor
Author
|
Incubated with commit: 6e730ad |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note:
If you notice a problem with Espeak on next (or master), please open a new issue to discuss this.
Summary of the issue:
In order to more quickly spot and report issues on Espeak, we are regularly updating espeak to the latest master on our next branch. When this gets to stable we can merge back to nvda master.
Description of how this pull request fixes the issue:
This updates the espeak submodule to the latest espeak-ng master commit and fixes any build errors.
In depth discussion of the changes:
Compiling mbrowrap was causing an issue, and we dont use mbrola anyway, so this was removed. It was noticed that a bunch of mbrola voices were listed in espeak but did not seem to do anything. The sconscript has been modified to exclude the 'espeak-ng-data/voice/mb' directory. This means that we can no longer recursively install espeak-ng-data and must instead manually install the files, and then recursive install for lang and voices/!v subfolders.
Removed lines from recursive install that seem unnecessary.
glob path/*.*should not add anything toglob path/*Allow unicode characters in espeak language names. Fixes part of #7167 - selecting Norwegian Bokmål no longer causes an error.
Added compilation of several missing files, and commented on why we dont compile other files. Tried to make the list of compiled files match the files listed in the automake used in espeak-ng
Testing performed:
Known issues with pull request:
None
Change log entry:
For now none. But perhaps eventually: