number agreement in Romance predeterminers

9 files changed, 19 insertions, 7 deletions

diff --git a/examples/attempto/AttemptoI.gf b/examples/attempto/AttemptoI.gf
index bad6dd342..240cbf969 100644
--- a/examples/attempto/AttemptoI.gf
+++ b/examples/attempto/AttemptoI.gf
@@ -47,9 +47,9 @@ lin someCollNP = mkNP somePl_Det ;
 lin allCollNP cn = mkNP all_Predet (mkNP a_Art plNum cn) ;
 
 lin noCollNP = mkNP no_Quant plNum ;
-lin eachTheNP cn = mkNP (mkNP each_Det) (mkAdv part_Prep (mkNP the_Art plNum cn)) ;
-lin eachSomeNP cn = mkNP (mkNP each_Det) (mkAdv part_Prep (mkNP somePl_Det cn)) ;
-lin eachNumNP ca cn = mkNP (mkNP each_Det) (mkAdv part_Prep (mkNP ca cn)) ;
+lin eachTheNP cn = eachOf (mkNP the_Art plNum cn) ;
+lin eachSomeNP cn = eachOf (mkNP somePl_Det cn) ;
+lin eachNumNP ca cn = eachOf (mkNP ca cn) ;
 
 lin someMassNP = mkNP someSg_Det ;
 lin allMassNP cn = mkNP all_Predet (mkNP cn) ;
@@ -203,7 +203,7 @@ lin commaOr_Conj = comma_or_Conj ;
 lin for_everyS cn = mkS (mkAdv for_Prep (mkNP every_Det cn)) ;
 lin for_eachS cn = mkS (mkAdv for_Prep (mkNP each_Det cn)) ;
 lin for_each_ofS card cn = 
-  mkS (mkAdv for_Prep (mkNP (mkNP each_Det) (mkAdv part_Prep (mkNP card cn)))) ;
+  mkS (mkAdv for_Prep (eachOf (mkNP card cn))) ;
 lin for_allMassS cn =
   mkS (mkAdv for_Prep (mkNP all_Predet (mkNP cn))) ;
 
diff --git a/examples/attempto/LexAttempto.gf b/examples/attempto/LexAttempto.gf
index 3d18d3ca4..11f7fa237 100644
--- a/examples/attempto/LexAttempto.gf
+++ b/examples/attempto/LexAttempto.gf
@@ -23,4 +23,6 @@ oper
   comma_or_Conj : Conj ;
 
   whose_IDet : IDet ;
+
+  eachOf : NP -> NP ;
 }
diff --git a/examples/attempto/LexAttemptoEng.gf b/examples/attempto/LexAttemptoEng.gf
index ada776cb9..ed61b66d9 100644
--- a/examples/attempto/LexAttemptoEng.gf
+++ b/examples/attempto/LexAttemptoEng.gf
@@ -31,4 +31,6 @@ oper
 
   whose_IDet = M.mkIDet "whose" singular ;
 
+  eachOf np = mkNP (mkNP each_Det) (SyntaxEng.mkAdv part_Prep np) ;
+
 }
diff --git a/examples/attempto/LexAttemptoFin.gf b/examples/attempto/LexAttemptoFin.gf
index 664facf18..209c80832 100644
--- a/examples/attempto/LexAttemptoFin.gf
+++ b/examples/attempto/LexAttemptoFin.gf
@@ -31,4 +31,6 @@ oper
 
   whose_IDet = mkIDet (M.mkIQuant "kenen") ;
 
+  eachOf np = mkNP (mkNP each_Det) (SyntaxFin.mkAdv (casePrep elative) np) ;
+
 }
diff --git a/examples/attempto/LexAttemptoFre.gf b/examples/attempto/LexAttemptoFre.gf
index b6f983c24..618f37175 100644
--- a/examples/attempto/LexAttemptoFre.gf
+++ b/examples/attempto/LexAttemptoFre.gf
@@ -1,7 +1,7 @@
 instance LexAttemptoFre of LexAttempto = 
   open ExtraFre, SyntaxFre, ParadigmsFre, ConstructX, 
     MakeStructuralFre,
-    IrregFre in {
+    IrregFre, (P = Prelude) in {
 
 oper
   possible_A = mkA "possible" ;
@@ -25,4 +25,6 @@ oper
 
   whose_IDet = mkIDet (mkIQuant "de qui") ; ----
 
+  eachOf np = mkNP (mkPredet "chacun" "chacune" genitive P.True) np ;
+
 }
diff --git a/examples/attempto/LexAttemptoGer.gf b/examples/attempto/LexAttemptoGer.gf
index 05a4e59ff..58de8a565 100644
--- a/examples/attempto/LexAttemptoGer.gf
+++ b/examples/attempto/LexAttemptoGer.gf
@@ -25,4 +25,6 @@ oper
 
   whose_IDet = mkIDet (mkIQuant "wessen") ;
 
+  eachOf np = mkNP (mkNP each_Det) (SyntaxGer.mkAdv part_Prep np) ;  ---- gen agr
+
 }
diff --git a/examples/attempto/LexAttemptoIta.gf b/examples/attempto/LexAttemptoIta.gf
index 04d79cfdb..de18a3ec2 100644
--- a/examples/attempto/LexAttemptoIta.gf
+++ b/examples/attempto/LexAttemptoIta.gf
@@ -1,6 +1,6 @@
 instance LexAttemptoIta of LexAttempto = 
   open ExtraIta, SyntaxIta, ParadigmsIta, ConstructX, 
-    MakeStructuralIta
+    MakeStructuralIta, (P = Prelude)
     in {
 
 oper
@@ -25,4 +25,5 @@ oper
 
   whose_IDet = mkIDet (mkIQuant "de chi") ; ----
 
+  eachOf np = mkNP (mkPredet "ciascuno" "ciascuna" genitive P.True) np ;
 }
diff --git a/examples/attempto/LexAttemptoSwe.gf b/examples/attempto/LexAttemptoSwe.gf
index c95ce035e..8f71e2b15 100644
--- a/examples/attempto/LexAttemptoSwe.gf
+++ b/examples/attempto/LexAttemptoSwe.gf
@@ -23,5 +23,6 @@ oper
   slash_Conj = mkConj [] "/" singular ;
   whose_IDet = mkIDet (mkIQuant "vems" "vems" "vems" dDefIndef) ;
 
+  eachOf np = mkNP (mkNP each_Det) (SyntaxSwe.mkAdv part_Prep np) ; ---- gen agr
 
 }
diff --git a/examples/attempto/TestAttemptoFin.gf b/examples/attempto/TestAttemptoFin.gf
index 7d6789628..bb87f7a7b 100644
--- a/examples/attempto/TestAttemptoFin.gf
+++ b/examples/attempto/TestAttemptoFin.gf
@@ -77,7 +77,7 @@ lin correct_A = mkA "oikea" ;
 
 lin kilogram_Unit = mkkN "kilo" ;
 
-oper mkkN : Str -> CN = \n -> mkCN (ParadigmsFin.mkN n) ;
+oper mkkN : Str -> CN = \n -> mkCN (ParadigmsFin.mk1N n) ;
 
 lin
   in_Prep = SyntaxFin.in_Prep ;