disambiguation in Phrasebook grammars, PGF server, and the GUI

1 files changed, 2 insertions, 13 deletions

diff --git a/examples/phrasebook/PhrasebookIta.gf b/examples/phrasebook/PhrasebookIta.gf
index 554b04ee8..d28531e90 100644
--- a/examples/phrasebook/PhrasebookIta.gf
+++ b/examples/phrasebook/PhrasebookIta.gf
@@ -9,19 +9,8 @@ concrete PhrasebookIta of Phrasebook =
     ParadigmsIta,
     Prelude in {
 
-lincat 
-  Gender = {s : Str ; g : R.Gender} ;
-  Politeness = {s : Str ; p : R.Politeness} ;
-
 lin
-  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) ;
+  PGreeting p g = mkText (lin Text (ss (g.s ! p.p ! R.Male ! R.Male))) (lin Text (ss p.s)) ;
 
-  Male = {s = [] ; g = R.Male} ;
-  Female = {s = [] ; g = R.Female} ;
-  Polite = {s = [] ; p = R.Polite} ;
-  Familiar = {s = [] ; p = R.Familiar} ;
-  
 }
+