From 156e193d477e37c36a6ddd794594d7ceffacd856 Mon Sep 17 00:00:00 2001
From: krangelov <kr.angelov@gmail.com>
Date: Tue, 27 Apr 2021 13:23:27 +0200
Subject: [PATCH] generalize DAP

---
 src/romance/CatRomance.gf           | 2 +-
 src/romance/ExtendRomanceFunctor.gf | 2 +-
 src/romance/NounRomance.gf          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/romance/CatRomance.gf b/src/romance/CatRomance.gf
index 76a87fd9..e37f2dca 100644
--- a/src/romance/CatRomance.gf
+++ b/src/romance/CatRomance.gf
@@ -75,7 +75,7 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
       sp : Number => Gender => Case => Str ;
       isNeg : Bool -- negative element, e.g. aucun
       } ;
-    DAP = {s : Gender => Str ; n : Number} ;
+    DAP = {s : Gender => Case => Str ; n : Number} ;
     Predet  = {
       s : AAgr   => Case => Str ;
       c : Case ; -- c : la plupart de
diff --git a/src/romance/ExtendRomanceFunctor.gf b/src/romance/ExtendRomanceFunctor.gf
index c0e3eb1b..fe9524c0 100644
--- a/src/romance/ExtendRomanceFunctor.gf
+++ b/src/romance/ExtendRomanceFunctor.gf
@@ -223,7 +223,7 @@ incomplete concrete ExtendRomanceFunctor of Extend =
 
     --TODO: actually use ant
     CompVP ant p vp = {
-        s = \\agr => ant.s ++ p.s ++ "de" ++ neg.p1 ++ infVP vp p.p agr ;
+        s = \\agr => ant.s ++ p.s ++ "de" ++ infVP vp p.p agr ;
         cop = serCopula
       } ;
 
diff --git a/src/romance/NounRomance.gf b/src/romance/NounRomance.gf
index cf54e4ed..a6b0457e 100644
--- a/src/romance/NounRomance.gf
+++ b/src/romance/NounRomance.gf
@@ -190,10 +190,10 @@ incomplete concrete NounRomance of Noun =
        a = np.a ** {n = det.n} } ;
 
     AdjDAP det ap = {
-      s = \\g => det.s ! g ++ ap.s ! genNum2Aform g det.n ;
+      s = \\g,c => det.s ! g ! c ++ ap.s ! genNum2Aform g det.n ;
       n = det.n ;
       } ;
 
-    DetDAP det = {s = \\g => det.s ! g ! Nom ; n = det.n } ;
+    DetDAP det = {s = \\g,c => det.s ! g ! c ; n = det.n } ;
 
 }