1 files changed, 3 insertions, 10 deletions
diff --git a/examples/phrasebook/PhrasebookFre.gf b/examples/phrasebook/PhrasebookFre.gf
index 5df0c0c86..a7de6f597 100644
--- a/examples/phrasebook/PhrasebookFre.gf
+++ b/examples/phrasebook/PhrasebookFre.gf
@@ -7,20 +7,16 @@ concrete PhrasebookFre of Phrasebook =
     (R = Roles),
     SyntaxFre,
     ParadigmsFre,
-    ResFre, ---- for Num to Utt 
     Prelude in {
 
 lincat 
-  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 = mkText s ;
-  PQuestion s = mkText s ;
-
-  PGreeting g = mkPhrase (g.s ! R.Polite ! R.Male ! R.Male) ;
+  PSentence s = mkText s | lin Text (mkUtt s) ;  -- optional .
+  PQuestion s = mkText s | lin Text (mkUtt s) ;  -- optional ?
+  PGreeting g = lin Text (ss (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) ;
 
   Male = {s = [] ; g = R.Male} ;
@@ -28,7 +24,4 @@ lin
   Polite = {s = [] ; p = R.Polite} ;
   Familiar = {s = [] ; p = R.Familiar} ;
   
-oper 
-  mkPhrase : Str -> Utt = \s -> lin Utt (ss s) ;
-
 }