diff --git a/lib/resource-1.0/german/PhraseGer.gf b/lib/resource-1.0/german/PhraseGer.gf index 652c070dd..34800c0c9 100644 --- a/lib/resource-1.0/german/PhraseGer.gf +++ b/lib/resource-1.0/german/PhraseGer.gf @@ -13,11 +13,7 @@ concrete PhraseGer of Phrase = CatGer ** open Prelude, ResGer in { UttIP ip = {s = ip.s ! Nom} ; --- Acc also UttIAdv iadv = iadv ; UttNP np = {s = np.s ! Acc} ; - UttVP vp = - let - vpi = vp.s ! agrP3 Sg ! VPInfinit Simul --- agr - in - ss (vp.n2 ! agrP3 Sg ++ vp.a2 ++ vpi.fin ++ infPart False ++ vpi.inf) ; + UttVP vp = {s = useInfVP vp} ; UttAdv adv = adv ; NoPConj = {s = []} ; diff --git a/lib/resource-1.0/german/ResGer.gf b/lib/resource-1.0/german/ResGer.gf index 22e73088b..83ef88d82 100644 --- a/lib/resource-1.0/german/ResGer.gf +++ b/lib/resource-1.0/german/ResGer.gf @@ -522,6 +522,10 @@ resource ResGer = ParamX ** open Prelude in { vp.inf ++ vp.ext > ; + useInfVP : VP -> Str = \vp -> + let vpi = infVP False vp in + vpi.p1 ! agrP3 Sg ++ vpi.p3 ++ vpi.p2 ; + -- The nominative case is not used as reflexive, but defined here -- so that we can reuse this in personal pronouns. -- The missing Sg "ihrer" shows that a dependence on gender would diff --git a/lib/resource-1.0/german/SentenceGer.gf b/lib/resource-1.0/german/SentenceGer.gf index f3b4b9b0f..4bb83c64a 100644 --- a/lib/resource-1.0/german/SentenceGer.gf +++ b/lib/resource-1.0/german/SentenceGer.gf @@ -14,7 +14,7 @@ concrete SentenceGer of Sentence = CatGer ** open ResGer in { agr = {n = n ; p = P2} ; verb = vp.s ! agr ! VPImperat ; in - verb.fin ++ vp.a1 ! pol ++ verb.inf ++ vp.n2 ! agr ++ vp.a2 ++ vp.ext + verb.fin ++ vp.a1 ! pol ++ verb.inf ++ vp.n2 ! agr ++ vp.a2 ++ vp.inf ++ vp.ext } ; SlashV2 np v2 = @@ -35,7 +35,7 @@ concrete SentenceGer of Sentence = CatGer ** open ResGer in { EmbedS s = {s = conjThat ++ s.s ! Sub} ; EmbedQS qs = {s = qs.s ! QIndir} ; - EmbedVP vp = {s = "zu" ++ (vp.s ! agrP3 Sg ! VPInfinit Simul).inf} ; --- agr ---- compl + EmbedVP vp = {s = useInfVP vp} ; UseCl t a p cl = {s = \\o => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! o} ; UseQCl t a p cl = {s = \\q => t.s ++ a.s ++ p.s ++ cl.s ! t.t ! a.a ! p.p ! q} ;