fixed English, Dutch, French and Romanian phrasebooks

6 files changed, 200 insertions, 94 deletions

diff --git a/examples/phrasebook/SentencesRon.gf b/examples/phrasebook/SentencesRon.gf
index a60cd9e1a..1b7f54af1 100644
--- a/examples/phrasebook/SentencesRon.gf
+++ b/examples/phrasebook/SentencesRon.gf
@@ -7,21 +7,31 @@ concrete SentencesRon of Sentences = NumeralRon ** SentencesI - [
     (Syntax = SyntaxRon), 
     (Symbolic = SymbolicRon), 
     (Lexicon = LexiconRon) ** 
-  open SyntaxRon, ExtraRon in {
+  open SyntaxRon, ExtraRon, (R = ResRon), (P = ParamX), (PR = ParadigmsRon) in {
 
 oper 
-  NPNationalityRon : Type = {lang : NP ; country : NP ; propObj : A; propPers : A};
-  CitizenshipRon : Type = {pers : A; prop : A};
+  NPNationalityRon : Type = {lang : NP ; 
+                             country : NP ; 
+                             propObj : A; 
+                             propPers : R.Gender => P.Number => Str};
+  CitizenshipRon : Type = {pers : R.Gender => P.Number => Str; 
+                           prop : A};
 
 
-  mkNPNationalityRon : NP -> NP -> A -> A -> NPNationalityRon = \la,co,pro, prp ->
+  mkNPNationalityRon : NP -> NP -> A -> Str -> Str -> Str -> Str -> NPNationalityRon = \la,co,pro, s1,s2,s3,s4 ->
         {lang = la ; 
          country = co ;
          propObj = pro ;
-         propPers = prp
+         propPers = mkCitiPers s1 s2 s3 s4
         } ;
  
-   mkCitizenshipRon : A -> A -> CitizenshipRon = \aobj, apers -> {pers = apers; prop = aobj};
+   mkCitizenshipRon : A -> Str -> Str -> Str -> Str -> CitizenshipRon = \aobj, ap1, ap2, ap3, ap4 -> {pers = mkCitiPers ap1 ap2 ap3 ap4; prop = aobj};
+
+   mkCitiPers : Str -> Str -> Str -> Str -> (R.Gender => P.Number => Str) = \francez, franceza, francezi, franceze ->  
+table {R.Masc => table {P.Sg => francez;
+                        P.Pl => francezi};
+ R.Fem => table {P.Sg => franceza;
+                 P.Pl => franceze}};
 
 
 lincat 
@@ -41,7 +51,7 @@ lin
          to = if_then_else Adv kind.at.needIndef (mkAdv kind.to name) (mkAdv kind.at (mkNP kind.name))
        } ;
 CitiNat n = {pers = n.propPers; prop = n.propObj} ;
-ACitizen p n = mkCl p.name n.pers ;
+ACitizen p n = mkCl p.name (PR.mkAdv (n.pers ! (p.name.a.g) ! (p.name.a.n))) ;
 PCitizenship x =  mkPhrase (mkUtt (mkAP x.prop)) ;
 PropCit p = p.prop ;
 }
diff --git a/examples/phrasebook/WordsDut.gf b/examples/phrasebook/WordsDut.gf
index 0a4549498..81829c7ee 100644
--- a/examples/phrasebook/WordsDut.gf
+++ b/examples/phrasebook/WordsDut.gf
@@ -1,5 +1,6 @@
 -- (c) 2009 Aarne Ranta under LGPL
 
+
 concrete WordsDut of Words = SentencesDut ** 
     open SyntaxDut, (P = ParadigmsDut), (I = IrregDut), (L = LexiconDut), ExtraDut, Prelude in {
 
@@ -42,6 +43,7 @@ concrete WordsDut of Words = SentencesDut **
  
     Airport = mkPlace (P.mkN "luchthaven" "luchthavens" P.de) "op" ; 
     AmusementPark = mkPlace (P.mkN "pretpark" "pretparken" P.het) "in" ;
+    Bank = mkPlace (P.mkN "bank" "banken" P.de) "op" ;
     Bar = mkPlace (P.mkN "bar" P.de) "in" ;  
     Cafeteria = mkPlace (P.mkN "cafetaria" "cafetaria's" P.de) "in" ;
     Center = mkPlace (P.mkN "centrum" "centra" P.het) "in" ;
@@ -54,6 +56,7 @@ concrete WordsDut of Words = SentencesDut **
     Park = mkPlace (P.mkN "park" "parken" P.het) "in" ; 
     Parking = mkPlace (P.mkN "parkeerplaats" "parkeerplaatsen" P.de) "op" ; --parkeren x parkeerplaats -- naar op 
     Pharmacy = mkPlace (P.mkN "apotheek" "apotheken" P.de)  "in" ;
+    PostOffice = mkPlace (P.mkN "postkantoor" "postkantoren" P.het) "op" ;
     Pub = mkPlace (P.mkN "kroeg" "kroegen" P.de) "in" ;
     Restaurant = mkPlace (P.mkN "restaurant" "restaurants" P.het) "in" ; 
     Shop = mkPlace (P.mkN "winkel" "winkels" P.de) "in" ; -- shop x winkel 
@@ -77,6 +80,7 @@ concrete WordsDut of Words = SentencesDut **
     Lei = mkCN (P.mkA "Roemeens") (P.mkN "leu" "lei" P.de) ;
     Leva = mkCN (P.mkA "Bulgaars") (P.mkN "leva" "levs" P.de) ;
     NorwegianCrown = mkCN (P.mkA "Noors") (P.mkN "kroon" "kronen "P.de) ;  
+    Pound = mkCN (P.mkA "Brits") (P.mkN "pond" "pond" P.het);
     Rouble = mkCN (P.mkA "Russisch") (P.mkN "roebel" "roebel" P.de) ;
     SwedishCrown = mkCN (P.mkA "Zweeds") (P.mkN "kroon" "kronen" P.de) ;
     Zloty = mkCN (P.mkA "Pools") (P.mkN "zloty" "zloty" P.de) ;
@@ -84,15 +88,24 @@ concrete WordsDut of Words = SentencesDut **
 
 -- Nationalities
 
---    Belgian = mkA "belgisk" ; belgische
---    Belgium = mkNP (mkPN "Belgien") ; belgië
---    English = mkNat "engelsk" "England" ; engelse
---    Finnish = mkNat "finsk" "Finland" ; finse 
---    Flemish = mkNP (mkPN "flamländska") ; vlaamse
---    French = mkNat "fransk" "Frankrike" ; franse
---    Italian = mkNat "italiensk" "Italien" ; italiaanse
---    Romanian = mkNat "rumänsk" "Rumänien" ; roemeense
---    Swedish = mkNat "svensk" "Sverige" ; zweedse
+    Belgian = P.mkA "Belgisch" ;
+    Belgium = mkNP (P.mkPN "België") ;
+    Bulgarian = mkNat "Bulgaars" "Bulgarije" ;
+    Catalan = mkNat "Catalaans" "Catalonië" ;
+    Danish = mkNat "Deens" "Denemarken" ;
+    Dutch = mkNat "Nederlands" "Nederland" ;
+    English = mkNat "Engels" "Engeland" ;
+    Finnish = mkNat "Fins" "Finland" ;
+    Flemish = mkNP (P.mkPN "Vlaams") ;
+    French = mkNat "Frans" "Frankrijk" ; 
+    German = mkNat "Duits" "Duitsland" ;
+    Italian = mkNat "Italiaans" "Italië" ;
+    Norwegian = mkNat "Noors" "Noorwegen" ;
+    Polish = mkNat "Pools" "Polen" ;
+    Romanian = mkNat "Roemeens" "Roemenië" ;
+    Russian = mkNat "Russisch" "Rusland" ;
+    Spanish = mkNat "Spaans" "Spanje" ;
+    Swedish = mkNat "Zweeds" "Zweden" ;
 
 
 -- Means of transportation
@@ -223,7 +236,7 @@ ik ga te voet/ ik ga lopend
 
   oper
     mkNat : Str -> Str -> NPNationality = \nat,co -> 
-      mkNPNationality (mkNP (P.mkPN (nat + "a"))) (mkNP (P.mkPN co)) (P.mkA nat) ;
+      mkNPNationality (mkNP (P.mkPN nat)) (mkNP (P.mkPN co)) (P.mkA nat) ;
 
     mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d -> 
       mkNPDay (mkNP (P.mkPN d)) (mkAdv on_Prep (mkNP (P.mkPN d))) 
@@ -249,20 +262,10 @@ ik ga te voet/ ik ga lopend
   mkSuperl : A -> Det = \a -> SyntaxDut.mkDet the_Art (SyntaxDut.mkOrd a) ;
 
 
-
-{-
-TheBest : SuperlModif ; de/het beste
-    TheClosest : SuperlModif ; welke ... is het dichtste bij (which .. is the closest)
-    TheCheapest : SuperlModif ; de goedkoopste
-    TheWorst : SuperlModif ; de slechtste
-    MostExpensive : SuperlModif ; de duurste
-    MostPopular : SuperlModif ; populairste
-
-    HowFar : Place -> Question ;                            -- how far is the zoo ?  
-    HowFarFrom : Place -> Place -> Question ;               -- how far is the center from the hotel ? hoever is het centrum van het hotel
-    HowFarFromBy : Place -> Place -> ByTransp -> Question ; -- how far is the airport from the hotel by taxi ? hoelang duurt het om van het vliegveld naar het hotel te gaan per taxi
-    HowFarBy : Place -> Transp -> Question ;                -- how far is the museum by bus ? hoe ver is het museum per bus/ hoelang doe je er over om met de bus naar het museum te gaan/hoelang doet de bus er over tot het museum
-
+{- 
+    HowFarFrom : how far is the center from the hotel ? hoe ver is het centrum van het hotel
+    HowFarFromBy : how far is the airport from the hotel by taxi ? hoe lang duurt het om van het vliegveld naar het hotel te gaan per taxi
+    HowFarBy : how far is the museum by bus ? hoe ver is het museum per bus/ hoelang doe je er over om met de bus naar het museum te gaan/hoelang doet de bus er over tot het museum
 
 
 -}
diff --git a/examples/phrasebook/WordsEng.gf b/examples/phrasebook/WordsEng.gf
index 80435eb06..517e36fa0 100644
--- a/examples/phrasebook/WordsEng.gf
+++ b/examples/phrasebook/WordsEng.gf
@@ -46,25 +46,25 @@ concrete WordsEng of Words = SentencesEng **
 -- defined by $mkPlace$.
 
     Airport = mkPlace "airport" "at" ;
-    AmusementPark = mkCompoundPlace "amusement" "park" "in" ;
+    AmusementPark = mkCompoundPlace "amusement" "park" "at" ;
     Bank = mkPlace "bank" "at" ;
     Bar = mkPlace "bar" "in" ;
-    Cafeteria = mkPlace "cafeteria" "in" ;
+    Cafeteria = mkPlace "canteen" "in" ;
     Center = mkPlace "center" "in" ;
     Cinema = mkPlace "cinema" "at" ;
     Church = mkPlace "church" "in" ;
-    Disco = mkPlace "disco" "in" ;
+    Disco = mkPlace "disco" "at" ;
     Hospital = mkPlace "hospital" "in" ;
     Hotel = mkPlace "hotel" "in" ;
-    Museum = mkPlace "museum" "in" ;
+    Museum = mkPlace "museum" "at" ;
     Park = mkPlace "park" "in" ;
-    Parking = mkPlace "parking" "in" ; 
+    Parking = mkCompoundPlace "car" "park" "in" ; 
     Pharmacy = mkPlace "pharmacy" "at" ;
-    PostOffice = mkCompoundPlace "post" "office" "in" ;
+    PostOffice = mkCompoundPlace "post" "office" "at" ;
     Pub = mkPlace "pub" "at" ;
     Restaurant = mkPlace "restaurant" "in" ;
     School = mkPlace "school" "at" ;
-    Shop = mkPlace "shop" "in" ;
+    Shop = mkPlace "shop" "at" ;
     Station = mkPlace "station" "at" ;
     Supermarket = mkPlace "supermarket" "at" ; 
     Theatre = mkPlace "theatre" "at" ;
@@ -83,6 +83,7 @@ concrete WordsEng of Words = SentencesEng **
     Lei = mkCN (mkN "leu" "lei") ;
     Leva = mkCN (mkN "lev") ;
     NorwegianCrown = mkCN (mkA "Norwegian") (mkN "crown") | mkCN (mkN "crown") ;
+    Pound = mkCN (mkN "pound") ;
     Rouble = mkCN (mkN "rouble") ;
     SwedishCrown = mkCN (mkA "Swedish") (mkN "crown") | mkCN (mkN "crown") ;
     Zloty = mkCN (mkN "zloty" "zloty") ;
@@ -92,9 +93,9 @@ concrete WordsEng of Words = SentencesEng **
     Belgian = mkA "Belgian" ;
     Belgium = mkNP (mkPN "Belgium") ;
     Bulgarian = mkNat "Bulgarian" "Bulgaria" ;
-    Catalan = mkNat "Catalan" "Catalonia" ;
+    Catalan = mkNPNationality (mkNP (mkPN "Catalan")) (mkNP (mkPN "Catalonia")) (mkA "Catalonian") ;
     Danish = mkNat "Danish" "Denmark" ;
- --   Dutch = mkNat "Dutch" ""
+    Dutch =  mkNPNationality (mkNP (mkPN "Dutch")) (mkNP the_Quant (mkN "Netherlands")) (mkA "Dutch") ;
     English = mkNat "English" "England" ;
     Finnish = mkNat "Finnish" "Finland" ;
     Flemish = mkNP (mkPN "Flemish") ;
@@ -124,7 +125,7 @@ concrete WordsEng of Words = SentencesEng **
 
 -- Actions: the predication patterns are very often language-dependent.
 
-    AHasAge p num = mkCl p.name (mkNP num L.year_N) ;
+    AHasAge p num = mkCl p.name (mkNP (mkDet num)) ;
     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")) (SyntaxEng.mkAdv for_Prep (mkNP num (mkN "person")))) ;
diff --git a/examples/phrasebook/WordsFre.gf b/examples/phrasebook/WordsFre.gf
index dd4508552..acf4a6207 100644
--- a/examples/phrasebook/WordsFre.gf
+++ b/examples/phrasebook/WordsFre.gf
@@ -6,6 +6,7 @@ concrete WordsFre of Words = SentencesFre ** open
   (E = ExtraFre),
   (L = LexiconFre),
   ParadigmsFre,
+  (M = MorphoFre),
   (P = ParadigmsFre),
   Prelude in {
 
@@ -24,7 +25,7 @@ lin
     Milk = mkCN L.milk_N ;
     Pizza = mkCN (mkN "pizza" feminine) ;
     Salt = mkCN L.salt_N ;
-    Tea = mkCN (mkN "thé") ;
+    Tea = mkCN (mkN "thé") ;
     Water = mkCN L.water_N ;
     Wine = mkCN L.wine_N ;
 
@@ -32,32 +33,45 @@ lin
 
     Bad = L.bad_A ;
     Boring = mkA "ennuyeux" ;
-    Cheap = let bm = "bon marché" in mkA bm bm bm bm ;
+    Cheap = let bm = "bon marché" in mkA bm bm bm bm ;
     Cold = L.cold_A ;
-    Delicious = mkA "délicieux" ;
+    Delicious = mkA "délicieux" ;
     Expensive = mkA "cher" ;
-    Fresh = mkA "frais" "fraîche" "frais" "fraîchement" ;
+    Fresh = mkA "frais" "fraîche" "frais" "fraîchement" ;
     Good = L.good_A ;
     Suspect = mkA "suspect" ;
     Warm = L.warm_A ;
 
 -- places
 
-    Airport = mkPlace (mkN "aéroport") dative ;
+    Airport = mkPlace (mkN "aéroport") dative ;
+    AmusementPark = mkPlace (compN (mkN "parc") ["d'attractions"]) in_Prep ;
+    Bank = mkPlace (mkN "banque") in_Prep ;
     Bar = mkPlace (mkN "bar") in_Prep ;
-    Church = mkPlace (mkN "église") in_Prep ;
-    Cinema = mkPlace (mkN "cinéma" masculine) in_Prep ;
-    Hospital = mkPlace (mkN "hôpital") dative ;
-    Hotel = mkPlace (mkN "hôtel") dative ;
-    Museum = mkPlace (mkN "musée" masculine) in_Prep ;
+    Cafeteria = mkPlace (mkN "cafétéria") in_Prep ;
+    Center = mkPlace (mkN "centre") in_Prep ;
+    Church = mkPlace (mkN "église") in_Prep ;
+    Cinema = mkPlace (mkN "cinéma" masculine) in_Prep ;
+    Disco = mkPlace (mkN "discothèque" feminine) dative ;
+    Hospital = mkPlace (mkN "hôpital") dative ;
+    Hotel = mkPlace (mkN "hôtel") dative ;
+    Museum = mkPlace (mkN "musée" masculine) in_Prep ;
     Park = mkPlace (mkN "parc") in_Prep ;
+    Parking = mkPlace (mkN "parking" masculine) in_Prep ;
+    Pharmacy = mkPlace (mkN "pharmacie" feminine) in_Prep ;
+    PostOffice = mkPlace (mkN "poste" feminine) dative ;
+    Pub = mkPlace (mkN "pub" masculine) dative ;
     Restaurant = mkPlace (mkN "restaurant") in_Prep ;
-    School = mkPlace (mkN "école") dative ;
+    School = mkPlace (mkN "école") dative ;
     Shop = mkPlace (mkN "magasin") in_Prep ;
     Station = mkPlace (mkN "gare") dative ;
-    Theatre = mkPlace (mkN "théâtre" masculine) in_Prep ;
+    Supermarket = mkPlace (mkN "supermarché" masculine) in_Prep ;
+    Theatre = mkPlace (mkN "théâtre" masculine) in_Prep ;
     Toilet = mkPlace (mkN "toilette") in_Prep ;
-    University = mkPlace (mkN "université" feminine) dative ;
+    University = mkPlace (mkN "université" feminine) dative ;
+    Zoo = mkPlace (mkN "zoo" masculine) dative ;
+
+    CitRestaurant cit = mkCNPlace (mkCN cit (mkN "restaurant")) in_Prep to_Prep ;
 
 -- currencies
 
@@ -65,23 +79,52 @@ lin
     Dollar = mkCN (mkN "dollar") ;
     Euro = mkCN (mkN "euro") ;
     Lei = mkCN (mkN "leu" "lei" masculine) ;
-    SwedishCrown = mkCN (mkA "suédois") (mkN "couronne") | mkCN (mkN "couronne") ;
-
+    Leva = mkCN (mkN "lev" "leva" masculine);
+    NorwegianCrown = mkCN (mkA "norvégien") (mkN "couronne") | mkCN (mkN "couronne") ;
+    Pound = mkCN (compN (mkN "livre") ["sterling"]);
+    Rouble = mkCN (mkN "rouble" "rouble" masculine) ;
+    SwedishCrown = mkCN (mkA "suédois") (mkN "couronne") | mkCN (mkN "couronne") ;
+    Zloty = mkCN (mkN "złoty" "złotych" masculine) ;
+   
 -- nationalities
 
     Belgian = mkA "belge" ;
     Belgium = mkNP (mkPN "Belgique") ;
+    Bulgarian = mkNat "bulgare" "Bulgarie" ;
+    Catalan = mkNat "cataln" "Catalogne" ;
+    Danish = mkNat "danois" "Danemark" ;
+    Dutch = mkNat "hollandais" "Holland" ;
     English = mkNat "anglais" "Angleterre" ;
     Finnish = mkNat "finlandais" "Finlande" ;
     Flemish = mkNP (mkPN "flamand") ;
-    French = mkNat "français" "France" ; 
+    French = mkNat "français" "France" ; 
+    German = mkNat "allemand" "Allemagne" ;
     Italian = mkNat "italien" "Italie" ;
+    Norwegian = mkNat "norvégien" "Norvège" ;
+    Polish = mkNat "polonais" "Pologne" ;
     Romanian = mkNat "roumain" "Roumanie" ;
-    Swedish = mkNat "suédois" "Suède" ;
+    Russian = mkNat "russe" "Russie" ;
+    Spanish = mkNat "espagnol" "Espagne" ;
+    Swedish = mkNat "suédois" "Suède" ;
+
+-- means of transportation
+  
+   Bike = mkTransport L.bike_N ;
+   Bus = mkTransport (mkN "bus") ;
+   Car = mkTransport L.car_N ;
+   Ferry = mkTransport (mkN "ferry-boat") ;
+   Plane = mkTransport L.airplane_N ;
+   Subway = mkTransport (mkN "metro") ;
+   Taxi = mkTransport (mkN "taxi") ;
+   Train = mkTransport (mkN "train") ;
+   Tram = mkTransport (mkN "tram") ;
+
+   ByFoot = P.mkAdv "à pied" ;
+
 
 -- actions
 
-    AHasAge p num = mkCl p.name have_V2 (mkNP num L.year_N) ;
+    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 "chambre")) 
@@ -89,15 +132,15 @@ lin
     AHasTable p num = mkCl p.name have_V2 
       (mkNP (mkNP a_Det (mkN "table")) 
         (SyntaxFre.mkAdv for_Prep (mkNP num (mkN "personne")))) ;
-    AMarried p = mkCl p.name (mkA "marié") ;
+    AMarried p = mkCl p.name (mkA "marié") ;
     AWant p obj = mkCl p.name vouloir_V2 obj ;
     ALike p item = mkCl item plaire_V2 p.name ;
     ASpeak p lang = mkCl p.name  (mkV2 (mkV "parler")) lang ;
     ALove p q = mkCl p.name (mkV2 (mkV "aimer")) q.name ;
     AHungry p = mkCl p.name (E.ComplCN have_V2 (mkCN (mkN "faim" feminine))) ;
-    AReady p = mkCl p.name (mkA "prêt") ;
+    AReady p = mkCl p.name (mkA "prêt") ;
     AThirsty p = mkCl p.name (E.ComplCN have_V2 (mkCN (mkN "soif" feminine))) ;
-    ATired p = mkCl p.name (mkA "fatigué") ;
+    ATired p = mkCl p.name (mkA "fatigué") ;
     AScared p = mkCl p.name (E.ComplCN have_V2 (mkCN (mkN "peur" feminine))) ;
     AIll p = mkCl p.name (mkA "malade") ;
     AUnderstand p = mkCl p.name (mkV IrregFre.comprendre_V2) ;
@@ -109,7 +152,7 @@ lin
 -- miscellaneous
 
     QWhatName p = mkQS (mkQCl how_IAdv (mkCl p.name (reflV (mkV "appeler")))) ;
-    QWhatAge p = mkQS (mkQCl (mkIP whichSg_IDet (mkN "âge" masculine)) p.name have_V2) ; 
+    QWhatAge p = mkQS (mkQCl (mkIP whichSg_IDet (mkN "âge" masculine)) p.name have_V2) ; 
 
     PropOpen p = mkCl p.name open_A ;
     PropClosed p = mkCl p.name closed_A ;
@@ -118,16 +161,17 @@ lin
     PropOpenDay p d = mkCl p.name (mkVP (mkVP open_A) d.habitual) ; 
     PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_A) d.habitual) ; 
 
-    HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (mkV "coûter"))) ; 
-    ItCost item price = mkCl item (mkV2 (mkV "coûter")) price ;
+    HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (mkV "coûter"))) ; 
+    ItCost item price = mkCl item (mkV2 (mkV "coûter")) price ;
 
 -- Building phrases from strings is complicated: the solution is to use
 -- mkText : Text -> Text -> Text ;
 
-    PSeeYouPlace p = mkText (lin Text (ss ("on se verra"))) (mkPhrase (mkUtt p.at)) ;
-    PSeeYouDate d = mkText (lin Text (ss ("on se verra"))) (mkPhrase (mkUtt d)) ;
+
+    PSeeYouPlace d = mkText (lin Text (ss ("on se voit"))) (mkPhrase (mkUtt d.at)) ;
+    PSeeYouDate d = mkText (lin Text (ss ("on se voit"))) (mkPhrase (mkUtt d)) ;
     PSeeYouPlaceDate p d = 
-      mkText (lin Text (ss ("on se verra"))) 
+      mkText (lin Text (ss ("on se voit"))) 
         (mkText (mkPhrase (mkUtt p.at)) (mkPhrase (mkUtt d))) ;
 
 -- Relations are expressed as "my wife" or "the wife of my son", as defined by $xOf$
@@ -153,6 +197,35 @@ lin
 
     Tomorrow = ParadigmsFre.mkAdv "demain" ;
 
+-- modifiers of places
+
+    TheBest = mkSuperl L.good_A ;
+    TheClosest = mkSuperl L.near_A ; 
+    TheCheapest = mkSuperl (compADeg {s = \\_ => (M.mkAdj "bon marché" "bon marché" "bon marché" "bon marché").s ; isPre = False ; lock_A = <>}) ; 
+    TheMostExpensive = mkSuperl (mkA "cher") ;
+    TheMostPopular = mkSuperl (mkA "populair") ;
+    TheWorst = mkSuperl L.bad_A ;
+
+    SuperlPlace sup p = placeNP sup p ;
+
+
+-- transports
+{-
+    HowFar place = mkQS (mkQCl which_IQuant (mkNP the_Det (mkN "distance" feminine))) ;  -- (mkNP ()place.name) ;
+
+    HowFarFrom x y = mkQS (mkQCl far_IAdv (mkNP y.name (SyntaxFre.mkAdv from_Prep x.name))) ;
+    HowFarFromBy x y t = 
+      mkQS (mkQCl far_IAdv (mkNP (mkNP y.name (SyntaxFre.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 -> NPNationality = \nat,co -> 
@@ -166,8 +239,17 @@ lin
       mkCNPlace (mkCN p) i dative ;
 
     open_A = P.mkA "ouvert" ;
-    closed_A = P.mkA "fermé" ;
+    closed_A = P.mkA "fermé" ;
 
     xOf : GNumber -> N -> NPPerson -> NPPerson = \n,x,p -> mkRelative n (mkCN x) p ; 
 
+    mkTransport : N -> {name : CN ; by : Adv} = \n -> {
+      name = mkCN n ; 
+      by = SyntaxFre.mkAdv by8means_Prep (mkNP n)
+      } ;
+
+    mkSuperl : A -> Det = \a -> SyntaxFre.mkDet the_Art (SyntaxFre.mkOrd a) ;
+    
+    far_IAdv = ss "loin" ;
+
 }
diff --git a/examples/phrasebook/WordsPol.gf b/examples/phrasebook/WordsPol.gf
index 5e0966541..a5c0e0cfb 100644
--- a/examples/phrasebook/WordsPol.gf
+++ b/examples/phrasebook/WordsPol.gf
@@ -1,4 +1,4 @@
---2 Implementations of Words, with English as example
+
 
 concrete WordsPol of Words = SentencesPol ** 
     open 
diff --git a/examples/phrasebook/WordsRon.gf b/examples/phrasebook/WordsRon.gf
index 704c66b6b..5775c46bf 100644
--- a/examples/phrasebook/WordsRon.gf
+++ b/examples/phrasebook/WordsRon.gf
@@ -68,7 +68,8 @@ concrete WordsRon of Words = SentencesRon ** open
     Theatre = mkPlace (P.mkN "teatru" "teatre") at_Prep ;
     Toilet = mkPlace (P.mkN "toaletă") at_Prep ;
     University = mkPlace (P.mkN "universitate") at_Prep ;
-    --Zoo = mkPlace 
+    Zoo = {name = mkCN (P.mkA "zoologic") (P.mkN "grădină" "grădini");
+           to = to_Prep; at = at_Prep };
 
     CitRestaurant cit = mkCNPlace (mkCN cit.prop (P.mkN "restaurant" "restaurante")) in_Prep to_Prep;  
 
@@ -80,30 +81,31 @@ concrete WordsRon of Words = SentencesRon ** open
     Lei = mkCN (P.mkN "leu" "lei") ;
     Leva = mkCN (P.mkN "levă" "leve") ;
     NorwegianCrown = mkCN (P.mkA "norvegian") (P.mkN "coroană") ;
+    Pound = mkCN (P.mkA "sterlin") (P.mkN "liră") ;
     Rouble = mkCN (P.mkN "rublă" "ruble") ;
     SwedishCrown = mkCN (P.mkA "suedez") (P.mkN "coroană") ;
     Zloty = mkCN (P.mkN "zlot" P.masculine) ;    
 
 -- nationalities
 
-    Belgian = mkCitizenshipRon (P.mkA "belgian") (P.mkA "belgian") ;
+    Belgian = mkCitizenshipRon (P.mkA "belgian" "belgiană" "belgieni" "belgiene")  "belgian" "belgiancă" "belgieni" "belgience" ;
     Belgium = mkNP (P.mkPN "Belgia") ;
-    Bulgarian = mkSimpNat "bulgar" "Bulgaria" ;
-    Catalan = mkSimpNat "catalan" "Catalonia" ;
-    Danish = mkSimpNat "danez" "Danemarca" ;
-    Dutch = mkSimpNat "olandez" "Olanda" ;
-    English = mkSimpNat "englez" "Anglia" ;
-    Finnish = mkSimpNat "finlandez" "Finlanda" ;
+    Bulgarian = mkCompNat "bulgar" "Bulgaria" "bulgăresc" "bulgar" "bulgăroaică" "bulgari" "bulgăroaice";
+    Catalan = mkSimpSimpNat "catalan" "Catalonia" ;
+    Danish = mkSimpSimpNat "danez" "Danemarca" ;
+    Dutch = mkSimpSimpNat "olandez" "Olanda" ;
+    English = mkNat "englez" "Anglia" "englez" "englezoaică" "englezi" "englezoaice" ;
+    Finnish = mkSimpSimpNat "finlandez" "Finlanda" ;
     Flemish = mkNP (P.mkPN "flamandă") ; 
-    French = mkSimpNat "francez" "Franţa" ;
-    German = mkSimpNat "german" "Germania" ; 
-    Italian = mkNPNationalityRon (mkNP (P.mkPN "italiană"))  (mkNP (P.mkPN "Italia")) (P.mkA "italian") (P.mkA "italian" "italiancă" "italieni" "italience") ;
-    Norwegian = mkSimpNat "norvegian" "Norvegia" ;
-    Polish = mkSimpNat "polonez" "Polonia" ;
-    Romanian = mkNPNationalityRon (mkNP (P.mkPN "română")) (mkNP (P.mkPN "România")) (P.mkA "român") (P.mkA "român" "româncă" "români" "românce") ;
-    Russian = mkSimpNat "rus" "Rusia" ;
-    Spanish = mkSimpNat "spaniol" "Spania" ;
-    Swedish = mkSimpNat "suedez" "Suedia" ;
+    French = mkCompNat "francez" "Franţa" "franțuzesc" "francez" "franțuzoaică" "francezi" "franțuzoaice";
+    German = mkCompNat "german" "Germania" "nemțesc" "neamț" "nemțoaică" "nemți" "nemțoaice"; 
+    Italian = mkSimpNat "italian"  "Italia" "italian" "italiancă" "italieni" "italience" ;
+    Norwegian = mkSimpSimpNat "norvegian" "Norvegia";
+    Polish = mkSimpSimpNat "polonez" "Polonia" ;
+    Romanian = mkNat "român" "România" "român" "româncă" "români" "românce" ;
+    Russian = mkNat "rus" "Rusia" "rus" "rusoaică" "ruși" "rusoaice";
+    Spanish = mkSimpSimpNat "spaniol" "Spania" ;
+    Swedish = mkSimpSimpNat "suedez" "Suedia" ;
     
 -- means of transportation 
 
@@ -221,18 +223,26 @@ concrete WordsRon of Words = SentencesRon ** open
 
 oper
 
-closed_A : A = P.mkA "inchis" ;
+closed_A : A = P.mkA "închis" ;
 open_A : A = P.mkA "deschis" ;
 
--- auxiliaries
+-- auxiliaries     
+
+   mkSimpSimpNat : Str -> Str -> NPNationalityRon = \nat, co -> 
+     mkSimpNat nat co nat (nat + "ă") (nat + "i") (nat+"e");
+
+    mkSimpNat : Str -> Str -> Str -> Str -> Str -> Str -> NPNationalityRon = \nat,co, citMS, citFS, citMP, citFP -> let adj = P.mkA nat in
+      mkNPNationalityRon (mkNP (P.mkPN (nat+"ă"))) (mkNP (P.mkPN co)) adj citMS citFS citMP citFP ;
+
+    mkNat : Str -> Str -> Str -> Str -> Str -> Str -> NPNationalityRon = \nat,co, citMS, citFS, citMP, citFP -> let adj = P.mkA (nat+"esc") in
+      mkNPNationalityRon (mkNP (P.mkPN (nat+"ă"))) (mkNP (P.mkPN co)) adj citMS citFS citMP citFP ;
 
-   mkSimpNat : Str -> Str -> NPNationalityRon = \nat, co ->
-      mkNPNationalityRon (mkNP (P.mkPN (nat+"ă"))) (mkNP (P.mkPN co)) (P.mkA nat) (P.mkA nat) ;    
+   mkCompNat : Str -> Str -> Str -> Str -> Str -> Str -> Str -> NPNationalityRon = \nat,co, adj, citMS, citFS, citMP, citFP -> let a = P.mkA adj in
+      mkNPNationalityRon (mkNP (P.mkPN (nat+"ă"))) (mkNP (P.mkPN co)) a citMS citFS citMP citFP ;
+   
 
-    mkNat : Str -> Str -> A -> NPNationalityRon = \nat,co, adj -> 
-      mkNPNationalityRon (mkNP (P.mkPN nat)) (mkNP (P.mkPN co)) adj adj ;
 
-    mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
+mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d ->
       let day = mkNP (P.mkPN d P.Feminine) ;
           ad = {s = d; lock_Adv=<>} in
       mkNPDay day ad ad; ---- difference is enforced by additional constructions