(Som) Restructure relatives and questions

src/somali/SentenceSom.gf

@@ -15,7 +15,7 @@ lin
 
 --2 Clauses missing object noun phrases
   -- : NP -> VPSlash -> ClSlash ;
-  SlashVP = predVPSlash ;
+  SlashVP = predVP ;
 {-
   -- : ClSlash -> Adv -> ClSlash ;     -- (whom) he sees today
   AdvSlash cls adv = cls ** insertAdv adv cls ;
@@ -27,9 +27,9 @@ lin
 
 -}
   --  : Temp -> Pol -> ClSlash -> SSlash ; -- (that) she had not seen
-  UseSlash t p cls = {s = \\b =>
-    let sent = cls.s ! b ! t.t ! t.a ! p.p in
-    sent ** {beforeSTM = t.s ++ p.s ++ sent.beforeSTM}
+  UseSlash t p cls = {
+    s = \\isSubord => let cl = cl2sentence isSubord cls in
+        t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p 
     } ;
 
 --2 Imperatives
@@ -52,10 +52,9 @@ lin
 
 -}
   -- : Temp -> Pol -> Cl -> S ;
-  UseCl t p cl = {s = \\b =>
-    let cltyp = if_then_else ClType b Subord Statement ;
-        sent = cl.s ! cltyp ! t.t ! t.a ! p.p in
-    sent ** {beforeSTM = t.s ++ p.s ++ sent.beforeSTM} ;
+  UseCl t p cls = {
+    s = \\isSubord => let cl = cl2sentence isSubord cls in
+        t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p 
     } ;
 
   -- : Temp -> Pol -> QCl -> QS ;
@@ -77,7 +76,8 @@ lin
 
 oper
 
-  advS : Adverb -> S -> S = \a,s -> s ** {s = \\b => let ss = s.s ! b in
-    ss ** {beforeSTM = linAdv a ++ ss.beforeSTM}} ;
+  advS : Adverb -> S -> S = \a,sent -> sent ** {
+    s = \\b => sent.s ! b ++ linAdv a
+    } ;
 
 }