simplified the treatment of politeness in Phrasebook

1 files changed, 8 insertions, 10 deletions

diff --git a/examples/phrasebook/WordsFre.gf b/examples/phrasebook/WordsFre.gf
index a0f406953..266d0ed6c 100644
--- a/examples/phrasebook/WordsFre.gf
+++ b/examples/phrasebook/WordsFre.gf
@@ -35,21 +35,19 @@ Boring = mkAPA "ennuyeux" ;
     Dollar = mkCN (mkN "dollar") ;

     Lei = mkCN (mkN "lei") ; ---- ?

 

+    AWant p obj = mkCl p want_V2 obj ;

+    ALike p item = mkCl item plaire_V2 p ;

+    AHave p kind = mkCl p have_V2 (mkNP kind) ;

+    ASpeak p lang = mkCl p  (mkV2 (mkV "parler")) lang ;

+    ALove p q = mkCl p (mkV2 (mkV "aimer")) q ;

+

     English = mkNP (mkPN "anglais") ;

     Finnish = mkNP (mkPN "finnois") ;

     French = mkNP (mkPN "français") ; 

     Romanian = mkNP (mkPN "roumain") ;

     Swedish = mkNP (mkPN "suédois") ;

 

-    AWant p obj = {s = \\r => mkCl (p.s ! r) want_V2 obj} ;

-    ALike p item = {s = \\r => mkCl item plaire_V2 (p.s ! r)} ;

-    AHave p kind = {s = \\r => mkCl (p.s ! r) have_V2 (mkNP kind)} ;

-    ASpeak p lang = {s = \\r => mkCl (p.s ! r) (mkV2 (mkV "parler")) lang} ;

-    ALove p q = {s = \\r => mkCl (p.s ! r) (mkV2 (mkV "aimer")) (q.s ! r)} ;

-

-

-  oper

-    mkAPA : (_ : Str) -> AP = \x -> mkAP (mkA x) ;

-

+oper

+mkAPA : (_ : Str) -> AP = \x -> mkAP (mkA x) ;

 

 }