fixes in French

lib/resource-1.0/romance/ConjunctionRomance.gf

@@ -33,8 +33,16 @@ incomplete concrete ConjunctionRomance of Conjunction =
     ConsS = consrTable Mood comma ;
     BaseAdv = twoSS ;
     ConsAdv = consrSS comma ;
-    BaseNP x y = twoTable NPForm x y ** {a = conjAgr x.a y.a} ;
-    ConsNP xs x = consrTable NPForm comma xs x ** {a = conjAgr xs.a x.a} ;
+    BaseNP x y = {
+      s1 = \\c => x.s ! c ; 
+      s2 = \\c => y.s ! (conjunctCase c) ; 
+      a = conjAgr x.a y.a
+      } ;
+    ConsNP x xs = {
+      s1 = \\c => x.s ! c ++ comma ++ xs.s1 ! (conjunctCase c) ; 
+      s2 = \\c => xs.s2 ! (conjunctCase c) ; 
+      a = conjAgr x.a xs.a
+      } ;
     BaseAP x y = twoTable AForm x y ** {isPre = andB x.isPre y.isPre} ;
     ConsAP xs x = consrTable AForm comma xs x ** {isPre = andB xs.isPre x.isPre} ;
 

lib/resource-1.0/romance/DiffRomance.gf

@@ -21,6 +21,11 @@ oper
   artDef    : Gender -> Number -> Case -> Str ;
   artIndef  : Gender -> Number -> Case -> Str ;
 
+-- This regulates whether a preposition is repeated in conjunction
+-- (Fre "la somme de 3 et de 4", Ita "la somma di 3 e 4").
+
+  conjunctCase : NPForm -> NPForm ;
+
   auxVerb   : VType -> (VF => Str) ;
   negation  : Polarity => (Str * Str) ;
   copula    : Verb ;
@@ -49,6 +54,7 @@ oper
 
 param
   Case = Nom | Acc | CPrep Prep ; 
+  NPForm = Ton Case | Aton Case | Poss {g : Gender ; n : Number} ; --- AAgr
 
 oper
   Verb = {s : VF => Str ; vtyp : VType} ;

lib/resource-1.0/romance/ResRomance.gf

@@ -6,10 +6,6 @@ interface ResRomance = DiffRomance ** open CommonRomance, Prelude in {
 
 --2 Constants uniformly defined in terms of language-dependent constants
 
-param
-
-  NPForm = Ton Case | Aton Case | Poss {g : Gender ; n : Number} ; --- AAgr
-
 oper
 
   nominative : Case = Nom ;