diff --git a/lib/src/bulgarian/ExtraBul.gf b/lib/src/bulgarian/ExtraBul.gf index d76dcd1c9..03be3a653 100644 --- a/lib/src/bulgarian/ExtraBul.gf +++ b/lib/src/bulgarian/ExtraBul.gf @@ -109,4 +109,9 @@ concrete ExtraBul of ExtraBulAbs = CatBul ** PassVPSlash vp = insertObj (\\a => vp.s ! Perf ! VPassive (aform a.gn Indef (RObj Acc)) ++ vp.compl1 ! a ++ vp.compl2 ! a) Pos (predV verbBe) ; + PassAgentVPSlash vp np = ---- AR 9/4/2014: to be verified + insertObj (\\_ => "קנוח" ++ np.s ! RObj Acc) Pos + (insertObj (\\a => vp.s ! Perf ! VPassive (aform a.gn Indef (RObj Acc)) ++ + vp.compl1 ! a ++ vp.compl2 ! a) Pos (predV verbBe)) ; + } diff --git a/lib/src/catalan/ExtraRomanceCat.gf b/lib/src/catalan/ExtraRomanceCat.gf index f74a467fc..cb2a69d97 100644 --- a/lib/src/catalan/ExtraRomanceCat.gf +++ b/lib/src/catalan/ExtraRomanceCat.gf @@ -1,2 +1,2 @@ concrete ExtraRomanceCat of ExtraRomanceAbs = CatCat ** ExtraRomance with - (ResRomance = ResCat) ; + (ResRomance = ResCat), (Grammar = GrammarCat) ; diff --git a/lib/src/french/ExtraFre.gf b/lib/src/french/ExtraFre.gf index e9b4df6b6..b86d99f6b 100644 --- a/lib/src/french/ExtraFre.gf +++ b/lib/src/french/ExtraFre.gf @@ -77,8 +77,8 @@ concrete ExtraFre of ExtraFreAbs = ExtraRomanceFre ** ExistsNP np = mkClause "il" True False np.a (insertComplement (\\_ => (np.s ! Nom).ton) (predV (regV "exister"))) ; - - PassAgentVPSlash vps np = passVPSlash - vps ("par" ++ (np.s ! Acc).ton) ; +--- in ExtraRomance +-- PassAgentVPSlash vps np = passVPSlash +-- vps ("par" ++ (np.s ! Acc).ton) ; } diff --git a/lib/src/french/ExtraRomanceFre.gf b/lib/src/french/ExtraRomanceFre.gf index 763e64bf9..0d6574618 100644 --- a/lib/src/french/ExtraRomanceFre.gf +++ b/lib/src/french/ExtraRomanceFre.gf @@ -1,2 +1,2 @@ concrete ExtraRomanceFre of ExtraRomanceAbs = CatFre ** ExtraRomance - [ProDrop] with - (ResRomance = ResFre) ; + (ResRomance = ResFre), (Grammar = GrammarFre) ; diff --git a/lib/src/italian/ExtraRomanceIta.gf b/lib/src/italian/ExtraRomanceIta.gf index af4bb5976..c07a2316e 100644 --- a/lib/src/italian/ExtraRomanceIta.gf +++ b/lib/src/italian/ExtraRomanceIta.gf @@ -1,2 +1,2 @@ concrete ExtraRomanceIta of ExtraRomanceAbs = CatIta ** ExtraRomance with - (ResRomance = ResIta) ; + (ResRomance = ResIta), (Grammar = GrammarIta) ; diff --git a/lib/src/romance/ExtraRomance.gf b/lib/src/romance/ExtraRomance.gf index 7bb904b4f..054d8cfa5 100644 --- a/lib/src/romance/ExtraRomance.gf +++ b/lib/src/romance/ExtraRomance.gf @@ -3,7 +3,7 @@ incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance ** CommonRomance, Coordination, ResRomance, - (G = Grammar), + Grammar, Prelude in { lin TPasseSimple = {s = []} ** {t = RPasse} ; --# notpresent @@ -77,8 +77,8 @@ incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance ** } ; PassVPSlash vps = passVPSlash vps [] ; ----- PassAgentVPSlash vps np = passVPSlash ----- vps (let by = in by.s ++ (np.s ! by.c).ton) ; + PassAgentVPSlash vps np = passVPSlash + vps (let by = in by.s ++ (np.s ! by.c).ton) ; oper passVPSlash : VPSlash -> Str -> ResRomance.VP = \vps, ag -> diff --git a/lib/src/spanish/ExtraRomanceSpa.gf b/lib/src/spanish/ExtraRomanceSpa.gf index d143b9612..b1c1eecea 100644 --- a/lib/src/spanish/ExtraRomanceSpa.gf +++ b/lib/src/spanish/ExtraRomanceSpa.gf @@ -1,2 +1,2 @@ concrete ExtraRomanceSpa of ExtraRomanceAbs = CatSpa ** ExtraRomance with - (ResRomance = ResSpa) ; + (ResRomance = ResSpa), (Grammar = GrammarSpa) ; diff --git a/lib/src/translator/ExtensionsBul.gf b/lib/src/translator/ExtensionsBul.gf index 624d0c5ab..017e07ce4 100644 --- a/lib/src/translator/ExtensionsBul.gf +++ b/lib/src/translator/ExtensionsBul.gf @@ -30,8 +30,8 @@ lin ---- GenIP = E.GenIP ; ---- GenRP = E.GenRP ; ----- PassVPSlash = E.PassVPSlash ; ----- PassAgentVPSlash = E.PassAgentVPSlash ; + PassVPSlash = E.PassVPSlash ; + PassAgentVPSlash = E.PassAgentVPSlash ; EmptyRelSlash = E.EmptyRelSlash ; diff --git a/lib/src/translator/ExtensionsFre.gf b/lib/src/translator/ExtensionsFre.gf index 4581783d3..43946e797 100644 --- a/lib/src/translator/ExtensionsFre.gf +++ b/lib/src/translator/ExtensionsFre.gf @@ -26,8 +26,8 @@ lin ---- GenIP = E.GenIP ; ---- GenRP = E.GenRP ; ----- PassVPSlash = E.PassVPSlash ; ----- PassAgentVPSlash = E.PassAgentVPSlash ; + PassVPSlash = E.PassVPSlash ; + PassAgentVPSlash = E.PassAgentVPSlash ; lin diff --git a/lib/src/translator/ExtensionsIta.gf b/lib/src/translator/ExtensionsIta.gf index 71b0d5ae5..0c4415b4a 100644 --- a/lib/src/translator/ExtensionsIta.gf +++ b/lib/src/translator/ExtensionsIta.gf @@ -26,8 +26,8 @@ lin ---- GenIP = E.GenIP ; ---- GenRP = E.GenRP ; ----- PassVPSlash = E.PassVPSlash ; ----- PassAgentVPSlash = E.PassAgentVPSlash ; + PassVPSlash = E.PassVPSlash ; + PassAgentVPSlash = E.PassAgentVPSlash ; lin diff --git a/lib/src/translator/ExtensionsSpa.gf b/lib/src/translator/ExtensionsSpa.gf index a068f46b1..612ea0863 100644 --- a/lib/src/translator/ExtensionsSpa.gf +++ b/lib/src/translator/ExtensionsSpa.gf @@ -26,8 +26,8 @@ lin ---- GenIP = E.GenIP ; ---- GenRP = E.GenRP ; ----- PassVPSlash = E.PassVPSlash ; ----- PassAgentVPSlash = E.PassAgentVPSlash ; + PassVPSlash = E.PassVPSlash ; + PassAgentVPSlash = E.PassAgentVPSlash ; lin