Patches from SVOX on lingware for de-DE, en-US, fr-FR for XSAMPA support.

Test updates to reflect fixes (in comments) and expand tests to allow
direct comparison between XSAMPA version and text version.
Fixes:
- de-DE: v Wahl "va:l fixed
- en-GB: A: (US) long "lA:N fixed
- en-US: l long "lA:N fixed
- fr-FR:
   H juin "ZHE~ fixed
   l long "lO~ fixed
   l long "lO~ (in a sentence) fixed
   w coin "kwE~ fixed

10 files changed, 14 insertions, 14 deletions

diff --git a/pico/lang/de-DE_gl0_sg.bin b/pico/lang/de-DE_gl0_sg.bin
index 5305b49..1655704 100755
--- a/pico/lang/de-DE_gl0_sg.bin
+++ b/pico/lang/de-DE_gl0_sg.bin
diff --git a/pico/lang/de-DE_ta.bin b/pico/lang/de-DE_ta.bin
index cd59da7..3cb978a 100755
--- a/pico/lang/de-DE_ta.bin
+++ b/pico/lang/de-DE_ta.bin
diff --git a/pico/lang/en-US_lh0_sg.bin b/pico/lang/en-US_lh0_sg.bin
index 91487cc..b2dfc39 100755
--- a/pico/lang/en-US_lh0_sg.bin
+++ b/pico/lang/en-US_lh0_sg.bin
diff --git a/pico/lang/en-US_ta.bin b/pico/lang/en-US_ta.bin
index 95cb042..943f57e 100755
--- a/pico/lang/en-US_ta.bin
+++ b/pico/lang/en-US_ta.bin
diff --git a/pico/lang/fr-FR_nk0_sg.bin b/pico/lang/fr-FR_nk0_sg.bin
index bf5467d..9a11e2b 100755
--- a/pico/lang/fr-FR_nk0_sg.bin
+++ b/pico/lang/fr-FR_nk0_sg.bin
diff --git a/pico/lang/fr-FR_ta.bin b/pico/lang/fr-FR_ta.bin
index 117dbe3..6d4d72e 100755
--- a/pico/lang/fr-FR_ta.bin
+++ b/pico/lang/fr-FR_ta.bin
diff --git a/pico/tests/data/xsampa_pico_man_de-DE.txt b/pico/tests/data/xsampa_pico_man_de-DE.txt
index 4e9690b..1182394 100644
--- a/pico/tests/data/xsampa_pico_man_de-DE.txt
+++ b/pico/tests/data/xsampa_pico_man_de-DE.txt
@@ -71,8 +71,8 @@
 # TEST s Masse "ma.s@
 <speak xml:lang="de-DE"> Ich teste <phoneme alphabet="xsampa" ph="&#34;ma.s@"/>.</speak>
 
-# BUG v Wahl "va:l says [val], [a] should be long
-<speak xml:lang="de-DE"> Ich teste <phoneme alphabet="xsampa" ph="&#34;va:l"/>.</speak>
+# TEST v Wahl "va:l says [val]
+<speak xml:lang="de-DE"> Ich teste <phoneme alphabet="xsampa" ph="&#34;va:l"/>. Ein Wahl.</speak>
 
 # TEST x Bach "bax
 <speak xml:lang="de-DE"> Ich teste <phoneme alphabet="xsampa" ph="&#34;bax"/>.</speak>
diff --git a/pico/tests/data/xsampa_pico_man_en-GB.txt b/pico/tests/data/xsampa_pico_man_en-GB.txt
index fbee754..b65af3a 100644
--- a/pico/tests/data/xsampa_pico_man_en-GB.txt
+++ b/pico/tests/data/xsampa_pico_man_en-GB.txt
@@ -197,7 +197,7 @@
 <speak xml:lang="en-GB"> Testing <phoneme alphabet="xsampa" ph="&#34;mE.Z@`"/>.</speak>
 <speak xml:lang="en-GB"> Testing <phoneme alphabet="xsampa" ph="&#34;mE.Z@"/>.</speak>
 
-# BUG A: (US) long "lA:N says [lang]
+# TEST A: (US) long "lA:N
 <speak xml:lang="en-GB"> Testing <phoneme alphabet="xsampa" ph="&#34;lA:N"/>.</speak>
 
 # TEST A:r\ (US) A:(GB) stars "stA:r\z
@@ -247,7 +247,7 @@
 # TEST j yacht "jA:t
 <speak xml:lang="en-GB"> Testing <phoneme alphabet="xsampa" ph="&#34;jA:t"/>.</speak>
 
-# BUG l long "lA:N
+# TEST l long "lA:N
 <speak xml:lang="en-GB"> Testing <phoneme alphabet="xsampa" ph="&#34;lA:N"/>.</speak>
 
 # TEST w wasp "wA:sp
diff --git a/pico/tests/data/xsampa_pico_man_en-US.txt b/pico/tests/data/xsampa_pico_man_en-US.txt
index 74ed371..6f477a2 100644
--- a/pico/tests/data/xsampa_pico_man_en-US.txt
+++ b/pico/tests/data/xsampa_pico_man_en-US.txt
@@ -87,8 +87,8 @@
 # TEST j yacht "jA:t
 <speak xml:lang="en-US"> Testing <phoneme alphabet="xsampa" ph="&#34;jA:t"/>.</speak>
 
-# BUG l long "lA:N  says [lang]
-<speak xml:lang="en-US"> Testing <phoneme alphabet="xsampa" ph="&#34;lA:N"/>.</speak>
+# TEST l long "lA:N
+<speak xml:lang="en-US"> Testing <phoneme alphabet="xsampa" ph="&#34;lA:N"/>. And long.</speak>
 
 # TEST l= little "lI.tl=
 <speak xml:lang="en-US"> Testing <phoneme alphabet="xsampa" ph="&#34;lI.tl= "/>.</speak>
diff --git a/pico/tests/data/xsampa_pico_man_fr-FR.txt b/pico/tests/data/xsampa_pico_man_fr-FR.txt
index 6cf6d1a..f6485e3 100644
--- a/pico/tests/data/xsampa_pico_man_fr-FR.txt
+++ b/pico/tests/data/xsampa_pico_man_fr-FR.txt
@@ -75,20 +75,20 @@
 
 # --------- Approximants
 
-# BUG H juin "ZHE~  says [j'lin]
-<speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;ZHE~"/>.</speak>
+# TEST H juin "ZHE~
+<speak xml:lang="fr-FR"> Le mois de <phoneme alphabet="xsampa" ph="&#34;ZHE~"/>, et de juin.</speak>
 
 # TEST j pierre "pjER
 <speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;pjER"/>.</speak>
 
-# BUG l long "lO~ says [ion]
-<speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;lO~"/>.</speak>
+# TEST l long "lO~
+<speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;lO~"/>, long, et longtemps.</speak>
 
-# TEST l long "lO~ works only in a sentence (here also used to say "longtemps")
+# TEST l long "lO~ used here in a sentence (to say "longtemps")
 <speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;lO~"/> et <phoneme alphabet="xsampa" ph="&#34;lO~tA~"/>.</speak>
 
-# BUG w coin "kwE~ says [keu'oin]
-<speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;kwE~"/>.</speak>
+# TEST w coin "kwE~
+<speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;kwE~"/>, et coin.</speak>
 
 
 # ---------  Vowels
@@ -103,7 +103,7 @@
 <speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;Zys.t@.mA~"/>.</speak>
 
 # BUG E seize "sEz says [seisse]
-<speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;sEz"/>.</speak>
+<speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;sEz"/>, et seize, et césar.</speak>
 
 # TEST O comme "kOm
 <speak xml:lang="fr-FR"> Je teste <phoneme alphabet="xsampa" ph="&#34;kOm"/>.</speak>