From 0e0bcfee2f65d94879e33b55f0516b6e8fb9d11c Mon Sep 17 00:00:00 2001 From: aarne Date: Sat, 24 Feb 2007 14:36:04 +0000 Subject: [PATCH] romance bug fixes --- lib/resource-1.0/french/DiffFre.gf | 3 ++- lib/resource-1.0/mathematical/SymbolRomance.gf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/resource-1.0/french/DiffFre.gf b/lib/resource-1.0/french/DiffFre.gf index aa07ab1a4..a9e6efcbc 100644 --- a/lib/resource-1.0/french/DiffFre.gf +++ b/lib/resource-1.0/french/DiffFre.gf @@ -117,7 +117,8 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in { mkImperative b p vp = { s = \\pol,aag => let - agr = aag ** {p = p} ; + num = if_then_else Number b Pl aag.n ; + agr = {g = aag.g ; n = num ; p = p} ; verb = (vp.s ! VPImperat).fin ! agr ; neg = vp.neg ! pol ; hascl = (pronArg agr.n agr.p vp.clAcc vp.clDat).p3 ; diff --git a/lib/resource-1.0/mathematical/SymbolRomance.gf b/lib/resource-1.0/mathematical/SymbolRomance.gf index c0a169924..ba9fa6528 100644 --- a/lib/resource-1.0/mathematical/SymbolRomance.gf +++ b/lib/resource-1.0/mathematical/SymbolRomance.gf @@ -17,7 +17,7 @@ lin hasClit = False } ; CNNumNP cn i = { - s = \\c => cn.s ! Sg ++ i.s ! Masc ; + s = \\c => artDef cn.g Sg (npform2case c) ++ cn.s ! Sg ++ i.s ! Masc ; a = agrP3 cn.g Sg ; hasClit = False } ;