From daee46b6e9f866b2603a6d991e3717977c27b945 Mon Sep 17 00:00:00 2001 From: jonsd Date: Mon, 18 Mar 2013 03:29:13 +0000 Subject: [PATCH] Change layout of esoeak-data/voices git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@321 d46cf337-b52f-0410-862d-fd96e6ae7743 --- espeak-data/voices/asia/fa | 3 +++ espeak-data/voices/asia/fa-pin | 6 ++++++ espeak-data/voices/{ => asia}/hi | 0 espeak-data/voices/{ => asia}/hy | 0 espeak-data/voices/{ => asia}/hy-west | 0 espeak-data/voices/{ => asia}/id | 2 +- espeak-data/voices/asia/ka | 2 ++ espeak-data/voices/{ => asia}/kn | 0 espeak-data/voices/{ => asia}/ku | 0 espeak-data/voices/{ => asia}/ml | 0 espeak-data/voices/asia/ne | 5 +++++ espeak-data/voices/asia/pa | 2 ++ espeak-data/voices/{ => asia}/ta | 0 espeak-data/voices/{ => asia}/tr | 0 espeak-data/voices/{ => asia}/vi | 0 espeak-data/voices/asia/vi-hue | 12 ++++++++++++ espeak-data/voices/{ => asia}/zh | 2 ++ espeak-data/voices/{ => asia}/zh-yue | 1 + espeak-data/voices/europe/an | 3 +++ espeak-data/voices/europe/bg | 5 +++++ espeak-data/voices/{ => europe}/bs | 0 espeak-data/voices/{ => europe}/ca | 0 espeak-data/voices/{ => europe}/cs | 0 espeak-data/voices/{ => europe}/cy | 2 +- espeak-data/voices/{ => europe}/da | 0 espeak-data/voices/{ => europe}/el | 0 espeak-data/voices/{ => europe}/es | 0 espeak-data/voices/europe/et | 3 +++ espeak-data/voices/{ => europe}/fi | 0 espeak-data/voices/{ => europe}/fr-be | 0 espeak-data/voices/europe/ga | 4 ++++ espeak-data/voices/{ => europe}/hr | 0 espeak-data/voices/{ => europe}/hu | 0 espeak-data/voices/{ => europe}/is | 2 +- espeak-data/voices/{ => europe}/it | 0 espeak-data/voices/europe/lt | 5 +++++ espeak-data/voices/{ => europe}/lv | 0 espeak-data/voices/{ => europe}/mk | 2 +- espeak-data/voices/{ => europe}/nl | 0 espeak-data/voices/{ => europe}/no | 0 espeak-data/voices/{ => europe}/pl | 0 espeak-data/voices/{ => europe}/pt-pt | 0 espeak-data/voices/{ => europe}/ro | 0 espeak-data/voices/{ => europe}/ru | 3 ++- espeak-data/voices/{ => europe}/sk | 0 espeak-data/voices/{ => europe}/sq | 0 espeak-data/voices/{ => europe}/sr | 0 espeak-data/voices/{ => europe}/sv | 0 espeak-data/voices/ka | 2 -- espeak-data/voices/{ => other}/af | 0 espeak-data/voices/other/en-n | 15 +++++++++++++++ espeak-data/voices/other/en-rp | 13 +++++++++++++ espeak-data/voices/other/en-sc | 16 ++++++++++++++++ espeak-data/voices/other/en-wi | 20 ++++++++++++++++++++ espeak-data/voices/other/en-wm | 14 ++++++++++++++ espeak-data/voices/{ => other}/eo | 2 ++ espeak-data/voices/{test => other}/grc | 0 espeak-data/voices/{test => other}/jbo | 0 espeak-data/voices/{ => other}/la | 0 espeak-data/voices/{ => other}/sw | 0 espeak-data/voices/pt | 7 ------- espeak-data/voices/test/nci | 7 ------- espeak-data/voices/test/pap | 5 ----- 63 files changed, 139 insertions(+), 26 deletions(-) create mode 100755 espeak-data/voices/asia/fa create mode 100755 espeak-data/voices/asia/fa-pin rename espeak-data/voices/{ => asia}/hi (100%) rename espeak-data/voices/{ => asia}/hy (100%) mode change 100644 => 100755 rename espeak-data/voices/{ => asia}/hy-west (100%) mode change 100644 => 100755 rename espeak-data/voices/{ => asia}/id (86%) create mode 100755 espeak-data/voices/asia/ka rename espeak-data/voices/{ => asia}/kn (100%) rename espeak-data/voices/{ => asia}/ku (100%) rename espeak-data/voices/{ => asia}/ml (100%) create mode 100755 espeak-data/voices/asia/ne create mode 100755 espeak-data/voices/asia/pa rename espeak-data/voices/{ => asia}/ta (100%) rename espeak-data/voices/{ => asia}/tr (100%) rename espeak-data/voices/{ => asia}/vi (100%) create mode 100755 espeak-data/voices/asia/vi-hue rename espeak-data/voices/{ => asia}/zh (97%) mode change 100644 => 100755 rename espeak-data/voices/{ => asia}/zh-yue (92%) create mode 100755 espeak-data/voices/europe/an create mode 100755 espeak-data/voices/europe/bg rename espeak-data/voices/{ => europe}/bs (100%) rename espeak-data/voices/{ => europe}/ca (100%) mode change 100644 => 100755 rename espeak-data/voices/{ => europe}/cs (100%) rename espeak-data/voices/{ => europe}/cy (70%) rename espeak-data/voices/{ => europe}/da (100%) rename espeak-data/voices/{ => europe}/el (100%) rename espeak-data/voices/{ => europe}/es (100%) create mode 100755 espeak-data/voices/europe/et rename espeak-data/voices/{ => europe}/fi (100%) rename espeak-data/voices/{ => europe}/fr-be (100%) create mode 100755 espeak-data/voices/europe/ga rename espeak-data/voices/{ => europe}/hr (100%) rename espeak-data/voices/{ => europe}/hu (100%) rename espeak-data/voices/{ => europe}/is (55%) rename espeak-data/voices/{ => europe}/it (100%) create mode 100755 espeak-data/voices/europe/lt rename espeak-data/voices/{ => europe}/lv (100%) rename espeak-data/voices/{ => europe}/mk (54%) rename espeak-data/voices/{ => europe}/nl (100%) rename espeak-data/voices/{ => europe}/no (100%) rename espeak-data/voices/{ => europe}/pl (100%) rename espeak-data/voices/{ => europe}/pt-pt (100%) rename espeak-data/voices/{ => europe}/ro (100%) rename espeak-data/voices/{ => europe}/ru (59%) rename espeak-data/voices/{ => europe}/sk (100%) rename espeak-data/voices/{ => europe}/sq (100%) mode change 100644 => 100755 rename espeak-data/voices/{ => europe}/sr (100%) mode change 100644 => 100755 rename espeak-data/voices/{ => europe}/sv (100%) delete mode 100644 espeak-data/voices/ka rename espeak-data/voices/{ => other}/af (100%) create mode 100755 espeak-data/voices/other/en-n create mode 100755 espeak-data/voices/other/en-rp create mode 100755 espeak-data/voices/other/en-sc create mode 100755 espeak-data/voices/other/en-wi create mode 100755 espeak-data/voices/other/en-wm rename espeak-data/voices/{ => other}/eo (73%) rename espeak-data/voices/{test => other}/grc (100%) rename espeak-data/voices/{test => other}/jbo (100%) mode change 100644 => 100755 rename espeak-data/voices/{ => other}/la (100%) mode change 100644 => 100755 rename espeak-data/voices/{ => other}/sw (100%) delete mode 100755 espeak-data/voices/pt delete mode 100644 espeak-data/voices/test/nci delete mode 100644 espeak-data/voices/test/pap diff --git a/espeak-data/voices/asia/fa b/espeak-data/voices/asia/fa new file mode 100755 index 00000000..39be0fa2 --- /dev/null +++ b/espeak-data/voices/asia/fa @@ -0,0 +1,3 @@ +name Farsi +language fa + diff --git a/espeak-data/voices/asia/fa-pin b/espeak-data/voices/asia/fa-pin new file mode 100755 index 00000000..0e183b82 --- /dev/null +++ b/espeak-data/voices/asia/fa-pin @@ -0,0 +1,6 @@ +name Farsi-Pinglish +// Sometimes, Farsi speakers write Farsi words using English characters, particularly in Chat and SMS (texte messages).), called Pinglish +language fa-pin +dictrules 1 +phonemes fa + diff --git a/espeak-data/voices/hi b/espeak-data/voices/asia/hi similarity index 100% rename from espeak-data/voices/hi rename to espeak-data/voices/asia/hi diff --git a/espeak-data/voices/hy b/espeak-data/voices/asia/hy old mode 100644 new mode 100755 similarity index 100% rename from espeak-data/voices/hy rename to espeak-data/voices/asia/hy diff --git a/espeak-data/voices/hy-west b/espeak-data/voices/asia/hy-west old mode 100644 new mode 100755 similarity index 100% rename from espeak-data/voices/hy-west rename to espeak-data/voices/asia/hy-west diff --git a/espeak-data/voices/id b/espeak-data/voices/asia/id similarity index 86% rename from espeak-data/voices/id rename to espeak-data/voices/asia/id index ce800f70..f35b116a 100755 --- a/espeak-data/voices/id +++ b/espeak-data/voices/asia/id @@ -1,4 +1,4 @@ -name indonesian-test +name indonesian language id gender male diff --git a/espeak-data/voices/asia/ka b/espeak-data/voices/asia/ka new file mode 100755 index 00000000..6f748b7f --- /dev/null +++ b/espeak-data/voices/asia/ka @@ -0,0 +1,2 @@ +name georgian +language ka diff --git a/espeak-data/voices/kn b/espeak-data/voices/asia/kn similarity index 100% rename from espeak-data/voices/kn rename to espeak-data/voices/asia/kn diff --git a/espeak-data/voices/ku b/espeak-data/voices/asia/ku similarity index 100% rename from espeak-data/voices/ku rename to espeak-data/voices/asia/ku diff --git a/espeak-data/voices/ml b/espeak-data/voices/asia/ml similarity index 100% rename from espeak-data/voices/ml rename to espeak-data/voices/asia/ml diff --git a/espeak-data/voices/asia/ne b/espeak-data/voices/asia/ne new file mode 100755 index 00000000..fc829532 --- /dev/null +++ b/espeak-data/voices/asia/ne @@ -0,0 +1,5 @@ +name nepali +language ne +gender male + +dictrules 1 diff --git a/espeak-data/voices/asia/pa b/espeak-data/voices/asia/pa new file mode 100755 index 00000000..2ce846b7 --- /dev/null +++ b/espeak-data/voices/asia/pa @@ -0,0 +1,2 @@ +name punjabi-test +language pa diff --git a/espeak-data/voices/ta b/espeak-data/voices/asia/ta similarity index 100% rename from espeak-data/voices/ta rename to espeak-data/voices/asia/ta diff --git a/espeak-data/voices/tr b/espeak-data/voices/asia/tr similarity index 100% rename from espeak-data/voices/tr rename to espeak-data/voices/asia/tr diff --git a/espeak-data/voices/vi b/espeak-data/voices/asia/vi similarity index 100% rename from espeak-data/voices/vi rename to espeak-data/voices/asia/vi diff --git a/espeak-data/voices/asia/vi-hue b/espeak-data/voices/asia/vi-hue new file mode 100755 index 00000000..83849f89 --- /dev/null +++ b/espeak-data/voices/asia/vi-hue @@ -0,0 +1,12 @@ +name vietnam_hue +language vi-hue +phonemes vi-hue +dictrules 1 +gender male + +words 1 +pitch 82 118 //80 118 +//breath 75 75 60 40 15 10 + //breathw 150 150 200 200 400 400 + voicing 90 //18 + flutter 20 diff --git a/espeak-data/voices/zh b/espeak-data/voices/asia/zh old mode 100644 new mode 100755 similarity index 97% rename from espeak-data/voices/zh rename to espeak-data/voices/asia/zh index 03edde41..559a6403 --- a/espeak-data/voices/zh +++ b/espeak-data/voices/asia/zh @@ -4,6 +4,8 @@ gender male words 1 pitch 80 118 +dict_min 100000 + //for some dialects //[en]: replace ng with n diff --git a/espeak-data/voices/zh-yue b/espeak-data/voices/asia/zh-yue similarity index 92% rename from espeak-data/voices/zh-yue rename to espeak-data/voices/asia/zh-yue index 0269a98a..8e2b8a7e 100755 --- a/espeak-data/voices/zh-yue +++ b/espeak-data/voices/asia/zh-yue @@ -12,3 +12,4 @@ gender male dictrules 1 words 1 +dict_min 10000 diff --git a/espeak-data/voices/europe/an b/espeak-data/voices/europe/an new file mode 100755 index 00000000..7bf245e0 --- /dev/null +++ b/espeak-data/voices/europe/an @@ -0,0 +1,3 @@ +name aragonese +language an +gender male diff --git a/espeak-data/voices/europe/bg b/espeak-data/voices/europe/bg new file mode 100755 index 00000000..c3842ca7 --- /dev/null +++ b/espeak-data/voices/europe/bg @@ -0,0 +1,5 @@ +name bulgarian +language bg + +stressAmp 13 12 17 17 20 22 22 21 +stressLength 180 170 200 200 200 200 210 220 \ No newline at end of file diff --git a/espeak-data/voices/bs b/espeak-data/voices/europe/bs similarity index 100% rename from espeak-data/voices/bs rename to espeak-data/voices/europe/bs diff --git a/espeak-data/voices/ca b/espeak-data/voices/europe/ca old mode 100644 new mode 100755 similarity index 100% rename from espeak-data/voices/ca rename to espeak-data/voices/europe/ca diff --git a/espeak-data/voices/cs b/espeak-data/voices/europe/cs similarity index 100% rename from espeak-data/voices/cs rename to espeak-data/voices/europe/cs diff --git a/espeak-data/voices/cy b/espeak-data/voices/europe/cy similarity index 70% rename from espeak-data/voices/cy rename to espeak-data/voices/europe/cy index 2991e99d..30abd943 100755 --- a/espeak-data/voices/cy +++ b/espeak-data/voices/europe/cy @@ -1,5 +1,5 @@ language cy -name welsh-test +name welsh gender male intonation 4 diff --git a/espeak-data/voices/da b/espeak-data/voices/europe/da similarity index 100% rename from espeak-data/voices/da rename to espeak-data/voices/europe/da diff --git a/espeak-data/voices/el b/espeak-data/voices/europe/el similarity index 100% rename from espeak-data/voices/el rename to espeak-data/voices/europe/el diff --git a/espeak-data/voices/es b/espeak-data/voices/europe/es similarity index 100% rename from espeak-data/voices/es rename to espeak-data/voices/europe/es diff --git a/espeak-data/voices/europe/et b/espeak-data/voices/europe/et new file mode 100755 index 00000000..6caf78ce --- /dev/null +++ b/espeak-data/voices/europe/et @@ -0,0 +1,3 @@ +name estonian +language et + diff --git a/espeak-data/voices/fi b/espeak-data/voices/europe/fi similarity index 100% rename from espeak-data/voices/fi rename to espeak-data/voices/europe/fi diff --git a/espeak-data/voices/fr-be b/espeak-data/voices/europe/fr-be similarity index 100% rename from espeak-data/voices/fr-be rename to espeak-data/voices/europe/fr-be diff --git a/espeak-data/voices/europe/ga b/espeak-data/voices/europe/ga new file mode 100755 index 00000000..27e5f8b9 --- /dev/null +++ b/espeak-data/voices/europe/ga @@ -0,0 +1,4 @@ +name Irish Gaeilge +language ga + +dictrules 1 // fix for eclipsis diff --git a/espeak-data/voices/hr b/espeak-data/voices/europe/hr similarity index 100% rename from espeak-data/voices/hr rename to espeak-data/voices/europe/hr diff --git a/espeak-data/voices/hu b/espeak-data/voices/europe/hu similarity index 100% rename from espeak-data/voices/hu rename to espeak-data/voices/europe/hu diff --git a/espeak-data/voices/is b/espeak-data/voices/europe/is similarity index 55% rename from espeak-data/voices/is rename to espeak-data/voices/europe/is index 9e9c4e74..b8f23834 100755 --- a/espeak-data/voices/is +++ b/espeak-data/voices/europe/is @@ -1,4 +1,4 @@ -name icelandic-test +name icelandic language is gender male diff --git a/espeak-data/voices/it b/espeak-data/voices/europe/it similarity index 100% rename from espeak-data/voices/it rename to espeak-data/voices/europe/it diff --git a/espeak-data/voices/europe/lt b/espeak-data/voices/europe/lt new file mode 100755 index 00000000..8295f6b2 --- /dev/null +++ b/espeak-data/voices/europe/lt @@ -0,0 +1,5 @@ + +name lithuanian +language lt +gender male + diff --git a/espeak-data/voices/lv b/espeak-data/voices/europe/lv similarity index 100% rename from espeak-data/voices/lv rename to espeak-data/voices/europe/lv diff --git a/espeak-data/voices/mk b/espeak-data/voices/europe/mk similarity index 54% rename from espeak-data/voices/mk rename to espeak-data/voices/europe/mk index 4607dd07..47a8398c 100755 --- a/espeak-data/voices/mk +++ b/espeak-data/voices/europe/mk @@ -1,4 +1,4 @@ -name macedonian-test +name macedonian language mk gender male diff --git a/espeak-data/voices/nl b/espeak-data/voices/europe/nl similarity index 100% rename from espeak-data/voices/nl rename to espeak-data/voices/europe/nl diff --git a/espeak-data/voices/no b/espeak-data/voices/europe/no similarity index 100% rename from espeak-data/voices/no rename to espeak-data/voices/europe/no diff --git a/espeak-data/voices/pl b/espeak-data/voices/europe/pl similarity index 100% rename from espeak-data/voices/pl rename to espeak-data/voices/europe/pl diff --git a/espeak-data/voices/pt-pt b/espeak-data/voices/europe/pt-pt similarity index 100% rename from espeak-data/voices/pt-pt rename to espeak-data/voices/europe/pt-pt diff --git a/espeak-data/voices/ro b/espeak-data/voices/europe/ro similarity index 100% rename from espeak-data/voices/ro rename to espeak-data/voices/europe/ro diff --git a/espeak-data/voices/ru b/espeak-data/voices/europe/ru similarity index 59% rename from espeak-data/voices/ru rename to espeak-data/voices/europe/ru index 238c6912..4136ab21 100755 --- a/espeak-data/voices/ru +++ b/espeak-data/voices/europe/ru @@ -1,6 +1,7 @@ -name russian_test +name russian language ru gender male replace 03 a a# +dict_min 20000 diff --git a/espeak-data/voices/sk b/espeak-data/voices/europe/sk similarity index 100% rename from espeak-data/voices/sk rename to espeak-data/voices/europe/sk diff --git a/espeak-data/voices/sq b/espeak-data/voices/europe/sq old mode 100644 new mode 100755 similarity index 100% rename from espeak-data/voices/sq rename to espeak-data/voices/europe/sq diff --git a/espeak-data/voices/sr b/espeak-data/voices/europe/sr old mode 100644 new mode 100755 similarity index 100% rename from espeak-data/voices/sr rename to espeak-data/voices/europe/sr diff --git a/espeak-data/voices/sv b/espeak-data/voices/europe/sv similarity index 100% rename from espeak-data/voices/sv rename to espeak-data/voices/europe/sv diff --git a/espeak-data/voices/ka b/espeak-data/voices/ka deleted file mode 100644 index bc2def28..00000000 --- a/espeak-data/voices/ka +++ /dev/null @@ -1,2 +0,0 @@ -name georgian-test -language ka diff --git a/espeak-data/voices/af b/espeak-data/voices/other/af similarity index 100% rename from espeak-data/voices/af rename to espeak-data/voices/other/af diff --git a/espeak-data/voices/other/en-n b/espeak-data/voices/other/en-n new file mode 100755 index 00000000..7f8ef32a --- /dev/null +++ b/espeak-data/voices/other/en-n @@ -0,0 +1,15 @@ +name lancashire +language en-uk-north +language en-uk 3 +language en 5 +gender male + +phonemes en-n + +stressLength 160 150 180 180 220 220 290 290 + +replace 00 i@3 i@ +replace 03 N n +//replace 03 I i +//replace 03 I2 i + diff --git a/espeak-data/voices/other/en-rp b/espeak-data/voices/other/en-rp new file mode 100755 index 00000000..abc1dbcb --- /dev/null +++ b/espeak-data/voices/other/en-rp @@ -0,0 +1,13 @@ +name english_rp +language en-uk-rp +language en-uk 4 +language en 5 +gender male + +phonemes en-rp +replace 00 o@ O@ +replace 00 i@3 i@ +replace 03 I i +replace 03 I2 i +replace 03 @ a# +replace 03 3 a# diff --git a/espeak-data/voices/other/en-sc b/espeak-data/voices/other/en-sc new file mode 100755 index 00000000..e0783ec3 --- /dev/null +++ b/espeak-data/voices/other/en-sc @@ -0,0 +1,16 @@ +name en-scottish +language en-sc +language en 4 +gender male + +phonemes en-sc +dictrules 5 6 7 +stressLength 180 130 200 200 0 0 250 270 + +replace 03 @ V +replace 03 I i +replace 03 I2 i +replace 01 aI aI2 +replace 02 a a/ +replace 02 u: U +replace 02 3: VR diff --git a/espeak-data/voices/other/en-wi b/espeak-data/voices/other/en-wi new file mode 100755 index 00000000..302538de --- /dev/null +++ b/espeak-data/voices/other/en-wi @@ -0,0 +1,20 @@ +name en-westindies +language en-wi +language en-uk 4 +language en 10 +gender male + +phonemes en-wi +dictrules 8 +stressLength 175 175 175 175 220 220 250 290 + +replace 00 D d +replace 00 T t[ +replace 00 U@ o@ +replace 00 i@3 i@ +replace 03 @ a# +replace 03 3 a# +replace 03 N n + +formant 1 98 100 100 +formant 2 98 100 100 diff --git a/espeak-data/voices/other/en-wm b/espeak-data/voices/other/en-wm new file mode 100755 index 00000000..33ff4fe4 --- /dev/null +++ b/espeak-data/voices/other/en-wm @@ -0,0 +1,14 @@ +name english_wmids +language en-uk-wmids +language en-uk 9 +language en 9 +gender male + +phonemes en-wm + +replace 00 h NULL +replace 00 o@ O@ +replace 00 i@3 i@ +dictrules 6 +intonation 4 +stressAdd 0 0 0 0 0 0 0 20 diff --git a/espeak-data/voices/eo b/espeak-data/voices/other/eo similarity index 73% rename from espeak-data/voices/eo rename to espeak-data/voices/other/eo index 36a4bff6..be18c0a7 100755 --- a/espeak-data/voices/eo +++ b/espeak-data/voices/other/eo @@ -1,3 +1,5 @@ name esperanto language eo gender male + +apostrophe 2 diff --git a/espeak-data/voices/test/grc b/espeak-data/voices/other/grc similarity index 100% rename from espeak-data/voices/test/grc rename to espeak-data/voices/other/grc diff --git a/espeak-data/voices/test/jbo b/espeak-data/voices/other/jbo old mode 100644 new mode 100755 similarity index 100% rename from espeak-data/voices/test/jbo rename to espeak-data/voices/other/jbo diff --git a/espeak-data/voices/la b/espeak-data/voices/other/la old mode 100644 new mode 100755 similarity index 100% rename from espeak-data/voices/la rename to espeak-data/voices/other/la diff --git a/espeak-data/voices/sw b/espeak-data/voices/other/sw similarity index 100% rename from espeak-data/voices/sw rename to espeak-data/voices/other/sw diff --git a/espeak-data/voices/pt b/espeak-data/voices/pt deleted file mode 100755 index 64a073d6..00000000 --- a/espeak-data/voices/pt +++ /dev/null @@ -1,7 +0,0 @@ -name brazil -language pt-br -language pt -gender male - -dictrules 2 - diff --git a/espeak-data/voices/test/nci b/espeak-data/voices/test/nci deleted file mode 100644 index d0864f3d..00000000 --- a/espeak-data/voices/test/nci +++ /dev/null @@ -1,7 +0,0 @@ -name nahuatl - classical -language nci -gender male - -intonation 3 -stressrule 2 -stressLength 190 190 200 200 0 0 220 240 diff --git a/espeak-data/voices/test/pap b/espeak-data/voices/test/pap deleted file mode 100644 index 3b105a7f..00000000 --- a/espeak-data/voices/test/pap +++ /dev/null @@ -1,5 +0,0 @@ -name papiamento-test -language pap - -phonemes base2 -