From f0ae2cfdb2189d6e6254714f22ed122bf79d29f2 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 11 Jan 2019 15:46:05 +0100 Subject: [PATCH 1/2] (Ara) add missing diacritic to with_Prep --- src/arabic/StructuralAra.gf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arabic/StructuralAra.gf b/src/arabic/StructuralAra.gf index 671b02e4..09ed0aff 100644 --- a/src/arabic/StructuralAra.gf +++ b/src/arabic/StructuralAra.gf @@ -117,7 +117,7 @@ concrete StructuralAra of Structural = CatAra ** whoPl_IP = mkIP "مَنْ" "مَنْ" Pl ; why_IAdv = ss "لِمَاذَا" ; without_Prep = mkPrep "بِدُونِ" ; - with_Prep = mkPrep "مَع" ; + with_Prep = mkPrep "مَعَ" ; yes_Utt = {s = \\_ => "نَعَم"} ; youSg_Pron = youSgMasc_Pron ; youPl_Pron = youPlMasc_Pron ; From 9d1e9b1bf19f8acd4eab268b2b9109d142fcca1e Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 11 Jan 2019 15:46:38 +0100 Subject: [PATCH 2/2] (Ara) include VPSlash's c2 in ReflVP --- src/arabic/VerbAra.gf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/arabic/VerbAra.gf b/src/arabic/VerbAra.gf index f72e2370..abb60294 100644 --- a/src/arabic/VerbAra.gf +++ b/src/arabic/VerbAra.gf @@ -102,12 +102,13 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in { -- : VPSlash -> VP ; -- love himself ReflVP vps = vps ** { - s = \\pgn,vf => vps.s ! pgn ! vf ++ reflPron Acc pgn + s = \\pgn,vf => vps.s ! pgn ! vf + ++ vps.c2.s ++ bindIf vps.c2.binds + ++ reflPron vps.c2.c pgn ; + c2 = noPrep } ; PassV2 = passPredV ; --- --- UseVS, UseVQ = \vv -> {s = vv.s ; c2 = [] ; isRefl = vv.isRefl} ; -- no CompAP ap = {s = \\agr,c => ap.s ! Hum ! agr.g ! agr.n ! Indef ! c ; --FIXME obj = emptyObj ; isNP = False} ;