From 7927fdae85bcbf4bc9d7c78a78a05db17471b327 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Wed, 19 Aug 2020 15:16:58 +0200
Subject: [PATCH] (May) New lexicon and V3s

---
 src/malay/LexiconMay.gf    | 14 +++++++-------
 src/malay/ParadigmsMay.gf  | 18 +++++++++++-------
 src/malay/StructuralMay.gf |  4 ++--
 src/malay/VerbMay.gf       | 11 ++++++++---
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/malay/LexiconMay.gf b/src/malay/LexiconMay.gf
index 52abf010..253091b5 100644
--- a/src/malay/LexiconMay.gf
+++ b/src/malay/LexiconMay.gf
@@ -52,14 +52,14 @@ lin book_N = mkN "buku" ;
 -- lin brown_A = mkA "" ;
 -- lin burn_V = mkV "" ;
 -- lin butter_N = mkN "" ;
--- lin buy_V2 = mkV2 "" ;
+lin buy_V2 = mkV2 "beli" ;
 
 ----
 -- C
 
 -- lin camera_N = mkN "" ;
 -- lin cap_N = mkN "" ;
--- lin car_N = mkN "" ;
+lin car_N = mkN "kereta" ;
 -- lin carpet_N = mkN "" ;
 lin cat_N = mkN "kucing" ;
 -- lin ceiling_N = mkN "" ;
@@ -74,7 +74,7 @@ lin cat_N = mkN "kucing" ;
 -- lin cloud_N = mkN "" ;
 -- lin coat_N = mkN "" ;
 -- lin cold_A = mkA "" ;
--- lin come_V = mkV "" ;
+lin come_V = mkV "datang" ;
 -- lin computer_N = mkN "" ;
 -- lin correct_A = mkA "" ;
 -- lin count_V2 = mkV2 "" ;
@@ -118,7 +118,7 @@ lin drink_V2 = mkV2 "minum" ;
 -- lin fall_V = mkV "" ;
 -- lin far_Adv = mkA "" ;
 -- lin fat_N = mkN "" ;
--- lin father_N2 = mkN2 "" ;
+lin father_N2 = mkN2 "bapa" ;
 -- lin fear_V2 = mkV2 "" ;
 -- lin fear_VS = mkVS "" ;
 -- lin feather_N = mkN "" ;
@@ -148,7 +148,7 @@ lin drink_V2 = mkV2 "minum" ;
 
 -- lin garden_N = mkN "" ;
 -- lin girl_N = mkN "" ;
--- lin give_V3 = mkV3 "" ;
+lin give_V3 = mkV3 (mkV "beri" Meng) ;
 -- lin glove_N = mkN "" ;
 lin go_V = mkV "pergi" ;
 -- lin gold_N = mkN "" ;
@@ -308,7 +308,7 @@ lin person_N = mkN "orang" ;
 -- lin see_V2 = mkV2 "" ;
 -- lin seed_N = mkN "" ;
 -- lin seek_V2 = mkV2 "" ;
--- lin sell_V3 = mkV3 "" ;
+lin sell_V3 = mkV3 (mkV "jual" Meng) ;
 -- lin send_V3 = mkV3 "" ;
 -- lin sew_V = mkV "" ;
 -- lin sharp_A = mkA "" ;
@@ -390,7 +390,7 @@ lin teach_V2 = mkV2 "ajar" ;
 -- W - Y
 
 -- lin wait_V2 = mkV2 "" ;
-lin walk_V = mkV "jalan" Ber ;
+lin walk_V = mkV "jalan" ;
 -- lin war_N = mkN "" ;
 -- lin warm_A = mkA "" ;
 -- lin wash_V2 = mkV2 "" ;
diff --git a/src/malay/ParadigmsMay.gf b/src/malay/ParadigmsMay.gf
index 73338494..893b456d 100644
--- a/src/malay/ParadigmsMay.gf
+++ b/src/malay/ParadigmsMay.gf
@@ -38,8 +38,10 @@ oper
     mkV2 : V -> Prep  -> V2 ;   -- V and Prep
     } ;
 
-  -- mkV3 : overload {
-  --   } ;
+  mkV3 : overload {
+    mkV3 : V -> V3 ; -- No prepositions
+    mkV3 : V -> Prep -> Prep -> V3 ; -- Prepositions for direct and indirect objects given
+    } ;
 
   -- mkVV : overload {
   --  } ;
@@ -102,7 +104,7 @@ oper
     } ;
 
   mkV = overload {
-    mkV : Str           -> V = \v   -> lin V (mkVerb v Meng) ;
+    mkV : Str           -> V = \v   -> lin V (mkVerb v Ber) ;
     mkV : Str -> Prefix -> V = \v,p -> lin V (mkVerb v p)
   } ;
 
@@ -110,10 +112,12 @@ oper
     mkV2 : Str       -> V2 = \v2  -> lin V2 ((mkVerb v2 Meng) ** {c2 = emptyPrep}) ;
     mkV2 : V -> Prep -> V2 = \v,p -> lin V2 (v ** {c2 = p})
     } ;
-  --
-  -- mkV3 = overload {
-  --   } ;
-  --
+
+  mkV3 = overload {
+    mkV3 : V -> V3 = \v -> lin V3 (v ** {c2,c3 = emptyPrep}) ;
+    mkV3 : V -> (p,q : Prep) -> V3 = \v,p,q -> lin V3 (v ** {c2 = p ; c3 = q})
+    } ;
+
   -- mkVV = overload {
   --  } ;
 
diff --git a/src/malay/StructuralMay.gf b/src/malay/StructuralMay.gf
index 9aa9243c..f22ab672 100644
--- a/src/malay/StructuralMay.gf
+++ b/src/malay/StructuralMay.gf
@@ -96,8 +96,8 @@ oper
 -- lin before_Prep = mkPrep "" ;
 -- lin behind_Prep = mkPrep ""  ;
 -- lin between_Prep = = mkPrep "" ;
--- lin by8agent_Prep = mkPrep ;
--- lin by8means_Prep = mkPrep ;
+lin by8agent_Prep = mkPrep "oleh" ; -- for pronoun agent, see Mintz p. 170, 5.4.1
+lin by8means_Prep = mkPrep "dengan" ;
 -- lin during_Prep = mkPrep ;
 -- lin except_Prep = mkPrep ;
 -- lin for_Prep = mkPrep ;
diff --git a/src/malay/VerbMay.gf b/src/malay/VerbMay.gf
index 08d4b929..d0456df4 100644
--- a/src/malay/VerbMay.gf
+++ b/src/malay/VerbMay.gf
@@ -38,11 +38,16 @@ lin
 
   -- : V2 -> VPSlash
   SlashV2a v2 = v2 ;
-{-
+
   -- : V3 -> NP -> VPSlash ; -- give it (to her)
+  Slash2V3 v3 dobj = {
+    s = \\vf => v3.s ! vf ++ v3.c2.s ++ dobj.s ;
+    c2 = v3.c3 -- Now the VPSlash is missing only the indirect object
+    } ;
+
+{-
   -- : V3 -> NP -> VPSlash ; -- give (it) to her
-  Slash2V3,
-  Slash3V3 = \v3 -> insertComp (useVc3 v3) ;
+  Slash3V3 v3 iobj =
 
   -- : V2S -> S  -> VPSlash ;  -- answer (to him) that it is good
   SlashV2S v2s s =