added Danish phrasebook, completed German one

1 files changed, 124 insertions, 30 deletions

diff --git a/examples/phrasebook/WordsGer.gf b/examples/phrasebook/WordsGer.gf
index c41524ba5..8ab02a0e2 100644
--- a/examples/phrasebook/WordsGer.gf
+++ b/examples/phrasebook/WordsGer.gf
@@ -10,13 +10,15 @@ concrete WordsGer of Words = SentencesGer **
     Apple = mkCN L.apple_N ;
     Beer = mkCN L.beer_N ;
     Bread = mkCN L.bread_N ;
-    Cheese = mkCN (mkN "Käse" "Käse" masculine) ;
---    Coffee = mkCN (mkN "Kaffee" "Kaffee" masculine) ;
+    Cheese = mkCN (mkN "Käse" "Käse" "Käse" "Käse" "Käse" "Käse" masculine) ;
+    Chicken = mkCN (mkN "Huhn" "Huhn" "Huhn" "Huhn" "Hühner" "Hühner" neuter) ;
+    Coffee = mkCN (mkN "Kaffee" "Kaffee" "Kaffee" "Kaffee" "Kaffees" "Kaffee" masculine) ;
     Fish = mkCN L.fish_N ;
+    Meat = mkCN (mkN "Fleisch" "Fleisch" "Fleisch" "Fleisch" "Fleisch" "Fleisch" neuter) ;
     Milk = mkCN L.milk_N ;
-    Pizza = mkCN (mkN "pizza" "pizzen" feminine) ;
+    Pizza = mkCN (mkN "Pizza" "Pizzen" feminine) ;
     Salt = mkCN L.salt_N ;
---    Tea = mkCN (mkN "Tee" neutrum) ;
+    Tea = mkCN (mkN "Tee" "Tee" "Tee" "Tee" "Tees" "Tees" masculine) ;
     Water = mkCN L.water_N ;
     Wine = mkCN L.wine_N ;
 
@@ -31,39 +33,79 @@ concrete WordsGer of Words = SentencesGer **
     Fresh = mkA "frisch" ;
     Good = L.good_A ;
     Warm = L.warm_A ;
+    Suspect = mkA "vermut" ;
 
 -- places
 
-    Airport = mkPlace (mkN "Flughafen" "Flughäfen" masculine) on_Prep to_Prep ;
---     Bar = mkPlace (mkN "bar" "barer") "i" ;
+    Airport = mkPlace (mkN "Flughafen" "Flughäfen" masculine) on_Prep to_Prep ; -- am/an dem (dative)  --im/in dem
     Church = mkPlace (mkN "Kirche") in_Prep to_Prep ;
     Hospital = mkPlace (mkN "Krankenhaus" "Krankenhäuser" neuter) in_Prep to_Prep ;
---     Museum = mkPlace (mkN "museum" "museet" "museer" "museerna") "på" ;
     Restaurant = mkPlace (mkN "Restaurant" "Restaurants" neuter) in_Prep to_Prep ;
     Station = mkPlace (mkN "Bahnhofen" "Bahnhöfen" masculine) on_Prep to_Prep ;
---     Toilet = mkPlace (mkN "toalett" "toaletter") "på" ;
-    University = mkPlace (mkN "Universität" "Universitäten" feminine) 
-       (mkPrep "an" dative) (mkPrep "an" accusative) ;
+    University = mkPlace (mkN "Universität" "Universitäten" feminine) in_Prep to_Prep ;
+
+    AmusementPark = mkPlace (mkN "Vergnügungspark" "Vergnügungspark" "Vergnügungspark" "Vergnügungspark" "Vergnügungsparks" "Vergnügungsparks" masculine) in_Prep to_Prep ;
+    Bank = mkPlace (mkN "Bank" "Bank" "Bank" "Bank" "Banken" "Banken" feminine) in_Prep to_Prep ;
+    Bar = mkPlace (mkN "Bar" "Bar" "Bar" "Bar" "Bars" "Bars" masculine) in_Prep to_Prep ;
+    Cafeteria = mkPlace (mkN "Cafeteria" "Cafeteria" "Cafeteria" "Cafeteria" "Cafeterien" "Cafeterien" feminine) in_Prep to_Prep ;
+    Center = mkPlace (mkN "Zentrum" "Zentrum" "Zentrum" "Zentrum" "Zentren" "Zentren" neuter) in_Prep to_Prep ;
+    Cinema = mkPlace (mkN "Kino" "Kino" "Kino" "Kino" "Kinos" "Kinos" neuter) in_Prep to_Prep ;
+    Disco = mkPlace (mkN "Disco" "Disco" "Disco" "Disco" "Discos" "Discos" feminine) in_Prep to_Prep ;
+    Hotel = mkPlace (mkN "Hotel" "Hotel" "Hotel" "Hotel" "Hotels" "Hotels" neuter) in_Prep to_Prep ;
+    Museum = mkPlace (mkN "Museum" "Museum" "Museum" "Museum" "Museen" "Museen" neuter) in_Prep to_Prep ;
+    Park = mkPlace (mkN "Park" "Park" "Park" "Park" "Parks" "Parks" masculine) in_Prep to_Prep ;
+    Parking = mkPlace (mkN "Parkplatz" "Parkplatz" "Parkplatz" "Parkplatz" "Parkplatzen" "Parkplatzen" masculine) on_Prep to_Prep ;
+    Pharmacy = mkPlace (mkN "Apotheke" "Apotheke" "Apotheke" "Apotheke" "Apotheken" "Apotheken" feminine) in_Prep to_Prep ;
+    PostOffice = mkPlace (mkN "Post" "Post" "Post" "Post" "Posten" "Posten" feminine) in_Prep to_Prep ;
+    Pub = mkPlace (mkN "Kneipe" "Kneipe" "Kneipe" "Kneipe" "Kneipen" "Kneipen" feminine) in_Prep to_Prep;
+    School = mkPlace (mkN "Schule" "Schule" "Schule" "Schule" "Schulen" "Schule" feminine) in_Prep to_Prep ;
+    Shop = mkPlace (mkN "Geschäft" "Geschäft" "Geschäft" "Geschäft" "Geschäfte" "Geschäfte" neuter) in_Prep to_Prep ;
+    Supermarket = mkPlace (mkN "Supermarkt" "Supermarkt" "Supermarkt" "Supermarkt" "Supermärkten" "Supermärkte" masculine) in_Prep to_Prep ;
+    Theatre = mkPlace (mkN "Theater" "Theater" "Theater" "Theaters" "Theatern" "Thaters" neuter) in_Prep to_Prep ; 
+    Toilet = mkPlace (mkN "Toilette" "Toilette" "Toilette" "Toilette" "Toiletten" "Toiletten" feminine) in_Prep to_Prep ; 
+    Zoo = mkPlace (mkN "Zoo" "Zoo" "Zoo" "Zoo" "Zoos" "Zoos" masculine) in_Prep to_Prep ;
+
+
+CitRestaurant cit = mkCNPlace (mkCN cit  (mkN "Restaurant" "Restaurants" neuter)) in_Prep to_Prep ;
+
 
 -- currencies
 
-    DanishCrown = mkCN (mkA "Dänisch") (mkN "Krone") | mkCN (mkN "Krone") ;
---     Dollar = mkCN (mkN "dollar" "dollar") ;
+    DanishCrown = mkCN (mkA "Dänisch") (mkN "Krone" "Kronen" feminine) | mkCN (mkN "Krone" "Kronen" feminine) ;
+     Dollar = mkCN (mkN "Dollar" "Dollar" "Dollar" "Dollar" "Dollar" "Dollar" masculine) ;
     Euro = mkCN (mkN "Euro" "Euro" "Euro" "Euro" "Euro" "Euro" neuter) ;
---     Lei = mkCN (mkN "lei" "lei") ;
-    SwedishCrown = mkCN (mkA "Schwedisch") (mkN "Krone") | mkCN (mkN "Krone") ;
+     Lei = mkCN (mkN "Leu" "Leu" "Leu" "Leu" "Lei" "Lei" masculine) ;
+    SwedishCrown = mkCN (mkA "Schwedisch") (mkN "Krone" "Kronen" feminine) | mkCN (mkN "Krone" "Kronen" feminine) ;
+    Leva = mkCN (mkN "Lewa" "Lewa" "Lewa" "Lewa" "Lewa" "Lewa" feminine);
+    NorwegianCrown = mkCN (mkA "Norwegisch") (mkN "Krone" "Kronen" feminine) | mkCN (mkN "Krone" "Kronen" feminine) ;
+    Pound = mkCN (mkN "Pfund" "Pfund" "Pfund" "Pfund" "Pfund" "Pfund" neuter) ;
+    Rouble = mkCN (mkN "Rubel" "Rubel" "Rubel" "Rubel" "Rubels" "Rubels" masculine);
+    Zloty = mkCN (mkN "Zloty" "Zloty" "Zloty" "Zloty" "Zloty" "Zloty" masculine);
+   
+
 
 -- nationalities
 
     Belgian = mkA "Belgisch" ;
     Belgium = mkNP (mkPN "Belgien") ;
-    English = mkNat "Englisch" "England" ;
-    Finnish = mkNat "Finnisch" "Finnland" ;
+    Bulgarian = mkNat "Bulgarien" "Bulgarisch" "bulgarisch" ;	
+    Catalan = mkNat "Katalonien" "Katalanisch" "katalanisch" ;
+    Danish = mkNat "Dänemark" "Dänisch" "dänisch" ;
+    Dutch = mkNat "den Niederlanden" "Niederländisch" "niederländisch" ;
+    English = mkNat "England" "Englisch" "englisch" ;
+    Finnish = mkNat "Finnland" "Finnisch" "finnisch" ;
     Flemish = mkNP (mkPN "Flämisch") ;
-    French = mkNat "Französisch" "Frankreich" ; 
-    Italian = mkNat "Italienisch" "Italien" ;
-    Romanian = mkNat "Rumänisch" "Rumänien" ;
-    Swedish = mkNat "Schwedisch" "Schweden" ;
+    French = mkNat "Frankreich" "Französisch" "französisch" ;
+    German = mkNat "Deutschland" "Deutsch" "deutsche" ;
+    Italian = mkNat "Italien" "Italienisch" "italienisch" ;
+    Norwegian = mkNat "Norwegen" "Norwegisch" "norwegisch" ;
+    Polish = mkNat "Polen" "Polnisch" "polnisch"  ;
+    Romanian = mkNat "Rumänien" "Rumänisch" "rumänisch" ;
+    Russian = mkNat "Russland" "Russisch" "russisch" ;
+    Spanish = mkNat "Spanien" "Spanisch" "spanisch" ;
+    Swedish = mkNat "Schweden" "Schwedisch" "schwedisch" ;
+
+
 
 -- actions
 
@@ -77,16 +119,16 @@ concrete WordsGer of Words = SentencesGer **
     AHasTable p num = mkCl p.name have_V2 
       (mkNP (mkNP a_Det (mkN "Tisch")) 
         (SyntaxGer.mkAdv for_Prep (mkNP num (mkN "Persone")))) ;
-    AIll p = mkCl p.name (mkA "Krank") ;
+    AIll p = mkCl p.name (mkA "krank") ;
     AKnow p = mkCl p.name wissen_V ;
-    ALike p item = mkCl item (mkV2 (fixprefixV "ge" (fallen_V)) dative) p.name ;
+    ALike p item = mkCl p.name (mkV2 mögen_V) item;
     ALive p co = mkCl p.name (mkVP (mkVP (mkV "wohnen")) (SyntaxGer.mkAdv in_Prep co)) ;
     ALove p q = mkCl p.name (mkV2 (mkV "lieben")) q.name ;
     AMarried p = mkCl p.name (mkA "verheiratet") ;
     AReady p = mkCl p.name (mkA "fertig") ;
     AScared p = mkCl p.name have_V2 (mkNP (mkN "Angst" "Angsten" feminine)) ;
     ASpeak p lang = mkCl p.name  (mkV2 sprechen_V) lang ;
-    AThirsty p = mkCl p.name (mkA "dürstig") ;
+    AThirsty p = mkCl p.name (mkA "durstig") ;
     ATired p = mkCl p.name (mkA "müde") ;
     AUnderstand p = mkCl p.name (fixprefixV "ver" stehen_V) ;
     AWant p obj = mkCl p.name want_VV (mkVP have_V2 obj) ;
@@ -110,10 +152,12 @@ concrete WordsGer of Words = SentencesGer **
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
---    PSeeYouDate d = mkText (lin Text (ss ("auf Wiedersehen"))) (mkPhrase (mkUtt d)) ;
---    PSeeYouPlaceDate p d = 
---      mkText (lin Text (ss ("auf Wiedersehen"))) 
---        (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
+    PSeeYouDate d = mkText (lin Text (ss ("Wir sehen uns"))) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlace p = mkText (lin Text (ss ("Wir sehen uns"))) (mkPhrase (mkUtt p.at)) ;
+    PSeeYouPlaceDate p d = 
+      mkText (lin Text (ss ("Wir sehen uns"))) 
+        (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
+
 
 -- Relations are expressed as "my wife" or "my son's wife", as defined by $xOf$
 -- below. Languages without productive genitives must use an equivalent of
@@ -137,12 +181,52 @@ concrete WordsGer of Words = SentencesGer **
 
     Tomorrow = ParadigmsGer.mkAdv "morgen" ;
 
+    TheBest = mkSuperl L.good_A ;
+    TheClosest = mkSuperl L.near_A ; 
+    TheCheapest = mkSuperl (mkA "billig") ;
+    TheMostExpensive = mkSuperl (mkA "teuer") ;
+    TheMostPopular = mkSuperl (mkA "beliebt") ;
+    TheWorst = mkSuperl (mkA "schlimm") ;
+
+    SuperlPlace sup p = placeNP sup p ;
+
+
+-- means of transportation 
+
+    Bike = mkTransport L.bike_N ; 
+    Bus = mkTransport (mkN "Bus" "Bus" "Bus" "Bus" "Buss" "Buss" masculine) ;
+    Car = mkTransport L.car_N ;
+    Ferry = mkTransport (mkN "Fähre" "Fähre" "Fähre" "Fähre" "Fähren" "Fähren" feminine) ;
+    Plane = mkTransport (mkN "Flugzeug" "Flugzeug" "Flugzeug" "Flugzeug" "Flugzeuge" "Flugzeuge" neuter) ;
+    Subway = mkTransport (mkN "U-Bahn" "U-Bahn" "U-Bahn" "U-Bahn" "U-Bahnen" "U-Bahnen" feminine) ;
+    Taxi = mkTransport (mkN "Taxi" "Taxi" "Taxi" "Taxi" "Taxis" "Taxis" neuter) ;
+    Train = mkTransport (mkN "Zug" "Zug" "Zug" "Zug" "Züge" "Züge" masculine) ;
+    Tram = mkTransport (mkN "Straßenbahn" "Straßenbahn" "Straßenbahn" "Straßenbahn" "Straßenbahnen" "Straßenbahnen" feminine) ;
+
+    ByFoot = ParadigmsGer.mkAdv "zu Fuß" ;
+
+
+    HowFar place = mkQS (mkQCl far_IAdv place.name) ;
+    HowFarFrom x y = mkQS (mkQCl far_IAdv (mkNP y.name (SyntaxGer.mkAdv from_Prep x.name))) ;
+    HowFarFromBy x y t = 
+      mkQS (mkQCl far_IAdv (mkNP (mkNP y.name (SyntaxGer.mkAdv from_Prep x.name)) t)) ;
+    HowFarBy y t = mkQS (mkQCl far_IAdv (mkNP y.name t)) ;
+ 
+    WhichTranspPlace trans place = 
+      mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ;
+
+    IsTranspPlace trans place =
+      mkQS (mkQCl (mkCl (mkCN trans.name place.to))) ;
+
+
+
 
   oper
-    mkNat : Str -> Str -> {lang : NP ; prop : A ; country : NP} = \nat,co -> 
-      {lang = mkNP (mkPN nat) ; 
-       prop = mkA nat ; country = mkNP (mkPN co)} ;
 
+    mkNat : Str -> Str -> Str -> {lang : NP ; prop : A ; country : NP} = \co, la, adj -> 
+      {lang = mkNP (mkPN la) ; 
+       prop = mkA adj ; country = mkNP (mkPN co)} ;
+     
     mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
       let day = mkNP (mkPN d) in
       {name = day ; 
@@ -160,5 +244,15 @@ concrete WordsGer of Words = SentencesGer **
     closed_Adv = mkAdv "geschlossen" ;
 
     xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> mkRelative n (mkCN x) p ; 
+  
+    
+    mkSuperl : A -> Det = \a -> SyntaxGer.mkDet the_Art (SyntaxGer.mkOrd a) ;
+
+
+    mkTransport : N -> {name : CN ; by : Adv} = \n -> {
+      name = mkCN n ; 
+      by = SyntaxGer.mkAdv by8means_Prep (mkNP the_Det n)
+      } ;
 
+   far_IAdv = ss "wie weit" ** {lock_IAdv = <>} ; 
 }