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

1 files changed, 57 insertions, 34 deletions

diff --git a/examples/phrasebook/WordsFre.gf b/examples/phrasebook/WordsFre.gf
index 6f0e7f152..0a93e611a 100644
--- a/examples/phrasebook/WordsFre.gf
+++ b/examples/phrasebook/WordsFre.gf
@@ -4,59 +4,72 @@ concrete WordsFre of Words = SentencesFre ** open
   SyntaxFre,
   IrregFre,
   (E = ExtraFre),
+  (L = LexiconFre),
   ParadigmsFre,
   (P = ParadigmsFre) in {
 
 lin
 
-Wine = mkCN (mkN "vin") ;
-    Beer = mkCN (mkN "bière") ;
-    Water = mkCN (mkN "eau" feminine) ;
+-- kinds
+
+    Apple = mkCN L.apple_N ;
+    Beer = mkCN L.beer_N ;
+    Bread = mkCN L.bread_N ;
+    Cheese = mkCN (mkN "fromage" masculine) ;
+    Chicken = mkCN (mkN "poulet") ;
     Coffee = mkCN (mkN "café") ;
+    Fish = mkCN L.fish_N ;
+    Meat = mkCN (mkN "viande") ;
+    Milk = mkCN L.milk_N ;
+    Pizza = mkCN (mkN "pizza" feminine) ;
+    Salt = mkCN L.salt_N ;
     Tea = mkCN (mkN "thé") ;
+    Water = mkCN L.water_N ;
+    Wine = mkCN L.wine_N ;
 
-Cheese = mkCN (mkN "fromage" masculine) ;
-Fish = mkCN (mkN "poisson" masculine) ;
-Pizza = mkCN (mkN "pizza" feminine) ;
+-- properties
 
-Fresh = mkA "frais" "fraîche" "frais" "fraîchement" ;
-Warm = mkA "chaud" ;
-Expensive = mkA "cher" ;
-Delicious = mkA "délicieux" ;
-Boring = mkA "ennuyeux" ;
-Good = prefixA (mkA "bon" "bonne" "bons" "bien") ;
+    Bad = L.bad_A ;
+    Boring = mkA "ennuyeux" ;
+    Cold = L.cold_A ;
+    Delicious = mkA "délicieux" ;
+    Expensive = mkA "cher" ;
+    Fresh = mkA "frais" "fraîche" "frais" "fraîchement" ;
+    Good = L.good_A ;
+    Warm = L.warm_A ;
 
-    Restaurant = mkPlace (mkN "restaurant") in_Prep ;
+-- places
+
+    Airport = mkPlace (mkN "aéroport") dative ;
     Bar = mkPlace (mkN "bar") in_Prep ;
-    Toilet = mkPlace (mkN "toilette") in_Prep ;
+    Church = mkPlace (mkN "église") in_Prep ;
+    Hospital = mkPlace (mkN "hôpital") dative ;
     Museum = mkPlace (mkN "musée" masculine) in_Prep ;
-    Airport = mkPlace (mkN "aéroport") dative ;
+    Restaurant = mkPlace (mkN "restaurant") in_Prep ;
     Station = mkPlace (mkN "gare") dative ;
-    Hospital = mkPlace (mkN "hôpital") dative ;
-    Church = mkPlace (mkN "église") in_Prep ;
+    Toilet = mkPlace (mkN "toilette") in_Prep ;
 
-    Euro = mkCN (mkN "euro") ;
+-- currencies
+
+    DanishCrown = mkCN (mkA "danois") (mkN "couronne") ;
     Dollar = mkCN (mkN "dollar") ;
+    Euro = mkCN (mkN "euro") ;
     Lei = mkCN (mkN "leu" "lei" masculine) ;
+    SwedishCrown = mkCN (mkA "suédois") (mkN "couronne") ;
+
+-- nationalities
 
+    Belgian = mkA "belge" ;
+    Belgium = mkNP (mkPN "Belgique") ;
     English = mkNat "anglais" "Angleterre" ;
     Finnish = mkNat "finlandais" "Finlande" ;
+    Flemish = mkNP (mkPN "flamand") ;
     French = mkNat "français" "France" ; 
     Italian = mkNat "italien" "Italie" ;
     Romanian = mkNat "roumain" "Roumanie" ;
     Swedish = mkNat "suédois" "Suède" ;
 
-    Belgian = mkA "belge" ;
-    Flemish = mkNP (mkPN "flamand") ;
-    Belgium = mkNP (mkPN "Belgique") ;
-
-    Monday = mkDay "lundi" ;
-    Tuesday = mkDay "mardi" ;
-    Wednesday = mkDay "mercredi" ;
-    Thursday = mkDay "jeudi" ;
-    Friday = mkDay "vendredi" ;
-    Saturday = mkDay "samedi" ;
-    Sunday = mkDay "dimanche" ;
+-- actions
 
     AWant p obj = mkCl p.name vouloir_V2 obj ;
     ALike p item = mkCl item plaire_V2 p.name ;
@@ -69,12 +82,11 @@ Good = prefixA (mkA "bon" "bonne" "bons" "bien") ;
     AIll p = mkCl p.name (mkA "malade") ;
     AUnderstand p = mkCl p.name (mkV IrregFre.comprendre_V2) ;
     AKnow p = mkCl p.name (mkV IrregFre.savoir_V2) ;
-    AWantGo p place = 
-      mkCl p.name want_VV (mkVP (mkVP IrregFre.aller_V) place.to) ;
+    AWantGo p place = mkCl p.name want_VV (mkVP (mkVP L.go_V) place.to) ;
     AHasName p name = mkCl p.name (mkV2 (reflV (mkV "appeler"))) name ;
-    ALive p co = 
-      mkCl p.name (mkVP (mkVP (mkV "habiter")) 
-        (SyntaxFre.mkAdv (mkPrep "en") co)) ;
+    ALive p co = mkCl p.name (mkVP (mkVP (mkV "habiter")) (SyntaxFre.mkAdv (mkPrep "en") co)) ;
+
+-- miscellaneous
 
     QWhatName p = mkQS (mkQCl how_IAdv (mkCl p.name (reflV (mkV "appeler")))) ;
 
@@ -88,6 +100,17 @@ Good = prefixA (mkA "bon" "bonne" "bons" "bien") ;
     HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (mkV "coûter"))) ; 
     ItCost item price = mkCl item (mkV2 (mkV "coûter")) price ;
 
+-- week days
+
+    Monday = mkDay "lundi" ;
+    Tuesday = mkDay "mardi" ;
+    Wednesday = mkDay "mercredi" ;
+    Thursday = mkDay "jeudi" ;
+    Friday = mkDay "vendredi" ;
+    Saturday = mkDay "samedi" ;
+    Sunday = mkDay "dimanche" ;
+
+
   oper
     mkNat : Str -> Str -> {lang : NP ; prop : A ; country : NP} = \nat,co -> 
       {lang = mkNP (mkPN nat) ; prop = mkA nat ; country = mkNP (mkPN co)} ;