Merge branch 'master' into master

2018-11-29 16:47:13 +03:00
parent 342ddf6f4b 31e5411f20
commit 93cf7c9c08
153 changed files with 7454 additions and 194712 deletions
@@ -13,8 +13,10 @@ incomplete concrete AdverbBantu of Adverb =
      } ;

   PrepNP prep np = let agr = complAgr np.a
+
    in {s = prep.s!agr.n!agr.g ++ (np.s ! NCase Loc ) } ; 
       AdAdv = cc2 ;
+
    PositAdAAdj a = {s = a.s  !AAdj G1 Sg } ;