some moving around of new phrasebook entries

1 files changed, 33 insertions, 11 deletions

diff --git a/examples/phrasebook/Words.gf b/examples/phrasebook/Words.gf
index 6c9412b10..086a19004 100644
--- a/examples/phrasebook/Words.gf
+++ b/examples/phrasebook/Words.gf
@@ -56,7 +56,7 @@ abstract Words = Sentences ** {
     University : PlaceKind ;
    
 
-    NationalRestaurant : Nationality -> PlaceKind ;
+    CitRestaurant : Citizenship -> PlaceKind ;
     Parking : PlaceKind ;
     Supermarket : PlaceKind ;
     Pharmacy : PlaceKind ;
@@ -107,17 +107,17 @@ abstract Words = Sentences ** {
 
 -- means of transportation 
 
-    Train : Transp ;
-    Bus : Transp ;
-    Plane : Transp ;
-    Ferry : Transp ;
-    Subway : Transp ;
-    Tram : Transp ;
-    Taxi : Transp ;
-    Car : Transp ;
-    Bike : Transp ; 
+    Train : Transport ;
+    Bus : Transport ;
+    Plane : Transport ;
+    Ferry : Transport ;
+    Subway : Transport ;
+    Tram : Transport ;
+    Taxi : Transport ;
+    Car : Transport ;
+    Bike : Transport ; 
 
-    ByFoot : ByTransp ;
+    ByFoot : ByTransport ;
 
 
 -- Actions (which can be expressed by different structures in different languages).
@@ -174,4 +174,26 @@ abstract Words = Sentences ** {
 
     Tomorrow : Date ;
 
+-- transports
+
+    HowFar : Place -> Question ;                  -- how far is the zoo ?
+    HowFarFrom : Place -> Place -> Question ;     -- how far is the center from the hotel ?
+    HowFarFromBy : Place -> Place -> ByTransport -> Question ; -- how far is the airport from the hotel by taxi ? 
+    HowFarBy : Place -> Transport -> Question ;                -- how far is the museum by bus ?
+
+
+                          
+    WhichTranspPlace : Transport -> Place -> Question ;   -- which bus goes to the hotel
+    IsTranspPlace    : Transport -> Place -> Question ;   -- is there a metro to the airport ?
+    ByTransp : Transport -> ByTransport ;             -- by bus
+
+    TheBest : Superlative ;
+    TheClosest : Superlative ;
+    TheCheapest : Superlative ;
+    TheWorst : Superlative ;
+    MostExpensive : Superlative ;
+    MostPopular : Superlative ;
+
+    SuperlPlace : Superlative -> PlaceKind -> Place ; -- the best bar
+
 }