mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-08 07:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Reece Dunn
2012-05-10 07:01:39 +01:00
parent dcbb5be63b 37ab9a0e33
commit 7ec4a690e8
9 changed files with 106 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/numbers.cpp
+13 -6
View File
@@ -1503,17 +1503,24 @@ static int LookupNum3(Translator *tr, int value, char *ph_out, int suppress_null
ph_hundred_and[0] = 0;
if(tensunits > 0)
{
if((value > 100) || ((control & 1) && (thousandplex==0)))
if((control & 2) && (tr->langopts.numbers2 & NUM2_MULTIPLE_ORDINAL))
{
if((tr->langopts.numbers & NUM_HUNDRED_AND) || ((tr->langopts.numbers & NUM_HUNDRED_AND_DIGIT) && (tensunits < 10)))
// Don't use "and" if we apply ordinal to both hundreds and units
}
else
{
if((value > 100) || ((control & 1) && (thousandplex==0)))
{
if((tr->langopts.numbers & NUM_HUNDRED_AND) || ((tr->langopts.numbers & NUM_HUNDRED_AND_DIGIT) && (tensunits < 10)))
{
Lookup(tr, "_0and", ph_hundred_and);
}
}
if((tr->langopts.numbers & NUM_THOUSAND_AND) && (hundreds == 0) && ((control & 1) || (ph_thousands[0] != 0)))
{
Lookup(tr, "_0and", ph_hundred_and);
}
}
if((tr->langopts.numbers & NUM_THOUSAND_AND) && (hundreds == 0) && ((control & 1) || (ph_thousands[0] != 0)))
{
Lookup(tr, "_0and", ph_hundred_and);
}
}
src/synthdata.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.46.14 22.Feb.12";
const char *version_string = "1.46.17 05.May.12";
const int version_phdata = 0x014600;
int option_device_number = -1;
src/tr_languages.cpp
+1
View File
@@ -1076,6 +1076,7 @@ SetLengthMods(tr,3); // all equal
tr->langopts.stress_rule = STRESSPOSN_1R; // stress on final syllable
tr->langopts.stress_flags = 0x6 | 0x10 | 0x2000 | 0x20000;
tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_DFRACTION_2 | NUM_HUNDRED_AND | NUM_AND_UNITS | NUM_ROMAN;
tr->langopts.numbers2 = NUM2_MULTIPLE_ORDINAL;
SetLetterVowel(tr,'y');
ResetLetterBits(tr,0x2);
SetLetterBits(tr,1,"bcdfgjkmnpqstvxz"); // B hard consonants, excluding h,l,r,w,y