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, 17 insertions, 9 deletions

diff --git a/examples/peacekeeping/finnish/PeaceCat_Fin.gf b/examples/peacekeeping/finnish/PeaceCat_Fin.gf
index 78da43ba7..b5e73aaf1 100644
--- a/examples/peacekeeping/finnish/PeaceCat_Fin.gf
+++ b/examples/peacekeeping/finnish/PeaceCat_Fin.gf
@@ -1,3 +1,3 @@
 --# -path=.:present:prelude
 
-concrete PeaceCat_Fin of PeaceCat = CatFin ** PeaceCatI with (Cat = CatFin);
+concrete PeaceCat_Fin of PeaceCat = CatFin ** PeaceCatI with (Lang = LangFin);
diff --git a/examples/peacekeeping/finnish/PeacePhrases_Fin.gf b/examples/peacekeeping/finnish/PeacePhrases_Fin.gf
index ee8f5ea61..bd528c36b 100644
--- a/examples/peacekeeping/finnish/PeacePhrases_Fin.gf
+++ b/examples/peacekeeping/finnish/PeacePhrases_Fin.gf
@@ -1,14 +1,14 @@
 --# -path=.:..:present:prelude
 
 concrete PeacePhrases_Fin of PeacePhrases = 
-  PeaceCat_Fin ** open LangFin, ParadigmsFin in {
+  PeaceCat_Fin ** open LangFin, ParadigmsFin, PeaceRes in {
 
 lin
-    Hello = { s = "terve" ++ "." } ;
-    GoodMorning = { s = ["hyvää huomenta"] ++ "." } ;
-    GoodEvening = { s = ["hyvää iltaa"] ++ "." } ;
-    WhatIsNamePron p = PhrUtt NoPConj (UttQS (UseQCl TPres ASimul PPos 
+    Hello = stop "terve" ;
+    GoodMorning = stop ["hyvää huomenta"] ;
+    GoodEvening = stop ["hyvää iltaa"] ;
+    WhatIsNamePron p = quest (PhrUtt NoPConj (UttQS (UseQCl TPres ASimul PPos 
       (QuestVP whatSg_IP (UseComp (CompNP (DetCN (DetSg (SgQuant (PossPron p)) NoOrd) 
-      (UseN (reg2N "nimi" "nimiä")))))))) NoVoc ;
+      (UseN (reg2N "nimi" "nimiä")))))))) NoVoc).s ;
 
 }
\ No newline at end of file
diff --git a/examples/peacekeeping/finnish/PeaceSpoken_Fin.gf b/examples/peacekeeping/finnish/PeaceSpoken_Fin.gf
new file mode 100644
index 000000000..98a23732b
--- /dev/null
+++ b/examples/peacekeeping/finnish/PeaceSpoken_Fin.gf
@@ -0,0 +1,8 @@
+--# -path=.:..:present:prelude
+
+concrete PeaceSpoken_Fin of PeaceSpoken = 
+  Peace_Fin ** {
+
+  flags startcat = PhraseSpoken ; 
+
+}
diff --git a/examples/peacekeeping/finnish/Peace_Fin.gf b/examples/peacekeeping/finnish/Peace_Fin.gf
index 0be7f4e96..f8e19d2b6 100644
--- a/examples/peacekeeping/finnish/Peace_Fin.gf
+++ b/examples/peacekeeping/finnish/Peace_Fin.gf
@@ -5,6 +5,6 @@ concrete Peace_Fin of Peace =
   PeaceLexExt_Fin, PeacePhrases_Fin
   ** {
 
-  flags startcat = Phr ; 
-
+  flags startcat = PhraseWritten ; 
+	optimize = all_subs ;
 }