mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-21 19:37:52 +00:00
Merge branch 'development' into build
This commit is contained in:
+1
-1
@@ -35,7 +35,7 @@
|
||||
#include "translate.h"
|
||||
#include "wave.h"
|
||||
|
||||
const char *version_string = "1.45.46 04.Oct.11";
|
||||
const char *version_string = "1.45.47 24.Oct.11";
|
||||
const int version_phdata = 0x014500;
|
||||
|
||||
int option_device_number = -1;
|
||||
|
||||
+1
-1
@@ -1441,7 +1441,7 @@ if(dictionary_flags2[0] & FLAG_ABBREV)
|
||||
// lang=Hungarian, If the last two words of a clause have capital letters (eg. a person name), unstress the last word.
|
||||
if((wflags & (FLAG_LAST_WORD | FLAG_FIRST_UPPER | FLAG_ALL_UPPER | FLAG_FIRST_WORD)) == (FLAG_LAST_WORD | FLAG_FIRST_UPPER))
|
||||
{
|
||||
if((wtab[-1].flags & (FLAG_FIRST_UPPER | FLAG_ALL_UPPER)) == FLAG_FIRST_UPPER)
|
||||
if(((wtab[-1].flags & (FLAG_FIRST_UPPER | FLAG_ALL_UPPER)) == FLAG_FIRST_UPPER) && ((tr->clause_terminator != 0x90028) || (wflags & FLAG_HAS_DOT)))
|
||||
{
|
||||
ChangeWordStress(tr,word_phonemes,3);
|
||||
}
|
||||
|
||||
@@ -183,6 +183,7 @@
|
||||
|
||||
// Punctuation types returned by ReadClause()
|
||||
// bits 0-7 pause x 10mS, bits 12-14 intonation type,
|
||||
// bits12-14 intonation type
|
||||
// bit 15- don't need space after the punctuation
|
||||
// bit 19=sentence, bit 18=clause, bits 17=voice change
|
||||
// bit 16 used to distinguish otherwise identical types
|
||||
|
||||
Reference in New Issue
Block a user