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

1 files changed, 4 insertions, 3 deletions

diff --git a/examples/phrasebook/PhrasebookFre.gf b/examples/phrasebook/PhrasebookFre.gf
index 7cf812466..5df0c0c86 100644
--- a/examples/phrasebook/PhrasebookFre.gf
+++ b/examples/phrasebook/PhrasebookFre.gf
@@ -2,7 +2,7 @@
 
 concrete PhrasebookFre of Phrasebook = 
   GreetingsFre,
-  FoodFre
+  WordsFre
   ** open 
     (R = Roles),
     SyntaxFre,
@@ -11,13 +11,14 @@ concrete PhrasebookFre of Phrasebook =
     Prelude in {
 
 lincat 
-  Phrase = Utt ;
+  Phrase = Text ;
   Gender = {s : Str ; g : R.Gender} ;
   Politeness = {s : Str ; p : R.Politeness} ;
 
 lin
   PNumeral n = mkPhrase ((mkCard <n : Numeral>).s ! masculine) ; ----
-  PSentence s = s ;
+  PSentence s = mkText s ;
+  PQuestion s = mkText s ;
 
   PGreeting g = mkPhrase (g.s ! R.Polite ! R.Male ! R.Male) ;
 ----  PGreeting p s h g = mkPhrase (g.s ! p.p ! s.g ! h.g ++ p.s ++ s.s ++ h.s) ;