From c2e0c709a764cf1bd10425943a80210dcb435c12 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Thu, 3 Oct 2019 17:59:00 +0200
Subject: [PATCH] (Som) Update FocusObj and UseSlash to new type of SSlash

---
 src/somali/ExtendSom.gf   | 6 +-----
 src/somali/SentenceSom.gf | 6 +++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/somali/ExtendSom.gf b/src/somali/ExtendSom.gf
index fdef3793..dd8266f7 100644
--- a/src/somali/ExtendSom.gf
+++ b/src/somali/ExtendSom.gf
@@ -11,11 +11,7 @@ lin
   GenModNP num np cn = DetCN (DetQuant IndefArt num) (genModCN cn np) ;
 
    -- : NP  -> SSlash  -> Utt ;   -- her I love -- Saeed p. 189-
-  FocusObj np sslash = -- FIXME: preposition disappears in negative sentences
-    let ss = sslash.s ! False ;
-        ssSub  = sslash.s ! True ; -- the negative particle is the same as subordinate, but verb forms come from main clause
-        obj = objpron np ! Abs ;
-     in {s = ssSub.beforeSTM ++ "waxa" ++ ssSub.stm ++ ss.afterSTM ++ obj} ;
+  FocusObj np sslash = {s = sslash.s ! False ++ objpron np ! Abs} ;
 
   -- FocusAdv : Adv -> S       -> Utt ;   -- today I will sleep
   -- FocusAdV : AdV -> S       -> Utt ;   -- never will I sleep
diff --git a/src/somali/SentenceSom.gf b/src/somali/SentenceSom.gf
index 27167f21..3460e003 100644
--- a/src/somali/SentenceSom.gf
+++ b/src/somali/SentenceSom.gf
@@ -28,7 +28,11 @@ lin
 -}
   --  : Temp -> Pol -> ClSlash -> SSlash ; -- (that) she had not seen
   UseSlash t p cls = {
-    s = \\isSubord => let cl = cl2sentence isSubord cls in
+    s = \\isSubord =>
+        let cls' : ClSlash = cls ** {
+                    stm = modSTM "waxa" "waxa aan" cls.stm -- Saeed p. 195
+                  } ;
+            cl : Clause = cl2sentence isSubord cls' in
         t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p
     } ;