From 4bc12bcde1747d521a9bb41f20bbd32999ef2a59 Mon Sep 17 00:00:00 2001
From: bringert <bringert@cs.chalmers.se>
Date: Fri, 21 Apr 2006 14:34:45 +0000
Subject: [PATCH] Peace keeping: added more lexicon words. Added this_NP and
 that_NP. Added some more examples.

---
 examples/peacekeeping/EXAMPLES                   | 9 ++++++++-
 examples/peacekeeping/PeaceLexCommon.gf          | 4 ++++
 examples/peacekeeping/PeaceLexCommonI.gf         | 4 ++++
 examples/peacekeeping/PeaceLexExt.gf             | 3 +++
 examples/peacekeeping/english/PeaceLexExt_Eng.gf | 8 ++++++--
 examples/peacekeeping/swedish/PeaceLexExt_Swe.gf | 6 +++++-
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/examples/peacekeeping/EXAMPLES b/examples/peacekeeping/EXAMPLES
index ad3b2c626..822e649eb 100644
--- a/examples/peacekeeping/EXAMPLES
+++ b/examples/peacekeeping/EXAMPLES
@@ -10,7 +10,7 @@ Who gives water to the children?
 Who is hungry?
 Where do you sleep?
 Where do you see the landmine?
-Where is the factory?
+Where are the weapons?
 
 The doctor sleeps.
 I see a small girl.
@@ -22,15 +22,20 @@ We give food to children.
 Are you cold?
 Landmines are dangerous.
 We are your friends.
+I am a police officer.
+This is a translation machine.
+Weapons aren't toys.
 These soldiers aren't your enemies.
 
 Walk!
+Breathe!
 Don't eat your friend!
 Drink cold water!
 Give your weapon to the soldier!
 Show me the landmine!
 Give water to the boy!
 Drop your weapon!
+Cooperate with us!
 
 == Should work ==
 
@@ -44,6 +49,8 @@ Drink! (drink is V2)
 
 Turn around!
 
+plural-/singular-only nouns: clothes, ...
+
 
 == English ==
 
diff --git a/examples/peacekeeping/PeaceLexCommon.gf b/examples/peacekeeping/PeaceLexCommon.gf
index 35bdf35b6..512d7ad81 100644
--- a/examples/peacekeeping/PeaceLexCommon.gf
+++ b/examples/peacekeeping/PeaceLexCommon.gf
@@ -15,6 +15,9 @@ abstract PeaceLexCommon = PeaceCat ** {
     whatPl_IP : IP ;
     whatSg_IP : IP ;
 
+    this_NP : NP ;
+    that_NP : NP ;
+
     -- Determiners
 
     aSg_Det : Det ;
@@ -74,6 +77,7 @@ abstract PeaceLexCommon = PeaceCat ** {
     woman_N : N;
 
     -- Verbs
+    breathe_V : V ;
     eat_V2 : V2 ;
     drink_V2 : V2 ;
     give_V3 : V3 ;
diff --git a/examples/peacekeeping/PeaceLexCommonI.gf b/examples/peacekeeping/PeaceLexCommonI.gf
index ba4347dbf..2b1cf29a4 100644
--- a/examples/peacekeeping/PeaceLexCommonI.gf
+++ b/examples/peacekeeping/PeaceLexCommonI.gf
@@ -15,6 +15,9 @@ incomplete concrete PeaceLexCommonI of PeaceLexCommon = PeaceCatI ** open Lang i
     whatPl_IP = whatPl_IP ;
     whatSg_IP = whatSg_IP ;
 
+    this_NP = this_NP ;
+    that_NP = that_NP ;
+
     -- Determiners
 
     aSg_Det =  DetSg (SgQuant IndefArt) NoOrd;
@@ -71,6 +74,7 @@ incomplete concrete PeaceLexCommonI of PeaceLexCommon = PeaceCatI ** open Lang i
     woman_N = woman_N ;
 
     -- Verbs
+    breathe_V = breathe_V ;
     drink_V2 = drink_V2 ;
     eat_V2 = eat_V2 ;
     give_V3 = give_V3;
diff --git a/examples/peacekeeping/PeaceLexExt.gf b/examples/peacekeeping/PeaceLexExt.gf
index 1cccc92c6..984440ef6 100644
--- a/examples/peacekeeping/PeaceLexExt.gf
+++ b/examples/peacekeeping/PeaceLexExt.gf
@@ -31,9 +31,12 @@ abstract PeaceLexExt = PeaceCat ** {
     police8officer_N : N ;
     skin_N : MassN ;
     soldier_N : N ;
+    toy_N : N ;
+    translation8machine_N : N ;
     weapon_N : N;
 
     -- Verbs
+    cooperate_V2 : V2 ;
     cough_V : V ;
     drop_V2 : V2 ;
     hurt_V : V ;
diff --git a/examples/peacekeeping/english/PeaceLexExt_Eng.gf b/examples/peacekeeping/english/PeaceLexExt_Eng.gf
index d5e2154b7..af4930fad 100644
--- a/examples/peacekeeping/english/PeaceLexExt_Eng.gf
+++ b/examples/peacekeeping/english/PeaceLexExt_Eng.gf
@@ -1,7 +1,8 @@
 --# -path=.:present:prelude
 
 concrete PeaceLexExt_Eng of PeaceLexExt = 
-  PeaceCat_Eng ** open ParadigmsEng, IrregEng in {
+  PeaceCat_Eng ** open ParadigmsEng, IrregEng, 
+                       LexiconEng, StructuralEng in {
 
   lin
 
@@ -31,12 +32,15 @@ concrete PeaceLexExt_Eng of PeaceLexExt =
     police8officer_N = compoundN "police" (regN "officer") ;
     skin_N = regN "skin" ;
     soldier_N = regN "soldier" ;
+    toy_N = regN "toy" ;
+    translation8machine_N = compoundN "translation" (regN "machine") ;
     weapon_N = regN "weapon";
 
     -- Verbs
+    cooperate_V2 = mkV2 (regV "cooperate") (mkPreposition "with") ;
     cough_V = regV "cough" ;
     drop_V2 = dirV2 (regDuplV "drop") ;
-    hurt_V = dirV2 hurt_V ;
+    hurt_V = hurt_V ;
     need_V2 = dirV2 (regV "need");
     own_V2 = dirV2 (regV "own") ;
     show_V3 = dirdirV3 (regV "show") ;
diff --git a/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf b/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf
index 065e1e3c0..7d2480d8c 100644
--- a/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf
+++ b/examples/peacekeeping/swedish/PeaceLexExt_Swe.gf
@@ -1,7 +1,8 @@
 --# -path=.:present:prelude
 
 concrete PeaceLexExt_Swe of PeaceLexExt = 
-  PeaceCat_Swe ** open ParadigmsSwe, IrregSwe, LexiconSwe in {
+  PeaceCat_Swe ** open ParadigmsSwe, IrregSwe, 
+                       LexiconSwe, StructuralSwe in {
 
   lin
 
@@ -31,9 +32,12 @@ concrete PeaceLexExt_Swe of PeaceLexExt =
     police8officer_N = mk2N "polis" "poliser" ;
     skin_N = mk2N "skinn" "skinn" ;
     soldier_N = mk2N "soldat" "soldater" ;
+    toy_N = regN "leksak" ;
+    translation8machine_N = mk2N "översättningsmaskin" "översättningsmaskiner";
     weapon_N = mkN "vapen" "vapnet" "vapen" "vapnen" ;
 
     -- Verbs
+    cooperate_V2 = mkV2 (regV "samarbetar") (mkPreposition "med") ;
     cough_V = regV "hostar" ;
     drop_V2 = dirV2 (regV "släpper") ;
     hurt_V = partV göra_V "ont" ; -- FIXME: "Gör ont ditt ben?"