WordsCat in_Prep problem

2 files changed, 45 insertions, 43 deletions

diff --git a/examples/phrasebook/GreetingsCat.gf b/examples/phrasebook/GreetingsCat.gf
index d31a239c8..4ee32d333 100644
--- a/examples/phrasebook/GreetingsCat.gf
+++ b/examples/phrasebook/GreetingsCat.gf
@@ -1,31 +1,33 @@
 concrete GreetingsCat of Greetings = open Prelude in {
 
---lincat 
---  Greeting = SS ;
+lincat 
+  Greeting = SS ;
 
---lin 
---  GBye = ss "ciao" ;
---  GCheers = ss "cincin" ;
---  GDamn = ss "maledizione" ;
---  GExcuse = ss "scusa" ;
---  GExcusePol = ss "scusi" ;
---  GGoodDay = ss "buongiorno" ;
---  GGoodEvening = ss "buona sera" ;
---  GGoodMorning = ss "buongiorno" ;
---  GGoodNight = ss "buona notte" ;
---  GGoodbye = ss "arrivederci" ;
---  GHello = ss "ciao" ;
---  GHelp = ss "aiuto" ;
---  GHowAreYou = ss "come sta" ;
---  GLookOut = ss "attenzione" ;
---  GNiceToMeetYou = ss "piacere di conoscerti" ;
---  GNiceToMeetYouPol = ss "piacere di conoscerLa" ;
---  GPleaseGive, GPleaseGivePol = ss "per favore" ;
---  GSeeYouSoon = ss "a presto" ; ----
---  GSorry = ss "scusami" ; ----
---  GSorryPol = ss "scusimi" ; ----
---  GThanks = ss "grazie" ;
---  GTheCheck = ss "il conto" ;
+lin 
+  GBye = ss "adéu" ;
+  GCheers = ss "salut" ;
+  GDamn = ss "merda" ;
+  GExcuse = ss "perdona" ;
+  GExcusePol = ss ("perdoni" | "disculpi") ;
+  GCongratulations = ss "felicitats" ;
+  GHappyBirthday = ss "feliç aniversari" ;
+  GGoodLuck = ss "sort" ;
+  GGoodDay = ss "bon dia" ;
+  GGoodEvening = ss "bona tarda" ;
+  GGoodMorning = ss "bon dia" ;
+  GGoodNight = ss "bona nit" ;
+  GGoodbye = ss "a reveure" ;
+  GHello = ss "hola" ;
+  GHelp = ss "socors" ;
+  GHowAreYou = ss "què tal" ;
+  GLookOut = ss "compte" ;
+  GNiceToMeetYou = ss "encantat de conèixer-lo" ; -- make distinction Masc/Fem
+  GPleaseGive = ss "si et plau" ;
+  GPleaseGivePol = ss "si us plau" ;
+  GSeeYouSoon = ss "fins aviat" ; 
+  GSorry = ss "perdoni" ;
+  GSorryPol = ss "em sap greu" ; 
+  GThanks = ss "gràcies" ;
+  GTheCheck = ss "el compte" ;
 
---}
 }
diff --git a/examples/phrasebook/WordsCat.gf b/examples/phrasebook/WordsCat.gf
index 4a9f271d2..80a8d2b6f 100644
--- a/examples/phrasebook/WordsCat.gf
+++ b/examples/phrasebook/WordsCat.gf
@@ -16,35 +16,35 @@ lin
     Apple = mkCN L.apple_N ;
     Beer = mkCN L.beer_N ;
     Bread = mkCN L.bread_N ;
---    Cheese = mkCN (mkN "formaggio") ;
---    Chicken = mkCN (mkN "pollo") ;
---    Coffee = mkCN (mkN "caffè") ;
+    Cheese = mkCN (mkN "formatge") ;
+    Chicken = mkCN (mkN "pollastre") ;
+    Coffee = mkCN (mkN "cafè") ;
     Fish = mkCN L.fish_N ;
---    Meat = mkCN (mkN "carne" feminine) ;
+    Meat = mkCN (mkN "carn" feminine) ;
     Milk = mkCN L.milk_N ;
---    Pizza = mkCN (mkN "pizza") ;
+    Pizza = mkCN (mkN "pizza") ;
     Salt = mkCN L.salt_N ;
---    Tea = mkCN (mkN "tè") ;
+    Tea = mkCN (mkN "te") ;
     Water = mkCN L.water_N ;
     Wine = mkCN L.wine_N ;
 
 -- properties
 
     Bad = L.bad_A ;
---    Boring = mkA "noioso" ;
---    Cheap = let c = "a buon mercato" in mkA c c c c c ; ----
+    Boring = mkA "avorrit" "avorrida" "avorrits" "avorrides" "avorridament" ;
+    Cheap = mkA "barat" ; 
     Cold = L.cold_A ;
---    Delicious = mkA "delizioso" ;
---    Expensive = mkA "caro" ;
---    Fresh = mkA "fresco" ;
+    Delicious = mkA "deliciós" "deliciosa" "deliciosos" "delicioses" "deliciosament";
+    Expensive = mkA "car" ;
+    Fresh = mkA "fresc" ;
     Good = L.good_A ;
     Warm = L.warm_A ;
---    Suspect = mkA "sospetto" ;
+    Suspect = mkA "sospitós" ;
 
 -- places
 
---    Airport = mkPlace (mkN "aeroporto") dative ;
---    Bar = mkPlace (mkN "bar") P.in_Prep ;
+    Airport = mkPlace (mkN "aeroport") dative ;
+    Bar = mkPlace (mkN "bar") P.in_Prep ;
 --    Church = mkPlace (mkN "chiesa") P.in_Prep ;
 --    Cinema = mkPlace (mkN "cinema") P.in_Prep ;
 --    Hospital = mkPlace (mkN "ospedale") P.in_Prep ;
@@ -153,7 +153,7 @@ lin
 
 -- auxiliaries
 
---  oper
+  oper
 --    mkNat : Str -> Str -> NPNationality = \nat,co -> 
 --      mkNPNationality (mkNP (mkPN nat)) (mkNP (mkPN co)) (mkA nat) ;
 
@@ -161,8 +161,8 @@ lin
 --      let day = mkNP (mkPN d) in
 --      mkNPDay day (P.mkAdv ("il" ++ d)) (P.mkAdv ("il" ++ d)) ; ---- ?
 
---    mkPlace : N -> Prep -> {name : CN ; at : Prep ; to : Prep} = \p,i ->
---      mkCNPlace (mkCN p) i dative ;
+    mkPlace : N -> Prep -> {name : CN ; at : Prep ; to : Prep} = \p,i ->
+      mkCNPlace (mkCN p) i dative ;
 
 --    xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> mkRelative n (mkCN x) p ;