From f634af931efe57840c9c2867968b15f67e432ef8 Mon Sep 17 00:00:00 2001
From: Laurette Marais <laurette.p@gmail.com>
Date: Wed, 20 Jul 2022 12:10:54 +0200
Subject: [PATCH] (zul) miscellaneous fixes

---
 src/zulu/ExtraExtZul.gf           | 11 +++++++++--
 src/zulu/ParadigmsZul.gf          |  1 +
 src/zulu/ResZul.gf                | 16 ++++++++--------
 src/zulu/abstract_ext/ExtraExt.gf |  1 +
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/zulu/ExtraExtZul.gf b/src/zulu/ExtraExtZul.gf
index 35e68a0c..d19824b8 100755
--- a/src/zulu/ExtraExtZul.gf
+++ b/src/zulu/ExtraExtZul.gf
@@ -160,12 +160,19 @@ concrete ExtraExtZul of ExtraExt =
 
     PossLocNP locn np = {
       empty = np.empty ;
-      s = \\n,nform => locn.s ;
-      mod = \\num => poss_concord!(C17)!Sg!np.i ++BIND++ (poss_NP np) ;
+      s = \\n,nform => locn.s ++ poss_concord!(C17)!n!np.i ++BIND++ (poss_NP np);
+      -- mod = \\num => poss_concord!(C17)!Sg!np.i ++BIND++ (poss_NP np) ;
       c = C17 ;
       emph = False
     } ;
 
+    PossNPLoc cn np = {
+      empty = np.empty ;
+      s = \\n,nform => cn.s!n!nform ++ poss_concord!cn.c!n!RC ++BIND++"s"++BIND++ (loc_NP np);
+      c = cn.c ;
+      emph = False
+    } ;
+
     InstrNPAdv np =
     let
       pref = instrPref!(initNP np.isPron np.agr)
diff --git a/src/zulu/ParadigmsZul.gf b/src/zulu/ParadigmsZul.gf
index 965f93ad..ede55915 100755
--- a/src/zulu/ParadigmsZul.gf
+++ b/src/zulu/ParadigmsZul.gf
@@ -77,6 +77,7 @@ oper
   } ;
 
   mkPN = overload {
+    mkPN : (John : Str) -> N  = \n -> lin N (regNoun n C1a_2a) ;   
     mkPN : (John : Str) -> ClassGender -> N  = \n,c -> lin N (regNoun n c) ;   -- "thing" nouns
     mkPN : (nyaka,onyakeni,eminyakeni : Str) -> ClassGender -> N = \n,ls,lp,c -> lin N (semiRegNoun n ls lp c) ;
     mkPN : (iso,amehlo,esweni,emehlweni : Str) -> ClassGender -> N = \ns,np,ls,lp,c -> lin N (mkNoun ns np ls lp c) ;
diff --git a/src/zulu/ResZul.gf b/src/zulu/ResZul.gf
index a221ef27..f41b7d53 100755
--- a/src/zulu/ResZul.gf
+++ b/src/zulu/ResZul.gf
@@ -960,7 +960,7 @@ resource ResZul = open Prelude,Predef,ParamX in {
         _+"wo" => (init root)+"eni" ;
         _+"o" => (init root)+"weni" ;
         _+"u" => (init root)+"wini" ;
-        _ => (init root)+"ini"
+        _ => root+"ini"
       } ;
 
     drop_init_vowel : Str -> Str = \s ->
@@ -1154,16 +1154,16 @@ resource ResZul = open Prelude,Predef,ParamX in {
       loc_NP : {
         empty : Str ;
         s : NForm => Str ;
-        mod : Str ;
-        dem : Str ;
-        predet_pre : Str ;
-        predet_post : Str ;
+        -- mod : Str ;
+        -- dem : Str ;
+        -- predet_pre : Str ;
+        -- predet_post : Str ;
         agr : Agr ;
         proDrop : Bool ;
         isPron : Bool ;
         -- reqLocS : Bool ;
-        qdef : QuantDef
-      } -> Str = \np -> np.s!NLoc ++ np.dem ++ np.mod ++ np.predet_pre ++ np.predet_post ;
+        -- qdef : QuantDef
+      } -> Str = \np -> np.s!NLoc ;
 
       poss_NP : {
         empty : Str ;
@@ -1325,7 +1325,7 @@ resource ResZul = open Prelude,Predef,ParamX in {
 
     -- ADJECTIVE ANTECEDENT AGREEMENT MORPHEME --
 
-    relAdjPrefLookup : Agr => Str = 
+    relAdjPrefLookup : Agr => Str =
       table {
         Third C1_2 Sg => "m" ;
         Third C1_2 Pl => "" ;
diff --git a/src/zulu/abstract_ext/ExtraExt.gf b/src/zulu/abstract_ext/ExtraExt.gf
index 3ae9381d..6bf5c6ab 100755
--- a/src/zulu/abstract_ext/ExtraExt.gf
+++ b/src/zulu/abstract_ext/ExtraExt.gf
@@ -28,6 +28,7 @@ abstract ExtraExt =
     -- RelV : CN -> V -> Temp -> Pol -> CN ; -- lights that flash
 
     PossLocNP : LocN -> NP -> CN ;
+    PossNPLoc : CN -> NP -> CN ; -- zasepulazini
 
     InstrNPAdv : NP -> Adv ; -- ngokuhlinzwa
     InstrAdvNPAdv : Adv -> NP -> Adv ; -- cishe ngehora