simplified the treatment of politeness in Phrasebook

1 files changed, 28 insertions, 27 deletions

diff --git a/examples/phrasebook/GreetingsFre.gf b/examples/phrasebook/GreetingsFre.gf
index bc5b8e9a5..17946558c 100644
--- a/examples/phrasebook/GreetingsFre.gf
+++ b/examples/phrasebook/GreetingsFre.gf
@@ -3,36 +3,37 @@ concrete GreetingsFre of Greetings = open Roles,Prelude in {
 flags coding = utf8 ;
 
 lincat 
-  Greeting = RolePhrase ;
+  Greeting = SS ;
 
 lin 
-  GHello = roleNeutral "salut" ;
-  GThanks = roleNeutral "merci" ;
-  GHowAreYou = roleNeutral "comment ça va" ;
-  GPleaseGive = politeDistinct "s'il vous plaît" "s'il te plaît" ;
-  GExcuse = politeDistinct "excusez-moi" "excuse-moi" ;
-  GSorry = roleNeutral "pardon" ;
-  GGoodbye = roleNeutral "au revoir" ;
-  GBye = roleNeutral "au revoir" ;
-  GWhatsYourName = 
-    politeDistinct "comment vous appelez-vous" "comment t'appelles-tu" ;
-  GNiceToMeetYou = speakerDistinct "enchanté" "enchantée" ;
-  GSeeYouSoon = roleNeutral "à bientôt" ;
-  GHelp = roleNeutral "au secours" ;
-  GLookOut = roleNeutral "attention" ;
-  GGoodMorning = roleNeutral "bonjour" ;
-  GGoodDay = roleNeutral "bonjour" ;
-  GGoodEvening = roleNeutral "bon soir" ;
-  GGoodNight = roleNeutral "bonne nuit" ;
-  GImHungry = roleNeutral "j'ai faim" ;
-  GImThirsty = roleNeutral "j'ai soif" ;
-  GImTired = speakerDistinct "je suis fatigué" "je suis fatiguée" ;
-  GImScared = roleNeutral "j'ai peur" ;
-  GIdontUnderstand = roleNeutral "je ne comprends pas" ;
-  GTheCheck = roleNeutral "l'addition" ;
+  GHello = ss "salut" ;
+  GThanks = ss "merci" ;
+  GHowAreYou = ss "comment ça va" ;
+  GPleaseGive = ss "s'il te plaît" ;
+  GPleaseGivePol = ss "s'il vous plaît" ;
+  GExcuse = ss "excuse-moi" ;
+  GExcusePol = ss "excusez-moi" ;
+  GSorry, GSorryPol = ss "pardon" ;
+  GGoodbye = ss "au revoir" ;
+  GBye = ss "au revoir" ;
+  GWhatsYourName = ss "comment vous appelez-vous" ; ----
+  GNiceToMeetYou = ss "enchanté" ;
+  GSeeYouSoon = ss "à bientôt" ;
+  GHelp = ss "au secours" ;
+  GLookOut = ss "attention" ;
+  GGoodMorning = ss "bonjour" ;
+  GGoodDay = ss "bonjour" ;
+  GGoodEvening = ss "bon soir" ;
+  GGoodNight = ss "bonne nuit" ;
+  GImHungry = ss "j'ai faim" ;
+  GImThirsty = ss "j'ai soif" ;
+  GImTired = ss "je suis fatigué" ; ----
+  GImScared = ss "j'ai peur" ;
+  GIdontUnderstand = ss "je ne comprends pas" ;
+  GTheCheck = ss "l'addition" ;
 
-  GYes = roleNeutral "oui" ; ---- si
-  GNo = roleNeutral "non" ;
+  GYes = ss "oui" ; ---- si
+  GNo = ss "non" ;
 
 
 }