From f19ca4ae95c6e7008a70b3e824d6488ea80c0406 Mon Sep 17 00:00:00 2001
From: odanoburu <bcclaro@gmail.com>
Date: Tue, 12 Feb 2019 10:49:42 -0200
Subject: [PATCH] (Romance) insertAdV before first negation particle - mv
 insertAdV to DiffRomance - use former version for French, as exception

---
 src/french/DiffFre.gf      | 9 +++++++++
 src/romance/DiffRomance.gf | 8 ++++++++
 src/romance/ResRomance.gf  | 6 ------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/french/DiffFre.gf b/src/french/DiffFre.gf
index cbfdf81cb..992fc5ada 100644
--- a/src/french/DiffFre.gf
+++ b/src/french/DiffFre.gf
@@ -2,6 +2,7 @@
 
 instance DiffFre of DiffRomance - [
   imperClit,
+  insertAdV,
   invertedClause,
   verbHyphen,
   iAdvQuestionInv
@@ -314,4 +315,12 @@ instance DiffFre of DiffRomance - [
 
   verbHyphen : Verb -> Str = \v -> v.s ! (VInfin True) ; --- kluge: use this field to store - or -t-
 
+  insertAdV : Str -> VP -> VP ;
+  insertAdV co vp = vp ** {
+    neg = \\b => let vpn = vp.neg ! b
+      -- hacky: the AdV is directly attached to the verb, so we put it
+      -- in the neg field
+      in {p1 = vpn.p1 ; p2 = vpn.p2 ++ co}
+    } ;
+
 }
diff --git a/src/romance/DiffRomance.gf b/src/romance/DiffRomance.gf
index 29c693380..90af8810f 100644
--- a/src/romance/DiffRomance.gf
+++ b/src/romance/DiffRomance.gf
@@ -189,4 +189,12 @@ oper
     <RPres,Simul>  => <verb ! VFin (VPres m) n p, []>
     } ;
 
+  insertAdV : Str -> VP -> VP ;
+  insertAdV co vp = vp ** {
+    neg = \\b => let vpn = vp.neg ! b
+      -- hacky: the AdV is directly attached to the verb, so we put it
+      -- in the neg field
+      in {p1 = co ++ vpn.p1 ; p2 = vpn.p2}
+    } ;
+
 } ;
diff --git a/src/romance/ResRomance.gf b/src/romance/ResRomance.gf
index ad38ed321..989cbb82e 100644
--- a/src/romance/ResRomance.gf
+++ b/src/romance/ResRomance.gf
@@ -133,12 +133,6 @@ oper
     comp  = \\a => vp.comp ! a ++ co ;
     } ;
 
-  insertAdV : Str -> VP -> VP ;
-  insertAdV co vp = vp ** {
-    neg = \\b => let vpn = vp.neg ! b
-      in {p1 = vpn.p1 ; p2 = vpn.p2 ++ co}
-    } ;
-
   insertClit3 : Str -> VP -> VP = \co,vp -> {
     s     = vp.s ;
     agr   = vp.agr ;