From fb6d3dae347f47107e5767f1ec6e87ed0bf9875a Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Tue, 24 Nov 2009 15:14:09 -0800 Subject: The automerger missed this change, and then skipped when we switched branches merge paths. Patch from SVOX: new lingware files for all languages. en-US and en-GB are now XSAMPA compatible. Updated respective test files to include cross-english tests. en-GB passes en-US tests en-US passes en-GB tests except for the following diphtongs: "I_@", "U_@" and "e_@" --- pico/lang/de-DE_gl0_sg.bin | Bin 636008 -> 636008 bytes pico/lang/de-DE_ta.bin | Bin 440988 -> 440732 bytes pico/lang/en-GB_kh0_sg.bin | Bin 584436 -> 584436 bytes pico/lang/en-GB_ta.bin | Bin 412184 -> 412248 bytes pico/lang/en-US_lh0_sg.bin | Bin 793868 -> 793868 bytes pico/lang/en-US_ta.bin | Bin 651956 -> 650668 bytes pico/lang/es-ES_ta.bin | Bin 256924 -> 256744 bytes pico/lang/es-ES_zl0_sg.bin | Bin 600672 -> 600672 bytes pico/lang/fr-FR_nk0_sg.bin | Bin 595056 -> 595056 bytes pico/lang/fr-FR_ta.bin | Bin 376220 -> 381936 bytes pico/lang/it-IT_cm0_sg.bin | Bin 628268 -> 628268 bytes pico/lang/it-IT_ta.bin | Bin 252260 -> 252044 bytes pico/tests/data/xsampa_pico_man_en-GB.txt | 151 +++++++++++++++++++++++++----- pico/tests/data/xsampa_pico_man_en-US.txt | 71 ++++++++++++++ 14 files changed, 198 insertions(+), 24 deletions(-) diff --git a/pico/lang/de-DE_gl0_sg.bin b/pico/lang/de-DE_gl0_sg.bin index 0ff87d2..5305b49 100755 Binary files a/pico/lang/de-DE_gl0_sg.bin and b/pico/lang/de-DE_gl0_sg.bin differ diff --git a/pico/lang/de-DE_ta.bin b/pico/lang/de-DE_ta.bin index 62526de..cd59da7 100755 Binary files a/pico/lang/de-DE_ta.bin and b/pico/lang/de-DE_ta.bin differ diff --git a/pico/lang/en-GB_kh0_sg.bin b/pico/lang/en-GB_kh0_sg.bin index 6c3002a..57c544a 100755 Binary files a/pico/lang/en-GB_kh0_sg.bin and b/pico/lang/en-GB_kh0_sg.bin differ diff --git a/pico/lang/en-GB_ta.bin b/pico/lang/en-GB_ta.bin index d138c6a..5050583 100755 Binary files a/pico/lang/en-GB_ta.bin and b/pico/lang/en-GB_ta.bin differ diff --git a/pico/lang/en-US_lh0_sg.bin b/pico/lang/en-US_lh0_sg.bin index 18e4b7e..91487cc 100755 Binary files a/pico/lang/en-US_lh0_sg.bin and b/pico/lang/en-US_lh0_sg.bin differ diff --git a/pico/lang/en-US_ta.bin b/pico/lang/en-US_ta.bin index 08c184c..95cb042 100755 Binary files a/pico/lang/en-US_ta.bin and b/pico/lang/en-US_ta.bin differ diff --git a/pico/lang/es-ES_ta.bin b/pico/lang/es-ES_ta.bin index ae83ebc..dfa3c55 100755 Binary files a/pico/lang/es-ES_ta.bin and b/pico/lang/es-ES_ta.bin differ diff --git a/pico/lang/es-ES_zl0_sg.bin b/pico/lang/es-ES_zl0_sg.bin index 5c23007..f29f6b1 100755 Binary files a/pico/lang/es-ES_zl0_sg.bin and b/pico/lang/es-ES_zl0_sg.bin differ diff --git a/pico/lang/fr-FR_nk0_sg.bin b/pico/lang/fr-FR_nk0_sg.bin index 128b15d..bf5467d 100755 Binary files a/pico/lang/fr-FR_nk0_sg.bin and b/pico/lang/fr-FR_nk0_sg.bin differ diff --git a/pico/lang/fr-FR_ta.bin b/pico/lang/fr-FR_ta.bin index f95537b..117dbe3 100755 Binary files a/pico/lang/fr-FR_ta.bin and b/pico/lang/fr-FR_ta.bin differ diff --git a/pico/lang/it-IT_cm0_sg.bin b/pico/lang/it-IT_cm0_sg.bin index 903fe9a..62d236b 100755 Binary files a/pico/lang/it-IT_cm0_sg.bin and b/pico/lang/it-IT_cm0_sg.bin differ diff --git a/pico/lang/it-IT_ta.bin b/pico/lang/it-IT_ta.bin index 54ec6fe..80baa46 100755 Binary files a/pico/lang/it-IT_ta.bin and b/pico/lang/it-IT_ta.bin differ diff --git a/pico/tests/data/xsampa_pico_man_en-GB.txt b/pico/tests/data/xsampa_pico_man_en-GB.txt index b5b5dde..fbee754 100644 --- a/pico/tests/data/xsampa_pico_man_en-GB.txt +++ b/pico/tests/data/xsampa_pico_man_en-GB.txt @@ -39,11 +39,11 @@ # TEST N thing "TIN Testing . -# TEST m mock "mA:k - Testing . +# TEST m mock "mQk + Testing . -# TEST n knock "nA:k - Testing . +# TEST n knock "nQk + Testing . # --------- Fricatives @@ -56,8 +56,8 @@ # TEST T thin "TIn Testing . -# BUG Z measure "mE.Z@` says [measu'chu'res] - Testing . +# TEST Z measure "mE.Z@ + Testing . # TEST f fit "fIt Testing . @@ -77,11 +77,11 @@ # --------- Approximants -# TEST j yacht "jA:t - Testing . +# TEST j yacht "jQt + Testing . -# BUG l long "lA:N says garbage after the [l] - Testing . +# TEST l long "lQN + Testing . # TEST l= little "lI.tl= Testing . @@ -89,8 +89,8 @@ # TEST r\ right "r\a_It Testing . -# BUG w wasp "wA:sp says garbage after the [wa] - Testing . +# TEST w wasp "wQsp + Testing . # --------- Affricates @@ -129,11 +129,11 @@ # --------- Long -# TEST 3: furs "f3:z says [fuz z z] +# TEST 3: furs "f3:z Testing . -# BUG A: stars "stA:z says [st'eyes] - Testing . +# TEST A: stars "stA:z + Testing . # TEST i: ease "i:z Testing . @@ -144,18 +144,27 @@ # --------- Diphthongs -# BUG o_U nose "no_Uz says garbage - Testing . +# TEST o_U nose "n@_Uz + Testing . + +# TEST I_@ fears "fI_@z + Testing . # TEST O_I noise "nO_Iz Testing . +# TEST U_@ cures "kjU_@z + Testing . + # TEST a_I rise "r\a_Iz Testing . # TEST a_U rouse "r\a_Uz Testing . +# TEST e_@ stairs "ste_@z + Testing . + # TEST e_I raise "r\e_Iz Testing . @@ -174,19 +183,113 @@ # TEST " primary stress BETTER TEST? <<<<<<<<<<<<------------------------------------ Testing and primary stress. -# --------- -# END_TEST -#----------------------- -# Tests from en-US +#--------------------------------------------------------- +# en-GB / en-GB compatibility -# BUG? W whale "We_Il says [kale] +# TEST W whale "We_Il Testing . -# BUG? @` actor "{k.t@` says garbage after [a] +# TEST @` actor "{k.t@` Testing . -# BUG? O: four "fO:r\ says garbage +# TEST @` (US) @ (GB) measure "mE.Z@` + Testing . + Testing . + +# BUG A: (US) long "lA:N says [lang] + Testing . + +# TEST A:r\ (US) A:(GB) stars "stA:r\z + Testing . + Testing . + +# TEST o_U (US) @_U (GB) nose "no_Uz + Testing . + Testing . + +# TEST O: (US) o: (GB) four fO:r\ + Testing . + Testing . + + +#--------------------------------------------------------- +# en-GB test content spoken using the en-GB resources + +# Consonants +# --------- Plosives + +# same as en-US + + +# --------- Nasals + +# TEST m mock "mA:k + Testing . + +# TEST n knock "nA:k + Testing . + +# --------- Fricatives + +# TEST Z measure "mE.Z@` + Testing . + +# TEST W whale "We_Il ("east coast" pronounciation of W phoneme for "wh") + Testing . + +# TEST w whale "We_Il + Testing . + + +# --------- Approximants + +# TEST j yacht "jA:t + Testing . + +# BUG l long "lA:N + Testing . + +# TEST w wasp "wA:sp + Testing . + + +# --------- Affricates + +# same as en-US + + +# Monophthongs +# --------- Short + +# same as en-US + + +# --------- Long + +# TEST 3`: furs "f3`:z + Testing . + +# TEST A: stars "stA:r\z + Testing . + +# TEST O: four "fO:r\ Testing . +# --------- Diphthongs + +# TEST o_U nose "no_Uz + Testing . + +# TEST a_I rise "r\a_Iz + Testing . + +# TEST a_U rouse "r\a_Uz + Testing . + +# TEST e_I raise "r\e_Iz + Testing . + +# --------- +# END_TEST diff --git a/pico/tests/data/xsampa_pico_man_en-US.txt b/pico/tests/data/xsampa_pico_man_en-US.txt index c722cd0..74ed371 100644 --- a/pico/tests/data/xsampa_pico_man_en-US.txt +++ b/pico/tests/data/xsampa_pico_man_en-US.txt @@ -183,6 +183,77 @@ # BUG " primary stress BETTER TEST? <<<<<<<<<<<<------------------------------------ Testing and primary stress. + +#--------------------------------------------------------- +# en-US test content spoken using the en-US resources + +# Consonants +# --------- Plosives + +# same as en-GB + + +# --------- Nasals + +# TEST m mock "mQk + Testing . + +# TEST n knock "nQk + Testing . + +# --------- Fricatives + +# TEST Z measure "mE.Z@ + Testing . + + +# --------- Approximants + +# TEST j yacht "jQt + Testing . + +# TEST l long "lQN + Testing . + +# TEST w wasp "wQsp + Testing . + + +# --------- Affricates + +# same as en-GB + + +# Monophthongs +# --------- Short + +# TEST Q pot "pQt + Testing . + + +# --------- Long + +# TEST 3: furs "f3:z + Testing . + +# TEST A: stars "stA:z + Testing . + + +# --------- Diphthongs + +# TEST o_U nose "n@_Uz + Testing . + +# IMPROVE I_@ fears "fI_@z + Testing . + +# IMPROVE U_@ cures "kjU_@z + Testing . + +# IMPROVE e_@ stairs "ste_@z + Testing . + # --------- # END_TEST -- cgit v1.1