From 06593c5fb9f7da4f264b9973b4962f74ebae665f Mon Sep 17 00:00:00 2001
From: Laurette Marais <laurette.p@gmail.com>
Date: Thu, 12 May 2022 05:21:11 +0200
Subject: [PATCH] fixed relative longform

---
 src/zulu/ResZul.gf  | 24 ------------------------
 src/zulu/VerbZul.gf |  5 ++++-
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/zulu/ResZul.gf b/src/zulu/ResZul.gf
index 6bc277ad6..9cabe2fd3 100755
--- a/src/zulu/ResZul.gf
+++ b/src/zulu/ResZul.gf
@@ -642,30 +642,6 @@ resource ResZul = open Prelude,Predef,ParamX in {
       t = RelType
     } ;
 
-    -- enumAdj : Str -> { s : AForm => Str ; empty : Str ; t : AType } = \a ->
-    -- {
-    --   s = \\_ => a ;
-    --   -- b = case a of {
-    --   --   ("kh"|"th"|"sh"|"b"|"f"|"hl")+_ => True ;
-    --   --   ("m"|"n")+_ => True ;
-    --   --   _ => False
-    --   -- } ;
-    --   empty = [] ;
-    --   t = EnumType
-    -- } ;
-
-    -- relSuf : VForm -> Bool -> Str = \longform ->
-    -- case longform of {
-    --   True => pre { #vowel => [] ; #cons => [] ; "y" => [] ; _ => "yo" } ;
-    --   False => []
-    -- } ;
-
-    rel_yo : Str = pre {
-      #vowel => [] ;
-      #cons => [] ;
-      _ => BIND++"yo"
-    } ;
-
     rel_yo_2 : Str = BIND++"yo" ;
 
     relSuf : VForm -> Str = \vform -> case vform of {
diff --git a/src/zulu/VerbZul.gf b/src/zulu/VerbZul.gf
index 575ad9d8c..baaf28dc2 100755
--- a/src/zulu/VerbZul.gf
+++ b/src/zulu/VerbZul.gf
@@ -16,7 +16,10 @@ concrete VerbZul of Verb = CatZul ** open ResZul, Prelude, ParamX in {
           rc = relConc vform a v.r ; -- o-
           tp = tensePref vform v.r v.syl ; -- [] / zo- / zuku-
           r = v.s!(rform vform l) ; -- hamba
-          suf = relSuf vform -- [] / -yo
+          suf = case l of {
+            True => relSuf vform ;
+            False => []
+          } ;
         in rc ++ tp ++ r ++ suf
       } ;
       iadv, advs, comp = [] ;