(Ara) Add field for word order in VS

src/arabic/CatAra.gf

@@ -77,10 +77,11 @@ concrete CatAra of Cat = CommonX - [Utt]  ** open ResAra, Prelude, ParamX in {
 
 -- Open lexical classes, e.g. Lexicon
 
-    V, VS, VQ, VA = ResAra.Verb ; -- = {s : VForm => Str} ;
+    V, VQ, VA = ResAra.Verb ; -- = {s : VForm => Str} ;
     V2, V2A = ResAra.Verb2 ;
     VV = ResAra.Verb2 ** {sc : Preposition} ; -- c2 is for verb
     V2S, V2Q = ResAra.Verb2 ;
+    VS = ResAra.Verb ** {o : Order} ;
     V3 = ResAra.Verb3 ;
     V2V = ResAra.Verb3 ** {sc : Preposition} ; -- c3 is for verb, c2 is for dir.obj
 

src/arabic/ParadigmsAra.gf

@@ -723,8 +723,8 @@ resource ParadigmsAra = open
 
   dirdirV3 v = dirV3 v (casePrep acc) ;
 
-  mkVS  v = v ** {lock_VS = <>} ;
-  mkVQ  v = v ** {lock_VQ = <>} ;
+  mkVS v = lin VS (v ** {o = Subord}) ;
+  mkVQ v = lin VQ v ;
 
   regVV : V -> VV = \v -> lin VV v ** {c2 = mkPreposition "أَنْ" ; sc = noPrep} ;
   c2VV : V -> Str -> VV = \v,prep -> regVV v ** {c2 = mkPreposition prep ; sc = noPrep} ;

src/arabic/VerbAra.gf

@@ -51,7 +51,7 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in {
 
     -- : VS -> S -> VP ;  -- say that she runs
     ComplVS vs s = predV vs ** { -- IL
-      obj = emptyObj ** {s = s.s ! Subord} 
+      obj = emptyObj ** {s = s.s ! vs.o} 
       } ;
 
     -- : VQ -> QS -> VP ;  -- wonder who runs