mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate the NUM_DFRACTION flags from the rest of the NUM_ bitmask flags.

Browse Source
This commit is contained in:
Reece H. Dunn
2020-04-12 10:53:04 +01:00
parent 5a8b7bdcfe
commit b8fbcf86ff
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/numbers.c
+1 -1
View File
@@ -1977,7 +1977,7 @@ static int TranslateNumber_1(Translator *tr, char *word, char *ph_out, unsigned
decimal_count++;
max_decimal_count = 2;
switch (decimal_mode = (tr->langopts.numbers & 0xe000))
switch (decimal_mode = (tr->langopts.numbers & NUM_DFRACTION_BITS))
{
case NUM_DFRACTION_4:
max_decimal_count = 5;
src/libespeak-ng/translate.h
+9 -7
View File
@@ -449,13 +449,7 @@ typedef struct {
#define NUM_OMIT_1_HUNDRED 0x00000400
#define NUM_1900 0x00000800
#define NUM_ALLOW_SPACE 0x00001000
#define NUM_DFRACTION_1 0x00002000
#define NUM_DFRACTION_2 0x00004000
#define NUM_DFRACTION_3 0x00006000
#define NUM_DFRACTION_4 0x00008000
#define NUM_DFRACTION_5 0x0000a000
#define NUM_DFRACTION_6 0x0000c000
#define NUM_DFRACTION_7 0x0000e000 // lang=si, alternative form of number for decimal fraction digits (except the last)
#define NUM_DFRACTION_BITS 0x0000e000
#define NUM_ORDINAL_DOT 0x00010000
#define NUM_NOPAUSE 0x00020000
#define NUM_AND_HUNDRED 0x00040000
@@ -470,6 +464,14 @@ typedef struct {
#define NUM_ROMAN_ORDINAL 0x08000000
#define NUM_SINGLE_STRESS_L 0x10000000
#define NUM_DFRACTION_1 0x00002000
#define NUM_DFRACTION_2 0x00004000
#define NUM_DFRACTION_3 0x00006000
#define NUM_DFRACTION_4 0x00008000
#define NUM_DFRACTION_5 0x0000a000
#define NUM_DFRACTION_6 0x0000c000
#define NUM_DFRACTION_7 0x0000e000 // lang=si, alternative form of number for decimal fraction digits (except the last)
// bits0-1=which numbers routine to use.
// bit2= thousands separator must be space
// bit3= , decimal separator, not .