Updating romance langs (mkMU) (#442)

* updating romance langs for percentage in Spa

* Delete Setup_compare.hs

src/catalan/CatCat.gf

@@ -1,6 +1,6 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
 concrete CatCat of Cat = 
-  CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol] ** 
+  CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol,MU] ** 
   CatRomance with -- JS restore TPast for notpresent
   (ResRomance = ResCat) ;

src/catalan/GrammarCat.gf

@@ -11,7 +11,7 @@ concrete GrammarCat of Grammar =
   RelativeCat,
   ConjunctionCat,
   PhraseCat,
-  TextX - [SC,Temp,Tense,Pol,PPos,PNeg],
+  TextX - [SC,Temp,Tense,Pol,PPos,PNeg,MU],
   IdiomCat,
   StructuralCat,
   TenseCat,

src/catalan/ParadigmsCat.gf

@@ -588,6 +588,6 @@ oper
   mk2V2  : V -> Prep -> V2 ;
   dirV2 : V -> V2 ;
 
-  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False} ;
+  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False; hasArt=False} ;
 
 } ;

src/french/CatFre.gf

@@ -1,5 +1,5 @@
 --# -path=.:../romance:../common:../abstract:../common:prelude
 
-concrete CatFre of Cat = CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol] 
+concrete CatFre of Cat = CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol,MU] 
   ** CatRomance with
   (ResRomance = ResFre) ;

src/french/GrammarFre.gf

@@ -11,7 +11,7 @@ concrete GrammarFre of Grammar =
   RelativeFre,
   ConjunctionFre,
   PhraseFre,
-  TextX - [SC,Temp,Tense,Pol,PPos,PNeg],
+  TextX - [SC,Temp,Tense,Pol,PPos,PNeg,MU],
   IdiomFre,
   StructuralFre,
   TenseFre,

src/french/ParadigmsFre.gf

@@ -590,6 +590,6 @@ oper
     _ => VFalse  -- prend-il
     } ;
 
-  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False} ;
+  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False; hasArt=False} ;
 
 } ;

src/italian/CatIta.gf

@@ -1,4 +1,4 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
-concrete CatIta of Cat = CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol] ** CatRomance with
+concrete CatIta of Cat = CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol,MU] ** CatRomance with
   (ResRomance = ResIta) ;

src/italian/GrammarIta.gf

@@ -11,7 +11,7 @@ concrete GrammarIta of Grammar =
   RelativeIta,
   ConjunctionIta,
   PhraseIta,
-  TextX - [SC,Temp,Tense,Pol,PPos,PNeg,TPres,TPast,TFut,TCond],
+  TextX - [SC,Temp,Tense,Pol,PPos,PNeg,TPres,TPast,TFut,TCond,MU],
   IdiomIta,
   StructuralIta,
   TenseIta,

src/italian/ParadigmsIta.gf

@@ -589,6 +589,6 @@ oper
   mk2V2  : V -> Prep -> V2 ;
   dirV2 : V -> V2 ;
 
-  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False} ;
+  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False; hasArt=False} ;
 
 } ;

src/portuguese/CatPor.gf

@@ -1,5 +1,5 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
 concrete CatPor of Cat = CommonX - 
-  [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol] ** CatRomance with
+  [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol,MU] ** CatRomance with
   (ResRomance = ResPor) ;

src/portuguese/GrammarPor.gf

@@ -11,7 +11,7 @@ concrete GrammarPor of Grammar =
   RelativePor,
   ConjunctionPor,
   PhrasePor,
-  TextPor - [SC,Temp,Tense,Pol,PPos,PNeg],      -- special punctuation
+  TextPor - [SC,Temp,Tense,Pol,PPos,PNeg,MU],      -- special punctuation
   IdiomPor,
   StructuralPor,
   TensePor,

src/portuguese/ParadigmsPor.gf

@@ -598,7 +598,7 @@ oper
 
   reflVerboV : Verbum -> V = \ve -> reflV (lin V (verboV ve)) ; --%
 
-  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False} ;
+  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False; hasArt=False} ;
 
 
 } ;

src/romance/CatRomance.gf

@@ -1,4 +1,4 @@
-incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
+incomplete concrete CatRomance of Cat = CommonX - [SC,Pol,MU]
   ** open Prelude, CommonRomance, ResRomance, (R = ParamX) in {
 
   flags optimize=all_subs ;
@@ -147,4 +147,8 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
     N = \n -> n.s ! Sg ;
     N2 = \n -> n.s ! Sg ++ n.c2.s ;
     N3 = \n -> n.s ! Sg ++ n.c2.s ++ n.c3.s ;
+
+  lincat MU = {s : Str ; isPre : Bool ; hasArt : Bool} ;
+
+
 }

src/romance/NounRomance.gf

@@ -208,9 +208,12 @@ incomplete concrete NounRomance of Noun =
     DetDAP det = det ;
 
     QuantityNP n m = heavyNPpol False {
-      s = \\c => preOrPost m.isPre m.s (n.s ! NCard Masc);
+      s = \\c => case <c,m.hasArt> of {
+                  <Acc,True>|<CPrep _,True> => artDef False Masc Sg c ++ preOrPost m.isPre m.s (n.s ! NCard Masc);
+                  _ => preOrPost m.isPre m.s (n.s ! NCard Masc)};
+                  
       a = agrP3 Masc n.n ;
       hasClit = False
       } ;
+    }
 
-}

src/spanish/CatSpa.gf

@@ -1,5 +1,5 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
 concrete CatSpa of Cat = CommonX - 
-  [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol] ** CatRomance with
+  [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond,Pol,MU] ** CatRomance with
   (ResRomance = ResSpa) ;

src/spanish/GrammarSpa.gf

@@ -11,7 +11,7 @@ concrete GrammarSpa of Grammar =
   RelativeSpa,
   ConjunctionSpa,
   PhraseSpa,
-  TextSpa - [SC,Temp,Tense,Pol,PPos,PNeg],      -- special punctuation
+  TextSpa - [SC,Temp,Tense,Pol,PPos,PNeg,MU],      -- special punctuation
   IdiomSpa,
   StructuralSpa,
   TenseSpa,

src/spanish/ParadigmsSpa.gf

@@ -618,6 +618,6 @@ oper
   mk2V2  : V -> Prep -> V2 ;
   dirV2 : V -> V2 ;
 
-  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False} ;
+  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False ; hasArt=False} ;
 
 } ;