disambiguation in Phrasebook grammars, PGF server, and the GUI

1 files changed, 1 insertions, 8 deletions

diff --git a/examples/phrasebook/Phrasebook.gf b/examples/phrasebook/Phrasebook.gf
index 3ddd5b573..6a0fdad80 100644
--- a/examples/phrasebook/Phrasebook.gf
+++ b/examples/phrasebook/Phrasebook.gf
@@ -5,18 +5,11 @@ abstract Phrasebook =
 
 flags startcat = Phrase ;
 
-cat 
-  Politeness ; Gender ; -- abstract parameters
 fun
 
 -- here rather than Sentences, because not functorial
-  PSentence : Sentence -> Phrase ;
-  PQuestion : Question -> Phrase ;
-  PGreeting : Greeting -> Phrase ;
+  PGreeting : Politeness -> Greeting -> Phrase ;
 ----  PGreeting : Politeness -> Gender -> Gender -> Greeting -> Phrase ;
               -- politeness level, speaker, hearer
 
-  Polite, Familiar : Politeness ;
-  Male, Female : Gender ;
-
 }