diff --git a/src/arabic/NounAra.gf b/src/arabic/NounAra.gf index 27edb0d4..55e5f294 100644 --- a/src/arabic/NounAra.gf +++ b/src/arabic/NounAra.gf @@ -168,7 +168,6 @@ lin a = {pgn = Per3 cn.g Sg ; isPron = False} ; empty = []} ; - UseN, UseN2 = useN ; Use2N3 n3 = n3 ; diff --git a/src/arabic/ResAra.gf b/src/arabic/ResAra.gf index 08c398bb..bbfc259e 100644 --- a/src/arabic/ResAra.gf +++ b/src/arabic/ResAra.gf @@ -162,7 +162,7 @@ resource ResAra = PatternsAra ** open Prelude, Predef, OrthoAra, ParamX in { AP : Type = {s : Species => Gender => NTable } ; uttAP : AP -> (Gender => Str) ; - uttAP ap = \\g => ap.s ! NoHum ! g ! Sg ! Def ! Nom ; ----IL + uttAP ap = \\g => ap.s ! NoHum ! g ! Sg ! Indef ! Bare ; ----IL CN : Type = Noun ** {np : Case => Str}; @@ -184,7 +184,7 @@ resource ResAra = PatternsAra ** open Prelude, Predef, OrthoAra, ParamX in { } ; uttNum : NumOrdCard -> (Gender => Str) ; - uttNum n = \\g => n.s ! g ! Def ! Nom ; ----IL + uttNum n = \\g => n.s ! g ! Def ! Bare ; ----IL param VForm = @@ -1572,9 +1572,9 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf -> { s = \\pgn,vf => let gn = pgn2gn pgn in case vf of { - VPPerf => v.s ! (VPerf Act pgn); - VPImpf m => v.s ! (VImpf m Act pgn); - VPImp => v.s ! (VImp gn.g gn.n) + VPPerf => v.s ! VPerf Act pgn ; + VPImpf m => v.s ! VImpf m Act pgn ; + VPImp => v.s ! VImp gn.g gn.n }; sc = noPrep ; obj = emptyObj ; @@ -1587,8 +1587,8 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf -> let actVP = predV v in actVP ** { s = \\pgn,vf => case vf of { - VPPerf => v.s ! (VPerf Pas pgn) ; - VPImpf m => v.s ! (VImpf m Pas pgn) ; + VPPerf => v.s ! VPerf Pas pgn ; + VPImpf m => v.s ! VImpf m Pas pgn ; _ => actVP.s ! pgn ! vf } }; diff --git a/src/arabic/StructuralAra.gf b/src/arabic/StructuralAra.gf index ee7b3157..7dc0d322 100644 --- a/src/arabic/StructuralAra.gf +++ b/src/arabic/StructuralAra.gf @@ -64,7 +64,7 @@ concrete StructuralAra of Structural = CatAra ** no_Utt = {s = \\_ => "لا"} ; on_Prep = mkPrep "عَلَى" ; only_Predet = mkPredet "فَقَط" False; --- or_Conj = ss "ْر" ** {n = Sg} ; + or_Conj = ss "أَوْ" ** {n = Sg} ; -- otherwise_PConj = ss "ْتهروِسي" ; part_Prep = mkPrep "مِنَ" ; -- please_Voc = ss "ةلَسي" ;