diff --git a/src/arabic/AdjectiveAra.gf b/src/arabic/AdjectiveAra.gf index 223aafbd4..0d2f1b1f0 100644 --- a/src/arabic/AdjectiveAra.gf +++ b/src/arabic/AdjectiveAra.gf @@ -3,7 +3,6 @@ concrete AdjectiveAra of Adjective = CatAra ** open ResAra, Prelude in { flags coding = utf8 ; lin - PositA a = { s = \\h,g,n,d,c => case h of { Hum => a.s ! APosit g n d c; @@ -33,6 +32,9 @@ concrete AdjectiveAra of Adjective = CatAra ** open ResAra, Prelude in { s = \\sp,g,n,st,c => ap.s ! sp ! g ! n ! st ! c ++ ada.s } ; + AdvAP, + SentAP = \ap,ss -> AdAP ss ap ; + UseA2 = PositA ; UseComparA a = { diff --git a/src/arabic/ConjunctionAra.gf b/src/arabic/ConjunctionAra.gf index 025a68d43..dc330d1a5 100644 --- a/src/arabic/ConjunctionAra.gf +++ b/src/arabic/ConjunctionAra.gf @@ -19,21 +19,15 @@ lin ConsS = consrTable Order comma ; ConjS = conjunctDistrTable Order ; - BaseNP x y = twoTable Case x y ** { - a = conjAgr x.a y.a ; - empty = [] ; - isHeavy = True ; + BaseNP x y = emptyNP ** twoTable Case x y ** { + a = conjAgr x.a y.a } ; - ConsNP xs x = consrTable Case comma xs x ** { - a = conjAgr xs.a x.a ; - empty = [] ; - isHeavy = True ; + ConsNP xs x = emptyNP ** consrTable Case comma xs x ** { + a = conjAgr xs.a x.a } ; - ConjNP conj ss = conjunctDistrTable Case conj ss ** { + ConjNP conj ss = emptyNP ** conjunctDistrTable Case conj ss ** { a = let gn = pgn2gn ss.a.pgn in - {pgn = Per3 gn.g (conjNumber conj.n gn.n) ; isPron = False} ; - empty = [] ; - isHeavy = True ; + {pgn = Per3 gn.g (conjNumber conj.n gn.n) ; isPron = False} } ; BaseAP = twoTable5 Species Gender Number State Case ;