Moved punctuation to a separate field, to allow spoken language grammars to omit it. Created top-level spoken language grammars. (all in peacekeeping)

4 files changed, 15 insertions, 7 deletions

diff --git a/examples/peacekeeping/swedish/PeaceCat_Swe.gf b/examples/peacekeeping/swedish/PeaceCat_Swe.gf
index 8b0ce1346..5ccfb2ed5 100644
--- a/examples/peacekeeping/swedish/PeaceCat_Swe.gf
+++ b/examples/peacekeeping/swedish/PeaceCat_Swe.gf
@@ -1,3 +1,3 @@
 --# -path=.:present:prelude
 
-concrete PeaceCat_Swe of PeaceCat = CatSwe ** PeaceCatI with (Cat = CatSwe);
\ No newline at end of file
+concrete PeaceCat_Swe of PeaceCat = CatSwe ** PeaceCatI with (Lang = LangSwe);
\ No newline at end of file
diff --git a/examples/peacekeeping/swedish/PeacePhrases_Swe.gf b/examples/peacekeeping/swedish/PeacePhrases_Swe.gf
index e04f58d61..7f9d88014 100644
--- a/examples/peacekeeping/swedish/PeacePhrases_Swe.gf
+++ b/examples/peacekeeping/swedish/PeacePhrases_Swe.gf
@@ -1,12 +1,12 @@
 --# -path=.:..:present:prelude
 
 concrete PeacePhrases_Swe of PeacePhrases = 
-  PeaceCat_Swe ** open CommonScand in {
+  PeaceCat_Swe ** open CommonScand, PeaceRes in {
 
 lin
-    Hello = { s = "hej" ++ "." } ;
-    GoodMorning = { s = ["god morgon"] ++ "." } ;
-    GoodEvening = { s = ["god kväll"] ++ "." } ;
-    WhatIsNamePron p = { s = ["vad heter"] ++ p.s!NPNom ++ "?"; };
+    Hello = stop "hej" ;
+    GoodMorning = stop ["god morgon"] ;
+    GoodEvening = stop ["god kväll"] ;
+    WhatIsNamePron p = stop (["vad heter"] ++ p.s!NPNom) ;
 
 }
\ No newline at end of file
diff --git a/examples/peacekeeping/swedish/PeaceSpoken_Swe.gf b/examples/peacekeeping/swedish/PeaceSpoken_Swe.gf
new file mode 100644
index 000000000..d622a1c07
--- /dev/null
+++ b/examples/peacekeeping/swedish/PeaceSpoken_Swe.gf
@@ -0,0 +1,8 @@
+--# -path=.:..:present:prelude
+
+concrete PeaceSpoken_Swe of PeaceSpoken = 
+  Peace_Swe ** {
+
+  flags startcat = PhraseSpoken ; 
+
+}
diff --git a/examples/peacekeeping/swedish/Peace_Swe.gf b/examples/peacekeeping/swedish/Peace_Swe.gf
index 77090ceb2..c08e227d3 100644
--- a/examples/peacekeeping/swedish/Peace_Swe.gf
+++ b/examples/peacekeeping/swedish/Peace_Swe.gf
@@ -5,6 +5,6 @@ concrete Peace_Swe of Peace =
   PeaceLexExt_Swe, PeacePhrases_Swe
   ** {
 
-  flags startcat = Phr ; 
+  flags startcat = PhraseWritten ; 
 
 }