added Danish phrasebook, completed German one

6 files changed, 343 insertions, 162 deletions

diff --git a/examples/phrasebook/GreetingsDan.gf b/examples/phrasebook/GreetingsDan.gf
index d2ede6136..9d2c0d166 100644
--- a/examples/phrasebook/GreetingsDan.gf
+++ b/examples/phrasebook/GreetingsDan.gf
@@ -1,28 +1,28 @@
 concrete GreetingsDan of Greetings = open Prelude in {
 
---lincat 
---  Greeting = SS ;
+lincat 
+  Greeting = SS ;
 
---lin 
---  GBye = ss "hej då" ;
---  GCheers = ss "skål" ;
+lin 
+  GBye = ss "hej hej" ; -- not google translate
+  GCheers = ss "farvel" ;
 --  GDamn = ss "fan" ;
---  GExcuse, GExcusePol = ss "ursäkta" ;
---  GGoodDay = ss "god dag" ;
---  GGoodEvening = ss "god afton" ;
---  GGoodMorning = ss "god morgon" ;
---  GGoodNight = ss "god natt" ;
---  GGoodbye = ss "hej då" ;
---  GHello = ss "hej" ;
---  GHelp = ss "hjälp" ;
---  GHowAreYou = ss "hur står det till" ;
---  GLookOut = ss "se upp" ;
---  GNiceToMeetYou, GNiceToMeetYouPol = ss "trevligt att träffas" ;
---  GPleaseGive, GPleaseGivePol = ss "var så god" ;
---  GSeeYouSoon = ss "vi ses snart" ;
---  GSorry, GSorryPol = ss "förlåt" ;
---  GThanks = ss "tack" ;
---  GTheCheck = ss "notan" ;
+  GExcuse, GExcusePol = ss "undskyld mig" ;
+  GGoodDay = ss "god dag" ;
+  GGoodEvening = ss "god aften" ;
+  GGoodMorning = ss "god morgen" ;
+  GGoodNight = ss "godnat" ;
+  GGoodbye = ss "farvel" ;
+  GHello = ss "hej" ;
+  GHelp = ss "hjælp" ;
+  GHowAreYou = ss "hvordan har du det" ;
+  GLookOut = ss "se ud" ;
+  GNiceToMeetYou, GNiceToMeetYouPol = ss "rart at møde dig" ;
+  GPleaseGive, GPleaseGivePol = ss "behage" ;
+  GSeeYouSoon = ss "se dig snart" ;
+  GSorry, GSorryPol = ss "undskyld" ;
+  GThanks = ss "tak" ;
+  GTheCheck = ss "regningen" ;
 
 --}
 }
diff --git a/examples/phrasebook/GreetingsGer.gf b/examples/phrasebook/GreetingsGer.gf
index 8062f6a7e..966fde634 100644
--- a/examples/phrasebook/GreetingsGer.gf
+++ b/examples/phrasebook/GreetingsGer.gf
@@ -17,7 +17,7 @@ lin
   GHelp = ss "Hilfe" ;
   GHowAreYou = ss "wie geht's" ;
   GLookOut = ss "Achtung" ;
---  GNiceToMeetYou = ss "trevligt att träffas" ;
+  GNiceToMeetYou = ss "nett, Sie zu treffen" ;
   GPleaseGive, GPleaseGivePol = ss "bitte" ;
   GSeeYouSoon = ss "bis bald" ;
   GSorry, GSorryPol = ss "Entschuldigung" ;
diff --git a/examples/phrasebook/PhrasebookDan.gf b/examples/phrasebook/PhrasebookDan.gf
index 76cae66eb..62267dc2b 100644
--- a/examples/phrasebook/PhrasebookDan.gf
+++ b/examples/phrasebook/PhrasebookDan.gf
@@ -1,4 +1,4 @@
---# -path=.:present
+--# -path=.:present:alltenses
 
 concrete PhrasebookDan of Phrasebook = 
   GreetingsDan,
diff --git a/examples/phrasebook/WordsDan.gf b/examples/phrasebook/WordsDan.gf
index 1dd812151..796a127e3 100644
--- a/examples/phrasebook/WordsDan.gf
+++ b/examples/phrasebook/WordsDan.gf
@@ -1,7 +1,7 @@
 -- (c) 2009 Aarne Ranta under LGPL
 
 concrete WordsDan of Words = SentencesDan ** 
-    open SyntaxDan, ParadigmsDan, IrregDan, (L = LexiconDan), ExtraDan, Prelude in {
+    open SyntaxDan, ParadigmsDan, IrregDan, (L = LexiconDan), ExtraDan, StructuralDan, Prelude in {
 
   lin
 
@@ -10,158 +10,245 @@ concrete WordsDan of Words = SentencesDan **
     Apple = mkCN L.apple_N ;
     Beer = mkCN L.beer_N ;
     Bread = mkCN L.bread_N ;
---    Cheese = mkCN (mkN "ost") ;
---    Chicken = mkCN (mkN "kyckling") ;
---    Coffee = mkCN (mkN "kaffe" neutrum) ;
+    Cheese = mkCN (mkN "ost" "osten" "oste" "ostene") ;
+    Chicken = mkCN (mkN "kylling" "kyllingen" "kyllinger" "kyllingerne") ;
+    Coffee = mkCN (mkN "kaffe" "kaffen" "kaffe" "kaffe") ; -- den kaffe ?
     Fish = mkCN L.fish_N ;
---    Meat = mkCN (mkN "kött" "kött") ;
+    Meat = mkCN (mkN "kød" "kødet" "kød" "kødet") ;
     Milk = mkCN L.milk_N ;
---    Pizza = mkCN (mkN "pizza") ;
+    Pizza = mkCN (mkN "pizza" "pizzaen" "pizzaer" "pizzaer") ; -- det pizzaer ?
     Salt = mkCN L.salt_N ;
---    Tea = mkCN (mkN "te" neutrum) ;
+    Tea = mkCN (mkN "te" "teen" "te" "te") ; -- det te ?
     Water = mkCN L.water_N ;
     Wine = mkCN L.wine_N ;
 
 -- properties
 
     Bad = L.bad_A ;
---    Cheap = mkA "billig" ;
---    Boring = mkA "tråkig" ;
+    Cheap = mkA "billig" ;
+    Boring = mkA "kedelig" ;
     Cold = L.cold_A ;
---    Delicious = mkA "läcker" ;
---    Expensive = mkA "dyr" ;
---    Fresh = mkA "färsk" ;
+    Delicious = mkA "lækker" ;
+    Expensive = mkA "dyr" ;
+    Fresh = mkA "frisk" ;
     Good = L.good_A ;
---    Suspect = mkA "suspekt" "suspekt" ;
+    Suspect = mkA "mistænkt" "mistænkt" ;
     Warm = L.warm_A ;
 
 -- places
 
---    Airport = mkPlace (mkN "flygplats" "flygplatser") "på" ;
---    Bar = mkPlace (mkN "bar" "barer") "i" ;
---    Church = mkPlace (mkN "kyrka") "i" ;
---    Cinema = mkPlace (mkN "bio" "bio" "bion" "biona") "på" ; ---- ?
---    Hospital = mkPlace (mkN "sjukhus" "sjukhus") "på" ;
---    Hotel = mkPlace (mkN "hotell" "hotell") "på" ;
---    Museum = mkPlace (mkN "museum" "museet" "museer" "museerna") "på" ;
---    Park = mkPlace (mkN "park" "parker") "i" ;
---    Restaurant = mkPlace (mkN "restaurang" "restauranger") "på" ;
---    Shop = mkPlace (mkN "affär" "affär") "i" ;
---    School = mkPlace (mkN "skola") "på" ;
---    Station = mkPlace (mkN "station" "stationer") "på" ;
---    Theatre = mkPlace (mkN "teater" "teatrar") "på" ;
---    Toilet = mkPlace (mkN "toalett" "toaletter") "på" ;
---    University = mkPlace (mkN "universitet" "universitet") "på" ;
+
+    Airport = mkPlace (mkN "lufthavnen" "lufthavnen" "lufthavne" "lufthavnene") "i" ;
+    AmusementPark = mkPlace (mkN "forlystelsespark" "forlystelsesparken" "forlystelsesparker" "forlystelsesparker") "i" ;
+    Bank = mkPlace (mkN "bank" "banken" "banke" "bankerne") "i" ;
+    Bar = mkPlace (mkN "bar" "baren" "barer" "barerne") "i" ;
+    Cafeteria = mkPlace (mkN "cafeteria" "cafeteriet" "cafeterier" "cafeterierne") "i" ;
+--    Center = mkPlace (mkN "" "" "" "") " " ;
+    Cinema = mkPlace (mkN "biograf" "biografen" "biografer" "biograferne") "i" ;
+    Church = mkPlace (mkN "kirke" "kirken" "kirker" "kirkerne") "i" ; 
+    Disco = mkPlace (mkN "diskotek" "diskoteket" "diskoteker" "diskotekerne") "i" ;
+    Hospital = mkPlace (mkN "hospital" "hospitalet" "hospitaler" "hospitalerne") "på" ;
+
+    Hotel = mkPlace (mkN "hotel" "hotellet" "hoteller" "hotellerne") "på" ;
+    Museum = mkPlace (mkN "museum" "museet" "museer" "museerne") "på" ;
+    Park = mkPlace (mkN "park" "parken" "parker" "parkerne") "i" ;
+    Parking = mkPlace (mkN "parkeringsplads" "parkeringspladsen" "parkeringspladser" "parkeringspladserne") "på" ;
+    Pharmacy = mkPlace (mkN "apotek" "apoteket" "apoteker" "apotekerne") "på" ;
+--    PostOffice = mkPlace (mkN "postkontor" "posthuset" "posthuse" "postkontorerne") "i" ;
+    Pub = mkPlace (mkN "pub" "pubben" "pubber" "pubber") "i" ;
+    Restaurant = mkPlace (mkN "restaurant" "restauranten" "restauranter" "restauranterne") "i" ;
+    School = mkPlace (mkN "skolen" "skolen" "skoler" "skolerne") "i" ;
+    Shop = mkPlace (mkN "butik" "butikken" "butikker" "butikkerne") "i" ;
+    Station = mkPlace (mkN "station" "stationen" "stationer" "stationerne") "på" ;
+    Supermarket = mkPlace (mkN "supermarked" "supermarkedet" "supermarkeder" "supermarkederne") "i" ;
+    Theatre = mkPlace (mkN "teater" "teatret" "teatre" "teatrene") "i" ;
+    Toilet = mkPlace (mkN "toilet" "toilettet" "toiletter" "toiletter") "i" ;
+    University = mkPlace (mkN "universitet" "universitetet" "universiteter" "universiteterne") "i" ;
+--    Zoo = mkPlace (mkN "zoo" "den zoologiske have" "zoologiske haver" "de zoologiske haver"
+
+    CitRestaurant cit = mkCNPlace (mkCN cit (mkN "restaurant")) in_Prep to_Prep ;
 
 -- currencies
 
---    DanishCrown = mkCN (mkA "dansk") (mkN "krona") | mkCN (mkN "krona") ;
---    Dollar = mkCN (mkN "dollar" "dollar") ;
---    Euro = mkCN (mkN "euro" "euro") ;
---    Lei = mkCN (mkN "lei" "lei") ;
---    SwedishCrown = mkCN (mkA "svensk") (mkN "krona") | mkCN (mkN "krona") ;
+    DanishCrown = mkCN (mkA "dansk") (mkN "krone" "kronen" "kroner" "kroner") | mkCN (mkN "krone" "kronen" "kroner" "kroner") ;
+    Dollar = mkCN (mkN "dollar" "dollaren" "dollars" "dollars") ; -- den dollars ?
+    Euro = mkCN (mkN "euro" "euroen" "euro" "euro") ; -- den euro 
+    Lei = mkCN (mkN "leu" "lei" "leis" "leis") ; -- det leis ?
+    Leva = mkCN (mkN "leva" "leva" "levas" "levas") ; -- det leva ?
+    NorwegianCrown = mkCN (mkA "norsk") (mkN "krone" "kronen" "kroner" "kroner") | mkCN (mkN "krone" "kronen" "kroner" "kroner") ;
+    Pound = mkCN (mkN "pund" "pund" "pounds" "pounds") ; -- det pounds ?
+    Rouble = mkCN (mkN "rubler" "rublen" "rubler" "rubler") ; -- det rubler ?
+    SwedishCrown = mkCN (mkA "svensk") (mkN "krone" "kronen" "kroner" "kroner") | mkCN (mkN "krone" "kronen" "kroner" "kroner") ;
+    Zloty = mkCN (mkN "zloty" "zloty" "zloty" "zloty") ; -- det zloty ?
 
 -- 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" ;
+    Belgium = mkNP (mkPN "Belgien") ;
+    Bulgarian = mkNat "bulgarsk" "Bulgarien" ;
+    Catalan = mkNat "catalansk" "Catalonien" ;
+    Danish = mkNat "dansk" "Danmark" ;
+    Dutch =  mkNat "hollandsk" "Holland" ;
+    English = mkNat "engelsk" "England" ;
+    Finnish = mkNat "finsk" "Finland" ;
+    Flemish = mkNP (mkPN "flamsk") ;
+    French = mkNat "fransk" "Frankrig" ; 
+    German = mkNat "tysk" "Tyskland" ;
+    Italian = mkNat "italiensk" "Italien" ;
+    Norwegian = mkNat "norsk" "Norge" ;
+    Polish = mkNat "polsk" "Polen" ;
+    Romanian = mkNat "rumænsk" "Rumænien" ;
+    Russian = mkNat "russisk" "Russland" ;
+    Spanish = mkNat "spansk" "Spanien" ;
+    Swedish = mkNat "svensk" "Sverige" ;
+
+
+
+-- Means of transportation 
+
+   Bike = mkTransport L.bike_N ;
+   Bus = mkTransport (mkN "bus" "bussen" "busser" "busserne") ;
+   Car = mkTransport L.car_N ;
+   Ferry = mkTransport (mkN "færge" "færgen" "færger" "færgerne") ;
+   Plane = mkTransport L.airplane_N ;
+   Subway = mkTransport (mkN "undergrundsbane" "undergrundsbanen" "undergrundsbaner" "undergrundsbanerne") ;
+   Taxi = mkTransport (mkN "taxi" "taxien" "taxier" "taxierne") ;
+   Train = mkTransport (mkN "tog" "toget" "tog" "toger") ;
+   Tram = mkTransport (mkN "sporvogn" "sporvognen" "sporvogner" "sporvognerne") ;
+
+   ByFoot = ParadigmsDan.mkAdv "til fods" ;
+
+
+
 
 -- actions
 
---    AHasAge p num = mkCl p.name (mkNP num L.year_N) ;
---    AHasName p name = mkCl p.name (mkV2 (mkV "heter")) name ;
+    AHasAge p num = mkCl p.name (mkNP num L.year_N) ;
+    AHasName p name = mkCl p.name (mkV2 (mkV "hedder")) name ;
     AHasChildren p num = mkCl p.name have_V2 (mkNP num L.child_N) ;
---    AHasRoom p num = mkCl p.name have_V2 
---      (mkNP (mkNP a_Det (mkN "rum" "rum")) 
---        (SyntaxDan.mkAdv for_Prep (mkNP num (mkN "person" "personer")))) ;
---    AHasTable p num = mkCl p.name have_V2 
---      (mkNP (mkNP a_Det (mkN "bord" "bord")) 
---        (SyntaxDan.mkAdv for_Prep (mkNP num (mkN "person" "personer")))) ;
---    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 ;
---    ALive p co = mkCl p.name (mkVP (mkVP (mkV "bo")) (SyntaxDan.mkAdv in_Prep co)) ;
---    ALove p q = mkCl p.name (mkV2 (mkV "älska")) q.name ;
---    AMarried p = mkCl p.name (mkA "gift") ;
---    AReady p = mkCl p.name (mkA "färdig") ;
---    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") ;
---    AUnderstand p = mkCl p.name (mkV "förstå" "förstod" "förstått") ;
---    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) ;
+    AHasRoom p num = mkCl p.name have_V2 
+      (mkNP (mkNP a_Det (mkN "værelse" "værelse" "værelser" "værelserne")) 
+        (SyntaxDan.mkAdv for_Prep (mkNP num (mkN "person" "person" "person" "person")))) ;
+    AHasTable p num = mkCl p.name have_V2 
+      (mkNP (mkNP a_Det (mkN "tabel" "tabellen" "tabeller" "tabellerne")) 
+        (SyntaxDan.mkAdv for_Prep (mkNP num (mkN "person" "person" "person" "person")))) ;
+    AHungry p = mkCl p.name (mkA "sulten") ;
+    AIll p = mkCl p.name (mkA "syg") ;
+    AKnow p = mkCl p.name  vide_V ; 
+    ALike p item = mkCl p.name (mkV2 holde_V (mkPrep "af")) item ;
+   -- ALive p co = mkCl p.name (mkVP (mkVP (mkV "bo")) (SyntaxDan.mkAdv in_Prep co)) ;
+    ALove p q = mkCl p.name (dirV2 (regV "elske")) q.name ;
+    AMarried p = mkCl p.name (mkA "gift") ;
+    AReady p = mkCl p.name (mkA "klar") ;
+    AScared p = mkCl p.name (mkA "bange") ;
+    ASpeak p lang = mkCl p.name  (mkV2 (mkV "tale")) lang ;
+    AThirsty p = mkCl p.name (mkA "tørstig") ;
+    ATired p = mkCl p.name (mkA "træt") ;
+    AUnderstand p = mkCl p.name (irregV "forstå" "forstod" "forstått") ;
+    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 p.name (mkV2 (mkV "heter"))) ;
---    QWhatAge p = mkQS (mkQCl (ICompAP (mkAP L.old_A)) p.name) ;
---    HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (mkV "kosta"))) ; 
---    ItCost item price = mkCl item (mkV2 (mkV "kosta")) price ;
+    QWhatName p = mkQS (mkQCl whatSg_IP p.name (mkV2 (mkV "hedder"))) ;
+    QWhatAge p = mkQS (mkQCl (ICompAP (mkAP L.old_A)) p.name) ;
+    HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (mkV "koster"))) ; 
+    ItCost item price = mkCl item (mkV2 (mkV "koster")) price ;
 
---    PropOpen p = mkCl p.name open_A ;
---    PropClosed p = mkCl p.name closed_A ;
---    PropOpenDate p d = mkCl p.name (mkVP (mkVP open_A) d) ; 
---    PropClosedDate p d = mkCl p.name (mkVP (mkVP closed_A) d) ; 
---    PropOpenDay p d = mkCl p.name (mkVP (mkVP open_A) d.habitual) ; 
---    PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_A) d.habitual) ; 
+    PropOpen p = mkCl p.name open_A ;
+    PropClosed p = mkCl p.name closed_A ;
+    PropOpenDate p d = mkCl p.name (mkVP (mkVP open_A) d) ; 
+    PropClosedDate p d = mkCl p.name (mkVP (mkVP closed_A) d) ; 
+    PropOpenDay p d = mkCl p.name (mkVP (mkVP open_A) d.habitual) ; 
+    PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_A) d.habitual) ; 
 
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
---    PSeeYou d = mkText (lin Text (ss ("vi ses"))) (mkPhrase (mkUtt d)) ;
---    PSeeYouPlace p d = 
---      mkText (lin Text (ss ("vi ses"))) 
---        (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
+    PSeeYouDate d = mkText (lin Text (ss ("se dig"))) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlace p = mkText (lin Text (ss ("se dig"))) (mkPhrase (mkUtt p.at)) ;
+    PSeeYouPlaceDate p d = 
+      mkText (lin Text (ss ("se dig"))) 
+        (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
 -- "the wife of my son" for non-pronouns.
 
---    Wife = xOf sing (mkN "fru" "fruar") ;
---    Husband = xOf sing L.man_N ;
---    Son = xOf sing (mkN "son" "söner") ;
---    Daughter = xOf sing (mkN "dotter" "döttrar") ;
---    Children = xOf plur L.child_N ;
+    Wife = xOf sing (mkN "kone" "konen" "koner" "konerne") ;
+    Husband = xOf sing L.man_N ;
+    Son = xOf sing (mkN "søn" "sønnen" "sønner" "sønnerne") ;
+    Daughter = xOf sing (mkN "datter" "datteren" "døtre" "døtre") ;
+    Children = xOf plur L.child_N ;
 
 -- 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" ;
+    Monday = mkDay "Mandag" ;
+    Tuesday = mkDay "Tirsdag" ;
+    Wednesday = mkDay "Onsdag" ;
+    Thursday = mkDay "Torsdag" ;
+    Friday = mkDay "Fredag" ;
+    Saturday = mkDay "Lørdag" ;
+    Sunday = mkDay "Søndag" ;
+
+    Tomorrow = ParadigmsDan.mkAdv "i morgen" ;
+
+
+-- modifiers of places
+
+    TheBest = mkSuperl L.good_A ;
+    TheClosest = mkSuperl L.near_A ; 
+    TheCheapest = mkSuperl (mkA "bilig") ;
+    TheMostExpensive = mkSuperl (mkA "dyr") ;
+    TheMostPopular = mkSuperl (mkA "populær") ;
+    TheWorst = mkSuperl L.bad_A ;
+
+    SuperlPlace sup p = placeNP sup p ;
+
+
+
+
+-- transports
+
+    HowFar place = mkQS (mkQCl far_IAdv place.name) ;
+    HowFarFrom x y = mkQS (mkQCl far_IAdv (mkNP y.name (SyntaxDan.mkAdv from_Prep x.name))) ;
+    HowFarFromBy x y t = 
+      mkQS (mkQCl far_IAdv (mkNP (mkNP y.name (SyntaxDan.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))) ;
+
 
---    Tomorrow = ParadigmsDan.mkAdv "imorgon" ;
+  oper
+    mkNat : Str -> Str -> NPNationality = \nat,co -> 
+      mkNPNationality (mkNP (mkPN (nat + "a"))) (mkNP (mkPN co)) (mkA nat) ;
 
---  oper
---    mkNat : Str -> Str -> NPNationality = \nat,co -> 
---      mkNPNationality (mkNP (mkPN (nat + "a"))) (mkNP (mkPN co)) (mkA nat) ;
+   mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
+      let day = mkNP (mkPN d) in 
+      mkNPDay day (SyntaxDan.mkAdv on_Prep day) 
+        (SyntaxDan.mkAdv on_Prep (mkNP a_Quant plNum (mkCN (mkN d)))) ;
 
---    mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
---      let day = mkNP (mkPN d) in 
---      mkNPDay day (SyntaxDan.mkAdv on_Prep day) 
---        (SyntaxDan.mkAdv on_Prep (mkNP a_Quant plNum (mkCN (mkN d)))) ;
+    mkPlace : N -> Str -> {name : CN ; at : Prep ; to : Prep} = \p,i -> 
+    mkCNPlace (mkCN p) (mkPrep i) to_Prep ;
 
---    mkPlace : N -> Str -> {name : CN ; at : Prep ; to : Prep} = \p,i -> 
---      mkCNPlace (mkCN p) (mkPrep i) to_Prep ;
+    open_A = mkA "åben" "åbet" ;
+    closed_A = mkA "lukket" "lukket" ;
 
---    open_A = mkA "öppen" "öppet" ;
---    closed_A = mkA "stängd" "stängt" ;
+    xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> 
+      relativePerson n (mkCN x) (\a,b,c -> mkNP (GenNP b) a c) p ;
 
---    xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> 
---      relativePerson n (mkCN x) (\a,b,c -> mkNP (GenNP b) a c) p ;
+    mkSuperl : A -> Det = \a -> mkDet the_Art (mkOrd a) ;
 
+    mkTransport : N -> {name : CN ; by : Adv} = \n -> {
+      name = mkCN n ; 
+      by = SyntaxDan.mkAdv by8means_Prep (mkNP n)
+      } ;
 
---}
+    far_IAdv = ExtraDan.IAdvAdv L.far_Adv ;
+    how8much_IAdv : IAdv = ss "hvad" ** {lock_IAdv = <>};
 }
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 = <>} ; 
 }
diff --git a/examples/phrasebook/WordsRon.gf b/examples/phrasebook/WordsRon.gf
index 5775c46bf..b3bbc2fac 100644
--- a/examples/phrasebook/WordsRon.gf
+++ b/examples/phrasebook/WordsRon.gf
@@ -153,7 +153,7 @@ concrete WordsRon of Words = SentencesRon ** open
     AMarried p = mkCl p.name (P.mkA "căsătorit") ;
     AReady p = mkCl p.name (P.mkA "gata" "gata" "gata" "gata") ;
     AScared p = mkCl p.name (P.mkA "speriat") ;
-    ASpeak p lang = mkCl p.name  (P.dirV2 (P.mkV "vorbi")) lang ;
+    ASpeak p lang = mkCl p.name  (P.mmkV2 (P.mkV "vorbi") (P.noPrep P.Nom)) lang ;
     AThirsty p = DatSubjCl p.name (mkVP (mkNP (P.mkN "sete"))) ;
     ATired p = mkCl p.name (P.mkA "obosit") ;
     AUnderstand p = mkCl p.name (v_besch83 "înţelege") ;
@@ -190,8 +190,8 @@ concrete WordsRon of Words = SentencesRon ** open
 
     Wife = xOf sing (P.mkN "soţie") ;
     Husband = xOf sing (P.mkN "soţ" "soţi") ;
-    Son = xOf sing (P.mkN "fiu") ;
-    Daughter = xOf sing (P.mkN "fiică") ;
+    Son = xOf sing (P.mkN "fiu" "fii") ;
+    Daughter = xOf sing (P.mkN "fiică" "fiice") ;
     Children = xOf plur L.child_N ;    
  
 -- week days