diff --git a/lib/src/french/ParseFre.gf b/lib/src/french/ParseFre.gf index e84a3956d..e6a82955d 100644 --- a/lib/src/french/ParseFre.gf +++ b/lib/src/french/ParseFre.gf @@ -13,7 +13,7 @@ concrete ParseFre of ParseEngAbs = SentenceFre - [ SlashVP, SlashVS], QuestionFre, RelativeFre, - IdiomFre [NP, VP, Tense, Cl, ProgrVP, ExistNP], + IdiomFre [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP], ExtraFre [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash, PassAgentVPSlash, Temp, Pol, Conj, VPS, ListVPS, S, Num, CN, RP, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, GenRP, VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV, diff --git a/lib/src/german/ExtraGer.gf b/lib/src/german/ExtraGer.gf index f2ae04fc8..735b4f73f 100644 --- a/lib/src/german/ExtraGer.gf +++ b/lib/src/german/ExtraGer.gf @@ -1,6 +1,6 @@ --# -coding=latin1 concrete ExtraGer of ExtraGerAbs = CatGer ** - open ResGer, Coordination, Prelude, IrregGer in { + open ResGer, Coordination, Prelude, IrregGer, (P = ParadigmsGer) in { lincat VPI = {s : Bool => Str} ; @@ -58,7 +58,9 @@ concrete ExtraGer of ExtraGerAbs = CatGer ** } ; PassVPSlash vps = - insertInf (vps.s.s ! VPastPart APred) (predV werdenPass); + insertInf (vps.s.s ! VPastPart APred) (predV werdenPass) ; + PassAgentVPSlash vps np = ---- "von" here, "durch" in StructuralGer + insertAdv (appPrep P.von_Prep np.s) (insertInf (vps.s.s ! VPastPart APred) (predV werdenPass)) ; lincat VPS = {s : Order => Agr => Str} ; diff --git a/lib/src/german/ExtraGerAbs.gf b/lib/src/german/ExtraGerAbs.gf index d2e157024..38774c02e 100644 --- a/lib/src/german/ExtraGerAbs.gf +++ b/lib/src/german/ExtraGerAbs.gf @@ -1,7 +1,7 @@ abstract ExtraGerAbs = Extra [ VPI,ListVPI,BaseVPI,ConsVPI,MkVPI,ComplVPIVV,ConjVPI,ClSlash,RCl, VPS,ListVPS,BaseVPS,ConsVPS,ConjVPS,MkVPS,PredVPS,EmptyRelSlash, - VPSlash,PassVPSlash,CompIQuant, + VPSlash, PassVPSlash, PassAgentVPSlash, CompIQuant, Temp,Tense,Pol,S,NP,VV,VP,Conj,IAdv,IQuant,IComp,ICompAP,IAdvAdv,Adv,AP] ** { flags coding=utf8; fun diff --git a/lib/src/german/ParseGer.gf b/lib/src/german/ParseGer.gf index d0ef47d6f..f9c1be4cb 100644 --- a/lib/src/german/ParseGer.gf +++ b/lib/src/german/ParseGer.gf @@ -13,7 +13,7 @@ concrete ParseGer of ParseEngAbs = QuestionGer, RelativeGer, IdiomGer [NP, VP, Tense, Cl, ProgrVP, ExistNP, SelfAdvVP, SelfAdVVP, SelfNP], - ExtraGer [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash, + ExtraGer [NP, Quant, VPSlash, VP, Tense, GenNP, PassVPSlash, PassAgentVPSlash, Temp, Pol, Conj, VPS, ListVPS, S, MkVPS, BaseVPS, ConsVPS, ConjVPS, PredVPS, VPI, VPIForm, VPIInf, VPIPresPart, ListVPI, VV, MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV, ClSlash, RCl, EmptyRelSlash],