change Food to Words in Phrasebook, since it's unpractical to have many small modules; added syntactic forms and words

1 files changed, 14 insertions, 4 deletions

diff --git a/examples/phrasebook/Sentences.gf b/examples/phrasebook/Sentences.gf
index 7afd69435..d1f79498b 100644
--- a/examples/phrasebook/Sentences.gf
+++ b/examples/phrasebook/Sentences.gf
@@ -1,7 +1,8 @@
 abstract Sentences = Numeral ** {
 
   cat
-    Sentence ; Object ; Item ; Kind ; Quality ;
+    Sentence ; Question ; Object ; Item ; Kind ; Quality ; 
+    Place ; PlaceKind ; Currency ; Price ;
 
   fun
     Is    : Item -> Quality -> Sentence ;
@@ -9,13 +10,22 @@ abstract Sentences = Numeral ** {
 
     IWant : Object -> Sentence ;
     ILike : Item -> Sentence ; 
-    DoYouHave : Kind -> Sentence ;
-    WhetherIs : Item -> Quality -> Sentence ;
+    DoYouHave : Kind -> Question ;
+    WhetherIs : Item -> Quality -> Question ;
+    WhereIs : Place -> Question ;
+
+    HowMuchCost : Item -> Question ;
+    ItCost : Item -> Price -> Sentence ;
+    AmountCurrency : Numeral -> Currency -> Price ;
+
     ObjItem : Item -> Object ;
     ObjNumber : Numeral -> Kind -> Object ;
     
-    This, That, These, Those : Kind -> Item ;
+    This, That, These, Those, The, Thes : Kind -> Item ;
     SuchKind : Quality -> Kind -> Kind ;
     Very : Quality -> Quality ;
+    Too : Quality -> Quality ;
+
+    ThePlace : PlaceKind -> Place ;
 
 }