From fb202420dd76f94e50e7b1a31e3ed4906a12aafc Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Tue, 1 Apr 2014 13:03:35 +0000
Subject: [PATCH] changed the definition of MassNP in Romance so that subject
 position doesn't return the partitive but the definite article. Thus "wine is
 good" becomes "le vin est bon" and "I drink wine" becomes "je bois du vin".
 Partitive on subject position seems incorrect, and the definite article the
 best choice when translating mass terms without articles on the subject
 position.

---
 lib/src/experimental/PredInstanceChi.gf | 6 +++---
 lib/src/romance/NounRomance.gf          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/experimental/PredInstanceChi.gf b/lib/src/experimental/PredInstanceChi.gf
index 130ddbe40..f9e575d91 100644
--- a/lib/src/experimental/PredInstanceChi.gf
+++ b/lib/src/experimental/PredInstanceChi.gf
@@ -143,9 +143,9 @@ oper
           vneg   = case p of {Pos => [] ; Neg => v.s.neg} ;
           pass   = case o of {CAct => [] ; CPass => passive_s}
        in case <t,a> of {
-          <X.Past,_>  => <pass,  bu_neg,  sta ++ v.s.s ++ v.s.pp> ;
-          <_,X.Anter> => <pass,  bu_neg,  sta ++ v.s.s ++ v.s.pp> ;
-          _          => <pass,  vneg,    sta ++ v.s.s> 
+          <X.Past,_>  => <sta ++ pass,  bu_neg,  v.s.s ++ v.s.pp> ;
+          <_,X.Anter> => <sta ++ pass,  bu_neg,  v.s.s ++ v.s.pp> ;
+          _           => <sta ++ pass,  vneg,    v.s.s> 
           } ;   ---- other aspects
 
 
diff --git a/lib/src/romance/NounRomance.gf b/lib/src/romance/NounRomance.gf
index 119adadf6..ff30233d0 100644
--- a/lib/src/romance/NounRomance.gf
+++ b/lib/src/romance/NounRomance.gf
@@ -115,7 +115,7 @@ incomplete concrete NounRomance of Noun =
         g = cn.g ;
         n = Sg
       in heavyNP {
-        s = \\c => partitive g c ++ cn.s ! n ;
+        s = table {Nom => artDef g n Nom ++ cn.s ! n ; c => partitive g c ++ cn.s ! n} ; -- le vin est bon ; je bois du vin
         a = agrP3 g n ;
         hasClit = False ;
         isNeg = False