polish demo

4 files changed, 343 insertions, 138 deletions

diff --git a/examples/phrasebook/GreetingsPol.gf b/examples/phrasebook/GreetingsPol.gf
index 9374e92b9..722d96ef3 100644
--- a/examples/phrasebook/GreetingsPol.gf
+++ b/examples/phrasebook/GreetingsPol.gf
@@ -1,28 +1,30 @@
 concrete GreetingsPol of Greetings = open Prelude in {
 
---lincat 
---  Greeting = SS ;
+flags
+  optimize =values ; coding =utf8 ; 
 
---lin 
---  GBye = ss "bye" ;
---  GCheers = ss "cheers" ;
---  GDamn = ss "damn" ;
---  GExcuse, GExcusePol = ss "excuse me" ;
---  GGoodDay = ss "good afternoon" ; ----
---  GGoodEvening = ss "good evening" ;
---  GGoodMorning = ss "good morning" ;
---  GGoodNight = ss "good night" ;
---  GGoodbye = ss "goodbye" ;
---  GHello = ss "hello" ;
---  GHelp = ss "help" ;
---  GHowAreYou = ss "how are you" ;
---  GLookOut = ss "look out" ;
---  GNiceToMeetYou, GNiceToMeetYouPol = ss "nice to meet you" ;
---  GPleaseGive, GPleaseGivePol = ss "please" ;
---  GSeeYouSoon = ss "see you soon" ;
---  GSorry, GSorryPol = ss "sorry" ;
---  GThanks = ss "thank you" ;
---  GTheCheck = ss "the bill" ;
+lincat 
+  Greeting = SS ; 
 
---}
+lin 
+  GBye = ss "cześć" ;
+  GCheers = ss "na zdrowie" ;
+  GDamn = ss "cholera" ; -- not polite
+  GExcuse, GExcusePol, GSorry, GSorryPol = ss "przepraszam" ;
+  GGoodDay, GGoodMorning = ss "dzień dobry" ;
+  GGoodEvening = ss "dobry wieczór" ;
+  GGoodNight = ss "dobranoc" ;
+  GGoodbye = ss "do widzenia" ;
+  GHello = ss "cześć" ;
+  GHelp = ss "pomocy" ;
+  GHowAreYou = ss "jak się masz" ;
+  GLookOut = ss "uwaga" ;
+  GNiceToMeetYou = ss "miło mi" ; 
+  GPleaseGive, GPleaseGivePol = ss "poproszę" ;
+  GSeeYouSoon = ss "do zobaczenia" ;
+  GThanks = ss "dziękuję" ;
+  GTheCheck = ss "rachunek" ;
+  GCongratulations = ss "gratulacje";
+  GHappyBirthday = ss "wszystkiego najlepszego z okazji urodzin" ;
+  GGoodLuck = ss "powodzenia" ; 
 }
diff --git a/examples/phrasebook/PhrasebookPol.gf b/examples/phrasebook/PhrasebookPol.gf
index 8b1c29dee..4a25c8caa 100644
--- a/examples/phrasebook/PhrasebookPol.gf
+++ b/examples/phrasebook/PhrasebookPol.gf
@@ -6,6 +6,11 @@ concrete PhrasebookPol of Phrasebook =
     SyntaxPol,
     Prelude in {
 
+flags 
+  language = pl_PL ; optimize =values ; coding =utf8 ; 
+      
+
+
 lin
   PGreeting g = lin Text g ;
 
diff --git a/examples/phrasebook/SentencesPol.gf b/examples/phrasebook/SentencesPol.gf
index 1d8116c53..2c733f274 100644
--- a/examples/phrasebook/SentencesPol.gf
+++ b/examples/phrasebook/SentencesPol.gf
@@ -1,4 +1,32 @@
-concrete SentencesPol of Sentences = NumeralPol ** SentencesI with 
+concrete SentencesPol of Sentences = 
+  NumeralPol ** SentencesI - [
+    Day,PDay,OnDay,Language,PLanguage,
+    Nationality,Transport,PTransport,ByTransp,
+    IFemale,YouFamFemale,YouPolFemale,YouPolMale] 
+    with 
   (Syntax = SyntaxPol),
   (Symbolic = SymbolicPol),
-  (Lexicon = LexiconPol) ;
+  (Lexicon = LexiconPol) ** open (R = ResPol), (Pron = PronounMorphoPol), Prelude in {
+    
+  flags  
+    optimize =values ; coding =utf8 ; 
+
+  lincat
+    Day = { name,hab,adv:Str } ;
+    Language = A ;
+    Citizenship = A ;
+    Nationality = { lang: A; prop: A; country: NP } ;
+    Transport = CN ;
+
+  lin
+    PDay d = (ss d.name) ** {lock_Text = <>};
+    OnDay d = (ss d.adv) ** {lock_Adv = <>};
+    PLanguage l = (ss l.pos.s1) ** {lock_Text = <>};    
+    PTransport t = mkPhrase (mkUtt t) ;
+    ByTransp t = (ss (t.s!R.Sg!R.Instr)) ** {lock_Adv = <>};
+    IFemale = mkPerson (Pron.pronJaFoo (R.PGen R.Fem));
+    YouFamFemale = mkPerson (Pron.pronTyFoo (R.PGen R.Fem));
+    YouPolFemale = mkPerson (Pron.pronPani);
+    YouPolMale = mkPerson (Pron.pronPan);
+
+}
diff --git a/examples/phrasebook/WordsPol.gf b/examples/phrasebook/WordsPol.gf
index a5c0e0cfb..4255f9f1e 100644
--- a/examples/phrasebook/WordsPol.gf
+++ b/examples/phrasebook/WordsPol.gf
@@ -1,13 +1,19 @@
-
+--2 Implementations of Words, with Polish as example
 
 concrete WordsPol of Words = SentencesPol ** 
     open 
+      ResPol,
       SyntaxPol, 
-      ParadigmsPol, 
       (L = LexiconPol), 
       (P = ParadigmsPol), 
---      ExtraPol, 
+      (Q = QuestionPol),
+      (N = NounPol),
+      MorphoPol,
       Prelude in {
+    
+  flags  
+    optimize =values ; coding =utf8 ; 
+      
   lin
 
 -- Kinds; many of them are in the resource lexicon, others can be built by $mkN$.
@@ -15,162 +21,326 @@ concrete WordsPol of Words = SentencesPol **
     Apple = mkCN L.apple_N ;
     Beer = mkCN L.beer_N ;
     Bread = mkCN L.bread_N ;
---    Cheese = mkCN (mkN "cheese") ;
---    Chicken = mkCN (mkN "chicken") ;
---    Coffee = mkCN (mkN "coffee") ;
+    Cheese = mkCN L.cheese_N ;
+    Chicken = mkCN (P.nPtak "kurczak") ;
+    Coffee = mkCN ({ s = table { 
+	     SF Sg Nom => "kawa";
+	     SF Sg (Acc|Gen) => "kawę";
+	     SF Sg Instr => "kawą";
+	     SF Sg VocP => "kawo"; 
+	     SF Sg _ => "kawie"; 
+	     SF Pl Gen => "kawy"; 
+	     SF Pl Dat => "kawom";
+	     SF Pl Instr => "kawami";
+	     SF Pl Loc => "kawach";
+	     SF Pl _ => "kawy" 
+	     };
+	   g = Fem;
+	   lock_N : {} = <>});
     Fish = mkCN L.fish_N ;
---    Meat = mkCN (mkN "meat") ;
+    Meat = mkCN L.meat_N ;
     Milk = mkCN L.milk_N ;
---    Pizza = mkCN (mkN "pizza") ;
+    Pizza = mkCN ({ s = table { 
+	     SF Sg Nom => "pizza";
+	     SF Sg (Acc) => "pizzę";
+	     SF Sg Instr => "pizzą";
+	     SF Sg (Dat|Gen) => "pizzy";
+	     SF Sg VocP => "pizzo"; 
+	     SF Sg _ => "pizzie"; 
+	     SF Pl Gen => "pizz"; 
+	     SF Pl Dat => "pizzom";
+	     SF Pl Instr => "pizzami";
+	     SF Pl Loc => "pizzach";
+	     SF Pl _ => "pizze" 
+	     };
+	   g = Fem;
+	   lock_N : {} = <>});
     Salt = mkCN L.salt_N ;
---    Tea = mkCN (mkN "tea") ;
+    Tea = mkCN (P.nWoda "herbata") ;
     Water = mkCN L.water_N ;
     Wine = mkCN L.wine_N ;
 
 -- Properties; many of them are in the resource lexicon, others can be built by $mkA$.
 
     Bad = L.bad_A ;
---    Boring = mkA "boring" ;
---    Cheap = mkA "cheap" ;
+    Boring = mkA (mkRegAdj "nudny" "nudniejszy" "nudno" "nudniej" );
+    Cheap = mkA (mkRegAdj "tani" "tańszy" "tanio" "taniej" );
     Cold = L.cold_A ;
---    Delicious = mkA "delicious" ;
---    Expensive = mkA "expensive" ;
---    Fresh = mkA "fresh" ;
+    Delicious = mkA (mkRegAdj "pyszny" "pyszniejszy" "pysznie" "pyszniej") ;
+    Expensive = mkA (mkRegAdj "drogi" "droższy" "drogo" "drożej" );
+    Fresh = mkA (mkRegAdj "świeży" "świeższy" "świeżo" "świeżej" );
     Good = L.good_A ;
---    Suspect = mkA "suspect" ;
+    Suspect = mkA (mkCompAdj "podejrzany" "podejrzanie" );
     Warm = L.warm_A ;
 
 -- Places require different prepositions to express location; in some languages 
 -- also the directional preposition varies, but in English we use $to$, as
 -- defined by $mkPlace$.
 
---    Airport = mkPlace "airport" "at" ;
---    Bar = mkPlace "bar" "in" ;
---    Church = mkPlace "church" "in" ;
---    Cinema = mkPlace "cinema" "at" ;
---    Hospital = mkPlace "hospital" "in" ;
---    Hotel = mkPlace "hotel" "in" ;
---    Museum = mkPlace "museum" "in" ;
---    Park = mkPlace "park" "in" ;
---    Restaurant = mkPlace "restaurant" "in" ;
---    School = mkPlace "school" "at" ;
---    Shop = mkPlace "shop" "in" ;
---    Station = mkPlace "station" "at" ;
---    Theatre = mkPlace "theatre" "at" ;
---    Toilet = mkPlace "toilet" "in" ;
---    University = mkPlace "university" "at" ;
+    Airport = mkPlaceNa (P.nWojsko "lotnisko") ;
+    AmusementPark = mkPlaceDo ["wesołe miasteczko"] ["wesołego miasteczka"] ["wesołym miasteczku"] Neut;
+    Bank = mkPlaceDo "bank" "banku" "banku" (Masc Inanimate);
+    Bar = mkPlaceDo "bar" "baru" "barze" (Masc Inanimate);
+    Cafeteria = mkPlaceDo "stołówka" "stołówki" "stołówce" Fem;
+    Center = mkPlaceDo "centrum" "centrum" "centrum" Neut;
+    Cinema = mkPlaceDo "kino" "kina" "kinie" Neut ;
+    Church = mkPlaceDo "kościół" "kościoła" "kościele" (Masc Inanimate);
+    Disco = mkPlaceNa "dyskoteka" "dyskotekę" "dyskotece" Fem ;
+    Hospital = mkPlaceDo "szpital" "szpitala" "szpitalu" (Masc Inanimate);
+    Hotel = mkPlaceDo "hotel" "hotelu" "hotelu" (Masc Inanimate) ;
+    Museum = mkPlaceDo "museum" "museum" "museum" Neut ;
+    Park = mkPlaceDo "park" "parku" "parku" (Masc Inanimate) ;
+    Parking = mkPlaceNa "parking" "parking" "parkingu" (Masc Inanimate) ;
+    Pharmacy = mkPlaceDo "apteka" "apteki" "aptece" Fem ;
+    PostOffice = mkPlaceNa "poczta" "pocztę" "poczcie" Fem ;
+    Pub = mkPlaceDo "pub" "pubu" "pubie" (Masc Inanimate) ;
+    Restaurant = mkPlaceDo L.restaurant_N;
+    School = mkPlaceDo L.school_N;
+    Shop = mkPlaceDo "sklep" "sklepu" "sklepie" (Masc Inanimate) ;
+    Station = mkPlaceNa "stacja" "stację" "stacji" Fem ;
+    Supermarket = mkPlaceDo "supermarket" "supermarketu" "supermarkecie" (Masc Inanimate) ;
+    Theatre = mkPlaceDo "teatr" "teatru" "teatrze" (Masc Inanimate) ;
+    Toilet = mkPlaceDo "toaleta" "toalety" "toalecie" Fem ;
+    University = mkPlaceNa L.university_N;
+    Zoo = mkPlaceDo "zoo" "zoo" "zoo" Neut ;
+   
+    CitRestaurant cit = { name=(mkCN cit (mkCN L.restaurant_N));
+        at = { s="w"; c=LocPrep; lock_Prep = <> }; to = {s="do"; c=GenPrep; lock_Prep = <>} };
+
 
 -- Currencies; $crown$ is ambiguous between Danish and Swedish crowns.
 
---    DanishCrown = mkCN (mkA "Danish") (mkN "crown") | mkCN (mkN "crown") ;
---    Dollar = mkCN (mkN "dollar") ;
---    Euro = mkCN (mkN "euro" "euros") ; -- to prevent euroes
---    Lei = mkCN (mkN "leu" "lei") ;
---    SwedishCrown = mkCN (mkA "Swedish") (mkN "crown") | mkCN (mkN "crown") ;
+    DanishCrown = mkCN (mkCurrency "korona holenderska" "korony holenderskie" "koron holenderskich" Fem);
+    Dollar = mkCN (P.nSer "dolar") ;
+    Euro = mkCN (mkCurrency "euro" "euro" "euro" Neut);
+    Lei = mkCN (mkCurrency "leja" "leje" "lei" Fem);
+    Leva = mkCN (mkCurrency "lew" "lewy" "lewów" (Masc Animate));
+    NorwegianCrown = mkCN (mkCurrency "korona norweska" "korony norweskie" "koron norweskich" Fem);
+    Pound = mkCN (mkCurrency "funt" "funty" "funtów" (Masc Animate));
+    Rouble = mkCN (mkCurrency "rubel" "ruble" "rubli" (Masc Animate));
+    SwedishCrown = mkCN (mkCurrency "korona szwedzka" "korony szwedzkie" "koron szwedzkich" Fem);
+    Zloty = mkCN (mkCurrency "złoty" "złote" "złotych" (Masc Animate));
 
 -- Nationalities
-
---    Belgian = mkA "Belgian" ;
---    Belgium = mkNP (mkPN "Belgium") ;
---    English = mkNat "English" "England" ;
---    Finnish = mkNat "Finnish" "Finland" ;
---    Flemish = mkNP (mkPN "Flemish") ;
---    French = mkNat "French" "France" ; 
---    Italian = mkNat "Italian" "Italy" ;
---    Romanian = mkNat "Romanian" "Romania" ;
---    Swedish = mkNat "Swedish" "Sweden" ;
+--  język, po języku, obywatelstwo, kraj
+    Belgian = mkA (mkCompAdj "belgijski") ;
+    Belgium = mkNP (P.nLilia "Belgia") ;
+    Bulgarian = mkNat "bułgarski" ["po bułgarsku"] "bułgarski" (P.nLilia "Bułgaria");
+    Catalan = mkNat "kataloński" ["po katalońsku"] "kataloński" (P.nLilia "Katalonia");
+    Danish = mkNat "duński" ["po duńsku"] "duński" (P.nLilia "Dania");
+    Dutch =  mkNat "holenderski" ["po holendersku"] "holenderski" (P.nLilia "Holandia");
+    English = mkNat "angielski" ["po angielsku"] "angielski" (P.nLilia "Anglia");
+    Finnish = mkNat "fiński" ["po fińsku"] "finladzki" (P.nLilia "Finlandia");
+    Flemish = mkA (mkCompAdj "flamandzki" ["po flamandzku"]);
+    French = mkNat "francuski" ["po francusku"] "francuski" (P.nLilia "Francja");
+    German = mkNat "niemiecki" ["po niemiecku"] "niemiecki" (mkCountry "Niemcy" "Niemczech" Plur);
+    Italian = mkNat "włoski" ["po włosku"] "włoski" (mkCountry "Włochy" "Włoszech" Plur);
+    Norwegian = mkNat "norweski" ["po norwesku"] "norweski" (P.nLilia "Norwegia");
+    Polish = mkNat "polski" ["po polsku"] "polski" (mkCountry "Polska" "Polsce" Fem);
+    Romanian = mkNat "rumuński" ["po rumuńsku"] "rumuński" (P.nLilia "Rumunia");
+    Russian = mkNat "rosyjski" ["po rosyjsku"] "rosyjski" (P.nLilia "Rosja");
+    Spanish = mkNat "hiszpański" ["po hiszpańsku"] "hiszpański" (P.nLilia "Hiszpania");
+    Swedish = mkNat "szwedzki" ["po szwedzku"] "szwedzki" (P.nLilia "Szwecja");
+
+-- Means of transportation 
+
+   Bike = mkCN L.bike_N ;
+   Bus = mkTransport "autobus" "autobusem" (Masc Inanimate) ;
+   Car = mkCN L.car_N ;
+   Ferry = mkTransport "prom" "promem" (Masc Inanimate) ;
+   Plane = mkCN L.airplane_N ;
+   Subway = mkTransport "metro" "metrem" Neut ;
+   Taxi = mkTransport "taksówka" "taksówką" Fem ;
+   Train = mkTransport "pociąg" "pociągiem" (Masc Inanimate) ;
+   Tram = mkTransport "tramwaj" "tramwajem" (Masc Inanimate) ;
+
+   ByFoot = ss "pieszo" ** {lock_Adv = <>};
 
 -- Actions: the predication patterns are very often language-dependent.
 
---    AHasAge p num = mkCl p.name (mkNP num L.year_N) ;
-    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 "room")) (SyntaxPol.mkAdv for_Prep (mkNP num (mkN "person")))) ;
---    AHasTable p num = mkCl p.name have_V2 
---      (mkNP (mkNP a_Det (mkN "table")) (SyntaxPol.mkAdv for_Prep (mkNP num (mkN "person")))) ;
---    AHasName p name = mkCl (nameOf p) name ;
---    AHungry p = mkCl p.name (mkA "hungry") ;
---    AIll p = mkCl p.name (mkA "ill") ;
---    AKnow p = mkCl p.name IrregPol.know_V ;
---    ALike p item = mkCl p.name (mkV2 (mkV "like")) item ;
---    ALive p co = mkCl p.name (mkVP (mkVP (mkV "live")) (SyntaxPol.mkAdv in_Prep co)) ;
---    ALove p q = mkCl p.name (mkV2 (mkV "love")) q.name ;
---    AMarried p = mkCl p.name (mkA "married") ;
---    AReady p = mkCl p.name (mkA "ready") ;
---    AScared p = mkCl p.name (mkA "scared") ;
---    ASpeak p lang = mkCl p.name  (mkV2 IrregPol.speak_V) lang ;
---    AThirsty p = mkCl p.name (mkA "thirsty") ;
---    ATired p = mkCl p.name (mkA "tired") ;
---    AUnderstand p = mkCl p.name IrregPol.understand_V ;
---    AWant p obj = mkCl p.name (mkV2 (mkV "want")) obj ;
---    AWantGo p place = mkCl p.name want_VV (mkVP (mkVP IrregPol.go_V) place.to) ;
 
--- miscellaneous
+-- ok commented because of the effectivness
+    AHasAge p num = mkCl p.name have_V2 (mkNP (mkDet num) (mkCN L.year_N)) ;
+    AHasChildren p num = mkCl p.name have_V2 (mkNP num L.child_N) ; --!!!!!!!!!!! FIXME HELP!!!!!
+    AHasRoom p num = mkCl p.name have_V2 
+      (mkNP (mkNP a_Det (P.nPokoj "pokój")) (SyntaxPol.mkAdv for_Prep (mkNP num (L.person_N)))) ;
+    AHasTable p num = mkCl p.name have_V2 
+      (mkNP (mkNP a_Det (L.table_N)) (SyntaxPol.mkAdv for_Prep (mkNP num (L.person_N)))) ;
+
+
+
+    AHasName p name = mkCl p.name (mkVP (mkComplicatedVerb (mkMonoVerb "być" conj1 Imperfective) name.nom));
+    AHungry p = mkCl p.name (mkA (mkRegAdj "głodny" "głodniejszy" "głodno" "głodniej" )) ;
+    AIll p = mkCl p.name (mkA (mkCompAdj "chory")) ;
+    AKnow p = mkCl p.name (mkVP (mkMonoVerb "wiedzieć" conj103 Imperfective)) ;
+    ALike p item = mkCl p.name (L.like_V2) item ;
+    ALive p co = mkCl p.name (mkVP (mkComplicatedVerb (mkMonoVerb "mieszkam" conj98 Imperfective) ("w" ++ co.dep!LocPrep)));
+    ALove p q = mkCl p.name (L.love_V2) q.name ;
+    AMarried p = mkCl p.name (case p.name.gn of {
+        MascPersSg|MascAniSg|MascInaniSg|MascPersPl=> mkCompAdj "żonaty";
+        _=>mkCompAdj "zamężny"}) ;
+    AReady p = mkCl p.name (L.ready_A) ;
+    AScared p = mkCl p.name (mkReflVerb (mkMonoVerb "bać" conjbac Imperfective)) ; 
+    ASpeak p lang = mkCl p.name  (mkVP (mkComplicatedVerb (mkMonoVerb "mówić" conj72 Imperfective) lang.advpos)) ;
+    AThirsty p = mkCl p.name (mkVP (mkComplicatedVerb (mkMonoVerb "chcieć" conj45 Imperfective) ["pić"]));
+    ATired p = mkCl p.name (mkA (mkCompAdj "zmęczony")) ;
+    AUnderstand p = mkCl p.name (mkVP (mkV "rozumieć" conj101 "zrozumieć" conj101)) ;
+    AWant p obj = mkCl p.name (dirV2 (mkMonoVerb "chcieć" conj45 Imperfective)) obj ; 
+    AWantGo p place = mkCl p.name want_VV (mkVP (mkComplicatedVerb (mkV1 "iść" conj41a "pójść" conj42) place.to.s)) ;
 
---    QWhatName p = mkQS (mkQCl whatSg_IP (mkVP (nameOf p))) ;
---    QWhatAge p = mkQS (mkQCl (ICompAP (mkAP L.old_A)) p.name) ;
---    HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item IrregPol.cost_V)) ; 
---    ItCost item price = mkCl item (mkV2 IrregPol.cost_V) price ;
+-- miscellaneous
 
---    PropOpen p = mkCl p.name open_Adv ;
---    PropClosed p = mkCl p.name closed_Adv ;
---    PropOpenDate p d = mkCl p.name (mkVP (mkVP open_Adv) d) ; 
---    PropClosedDate p d = mkCl p.name (mkVP (mkVP closed_Adv) d) ; 
---    PropOpenDay p d = mkCl p.name (mkVP (mkVP open_Adv) d.habitual) ; 
---    PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_Adv) d.habitual) ; 
+    QWhatName p = mkQS (mkQCl how_IAdv (mkCl p.name 
+        (mkVP (mkComplicatedVerb (mkMonoVerb "mieć" conj100 Imperfective) ["na imię"]))));
+    QWhatAge p = mkQS (mkQCl howmany_IAdv (mkCl p.name 
+        (mkVP (mkComplicatedVerb (mkMonoVerb "mieć" conj100 Imperfective) ["lat"]))));
+    HowMuchCost item = { s="ile" ++ 
+        (mkMonoVerb "kosztować" conj53 Imperfective).si!(VFinM (extract_num!item.gn) P3) ++ item.nom; 
+        lock_QS=<> } ; 
+    ItCost item price = mkCl item (dirV2 (mkMonoVerb "kosztować" conj53 Imperfective) ) price ;
+
+    PropOpen p = mkCl p.name open_A ;
+    PropClosed p = mkCl p.name closed_A ;
+    PropOpenDate p d = mkCl p.name (mkAP d open_A) ; 
+    PropClosedDate p d = mkCl p.name (mkAP d closed_A) ; 
+    PropOpenDay p d = mkCl p.name (mkAP (ss d.hab) open_A) ; 
+    PropClosedDay p d = mkCl p.name (mkAP (ss d.hab) closed_A) ; 
 
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
---    PSeeYou d = mkText (lin Text (ss ("see you"))) (mkPhrase (mkUtt d)) ;
---    PSeeYouPlace p d = 
---      mkText (lin Text (ss ("see you"))) 
---        (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
-
+    PSeeYouDate d = mkText (lin Text (ss ("do zobaczenia"))) (mkPhrase (mkUtt d)) ;
+    PSeeYouPlace p = mkText (lin Text (ss ("do zobaczenia"))) (mkPhrase (mkUtt p.at)) ;
+    PSeeYouPlaceDate p d = 
+      mkText (lin Text (ss ("do zobaczenia"))) 
+        (mkText (mkPhrase (mkUtt d)) (mkPhrase (mkUtt p.at))) ;
+-- 
 -- 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 "wife") ;
---    Husband = xOf sing (mkN "husband") ;
---    Son = xOf sing (mkN "son") ;
---    Daughter = xOf sing (mkN "daughter") ;
---    Children = xOf plur L.child_N ;
+-- 
+    Wife p     = xOf p N.NumSg L.wife_N ;
+    Husband p  = xOf p N.NumSg L.husband_N ;
+    Son p      = xOf p N.NumSg (mkPer "syn" "syna" "syna" (Masc Personal)) ;
+    Daughter p = xOf p N.NumSg (mkPer "córka" "córki" "córkę" Fem );
+    Children p = xOf p N.NumPl L.child_N ;
 
 -- week days
 
---    Monday = mkDay "Monday" ;
---    Tuesday = mkDay "Tuesday" ;
---    Wednesday = mkDay "Wednesday" ;
---    Thursday = mkDay "Thursday" ;
---    Friday = mkDay "Friday" ;
---    Saturday = mkDay "Saturday" ;
---    Sunday = mkDay "Sunday" ;
+    Monday = { name="poniedziałek"; hab=["w poniedziałki"]; adv=["w poniedziałek"] } ; 
+    Tuesday = { name="wtorek"; hab=["we wtorki"]; adv=["we wtorek"] } ; 
+    Wednesday = { name="środa"; hab=["we środy"]; adv=["we środę"] } ; 
+    Thursday = { name="czwartek"; hab=["w czwartki"]; adv=["w czwartek"] } ; 
+    Friday = { name="piątek"; hab=["w piątki"]; adv=["w piątek"] } ; 
+    Saturday = { name="sobota"; hab=["w soboty"]; adv=["w sobotę"] } ; 
+    Sunday = { name="niedziela"; hab=["w niedziele"]; adv=["w niedzielę"] } ; 
  
---    Tomorrow = P.mkAdv "tomorrow" ;
+    Tomorrow = (ss "jutro") ** {lock_Adv = <>} ;
 
--- auxiliaries
+-- modifiers of places
+
+    TheBest = mkSuperl L.good_A ;
+    TheClosest = mkSuperl L.near_A ; 
+    TheCheapest = mkSuperl (mkA (mkRegAdj "tani" "tańszy" "tanio" "taniej") );
+    TheMostExpensive = mkSuperl (mkA (mkRegAdj "drogi" "droższy" "drogo" "drożej" ) );
+    TheMostPopular = mkSuperl (mkA (mkRegAdj "popularny" "popularniejszy" "popularnie" "popularniej" ) ) ;
+    TheWorst = mkSuperl L.bad_A ;
 
---  oper
+    SuperlPlace sup p = placeNP sup p ;
 
---    mkNat : Str -> Str -> NPNationality = \nat,co -> 
---      mkNPNationality (mkNP (mkPN nat)) (mkNP (mkPN co)) (mkA nat) ;
 
---    mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
---      let day = mkNP (mkPN d) in 
---      mkNPDay day (SyntaxPol.mkAdv on_Prep day) 
---        (SyntaxPol.mkAdv on_Prep (mkNP a_Quant plNum (mkCN (mkN d)))) ;
+-- transports
+    HowFar place = mkQS (Q.QuestIComp (Q.CompIAdv far_IAdv) place.name) ;
+    
+    --jak daleko jest z cenrum do hotelu
+    HowFarFrom x y = { s=["jak jest daleko z"] ++ x.name.dep!GenPrep ++ y.to.s; lock_QS=<> };
 
---    mkPlace : Str -> Str -> {name : CN ; at : Prep ; to : Prep} = \p,i -> 
---      mkCNPlace (mkCN (mkN p)) (P.mkPrep i) to_Prep ;
+    --jak daleko jest pieszo z centrum do hotelu
+    HowFarFromBy x y t = 
+      { s=["jak jest daleko"] ++ t.s ++ "z" ++ x.name.dep!GenPrep ++ y.to.s; lock_QS=<> };
+
+    HowFarBy y t = 
+            { s=["jak jest daleko"] ++ t.s ++ y.to.s; lock_QS=<> };
+ 
+    WhichTranspPlace trans place = 
+      { s= ktory ! AF (cast_gennum!<trans.g,Sg>) Instr ++ trans.s!Sg!Instr ++ place.to.s; lock_QS=<> };
 
---    open_Adv = P.mkAdv "open" ;
---    closed_Adv = P.mkAdv "closed" ;
+    IsTranspPlace trans place = 
+      { s= ["czy jest stąd"] ++ trans.s!Sg!Nom ++ place.to.s; lock_QS=<> };
 
---    xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> 
---      relativePerson n (mkCN x) (\a,b,c -> mkNP (GenNP b) a c) p ;
 
---    nameOf : NPPerson -> NP = \p -> (xOf sing (mkN "name") p).name ;
+-- auxiliaries
+
+  oper
+  
+  mkA : Adj -> A = \adj -> adj ** { lock_A = <> };
+
+  mkPlaceDo = overload {
+    mkPlaceDo : N -> {name : CN ; at : Prep ; to : Prep} = \n -> {
+      name = mkCN n; at = { s="w"; c=LocPrep; lock_Prep = <> }; to = {s="do"; c=GenPrep; lock_Prep = <>} };
+    mkPlaceDo : Str -> Str -> Str -> Gender -> {name : CN ; at : Prep ; to : Prep} = \nom,gen,loc,g -> {
+      name = mkCN {
+        s = table {SF Sg Nom => nom; SF Sg Gen => gen; SF Sg Loc => loc; _ => ["not implemented"]};
+        g = g;
+        lock_N=<>
+      };
+      at = { s="w"; c=LocPrep; lock_Prep = <> }; to = {s="do"; c=GenPrep; lock_Prep = <>} };
+  };
+  
+  mkPlaceNa = overload {
+    mkPlaceNa : N -> {name : CN ; at : Prep ; to : Prep} = \n -> {
+      name = mkCN n; at = { s="na"; c=LocPrep; lock_Prep = <> }; to = {s="na"; c=AccPrep; lock_Prep = <>} };
+    mkPlaceNa : Str -> Str -> Str -> Gender -> {name : CN ; at : Prep ; to : Prep} = \nom,acc,loc,g -> {
+      name = mkCN {
+        s = table {SF Sg Nom => nom; SF Sg Acc => acc; SF Sg Loc => loc; _ => ["not implemented"]};
+        g = g;
+        lock_N=<>
+      };
+    at = { s="na"; c=LocPrep; lock_Prep = <> }; to = {s="na"; c=AccPrep; lock_Prep = <>} };
+  };
+  
+  mkTransport : Str -> Str -> Gender -> CN = \nom,instr,g -> {
+    s = \\n,c => case <n,c> of {<Sg,Nom> => nom; <Sg,Instr> => instr; _ => ["not implemented"]};
+    g = g;
+    lock_CN=<>
+  };
+
+  mkCountry : Str -> Str -> Gender -> N = \nom,loc,g -> {
+    s = table {SF Sg Nom => nom; SF Sg Loc => loc; _ => ["not implemented"]};
+    g = g;
+    lock_N=<>
+  };
+
+  mkPer : Str -> Str -> Str -> Gender -> N = \nom,gen,acc,g -> {
+    s = table {SF Sg Nom => nom; SF Sg Gen => gen; SF Sg Acc => acc; _ => ["not implemented"]};
+    g = g;
+    lock_N=<>
+  };
+
+  
+  mkCurrency : Str -> Str -> Str -> Gender -> N = \nom,nompl,genpl,g -> {
+    s = table {SF Sg Nom => nom; SF Pl Nom => nompl; SF Pl Gen => genpl; _ => ["not implemented"]};
+    g = g;
+    lock_N=<>
+  };
+  
+  mkNat : Str -> Str -> Str -> N -> { lang: A; prop: A; country: NP } = \lang,ladv,prop,country -> {
+    lang = mkA (mkCompAdj lang ladv); prop = mkA (mkCompAdj prop); country=mkNP country };
+ 
+    open_A : A = (mkA (mkCompAdj "otwarty"));
+    closed_A : A = (mkA (mkCompAdj "zamknięty"));
+    
+    xOf : NPPerson -> Num -> N -> NPPerson = \p,num,n ->
+        { name = case p.isPron of {
+            True  => mkNP (mkDet p.poss num) n; 
+            False => mkNP (mkNP n) ({s=p.name.dep!GenNoPrep; lock_Adv=<>})
+          };
+          isPron = False;
+          poss = p.poss }; --it is not used, because it is not a pron
+    
+    mkSuperl : A -> Det = \a -> SyntaxPol.mkDet the_Art (SyntaxPol.mkOrd a) ;
+
+   far_IAdv : IAdv = (ss ["jak daleko"]) ** {lock_IAdv = <>};
+   howmany_IAdv : IAdv = (ss ["ile"]) ** {lock_IAdv = <>};
 
---}
 }