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/english/PeaceCat_Eng.gf b/examples/peacekeeping/english/PeaceCat_Eng.gf
index ac1d9a7dd..d73e1d581 100644
--- a/examples/peacekeeping/english/PeaceCat_Eng.gf
+++ b/examples/peacekeeping/english/PeaceCat_Eng.gf
@@ -1,3 +1,3 @@
 --# -path=.:present:prelude
 
-concrete PeaceCat_Eng of PeaceCat = CatEng ** PeaceCatI with (Cat = CatEng);
\ No newline at end of file
+concrete PeaceCat_Eng of PeaceCat = CatEng ** PeaceCatI with (Lang = LangEng);
\ No newline at end of file
diff --git a/examples/peacekeeping/english/PeacePhrases_Eng.gf b/examples/peacekeeping/english/PeacePhrases_Eng.gf
index 73297d111..8bcf41ce0 100644
--- a/examples/peacekeeping/english/PeacePhrases_Eng.gf
+++ b/examples/peacekeeping/english/PeacePhrases_Eng.gf
@@ -1,12 +1,12 @@
 --# -path=.:..:present:prelude
 
 concrete PeacePhrases_Eng of PeacePhrases = 
-  PeaceCat_Eng ** open ResEng in {
+  PeaceCat_Eng ** open ResEng, PeaceRes in {
 
 lin
-    Hello = { s = "hello" ++ "." } ;
-    GoodMorning = { s = ["good morning"] ++ "." } ;
-    GoodEvening = { s = ["good evening"] ++ "." } ;
-    WhatIsNamePron p = { s = ["what is"] ++ p.s!Gen ++ "name" ++ "?"; };
+    Hello = stop "hello" ;
+    GoodMorning = stop ["good morning"];
+    GoodEvening = stop ["good evening"] ;
+    WhatIsNamePron p = quest (["what is"] ++ p.s!Gen ++ "name") ;
 
 }
\ No newline at end of file
diff --git a/examples/peacekeeping/english/PeaceSpoken_Eng.gf b/examples/peacekeeping/english/PeaceSpoken_Eng.gf
new file mode 100644
index 000000000..bdd81bd9f
--- /dev/null
+++ b/examples/peacekeeping/english/PeaceSpoken_Eng.gf
@@ -0,0 +1,8 @@
+--# -path=.:..:present:prelude
+
+concrete PeaceSpoken_Eng of PeaceSpoken = 
+  Peace_Eng ** {
+
+  flags startcat = PhraseSpoken ; 
+
+}
diff --git a/examples/peacekeeping/english/Peace_Eng.gf b/examples/peacekeeping/english/Peace_Eng.gf
index bb3c726ed..dff33298b 100644
--- a/examples/peacekeeping/english/Peace_Eng.gf
+++ b/examples/peacekeeping/english/Peace_Eng.gf
@@ -5,6 +5,6 @@ concrete Peace_Eng of Peace =
   PeaceLexExt_Eng, PeacePhrases_Eng
   ** {
 
-  flags startcat = Phr ; 
+  flags startcat = PhraseWritten ; 
 
 }