From d6040b9f626523d458552da1da219b92f3152869 Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 6 Mar 2006 15:36:09 +0000 Subject: [PATCH] working on ExTramI and german verbs phrase --- resource-1.0/german/ResGer.gf | 4 ++-- resource-1.0/multimodal/Demonstrative.gf | 1 + resource-1.0/multimodal/DemonstrativeI.gf | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resource-1.0/german/ResGer.gf b/resource-1.0/german/ResGer.gf index 5d9065501..d82bc49b8 100644 --- a/resource-1.0/german/ResGer.gf +++ b/resource-1.0/german/ResGer.gf @@ -481,12 +481,12 @@ resource ResGer = ParamX ** open Prelude in { } ; insertInf : Str -> VP -> VP = \inf,vp -> { - s = vp.s ; + s = \\a,vf => {fin = (vp.s ! a ! vf).fin ; inf = inf ++ (vp.s ! a ! vf).inf} ; a1 = vp.a1 ; n2 = vp.n2 ; a2 = vp.a2 ; isAux = vp.isAux ; ---- - inf = vp.inf ++ inf ; + inf = vp.inf ; --- ++ inf ; ext = vp.ext } ; diff --git a/resource-1.0/multimodal/Demonstrative.gf b/resource-1.0/multimodal/Demonstrative.gf index fffca641d..8dad13515 100644 --- a/resource-1.0/multimodal/Demonstrative.gf +++ b/resource-1.0/multimodal/Demonstrative.gf @@ -85,4 +85,5 @@ abstract Demonstrative = Cat, PredefAbs ** { point1, point2 : Point ; + x_MAdv, y_MAdv : MAdv ; } diff --git a/resource-1.0/multimodal/DemonstrativeI.gf b/resource-1.0/multimodal/DemonstrativeI.gf index 3032eaf46..4cf7a5def 100644 --- a/resource-1.0/multimodal/DemonstrativeI.gf +++ b/resource-1.0/multimodal/DemonstrativeI.gf @@ -102,5 +102,8 @@ incomplete concrete DemonstrativeI of Demonstrative = Cat ** point1 = mkPoint "p1" ; point2 = mkPoint "p2" ; + x_MAdv = mkDem Adv (ss "X") noPoint ; --- relies on Adv = {s : Str} + y_MAdv = mkDem Adv (ss "Y") noPoint ; --- + }