politeness and disambiguation in Phrasebook (not visible yet)

1 files changed, 10 insertions, 3 deletions

diff --git a/examples/phrasebook/PhrasebookEng.gf b/examples/phrasebook/PhrasebookEng.gf
index ee919d285..4d4b26781 100644
--- a/examples/phrasebook/PhrasebookEng.gf
+++ b/examples/phrasebook/PhrasebookEng.gf
@@ -3,6 +3,7 @@
 concrete PhrasebookEng of Phrasebook = 
   GreetingsEng,
   FoodEng ** open 
+    (R = Roles),
     SyntaxEng,
     ResEng, ---- for Num to Utt 
     Prelude in {
@@ -12,12 +13,18 @@ lincat
 
 lin
   PNumeral n = 
-    mkPhrase (ss ((SyntaxEng.mkCard <n : Numeral>).s ! Nom)) ; ----
-  PGreeting g = mkPhrase g ;
+    mkPhrase ((SyntaxEng.mkCard <n : Numeral>).s ! Nom) ; ----
   PSentence s = s ;
 
+  PGreeting g = mkPhrase g.s ;
+----  PGreeting p s h g = mkPhrase (g.s ++ p.s ++ s.s ++ h.s) ;
+
+  Male = {s = [] ; g = R.Male} ;
+  Female = {s = [] ; g = R.Female} ;
+  Polite = {s = [] ; p = R.Polite} ;
+  Familiar = {s = [] ; p = R.Familiar} ;
 
 oper 
-  mkPhrase : SS -> Utt = \s -> lin Utt s ;
+  mkPhrase : Str -> Utt = \s -> lin Utt (ss s) ;
 
 }