Romance reflexives in lexicon; German infinitival phrase

lib/resource-1.0/german/ResGer.gf

@@ -515,6 +515,13 @@ resource ResGer = ParamX ** open Prelude in {
           }
     } ;
 
+  infVP : Bool -> VP -> ((Agr => Str) * Str * Str) = \isAux, vp ->
+    <
+     \\agr => vp.n2 ! agr ++  vp.a2,
+     infPart isAux ++ (vp.s ! agrP3 Sg ! VPInfinit Simul).inf,
+     vp.inf ++ vp.ext
+    > ;
+
 -- 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

lib/resource-1.0/german/VerbGer.gf

@@ -11,15 +11,12 @@ concrete VerbGer of Verb = CatGer ** open Prelude, ResGer in {
 
     ComplVV v vp = 
       let 
-        compl : Agr -> (Str * Str) = \a -> 
-          let 
-             vpi = vp.s ! a ! VPInfinit Simul 
-          in
-          <vp.n2 ! a ++  vp.a2, infPart v.isAux ++ vpi.inf> ;
-        obj : Agr => Str = \\a => (compl a).p1 ;
-        inf : Str = (compl (agrP3 Sg)).p2 ; --- agr makes no diff here
+        vpi = infVP v.isAux vp 
       in
-      insertInf inf (insertObj obj (predVGen v.isAux v)) ;
+      insertExtrapos vpi.p3 (
+        insertInf vpi.p2 (
+          insertObj vpi.p1 (
+            predVGen v.isAux v))) ;
 
     ComplVS v s = 
       insertExtrapos (conjThat ++ s.s ! Sub) (predV v) ;