From 36a2872b4b5bf7aaa8d063eaf4a04d5fcad3ea2c Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 5 Feb 2017 19:45:29 +0000 Subject: [PATCH] Don't allow the gender property to be set in language files (they are only relevant in voice files). --- espeak-ng-data/lang/aav/vi | 1 - espeak-ng-data/lang/aav/vi-VN-x-central | 1 - espeak-ng-data/lang/aav/vi-VN-x-south | 1 - espeak-ng-data/lang/art/eo | 1 - espeak-ng-data/lang/art/lfn | 1 - espeak-ng-data/lang/azc/nci | 1 - espeak-ng-data/lang/bat/lt | 2 -- espeak-ng-data/lang/bat/lv | 1 - espeak-ng-data/lang/bnt/sw | 1 - espeak-ng-data/lang/bnt/tn | 1 - espeak-ng-data/lang/cel/cy | 1 - espeak-ng-data/lang/dra/ml | 1 - espeak-ng-data/lang/dra/ta | 1 - espeak-ng-data/lang/gmq/da | 3 --- espeak-ng-data/lang/gmq/is | 2 -- espeak-ng-data/lang/gmq/no | 1 - espeak-ng-data/lang/gmq/sv | 2 -- espeak-ng-data/lang/gmw/af | 1 - espeak-ng-data/lang/gmw/de | 3 --- espeak-ng-data/lang/gmw/en | 1 - espeak-ng-data/lang/gmw/en-029 | 1 - espeak-ng-data/lang/gmw/en-GB-scotland | 1 - espeak-ng-data/lang/gmw/en-GB-x-gbclan | 3 --- espeak-ng-data/lang/gmw/en-GB-x-gbcwmd | 1 - espeak-ng-data/lang/gmw/en-GB-x-rp | 1 - espeak-ng-data/lang/gmw/en-US | 2 -- espeak-ng-data/lang/gmw/nl | 1 - espeak-ng-data/lang/grk/el | 3 --- espeak-ng-data/lang/grk/grc | 2 -- espeak-ng-data/lang/inc/bn | 1 - espeak-ng-data/lang/inc/hi | 1 - espeak-ng-data/lang/inc/ne | 1 - espeak-ng-data/lang/ine/hy | 1 - espeak-ng-data/lang/ine/hy-arevmda | 2 -- espeak-ng-data/lang/ine/sq | 1 - espeak-ng-data/lang/ira/ku | 1 - espeak-ng-data/lang/itc/la | 1 - espeak-ng-data/lang/jpx/jp | 1 - espeak-ng-data/lang/ko | 1 - espeak-ng-data/lang/poz/id | 1 - espeak-ng-data/lang/poz/ms | 1 - espeak-ng-data/lang/roa/an | 1 - espeak-ng-data/lang/roa/ca | 2 -- espeak-ng-data/lang/roa/es | 1 - espeak-ng-data/lang/roa/es-419 | 1 - espeak-ng-data/lang/roa/fr | 1 - espeak-ng-data/lang/roa/fr-BE | 1 - espeak-ng-data/lang/roa/it | 2 -- espeak-ng-data/lang/roa/pt-BR | 1 - espeak-ng-data/lang/roa/pt-PT | 1 - espeak-ng-data/lang/roa/ro | 1 - espeak-ng-data/lang/sem/ar | 1 - espeak-ng-data/lang/sit/cmn | 1 - espeak-ng-data/lang/sit/yue | 1 - espeak-ng-data/lang/trk/tr | 2 -- espeak-ng-data/lang/trk/tt | 1 - espeak-ng-data/lang/urj/fi | 2 -- espeak-ng-data/lang/urj/hu | 1 - espeak-ng-data/lang/zls/bs | 1 - espeak-ng-data/lang/zls/cs | 2 -- espeak-ng-data/lang/zls/hr | 1 - espeak-ng-data/lang/zls/mk | 2 -- espeak-ng-data/lang/zls/pl | 1 - espeak-ng-data/lang/zls/ru | 1 - espeak-ng-data/lang/zls/sk | 2 -- espeak-ng-data/lang/zls/sr | 1 - src/libespeak-ng/voices.c | 18 ++++++++++-------- 67 files changed, 10 insertions(+), 95 deletions(-) diff --git a/espeak-ng-data/lang/aav/vi b/espeak-ng-data/lang/aav/vi index 91e2aba4..2ab8767c 100644 --- a/espeak-ng-data/lang/aav/vi +++ b/espeak-ng-data/lang/aav/vi @@ -1,6 +1,5 @@ name Vietnamese (Northern) language vi -gender male words 1 pitch 80 118 diff --git a/espeak-ng-data/lang/aav/vi-VN-x-central b/espeak-ng-data/lang/aav/vi-VN-x-central index 7248d0b4..6d2b9ed0 100644 --- a/espeak-ng-data/lang/aav/vi-VN-x-central +++ b/espeak-ng-data/lang/aav/vi-VN-x-central @@ -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 diff --git a/espeak-ng-data/lang/aav/vi-VN-x-south b/espeak-ng-data/lang/aav/vi-VN-x-south index 2f46869a..b1da9a50 100644 --- a/espeak-ng-data/lang/aav/vi-VN-x-south +++ b/espeak-ng-data/lang/aav/vi-VN-x-south @@ -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 diff --git a/espeak-ng-data/lang/art/eo b/espeak-ng-data/lang/art/eo index d8a69b67..e47501fa 100644 --- a/espeak-ng-data/lang/art/eo +++ b/espeak-ng-data/lang/art/eo @@ -1,5 +1,4 @@ name Esperanto language eo -gender male apostrophe 2 diff --git a/espeak-ng-data/lang/art/lfn b/espeak-ng-data/lang/art/lfn index 53d52e0c..d5e43871 100644 --- a/espeak-ng-data/lang/art/lfn +++ b/espeak-ng-data/lang/art/lfn @@ -1,6 +1,5 @@ name Lingua Franca Nova language lfn -gender male phonemes base2 l_unpronouncable 0 diff --git a/espeak-ng-data/lang/azc/nci b/espeak-ng-data/lang/azc/nci index 33ef1402..e2de619f 100644 --- a/espeak-ng-data/lang/azc/nci +++ b/espeak-ng-data/lang/azc/nci @@ -1,6 +1,5 @@ name Nahuatl (Classical) language nci -gender male intonation 3 stressrule 2 diff --git a/espeak-ng-data/lang/bat/lt b/espeak-ng-data/lang/bat/lt index 00e7eb28..7cdb1930 100644 --- a/espeak-ng-data/lang/bat/lt +++ b/espeak-ng-data/lang/bat/lt @@ -1,4 +1,2 @@ name Lithuanian language lt -gender male - diff --git a/espeak-ng-data/lang/bat/lv b/espeak-ng-data/lang/bat/lv index 19091a2d..9fb0ea52 100644 --- a/espeak-ng-data/lang/bat/lv +++ b/espeak-ng-data/lang/bat/lv @@ -1,6 +1,5 @@ name Latvian language lv -gender male maintainer Valdis Vitolins status mature words 0 2 diff --git a/espeak-ng-data/lang/bnt/sw b/espeak-ng-data/lang/bnt/sw index 7074b1b4..d1a4db33 100644 --- a/espeak-ng-data/lang/bnt/sw +++ b/espeak-ng-data/lang/bnt/sw @@ -1,5 +1,4 @@ name Swahili language sw -gender male status testing diff --git a/espeak-ng-data/lang/bnt/tn b/espeak-ng-data/lang/bnt/tn index 6aef67a7..8b484e43 100644 --- a/espeak-ng-data/lang/bnt/tn +++ b/espeak-ng-data/lang/bnt/tn @@ -1,5 +1,4 @@ name Setswana language tn -gender male status testing diff --git a/espeak-ng-data/lang/cel/cy b/espeak-ng-data/lang/cel/cy index cb06776b..6d021329 100644 --- a/espeak-ng-data/lang/cel/cy +++ b/espeak-ng-data/lang/cel/cy @@ -1,5 +1,4 @@ name Welsh language cy -gender male intonation 4 diff --git a/espeak-ng-data/lang/dra/ml b/espeak-ng-data/lang/dra/ml index 98a69261..92394bbc 100644 --- a/espeak-ng-data/lang/dra/ml +++ b/espeak-ng-data/lang/dra/ml @@ -1,6 +1,5 @@ name Malayalam language ml -gender male intonation 2 //consonants 80 diff --git a/espeak-ng-data/lang/dra/ta b/espeak-ng-data/lang/dra/ta index d9bee8b1..aae63348 100644 --- a/espeak-ng-data/lang/dra/ta +++ b/espeak-ng-data/lang/dra/ta @@ -1,6 +1,5 @@ name Tamil language ta -gender male intonation 2 consonants 80 diff --git a/espeak-ng-data/lang/gmq/da b/espeak-ng-data/lang/gmq/da index 3b9b669c..58f02f15 100644 --- a/espeak-ng-data/lang/gmq/da +++ b/espeak-ng-data/lang/gmq/da @@ -1,7 +1,4 @@ name Danish language da -gender male tunes s2 c2 q2 e2 - - diff --git a/espeak-ng-data/lang/gmq/is b/espeak-ng-data/lang/gmq/is index bbaa0eeb..04bf5ad3 100644 --- a/espeak-ng-data/lang/gmq/is +++ b/espeak-ng-data/lang/gmq/is @@ -1,4 +1,2 @@ name Icelandic language is -gender male - diff --git a/espeak-ng-data/lang/gmq/no b/espeak-ng-data/lang/gmq/no index a389b5c4..ae6051ae 100644 --- a/espeak-ng-data/lang/gmq/no +++ b/espeak-ng-data/lang/gmq/no @@ -1,6 +1,5 @@ name Norwegian language no language nb -gender male intonation 4 diff --git a/espeak-ng-data/lang/gmq/sv b/espeak-ng-data/lang/gmq/sv index 96a39516..bb2d0299 100644 --- a/espeak-ng-data/lang/gmq/sv +++ b/espeak-ng-data/lang/gmq/sv @@ -1,4 +1,2 @@ name Swedish language sv -gender male - diff --git a/espeak-ng-data/lang/gmw/af b/espeak-ng-data/lang/gmw/af index d8159de4..64fc96f5 100644 --- a/espeak-ng-data/lang/gmw/af +++ b/espeak-ng-data/lang/gmw/af @@ -1,6 +1,5 @@ name Afrikaans language af -gender male maintainer Christo de Klerk status mature diff --git a/espeak-ng-data/lang/gmw/de b/espeak-ng-data/lang/gmw/de index fb33bdfe..470e5afd 100644 --- a/espeak-ng-data/lang/gmw/de +++ b/espeak-ng-data/lang/gmw/de @@ -1,5 +1,2 @@ name German language de -gender male - - diff --git a/espeak-ng-data/lang/gmw/en b/espeak-ng-data/lang/gmw/en index 069604af..f23fb531 100644 --- a/espeak-ng-data/lang/gmw/en +++ b/espeak-ng-data/lang/gmw/en @@ -1,7 +1,6 @@ name English (Great Britain) language en-gb 2 language en 2 -gender male maintainer Reece H. Dunn status mature diff --git a/espeak-ng-data/lang/gmw/en-029 b/espeak-ng-data/lang/gmw/en-029 index 4672c78d..3130376e 100644 --- a/espeak-ng-data/lang/gmw/en-029 +++ b/espeak-ng-data/lang/gmw/en-029 @@ -1,7 +1,6 @@ name English (Caribbean) language en-029 language en 10 -gender male maintainer Reece H. Dunn status mature diff --git a/espeak-ng-data/lang/gmw/en-GB-scotland b/espeak-ng-data/lang/gmw/en-GB-scotland index b510791b..a4655a0e 100644 --- a/espeak-ng-data/lang/gmw/en-GB-scotland +++ b/espeak-ng-data/lang/gmw/en-GB-scotland @@ -1,7 +1,6 @@ name English (Scotland) language en-gb-scotland language en 4 -gender male maintainer Reece H. Dunn status mature diff --git a/espeak-ng-data/lang/gmw/en-GB-x-gbclan b/espeak-ng-data/lang/gmw/en-GB-x-gbclan index b1508d1d..9d78707d 100644 --- a/espeak-ng-data/lang/gmw/en-GB-x-gbclan +++ b/espeak-ng-data/lang/gmw/en-GB-x-gbclan @@ -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 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 - - diff --git a/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd b/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd index 4b52f297..cf3a69b0 100644 --- a/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd +++ b/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd @@ -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 diff --git a/espeak-ng-data/lang/gmw/en-GB-x-rp b/espeak-ng-data/lang/gmw/en-GB-x-rp index 7e1b9146..bf9106a3 100644 --- a/espeak-ng-data/lang/gmw/en-GB-x-rp +++ b/espeak-ng-data/lang/gmw/en-GB-x-rp @@ -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 status mature diff --git a/espeak-ng-data/lang/gmw/en-US b/espeak-ng-data/lang/gmw/en-US index d90ddf53..bed71550 100644 --- a/espeak-ng-data/lang/gmw/en-US +++ b/espeak-ng-data/lang/gmw/en-US @@ -1,7 +1,6 @@ name English (America) language en-us 2 language en 3 -gender male maintainer Reece H. Dunn status mature @@ -15,4 +14,3 @@ stressAmp 17 16 19 19 19 19 21 19 replace 03 I i replace 03 I2 i - diff --git a/espeak-ng-data/lang/gmw/nl b/espeak-ng-data/lang/gmw/nl index 4e34d7e4..a212fbef 100644 --- a/espeak-ng-data/lang/gmw/nl +++ b/espeak-ng-data/lang/gmw/nl @@ -1,3 +1,2 @@ name Dutch language nl -gender male diff --git a/espeak-ng-data/lang/grk/el b/espeak-ng-data/lang/grk/el index 5c541d4e..2ee6f819 100644 --- a/espeak-ng-data/lang/grk/el +++ b/espeak-ng-data/lang/grk/el @@ -1,5 +1,2 @@ name Greek (Modern) language el -gender male - - diff --git a/espeak-ng-data/lang/grk/grc b/espeak-ng-data/lang/grk/grc index 09f1db19..baa8b2c6 100644 --- a/espeak-ng-data/lang/grk/grc +++ b/espeak-ng-data/lang/grk/grc @@ -1,8 +1,6 @@ name Greek (Ancient) language grc -gender male stressLength 170 170 190 190 0 0 230 240 dictrules 1 words 3 - diff --git a/espeak-ng-data/lang/inc/bn b/espeak-ng-data/lang/inc/bn index ee6d5c29..c7918026 100644 --- a/espeak-ng-data/lang/inc/bn +++ b/espeak-ng-data/lang/inc/bn @@ -1,3 +1,2 @@ name Bengali language bn -gender male diff --git a/espeak-ng-data/lang/inc/hi b/espeak-ng-data/lang/inc/hi index ad70ab82..16ea3892 100644 --- a/espeak-ng-data/lang/inc/hi +++ b/espeak-ng-data/lang/inc/hi @@ -1,3 +1,2 @@ name Hindi language hi -gender male diff --git a/espeak-ng-data/lang/inc/ne b/espeak-ng-data/lang/inc/ne index d8d4419b..4b64cc2b 100644 --- a/espeak-ng-data/lang/inc/ne +++ b/espeak-ng-data/lang/inc/ne @@ -1,5 +1,4 @@ name Nepali language ne -gender male dictrules 1 diff --git a/espeak-ng-data/lang/ine/hy b/espeak-ng-data/lang/ine/hy index 63837b42..89e8c27c 100644 --- a/espeak-ng-data/lang/ine/hy +++ b/espeak-ng-data/lang/ine/hy @@ -1,3 +1,2 @@ name Armenian (East Armenia) language hy -gender male diff --git a/espeak-ng-data/lang/ine/hy-arevmda b/espeak-ng-data/lang/ine/hy-arevmda index 018970fa..14890c03 100644 --- a/espeak-ng-data/lang/ine/hy-arevmda +++ b/espeak-ng-data/lang/ine/hy-arevmda @@ -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 // ?? - diff --git a/espeak-ng-data/lang/ine/sq b/espeak-ng-data/lang/ine/sq index bf8d18ec..9ace3576 100644 --- a/espeak-ng-data/lang/ine/sq +++ b/espeak-ng-data/lang/ine/sq @@ -1,6 +1,5 @@ name Albanian language sq -gender male // add this line to remove 'ë' at the end of words // replace 00 @/ NULL diff --git a/espeak-ng-data/lang/ira/ku b/espeak-ng-data/lang/ira/ku index f2b78c9c..b26bca25 100644 --- a/espeak-ng-data/lang/ira/ku +++ b/espeak-ng-data/lang/ira/ku @@ -1,6 +1,5 @@ name Kurdish language ku -gender male //words 1 48 diff --git a/espeak-ng-data/lang/itc/la b/espeak-ng-data/lang/itc/la index 367eafc2..c6e019ab 100644 --- a/espeak-ng-data/lang/itc/la +++ b/espeak-ng-data/lang/itc/la @@ -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) diff --git a/espeak-ng-data/lang/jpx/jp b/espeak-ng-data/lang/jpx/jp index 2fa69800..1434828f 100644 --- a/espeak-ng-data/lang/jpx/jp +++ b/espeak-ng-data/lang/jpx/jp @@ -1,6 +1,5 @@ name Japanese language jp phonemes jp -gender male intonation 4 diff --git a/espeak-ng-data/lang/ko b/espeak-ng-data/lang/ko index 74f98ab3..f03ba091 100644 --- a/espeak-ng-data/lang/ko +++ b/espeak-ng-data/lang/ko @@ -1,6 +1,5 @@ name Korean language ko -gender male pitch 80 118 intonation 2 diff --git a/espeak-ng-data/lang/poz/id b/espeak-ng-data/lang/poz/id index fc74fa01..d300372f 100644 --- a/espeak-ng-data/lang/poz/id +++ b/espeak-ng-data/lang/poz/id @@ -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 diff --git a/espeak-ng-data/lang/poz/ms b/espeak-ng-data/lang/poz/ms index ac625c66..a90a18b1 100644 --- a/espeak-ng-data/lang/poz/ms +++ b/espeak-ng-data/lang/poz/ms @@ -1,7 +1,6 @@ // Last updated: 14 October 2010, Jason Ong (jason@portalgroove.com) name Malay language ms -gender male phonemes id translator id diff --git a/espeak-ng-data/lang/roa/an b/espeak-ng-data/lang/roa/an index 067118b7..dc75aa8e 100644 --- a/espeak-ng-data/lang/roa/an +++ b/espeak-ng-data/lang/roa/an @@ -1,3 +1,2 @@ name Aragonese language an -gender male diff --git a/espeak-ng-data/lang/roa/ca b/espeak-ng-data/lang/roa/ca index 8fc46e90..54af356f 100644 --- a/espeak-ng-data/lang/roa/ca +++ b/espeak-ng-data/lang/roa/ca @@ -1,4 +1,2 @@ name Catalan language ca -gender male - diff --git a/espeak-ng-data/lang/roa/es b/espeak-ng-data/lang/roa/es index bcc02291..dc90e41c 100644 --- a/espeak-ng-data/lang/roa/es +++ b/espeak-ng-data/lang/roa/es @@ -1,5 +1,4 @@ name Spanish (Spain) language es -gender male dictrules 1 tunes s6 c6 q6 e6 diff --git a/espeak-ng-data/lang/roa/es-419 b/espeak-ng-data/lang/roa/es-419 index c57a5b23..0acaa106 100644 --- a/espeak-ng-data/lang/roa/es-419 +++ b/espeak-ng-data/lang/roa/es-419 @@ -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 diff --git a/espeak-ng-data/lang/roa/fr b/espeak-ng-data/lang/roa/fr index 1d6dcab3..9e0b9440 100644 --- a/espeak-ng-data/lang/roa/fr +++ b/espeak-ng-data/lang/roa/fr @@ -1,7 +1,6 @@ name French (France) language fr-fr language fr -gender male dictrules 1 tunes s3 c3 q3 e3 diff --git a/espeak-ng-data/lang/roa/fr-BE b/espeak-ng-data/lang/roa/fr-BE index 0b4f06c6..1a0311f9 100644 --- a/espeak-ng-data/lang/roa/fr-BE +++ b/espeak-ng-data/lang/roa/fr-BE @@ -1,7 +1,6 @@ name French (Belgium) language fr-be language fr 8 -gender male dictrules 2 tunes s3 c3 q3 e3 diff --git a/espeak-ng-data/lang/roa/it b/espeak-ng-data/lang/roa/it index 9548ecb9..ad7bb50e 100644 --- a/espeak-ng-data/lang/roa/it +++ b/espeak-ng-data/lang/roa/it @@ -1,9 +1,7 @@ name Italian language it -gender male maintainer Christian Leo M status mature tunes s4 c4 q4 e4 - diff --git a/espeak-ng-data/lang/roa/pt-BR b/espeak-ng-data/lang/roa/pt-BR index f1b44d25..f6a064bf 100644 --- a/espeak-ng-data/lang/roa/pt-BR +++ b/espeak-ng-data/lang/roa/pt-BR @@ -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 diff --git a/espeak-ng-data/lang/roa/pt-PT b/espeak-ng-data/lang/roa/pt-PT index f84b5e08..31fe1305 100644 --- a/espeak-ng-data/lang/roa/pt-PT +++ b/espeak-ng-data/lang/roa/pt-PT @@ -1,7 +1,6 @@ name Portuguese (Portugal) language pt-pt language pt 6 -gender male phonemes pt-pt dictrules 1 diff --git a/espeak-ng-data/lang/roa/ro b/espeak-ng-data/lang/roa/ro index 135c1226..94441efe 100644 --- a/espeak-ng-data/lang/roa/ro +++ b/espeak-ng-data/lang/roa/ro @@ -1,3 +1,2 @@ name Romanian language ro -gender male diff --git a/espeak-ng-data/lang/sem/ar b/espeak-ng-data/lang/sem/ar index 12185836..c6d71be7 100644 --- a/espeak-ng-data/lang/sem/ar +++ b/espeak-ng-data/lang/sem/ar @@ -1,7 +1,6 @@ name Arabic language ar phonemes ar -gender male pitch 160 120 roughness 0 speed 70 diff --git a/espeak-ng-data/lang/sit/cmn b/espeak-ng-data/lang/sit/cmn index 14204747..fbd74570 100644 --- a/espeak-ng-data/lang/sit/cmn +++ b/espeak-ng-data/lang/sit/cmn @@ -1,6 +1,5 @@ name Chinese (Mandarin) language zh -gender male words 1 pitch 80 118 diff --git a/espeak-ng-data/lang/sit/yue b/espeak-ng-data/lang/sit/yue index 444124d8..f861ca16 100644 --- a/espeak-ng-data/lang/sit/yue +++ b/espeak-ng-data/lang/sit/yue @@ -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 diff --git a/espeak-ng-data/lang/trk/tr b/espeak-ng-data/lang/trk/tr index 2507ae81..1d5cbc49 100644 --- a/espeak-ng-data/lang/trk/tr +++ b/espeak-ng-data/lang/trk/tr @@ -1,4 +1,2 @@ name Turkish language tr -gender male - diff --git a/espeak-ng-data/lang/trk/tt b/espeak-ng-data/lang/trk/tt index a72d3500..10ebba4c 100644 --- a/espeak-ng-data/lang/trk/tt +++ b/espeak-ng-data/lang/trk/tt @@ -1,3 +1,2 @@ name Tatar language tt -gender male diff --git a/espeak-ng-data/lang/urj/fi b/espeak-ng-data/lang/urj/fi index d5966fab..ef14b147 100644 --- a/espeak-ng-data/lang/urj/fi +++ b/espeak-ng-data/lang/urj/fi @@ -1,4 +1,2 @@ name Finnish language fi -gender male - diff --git a/espeak-ng-data/lang/urj/hu b/espeak-ng-data/lang/urj/hu index 00d40320..5ece4b1b 100644 --- a/espeak-ng-data/lang/urj/hu +++ b/espeak-ng-data/lang/urj/hu @@ -1,6 +1,5 @@ name Hungarian language hu -gender male option bracket 0 0 pitch 81 117 diff --git a/espeak-ng-data/lang/zls/bs b/espeak-ng-data/lang/zls/bs index d19f6ec9..554e47c9 100644 --- a/espeak-ng-data/lang/zls/bs +++ b/espeak-ng-data/lang/zls/bs @@ -2,7 +2,6 @@ name Bosnian language bs phonemes hr dictionary hbs -gender male pitch 81 120 formant 0 100 100 100 diff --git a/espeak-ng-data/lang/zls/cs b/espeak-ng-data/lang/zls/cs index db2b4c3e..5c3bf2ac 100644 --- a/espeak-ng-data/lang/zls/cs +++ b/espeak-ng-data/lang/zls/cs @@ -1,4 +1,2 @@ name Czech language cs -gender male - diff --git a/espeak-ng-data/lang/zls/hr b/espeak-ng-data/lang/zls/hr index c821cbe0..7baa8a02 100644 --- a/espeak-ng-data/lang/zls/hr +++ b/espeak-ng-data/lang/zls/hr @@ -1,7 +1,6 @@ name Croatian language hr language hbs -gender male dictionary hbs diff --git a/espeak-ng-data/lang/zls/mk b/espeak-ng-data/lang/zls/mk index 3eab6b4e..380c20b6 100644 --- a/espeak-ng-data/lang/zls/mk +++ b/espeak-ng-data/lang/zls/mk @@ -1,4 +1,2 @@ name Macedonian language mk -gender male - diff --git a/espeak-ng-data/lang/zls/pl b/espeak-ng-data/lang/zls/pl index 4e9c3bea..b85f56be 100644 --- a/espeak-ng-data/lang/zls/pl +++ b/espeak-ng-data/lang/zls/pl @@ -1,5 +1,4 @@ name Polish language pl -gender male intonation 2 diff --git a/espeak-ng-data/lang/zls/ru b/espeak-ng-data/lang/zls/ru index c38ac7be..71a615b8 100644 --- a/espeak-ng-data/lang/zls/ru +++ b/espeak-ng-data/lang/zls/ru @@ -1,6 +1,5 @@ name Russian language ru -gender male replace 03 a a# diff --git a/espeak-ng-data/lang/zls/sk b/espeak-ng-data/lang/zls/sk index 461a3c43..e849e61b 100644 --- a/espeak-ng-data/lang/zls/sk +++ b/espeak-ng-data/lang/zls/sk @@ -1,4 +1,2 @@ name Slovak language sk -gender male - diff --git a/espeak-ng-data/lang/zls/sr b/espeak-ng-data/lang/zls/sr index 50c78abb..0bb49466 100644 --- a/espeak-ng-data/lang/zls/sr +++ b/espeak-ng-data/lang/zls/sr @@ -1,6 +1,5 @@ name Serbian language sr -gender male dictionary hbs // attributes towards !variant3 pitch 80 120 diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c index 75f34c24..f35bcf2a 100644 --- a/src/libespeak-ng/voices.c +++ b/src/libespeak-ng/voices.c @@ -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));