From 4c03a40aef6996c602f3bc7d70b32e40d41e2370 Mon Sep 17 00:00:00 2001
From: Laurette Marais <laurette.p@gmail.com>
Date: Wed, 1 Jun 2022 13:23:51 +0200
Subject: [PATCH] (zul) fixed demonstratives

---
 src/zulu/ExtraExtZul.gf   |  5 +----
 src/zulu/ResZul.gf        | 26 +++++++++++---------------
 src/zulu/StructuralZul.gf |  7 ++-----
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/zulu/ExtraExtZul.gf b/src/zulu/ExtraExtZul.gf
index 3360edb30..35e68a0c4 100755
--- a/src/zulu/ExtraExtZul.gf
+++ b/src/zulu/ExtraExtZul.gf
@@ -507,10 +507,7 @@ concrete ExtraExtZul of ExtraExt =
     it17_Pron = mkPron (Third C17 Sg) ;
 
     yonder_Quant = {
-      s = \\b,a => case b of {
-        False => dem_pron!Dem3!a ;
-        True => dem_pron!Dem3!a ++ dem_pron_na!Dem3!a
-      } ;
+      s = \\b,a => dem_pron!Dem3!a ;
       dist = Dem3
     } ;
 
diff --git a/src/zulu/ResZul.gf b/src/zulu/ResZul.gf
index ce43caa1e..8b33454e8 100755
--- a/src/zulu/ResZul.gf
+++ b/src/zulu/ResZul.gf
@@ -216,8 +216,7 @@ resource ResZul = open Prelude,Predef,ParamX in {
       }
     } ;
 
-    dem_pron_na : Distance => Agr => Str = table {
-      Dem1 => table {
+    dem_pron_na : Agr => Str = table {
         First Sg => BIND++"na" ;
         First Pl => [] ;
         Second Sg => BIND++"na" ;
@@ -241,17 +240,6 @@ resource ResZul = open Prelude,Predef,ParamX in {
         Third C14 _ => [] ;
         Third C15 _ => [] ;
         Third C17 _ => []
-      } ;
-      Dem2 => table {
-        First _ => [] ;
-        Second _ => [] ;
-        Third _ _ => []
-      } ;
-      Dem3 => table {
-        First _ => [] ;
-        Second _ => [] ;
-        Third _ _ => []
-      }
     } ;
 
     -----------
@@ -976,10 +964,14 @@ resource ResZul = open Prelude,Predef,ParamX in {
       case <cg,n> of
       {
         <C1_2,Sg> => case root of {
+          #vowel+_ => "um"+root ;
           _+#cons+#vowel+#cons+_+#vowel+_ => "um"+root ;
           _ => "umu"+root
         } ; -- umu for single syllables, um for the rest
-        <C1_2,Pl> => "aba"+root ; -- abe for tribes or guilds
+        <C1_2,Pl> => case root of {
+          #vowel+_ => "ab"+root ;
+          _ => "aba"+root  -- abe for tribes or guilds
+        } ;
         <C1a_2a,Sg> => "u"+root ;
         <C1a_2a,Pl> => "o"+root ;
         <C3_4,Sg> => case root of {
@@ -1024,10 +1016,14 @@ resource ResZul = open Prelude,Predef,ParamX in {
         case <cg,n> of
         {
           <C1_2,Sg> => case root of {
+            #vowel+_ => "kum"+root ;
             _+#cons+#vowel+#cons+_+#vowel+_ => "kum"+root ;
             _ => "kumu"+root
           } ; -- umu for single syllables, um for the rest
-          <C1_2,Pl> => "kuba"+root ; -- abe for tribes or guilds
+          <C1_2,Pl> => case root of {
+            #vowel+_ => "kub"+root ;
+            _ => "kuba"+root -- abe for tribes or guilds
+          } ;
           <C1a_2a,Sg> => "ku"+root ;
           <C1a_2a,Pl> => "ko"+root ;
           <C3_4,Sg> => case root of {
diff --git a/src/zulu/StructuralZul.gf b/src/zulu/StructuralZul.gf
index 690ff58d4..9d7674197 100755
--- a/src/zulu/StructuralZul.gf
+++ b/src/zulu/StructuralZul.gf
@@ -130,17 +130,14 @@ concrete StructuralZul of Structural = CatZul **
 
   -- Quant (we use this category for demonstratives only)
     that_Quant = {
-      s = \\b,a => case b of {
-        False => dem_pron!Dem2!a ;
-        True => dem_pron_na!Dem2!a
-      } ;
+      s = \\b,a => dem_pron!Dem2!a ;
       dist = Dem2
     } ;
     -- this_Quant = { s = [] ; dist = Dem1 } ;
     this_Quant = {
       s = \\b,a => case b of {
         False => dem_pron!Dem1!a ;
-        True => dem_pron_na!Dem1!a
+        True => dem_pron!Dem1!a ++ dem_pron_na!a
       } ;
       dist = Dem1
     } ;