reordered phrasebook sources so that they are easier to clone; cloned Ger,Spa,Cat,Bul

1 files changed, 63 insertions, 40 deletions

diff --git a/examples/phrasebook/WordsSwe.gf b/examples/phrasebook/WordsSwe.gf
index 02672f541..4db68c341 100644
--- a/examples/phrasebook/WordsSwe.gf
+++ b/examples/phrasebook/WordsSwe.gf
@@ -1,72 +1,85 @@
 -- (c) 2009 Aarne Ranta under LGPL
 
 concrete WordsSwe of Words = SentencesSwe ** 
-    open SyntaxSwe, ParadigmsSwe, IrregSwe, Prelude in {
+    open SyntaxSwe, ParadigmsSwe, IrregSwe, (L = LexiconSwe), Prelude in {
+
   lin
-    Wine = mkCN (mkN "vin" "vinet" "viner" "vinerna") ;
-    Beer = mkCN (mkN "öl" neutrum) ;
-    Water = mkCN (mkN "vatten" "vattnet" "vatten" "vattnen") ;
+
+-- kinds of food
+
+    Apple = mkCN L.apple_N ;
+    Beer = mkCN L.beer_N ;
+    Bread = mkCN L.bread_N ;
+    Cheese = mkCN (mkN "ost") ;
     Coffee = mkCN (mkN "kaffe" neutrum) ;
+    Fish = mkCN L.fish_N ;
+    Milk = mkCN L.milk_N ;
+    Pizza = mkCN (mkN "pizza") ;
+    Salt = mkCN L.salt_N ;
     Tea = mkCN (mkN "te" neutrum) ;
+    Water = mkCN L.water_N ;
+    Wine = mkCN L.wine_N ;
 
-    Pizza = mkCN (mkN "pizza") ;
-    Cheese = mkCN (mkN "ost") ;
-    Fish = mkCN (mkN "fisk") ;
-    Fresh = mkA "färsk" ;
-    Warm = mkA "varm" ;
-    Expensive = mkA "dyr" ;
-    Delicious = mkA "läcker" ;
+-- properties
+
+    Bad = L.bad_A ;
     Boring = mkA "tråkig" ;
-    Good = mkA "god" "gott" "goda" "bättre" "bäst" ;
+    Cold = L.cold_A ;
+    Delicious = mkA "läcker" ;
+    Expensive = mkA "dyr" ;
+    Fresh = mkA "färsk" ;
+    Good = L.good_A ;
+    Warm = L.warm_A ;
 
-    Restaurant = mkPlace (mkN "restaurang" "restauranger") "på" ;
+-- places
+
+    Airport = mkPlace (mkN "flygplats" "flygplatser") "på" ;
     Bar = mkPlace (mkN "bar" "barer") "i" ;
-    Toilet = mkPlace (mkN "toalett" "toaletter") "på" ;
+    Church = mkPlace (mkN "kyrka") "i" ;
+    Hospital = mkPlace (mkN "sjukhus" "sjukhus") "på" ;
     Museum = mkPlace (mkN "museum" "museet" "museer" "museerna") "på" ;
-    Airport = mkPlace (mkN "flygplats" "flygplatser") "på" ;
+    Restaurant = mkPlace (mkN "restaurang" "restauranger") "på" ;
     Station = mkPlace (mkN "station" "stationer") "på" ;
-    Hospital = mkPlace (mkN "sjukhus" "sjukhus") "på" ;
-    Church = mkPlace (mkN "kyrka") "i" ;
+    Toilet = mkPlace (mkN "toalett" "toaletter") "på" ;
 
-    Euro = mkCN (mkN "euro" "euro") ;
+-- currencies
+
+    DanishCrown = mkCN (mkA "dansk") (mkN "krona") ;
     Dollar = mkCN (mkN "dollar" "dollar") ;
+    Euro = mkCN (mkN "euro" "euro") ;
     Lei = mkCN (mkN "lei" "lei") ;
+    SwedishCrown = mkCN (mkA "svensk") (mkN "krona") ;
 
+-- nationalities
+
+    Belgian = mkA "belgisk" ;
+    Belgium = mkNP (mkPN "Belgien") ;
     English = mkNat "engelsk" "England" ;
     Finnish = mkNat "finsk" "Finland" ;
+    Flemish = mkNP (mkPN "flamländska") ;
     French = mkNat "fransk" "Frankrike" ; 
     Italian = mkNat "italiensk" "Italien" ;
     Romanian = mkNat "rumänsk" "Rumänien" ;
     Swedish = mkNat "svensk" "Sverige" ;
 
-    Belgian = mkA "belgisk" ;
-    Flemish = mkNP (mkPN "flamländska") ;
-    Belgium = mkNP (mkPN "Belgien") ;
-
-    Monday = mkDay "måndag" ;
-    Tuesday = mkDay "tisdag" ;
-    Wednesday = mkDay "onsdag" ;
-    Thursday = mkDay "torsdag" ;
-    Friday = mkDay "fredag" ;
-    Saturday = mkDay "lördag" ;
-    Sunday = mkDay "söndag" ;
+-- actions
 
-    AWant p obj = mkCl p.name want_VV (mkVP have_V2 obj) ;
+    AHasName p name = mkCl (nameOf p) name ;
+    AHungry p = mkCl p.name (mkA "hungrig") ;
+    AIll p = mkCl p.name (mkA "sjuk") ;
+    AKnow p = mkCl p.name (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ; 
     ALike p item = mkCl p.name (mkV2 (mkV "tycker") (mkPrep "om")) item ;
-    ASpeak p lang = mkCl p.name  (mkV2 (mkV "tala")) lang ;
+    ALive p co = mkCl p.name (mkVP (mkVP (mkV "bo")) (SyntaxSwe.mkAdv in_Prep co)) ;
     ALove p q = mkCl p.name (mkV2 (mkV "älska")) q.name ;
-    AHungry p = mkCl p.name (mkA "hungrig") ;
+    AScared p = mkCl p.name (mkA "rädd") ;
+    ASpeak p lang = mkCl p.name  (mkV2 (mkV "tala")) lang ;
     AThirsty p = mkCl p.name (mkA "törstig") ;
     ATired p = mkCl p.name (mkA "trött") ;
-    AScared p = mkCl p.name (mkA "rädd") ;
-    AIll p = mkCl p.name (mkA "sjuk") ;
     AUnderstand p = mkCl p.name (mkV "förstå" "förstod" "förstått") ;
-    AKnow p = mkCl p.name (mkV "veta" "vet" "vet" "visste" "vetat" "visst") ; 
-                          ---- IrregSwe.veta_V gives "missing"
-    AWantGo p place = mkCl p.name want_VV (mkVP (mkVP IrregSwe.gå_V) place.to) ;
-    AHasName p name = mkCl (nameOf p) name ;
-    ALive p co = 
-      mkCl p.name (mkVP (mkVP (mkV "bo")) (SyntaxSwe.mkAdv in_Prep co)) ;
+    AWant p obj = mkCl p.name want_VV (mkVP have_V2 obj) ;
+    AWantGo p place = mkCl p.name want_VV (mkVP (mkVP L.go_V) place.to) ;
+
+-- miscellaneous
 
     QWhatName p = mkQS (mkQCl whatSg_IP (mkVP (nameOf p))) ;
 
@@ -80,6 +93,16 @@ concrete WordsSwe of Words = SentencesSwe **
     HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (mkV "kosta"))) ; 
     ItCost item price = mkCl item (mkV2 (mkV "kosta")) price ;
 
+-- week days
+
+    Monday = mkDay "måndag" ;
+    Tuesday = mkDay "tisdag" ;
+    Wednesday = mkDay "onsdag" ;
+    Thursday = mkDay "torsdag" ;
+    Friday = mkDay "fredag" ;
+    Saturday = mkDay "lördag" ;
+    Sunday = mkDay "söndag" ;
+
   oper
     mkNat : Str -> Str -> {lang : NP ; prop : A ; country : NP} = \nat,co -> 
       {lang = mkNP (mkPN (nat + "a")) ;