(zul) change to Quant lincat

src/zulu/CatZul.gf

@@ -121,7 +121,7 @@ concrete CatZul of Cat = CommonX - [Temp,Tense,Adv,IAdv] **
     Num  = { s: Str ; n : Number } ;
 --     Card = {s,sp : Bool => Case => Str ; n : Number} ;
 --     ACard = {s : Case => Str ; n : Number} ;
-    Quant = { s : Str ; dist : Distance } ;
+    Quant = { s : Bool => Agr => Str ; dist : Distance } ;
 
 -- Numeral
 

src/zulu/ExtraExtZul.gf

@@ -506,7 +506,13 @@ concrete ExtraExtZul of ExtraExt =
     it15_Pron = mkPron (Third C15 Sg) ;
     it17_Pron = mkPron (Third C17 Sg) ;
 
-    yonder_Quant = { s = [] ; dist = Dem3 } ;
+    yonder_Quant = {
+      s = \\b,a => case b of {
+        False => dem_pron!Dem3!a ;
+        True => dem_pron!Dem3!a ++ dem_pron_na!Dem3!a
+      } ;
+      dist = Dem3
+    } ;
 
     at_which_IAdv np = {
       s = "nga" ++BIND++ atwhichPhiPref!np.agr ++BIND++ "phi" ++ (np.s!NFull) ;

src/zulu/NounExtZul.gf

@@ -19,15 +19,15 @@ concrete NounExtZul of NounExt = CatZul,CatExtZul ** open ResZul, Prelude, Param
     } ;
 
     DemPostdet q = {
-      s = \\a => dem_pron!q.dist!a ++ dem_pron_na!q.dist!a ++ q.s
+      s = \\a => q.s!True!a
     } ;
 
     QuantDemPostdet q d = {
-      s = \\a => q.s!a  ++ dem_pron!d.dist!a ++ dem_pron_na!d.dist!a ++ d.s
+      s = \\a => q.s!a ++ d.s!True!a
     } ;
 
     DemQuantPostdet d q = {
-      s = \\a => dem_pron!d.dist!a ++ dem_pron_na!d.dist!a ++ q.s!a ++ d.s
+      s = \\a => d.s!True!a ++ q.s!a
     } ;
 
     DetNum n = n ; -- ** { spec = Spec } ;
@@ -93,12 +93,12 @@ concrete NounExtZul of NounExt = CatZul,CatExtZul ** open ResZul, Prelude, Param
     } ;
 
     DemPredet q = {
-      s = \\a => dem_pron!q.dist!a ++ q.s ;
+      s = \\a => q.s!False!a ;
       hasDem = True
     } ;
 
     QuantDemPredet q d = {
-      s = \\a => q.s!a ++ dem_pron!d.dist!a ++ d.s ;
+      s = \\a => q.s!a ++ d.s!False!a ;
       hasDem = True
     } ;
 

src/zulu/StructuralZul.gf

@@ -129,8 +129,21 @@ concrete StructuralZul of Structural = CatZul **
     --   youPol_Pron = mkPron "you" "you" "your" "yours" singular P2 human ;
 
   -- Quant (we use this category for demonstratives only)
-    that_Quant = { s = [] ; dist = Dem2 } ;
+    that_Quant = {
-    this_Quant = { s = [] ; dist = Dem1 } ;
+      s = \\b,a => case b of {
+        False => dem_pron!Dem2!a ;
+        True => dem_pron_na!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
+      } ;
+      dist = Dem1
+    } ;
   --   no_Quant = mkQuant "no" "no" "none" "none" ;
 
   -- Subj