Browse Source

Don't allow the gender property to be set in language files (they are only relevant in voice files).

master
Reece H. Dunn 8 years ago
parent
commit
36a2872b4b
67 changed files with 10 additions and 95 deletions
  1. 0
    1
      espeak-ng-data/lang/aav/vi
  2. 0
    1
      espeak-ng-data/lang/aav/vi-VN-x-central
  3. 0
    1
      espeak-ng-data/lang/aav/vi-VN-x-south
  4. 0
    1
      espeak-ng-data/lang/art/eo
  5. 0
    1
      espeak-ng-data/lang/art/lfn
  6. 0
    1
      espeak-ng-data/lang/azc/nci
  7. 0
    2
      espeak-ng-data/lang/bat/lt
  8. 0
    1
      espeak-ng-data/lang/bat/lv
  9. 0
    1
      espeak-ng-data/lang/bnt/sw
  10. 0
    1
      espeak-ng-data/lang/bnt/tn
  11. 0
    1
      espeak-ng-data/lang/cel/cy
  12. 0
    1
      espeak-ng-data/lang/dra/ml
  13. 0
    1
      espeak-ng-data/lang/dra/ta
  14. 0
    3
      espeak-ng-data/lang/gmq/da
  15. 0
    2
      espeak-ng-data/lang/gmq/is
  16. 0
    1
      espeak-ng-data/lang/gmq/no
  17. 0
    2
      espeak-ng-data/lang/gmq/sv
  18. 0
    1
      espeak-ng-data/lang/gmw/af
  19. 0
    3
      espeak-ng-data/lang/gmw/de
  20. 0
    1
      espeak-ng-data/lang/gmw/en
  21. 0
    1
      espeak-ng-data/lang/gmw/en-029
  22. 0
    1
      espeak-ng-data/lang/gmw/en-GB-scotland
  23. 0
    3
      espeak-ng-data/lang/gmw/en-GB-x-gbclan
  24. 0
    1
      espeak-ng-data/lang/gmw/en-GB-x-gbcwmd
  25. 0
    1
      espeak-ng-data/lang/gmw/en-GB-x-rp
  26. 0
    2
      espeak-ng-data/lang/gmw/en-US
  27. 0
    1
      espeak-ng-data/lang/gmw/nl
  28. 0
    3
      espeak-ng-data/lang/grk/el
  29. 0
    2
      espeak-ng-data/lang/grk/grc
  30. 0
    1
      espeak-ng-data/lang/inc/bn
  31. 0
    1
      espeak-ng-data/lang/inc/hi
  32. 0
    1
      espeak-ng-data/lang/inc/ne
  33. 0
    1
      espeak-ng-data/lang/ine/hy
  34. 0
    2
      espeak-ng-data/lang/ine/hy-arevmda
  35. 0
    1
      espeak-ng-data/lang/ine/sq
  36. 0
    1
      espeak-ng-data/lang/ira/ku
  37. 0
    1
      espeak-ng-data/lang/itc/la
  38. 0
    1
      espeak-ng-data/lang/jpx/jp
  39. 0
    1
      espeak-ng-data/lang/ko
  40. 0
    1
      espeak-ng-data/lang/poz/id
  41. 0
    1
      espeak-ng-data/lang/poz/ms
  42. 0
    1
      espeak-ng-data/lang/roa/an
  43. 0
    2
      espeak-ng-data/lang/roa/ca
  44. 0
    1
      espeak-ng-data/lang/roa/es
  45. 0
    1
      espeak-ng-data/lang/roa/es-419
  46. 0
    1
      espeak-ng-data/lang/roa/fr
  47. 0
    1
      espeak-ng-data/lang/roa/fr-BE
  48. 0
    2
      espeak-ng-data/lang/roa/it
  49. 0
    1
      espeak-ng-data/lang/roa/pt-BR
  50. 0
    1
      espeak-ng-data/lang/roa/pt-PT
  51. 0
    1
      espeak-ng-data/lang/roa/ro
  52. 0
    1
      espeak-ng-data/lang/sem/ar
  53. 0
    1
      espeak-ng-data/lang/sit/cmn
  54. 0
    1
      espeak-ng-data/lang/sit/yue
  55. 0
    2
      espeak-ng-data/lang/trk/tr
  56. 0
    1
      espeak-ng-data/lang/trk/tt
  57. 0
    2
      espeak-ng-data/lang/urj/fi
  58. 0
    1
      espeak-ng-data/lang/urj/hu
  59. 0
    1
      espeak-ng-data/lang/zls/bs
  60. 0
    2
      espeak-ng-data/lang/zls/cs
  61. 0
    1
      espeak-ng-data/lang/zls/hr
  62. 0
    2
      espeak-ng-data/lang/zls/mk
  63. 0
    1
      espeak-ng-data/lang/zls/pl
  64. 0
    1
      espeak-ng-data/lang/zls/ru
  65. 0
    2
      espeak-ng-data/lang/zls/sk
  66. 0
    1
      espeak-ng-data/lang/zls/sr
  67. 10
    8
      src/libespeak-ng/voices.c

+ 0
- 1
espeak-ng-data/lang/aav/vi View File

@@ -1,6 +1,5 @@
name Vietnamese (Northern)
language vi
gender male

words 1
pitch 80 118

+ 0
- 1
espeak-ng-data/lang/aav/vi-VN-x-central View File

@@ -2,7 +2,6 @@ name Vietnamese (Central)
language vi-vn-x-central
phonemes vi-hue
dictrules 1
gender male

words 1
pitch 82 118 //80 118

+ 0
- 1
espeak-ng-data/lang/aav/vi-VN-x-south View File

@@ -2,7 +2,6 @@ name Vietnamese (Southern)
language vi-vn-x-south
phonemes vi-sgn
dictrules 2
gender male

words 1
pitch 82 118 //80 118

+ 0
- 1
espeak-ng-data/lang/art/eo View File

@@ -1,5 +1,4 @@
name Esperanto
language eo
gender male

apostrophe 2

+ 0
- 1
espeak-ng-data/lang/art/lfn View File

@@ -1,6 +1,5 @@
name Lingua Franca Nova
language lfn
gender male
phonemes base2
l_unpronouncable 0

+ 0
- 1
espeak-ng-data/lang/azc/nci View File

@@ -1,6 +1,5 @@
name Nahuatl (Classical)
language nci
gender male

intonation 3
stressrule 2

+ 0
- 2
espeak-ng-data/lang/bat/lt View File

@@ -1,4 +1,2 @@
name Lithuanian
language lt
gender male


+ 0
- 1
espeak-ng-data/lang/bat/lv View File

@@ -1,6 +1,5 @@
name Latvian
language lv
gender male
maintainer Valdis Vitolins <[email protected]>
status mature
words 0 2

+ 0
- 1
espeak-ng-data/lang/bnt/sw View File

@@ -1,5 +1,4 @@
name Swahili
language sw
gender male

status testing

+ 0
- 1
espeak-ng-data/lang/bnt/tn View File

@@ -1,5 +1,4 @@
name Setswana
language tn
gender male

status testing

+ 0
- 1
espeak-ng-data/lang/cel/cy View File

@@ -1,5 +1,4 @@
name Welsh
language cy
gender male

intonation 4

+ 0
- 1
espeak-ng-data/lang/dra/ml View File

@@ -1,6 +1,5 @@
name Malayalam
language ml
gender male

intonation 2
//consonants 80

+ 0
- 1
espeak-ng-data/lang/dra/ta View File

@@ -1,6 +1,5 @@
name Tamil
language ta
gender male

intonation 2
consonants 80

+ 0
- 3
espeak-ng-data/lang/gmq/da View File

@@ -1,7 +1,4 @@
name Danish
language da
gender male

tunes s2 c2 q2 e2



+ 0
- 2
espeak-ng-data/lang/gmq/is View File

@@ -1,4 +1,2 @@
name Icelandic
language is
gender male


+ 0
- 1
espeak-ng-data/lang/gmq/no View File

@@ -1,6 +1,5 @@
name Norwegian
language no
language nb
gender male

intonation 4

+ 0
- 2
espeak-ng-data/lang/gmq/sv View File

@@ -1,4 +1,2 @@
name Swedish
language sv
gender male


+ 0
- 1
espeak-ng-data/lang/gmw/af View File

@@ -1,6 +1,5 @@
name Afrikaans
language af
gender male

maintainer Christo de Klerk <[email protected]>
status mature

+ 0
- 3
espeak-ng-data/lang/gmw/de View File

@@ -1,5 +1,2 @@
name German
language de
gender male



+ 0
- 1
espeak-ng-data/lang/gmw/en View File

@@ -1,7 +1,6 @@
name English (Great Britain)
language en-gb 2
language en 2
gender male

maintainer Reece H. Dunn <[email protected]>
status mature

+ 0
- 1
espeak-ng-data/lang/gmw/en-029 View File

@@ -1,7 +1,6 @@
name English (Caribbean)
language en-029
language en 10
gender male

maintainer Reece H. Dunn <[email protected]>
status mature

+ 0
- 1
espeak-ng-data/lang/gmw/en-GB-scotland View File

@@ -1,7 +1,6 @@
name English (Scotland)
language en-gb-scotland
language en 4
gender male

maintainer Reece H. Dunn <[email protected]>
status mature

+ 0
- 3
espeak-ng-data/lang/gmw/en-GB-x-gbclan View File

@@ -2,7 +2,6 @@ name English (Lancaster)
language en-gb-x-gbclan
language en-gb 3
language en 5
gender male

maintainer Reece H. Dunn <[email protected]>
status mature
@@ -14,5 +13,3 @@ stressLength 160 150 180 180 220 220 290 290
replace 00 i@3 i@
replace 03 N n
replace 03 i I2



+ 0
- 1
espeak-ng-data/lang/gmw/en-GB-x-gbcwmd View File

@@ -2,7 +2,6 @@ name English (West Midlands)
language en-gb-x-gbcwmd
language en-gb 9
language en 9
gender male

phonemes en-wm


+ 0
- 1
espeak-ng-data/lang/gmw/en-GB-x-rp View File

@@ -2,7 +2,6 @@ name English (Received Pronunciation)
language en-gb-x-rp
language en-gb 4
language en 5
gender male

maintainer Reece H. Dunn <[email protected]>
status mature

+ 0
- 2
espeak-ng-data/lang/gmw/en-US View File

@@ -1,7 +1,6 @@
name English (America)
language en-us 2
language en 3
gender male

maintainer Reece H. Dunn <[email protected]>
status mature
@@ -15,4 +14,3 @@ stressAmp 17 16 19 19 19 19 21 19

replace 03 I i
replace 03 I2 i


+ 0
- 1
espeak-ng-data/lang/gmw/nl View File

@@ -1,3 +1,2 @@
name Dutch
language nl
gender male

+ 0
- 3
espeak-ng-data/lang/grk/el View File

@@ -1,5 +1,2 @@
name Greek (Modern)
language el
gender male



+ 0
- 2
espeak-ng-data/lang/grk/grc View File

@@ -1,8 +1,6 @@
name Greek (Ancient)
language grc
gender male

stressLength 170 170 190 190 0 0 230 240
dictrules 1
words 3


+ 0
- 1
espeak-ng-data/lang/inc/bn View File

@@ -1,3 +1,2 @@
name Bengali
language bn
gender male

+ 0
- 1
espeak-ng-data/lang/inc/hi View File

@@ -1,3 +1,2 @@
name Hindi
language hi
gender male

+ 0
- 1
espeak-ng-data/lang/inc/ne View File

@@ -1,5 +1,4 @@
name Nepali
language ne
gender male

dictrules 1

+ 0
- 1
espeak-ng-data/lang/ine/hy View File

@@ -1,3 +1,2 @@
name Armenian (East Armenia)
language hy
gender male

+ 0
- 2
espeak-ng-data/lang/ine/hy-arevmda View File

@@ -1,7 +1,6 @@
name Armenian (West Armenia)
language hy-arevmda
language hy 8
gender male

dictrules 1

@@ -19,4 +18,3 @@ replace 00 tS dZ
replace 00 k g

replace 00 R2 R // ??


+ 0
- 1
espeak-ng-data/lang/ine/sq View File

@@ -1,6 +1,5 @@
name Albanian
language sq
gender male

// add this line to remove 'ë' at the end of words
// replace 00 @/ NULL

+ 0
- 1
espeak-ng-data/lang/ira/ku View File

@@ -1,6 +1,5 @@
name Kurdish
language ku
gender male

//words 1 48


+ 0
- 1
espeak-ng-data/lang/itc/la View File

@@ -1,6 +1,5 @@
name Latin
language la
gender male
stressrule 2 33 0 2
// rule=penultimate
// flags=0100001 (no automatic secondary stress + don't stres monosyllables)

+ 0
- 1
espeak-ng-data/lang/jpx/jp View File

@@ -1,6 +1,5 @@
name Japanese
language jp
phonemes jp
gender male

intonation 4

+ 0
- 1
espeak-ng-data/lang/ko View File

@@ -1,6 +1,5 @@
name Korean
language ko
gender male
pitch 80 118
intonation 2


+ 0
- 1
espeak-ng-data/lang/poz/id View File

@@ -1,6 +1,5 @@
name Indonesian
language id
gender male

stressLength 160 200 180 180 0 0 220 240
stressAmp 16 18 18 18 0 0 22 21

+ 0
- 1
espeak-ng-data/lang/poz/ms View File

@@ -1,7 +1,6 @@
// Last updated: 14 October 2010, Jason Ong ([email protected])
name Malay
language ms
gender male
phonemes id

translator id

+ 0
- 1
espeak-ng-data/lang/roa/an View File

@@ -1,3 +1,2 @@
name Aragonese
language an
gender male

+ 0
- 2
espeak-ng-data/lang/roa/ca View File

@@ -1,4 +1,2 @@
name Catalan
language ca
gender male


+ 0
- 1
espeak-ng-data/lang/roa/es View File

@@ -1,5 +1,4 @@
name Spanish (Spain)
language es
gender male
dictrules 1
tunes s6 c6 q6 e6

+ 0
- 1
espeak-ng-data/lang/roa/es-419 View File

@@ -2,7 +2,6 @@ name Spanish (Latin America)
language es-419
language es-mx 6
language es 6
gender male

phonemes es-la
dictrules 2

+ 0
- 1
espeak-ng-data/lang/roa/fr View File

@@ -1,7 +1,6 @@
name French (France)
language fr-fr
language fr
gender male

dictrules 1
tunes s3 c3 q3 e3

+ 0
- 1
espeak-ng-data/lang/roa/fr-BE View File

@@ -1,7 +1,6 @@
name French (Belgium)
language fr-be
language fr 8
gender male

dictrules 2
tunes s3 c3 q3 e3

+ 0
- 2
espeak-ng-data/lang/roa/it View File

@@ -1,9 +1,7 @@
name Italian
language it
gender male

maintainer Christian Leo M <[email protected]>
status mature

tunes s4 c4 q4 e4


+ 0
- 1
espeak-ng-data/lang/roa/pt-BR View File

@@ -1,7 +1,6 @@
name Portuguese (Brazil)
language pt-br
language pt
gender male

dictrules 2
stressLength 200 115 230 230 0 0 250 270

+ 0
- 1
espeak-ng-data/lang/roa/pt-PT View File

@@ -1,7 +1,6 @@
name Portuguese (Portugal)
language pt-pt
language pt 6
gender male
phonemes pt-pt

dictrules 1

+ 0
- 1
espeak-ng-data/lang/roa/ro View File

@@ -1,3 +1,2 @@
name Romanian
language ro
gender male

+ 0
- 1
espeak-ng-data/lang/sem/ar View File

@@ -1,7 +1,6 @@
name Arabic
language ar
phonemes ar
gender male
pitch 160 120
roughness 0
speed 70

+ 0
- 1
espeak-ng-data/lang/sit/cmn View File

@@ -1,6 +1,5 @@
name Chinese (Mandarin)
language zh
gender male
words 1
pitch 80 118


+ 0
- 1
espeak-ng-data/lang/sit/yue View File

@@ -6,7 +6,6 @@ language zhy
translator zhy
phonemes zhy
dictionary zhy
gender male

// interpret English letters as 1=English words, 2=jyutping
dictrules 1

+ 0
- 2
espeak-ng-data/lang/trk/tr View File

@@ -1,4 +1,2 @@
name Turkish
language tr
gender male


+ 0
- 1
espeak-ng-data/lang/trk/tt View File

@@ -1,3 +1,2 @@
name Tatar
language tt
gender male

+ 0
- 2
espeak-ng-data/lang/urj/fi View File

@@ -1,4 +1,2 @@
name Finnish
language fi
gender male


+ 0
- 1
espeak-ng-data/lang/urj/hu View File

@@ -1,6 +1,5 @@
name Hungarian
language hu
gender male
option bracket 0 0
pitch 81 117


+ 0
- 1
espeak-ng-data/lang/zls/bs View File

@@ -2,7 +2,6 @@ name Bosnian
language bs
phonemes hr
dictionary hbs
gender male

pitch 81 120
formant 0 100 100 100

+ 0
- 2
espeak-ng-data/lang/zls/cs View File

@@ -1,4 +1,2 @@
name Czech
language cs
gender male


+ 0
- 1
espeak-ng-data/lang/zls/hr View File

@@ -1,7 +1,6 @@
name Croatian
language hr
language hbs
gender male

dictionary hbs


+ 0
- 2
espeak-ng-data/lang/zls/mk View File

@@ -1,4 +1,2 @@
name Macedonian
language mk
gender male


+ 0
- 1
espeak-ng-data/lang/zls/pl View File

@@ -1,5 +1,4 @@
name Polish
language pl
gender male

intonation 2

+ 0
- 1
espeak-ng-data/lang/zls/ru View File

@@ -1,6 +1,5 @@
name Russian
language ru
gender male

replace 03 a a#


+ 0
- 2
espeak-ng-data/lang/zls/sk View File

@@ -1,4 +1,2 @@
name Slovak
language sk
gender male


+ 0
- 1
espeak-ng-data/lang/zls/sr View File

@@ -1,6 +1,5 @@
name Serbian
language sr
gender male
dictionary hbs

// attributes towards !variant3 pitch 80 120

+ 10
- 8
src/libespeak-ng/voices.c View File

@@ -265,7 +265,7 @@ void ReadTonePoints(char *string, int *tone_pts)
&tone_pts[8], &tone_pts[9]);
}

static espeak_VOICE *ReadVoiceFile(FILE *f_in, const char *fname)
static espeak_VOICE *ReadVoiceFile(FILE *f_in, const char *fname, int is_language_file)
{
// Read a Voice file, allocate a VOICE_DATA and set data from the
// file's language, gender, name lines
@@ -320,6 +320,8 @@ static espeak_VOICE *ReadVoiceFile(FILE *f_in, const char *fname)
break;
case V_GENDER:
sscanf(p, "%s %d", vgender, &age);
if (is_language_file)
fprintf(stderr, "Error (%s): gender attribute specified on a language file\n", fname);
break;
case V_VARIANTS:
sscanf(p, "%d", &n_variants);
@@ -1389,7 +1391,7 @@ char const *SelectVoice(espeak_VOICE *voice_select, int *found)
return vp->identifier;
}

static void GetVoices(const char *path, int len_path_voices)
static void GetVoices(const char *path, int len_path_voices, int is_language_file)
{
FILE *f_voice;
espeak_VOICE *voice_data;
@@ -1416,14 +1418,14 @@ static void GetVoices(const char *path, int len_path_voices)

if (ftype == -EISDIR) {
// a sub-directory
GetVoices(fname, len_path_voices);
GetVoices(fname, len_path_voices, is_language_file);
} else if (ftype > 0) {
// a regular file, add it to the voices list
if ((f_voice = fopen(fname, "r")) == NULL)
continue;

// pass voice file name within the voices directory
voice_data = ReadVoiceFile(f_voice, fname+len_path_voices);
voice_data = ReadVoiceFile(f_voice, fname+len_path_voices, is_language_file);
fclose(f_voice);

if (voice_data != NULL)
@@ -1452,14 +1454,14 @@ static void GetVoices(const char *path, int len_path_voices)

if (ftype == -EISDIR) {
// a sub-directory
GetVoices(fname, len_path_voices);
GetVoices(fname, len_path_voices, is_language_file);
} else if (ftype > 0) {
// a regular file, add it to the voices list
if ((f_voice = fopen(fname, "r")) == NULL)
continue;

// pass voice file name within the voices directory
voice_data = ReadVoiceFile(f_voice, fname+len_path_voices);
voice_data = ReadVoiceFile(f_voice, fname+len_path_voices, is_language_file);
fclose(f_voice);

if (voice_data != NULL)
@@ -1567,10 +1569,10 @@ ESPEAK_API const espeak_VOICE **espeak_ListVoices(espeak_VOICE *voice_spec)
FreeVoiceList();

sprintf(path_voices, "%s%cvoices", path_home, PATHSEP);
GetVoices(path_voices, strlen(path_voices)+1);
GetVoices(path_voices, strlen(path_voices)+1, 0);

sprintf(path_voices, "%s%clang", path_home, PATHSEP);
GetVoices(path_voices, strlen(path_voices)+1);
GetVoices(path_voices, strlen(path_voices)+1, 1);

voices_list[n_voices_list] = NULL; // voices list terminator
espeak_VOICE **new_voices = (espeak_VOICE **)realloc(voices, sizeof(espeak_VOICE *)*(n_voices_list+1));

Loading…
Cancel
Save