slight refactoring of Phrasebook, with less start words

1 files changed, 24 insertions, 27 deletions

diff --git a/examples/phrasebook/GreetingsSpa.gf b/examples/phrasebook/GreetingsSpa.gf
index 673bac85e..604765a33 100644
--- a/examples/phrasebook/GreetingsSpa.gf
+++ b/examples/phrasebook/GreetingsSpa.gf
@@ -1,34 +1,31 @@
-concrete GreetingsSpa of Greetings = open Prelude in {
+concrete GreetingsSpa of Greetings = SentencesSpa [Greeting,mkGreeting] ** open Prelude in {
 
 flags coding = utf8 ;
 
-lincat 
-  Greeting = SS ;
-
 lin 
-  GBye = ss "adiós" ;
-  GCheers = ss "salud" ;
-  GDamn = ss "joder" ;
-  GExcuse = ss "perdón" ;
-  GExcusePol = ss "perdone" ;
-  GCongratulations = ss "felicitaciones" ;
-  GGoodLuck = ss "buena suerte" ;
-  GHappyBirthday = ss "feliz cumpleaños" ;
-  GGoodMorning, GGoodDay = ss "buenos días" ;
-  GGoodEvening = ss "buenas tardes" ;
-  GGoodNight = ss "buenas noches" ;
-  GGoodbye = ss "hasta luego" ;
-  GHello = ss "hola" ;
-  GHelp = ss "socorro" ;
-  GHowAreYou = ss "cómo está" ; -- the polite singular "you"
-  GLookOut = ss "atención" ;
-  GNiceToMeetYou = ss "encantado de conocerle" ; -- the polite singular "you"
-  GPleaseGive, GPleaseGivePol = ss "por favor" ;
-  GSeeYouSoon = ss "nos vemos pronto" ; 
-  GSorry = ss "disculpa" ; 
-  GSorryPol = ss "disculpe" ; 
-  GThanks = ss "gracias" ;
-  GTheCheck = ss "la cuenta" ;
+  GBye = mkGreeting "adiós" ;
+  GCheers = mkGreeting "salud" ;
+  GDamn = mkGreeting "joder" ;
+  GExcuse = mkGreeting "perdón" ;
+  GExcusePol = mkGreeting "perdone" ;
+  GCongratulations = mkGreeting "felicitaciones" ;
+  GGoodLuck = mkGreeting "buena suerte" ;
+  GHappyBirthday = mkGreeting "feliz cumpleaños" ;
+  GGoodMorning, GGoodDay = mkGreeting "buenos días" ;
+  GGoodEvening = mkGreeting "buenas tardes" ;
+  GGoodNight = mkGreeting "buenas noches" ;
+  GGoodbye = mkGreeting "hasta luego" ;
+  GHello = mkGreeting "hola" ;
+  GHelp = mkGreeting "socorro" ;
+  GHowAreYou = mkGreeting "cómo está¡" ; -- the polite singular "you"
+  GLookOut = mkGreeting "atención" ;
+  GNiceToMeetYou = mkGreeting "encantado de conocerle" ; -- the polite singular "you"
+  GPleaseGive, GPleaseGivePol = mkGreeting "por favor" ;
+  GSeeYouSoon = mkGreeting "nos vemos pronto" ; 
+  GSorry = mkGreeting "disculpa" ; 
+  GSorryPol = mkGreeting "disculpe" ; 
+  GThanks = mkGreeting "gracias" ;
+  GTheCheck = mkGreeting "la cuenta" ;
 
 
 }