romancs imp PlP1 forms ; Spanish ordinals over 1000

lib/resource-1.0/french/DiffFre.gf

@@ -117,10 +117,7 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in {
       s = \\pol,aag => 
         let 
           agr   = aag ** {p = p} ;
-          verb  = case p of {
+          verb  = (vp.s ! VPImperat).fin ! agr ;
-            P1 => (vp.s ! VPFinite (VPres Indic) Simul).fin ! agr ;
-            _  => (vp.s ! VPImperat).fin ! agr --- P2 only
-            } ;
           neg   = vp.neg ! pol ;
           clpr  = pronArgGen pol agr.n agr.p vp.clAcc vp.clDat ;
           compl = neg.p2 ++ clpr.p2 ++ vp.comp ! agr ++ vp.ext ! pol

lib/resource-1.0/french/LexiconFre.gf

@@ -131,7 +131,7 @@ lin
   old_A = 
     prefA (compADeg (mkA "vieux" "vieille" "vieux" "vieillement")) ; ---- vieil
   open_V2 = ouvrir_V2 ;
-  paint_V2A = mkV2A (v2V peindre_V2) accusative (mkPreposition "en") ;
+  paint_V2A = mkV2A (v2V peindre_V2) accusative (mkPrep "en") ;
   paper_N = regGenN "papier" masculine ;
   paris_PN = mkPN "Paris" masculine ;
   peace_N = regGenN "paix" feminine ;
@@ -323,7 +323,7 @@ lin
   hunt_V2 = dirV2 (regV "chasser") ;
   kill_V2 = dirV2 (regV "tuer") ;
   laugh_V =  rire_V2 ;
-  lie_V = reflV étendre_V2 ;
+  lie_V = reflV (v2V étendre_V2) ;
   play_V = regV "jouer" ;
   pull_V2 = dirV2 (regV "tirer") ;
   push_V2 = dirV2 (regV "pousser") ;
@@ -331,7 +331,7 @@ lin
   scratch_V2 = dirV2 (regV "gratter") ;
   sew_V = coudre_V2 ;
   sing_V = regV "chanter" ;
-  sit_V = reflV asseoir_V2 ;
+  sit_V = reflV (v2V asseoir_V2) ;
   smell_V = v2V ( sentir_V2) ;
   spit_V = regV "cracher" ;
   squeeze_V2 = dirV2 (regV "serrer") ;
@@ -348,9 +348,8 @@ lin
   wash_V2 = dirV2 (regV "laver") ;
   wipe_V2 = dirV2 (regV "essuyer") ;
 
-    hold_V2 = dirV2 tenir_V2 ;
+    hold_V2 = tenir_V2 ;
-    split_V2 = dirV2 fendre_V2 ;
+    split_V2 = fendre_V2 ;
-    lie_V = reflV étendre_V2 ;
+    sit_V = reflV (v2V asseoir_V2) ;
-    sit_V = reflV asseoir_V2 ;
 
 } ;

lib/resource-1.0/french/ParadigmsFre.gf

@@ -290,9 +290,9 @@ oper
   plural = Pl ;
 
   Preposition = Compl ;
-  accusative = complAcc ;
+  accusative = complAcc ** {lock_Prep = <>} ;
-  genitive = complGen ;
+  genitive = complGen ** {lock_Prep = <>} ;
-  dative = complDat ;
+  dative = complDat ** {lock_Prep = <>} ;
   mkPrep p = {s = p ; c = Acc ; isDir = False ; lock_Prep = <>} ;
 
   --- obsolete
@@ -348,8 +348,8 @@ oper
   v2V v = v ** {lock_V = <>} ;
 
   mkV3 v p q = v ** {c2 = p ; c3 = q ; lock_V3 = <>} ;
-  dirV3 v p = mkV3 v complAcc p ;
+  dirV3 v p = mkV3 v accusative p ;
-  dirdirV3 v = dirV3 v complDat ;
+  dirdirV3 v = dirV3 v dative ;
 
   V0 : Type = V ;
   V2S, V2V, V2Q : Type = V2 ;

lib/resource-1.0/italian/DiffIta.gf

@@ -105,9 +105,8 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
       s = \\pol,aag => 
         let 
           agr   = aag ** {p = p} ;
-          verb  = case <aag.n, pol,p> of {
+          verb  = case <aag.n, pol> of {
-            <_,_,   P1> => (vp.s ! VPFinite (VPres Indic) Simul).fin ! agr ;
+            <Sg,Neg> => (vp.s ! VPInfinit Simul).inf ! aag ;
-            <Sg,Neg,P2> => (vp.s ! VPInfinit Simul).inf ! aag ;
             _ => (vp.s ! VPImperat).fin ! agr
             } ;
           neg   = vp.neg ! pol ;

lib/resource-1.0/romance/ResRomance.gf

@@ -61,9 +61,10 @@ oper
       habet  : TMood -> Agr -> Str = \tm,a -> aux ! VFin tm a.n a.p ;
       habere : Str = aux ! VInfin ;
 
-      vimp : Agr -> Str = \a -> verb.s ! VImper (case a.n of {
+      vimp : Agr -> Str = \a -> verb.s ! VImper (case <a.n,a.p> of {
-        Sg => SgP2 ;
+        <Pl,P1> => PlP1 ;
-        Pl => PlP2
+        <Sg,_>  => SgP2 ;
+        <Pl,_>  => PlP2
         }) ;
 
       vf : (Agr -> Str) -> (AAgr -> Str) -> {

lib/resource-1.0/spanish/DiffSpa.gf

@@ -78,9 +78,8 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
       s = \\pol,aag => 
         let 
           agr   = aag ** {p = p} ;
-          verb  = case <aag.n, pol,p> of {
+          verb  = case <aag.n, pol> of {
-            <_,_,   P1> => (vp.s ! VPFinite (VPres Conjunct) Simul).fin ! agr ;
+            <Sg,Neg> => (vp.s ! VPFinite (VPres Conjunct) Simul).fin ! agr ;
-            <Sg,Neg,P2> => (vp.s ! VPFinite (VPres Conjunct) Simul).fin ! agr ;
             _ => (vp.s ! VPImperat).fin ! agr
             } ;
           neg   = vp.neg ! pol ;

lib/resource-1.0/spanish/NumeralSpa.gf

@@ -60,8 +60,8 @@ lin pot2 d = spl (d.s ! hundra) ;
 lin pot2plus d e = 
   {s = \\g => d.s ! hundra ! g ++ e.s ! g ; n = Pl} ;
 lin pot2as3 n = n ;
-lin pot3 n = spl (\\g => n.s ! g ++ mil g) ;
+lin pot3 n = spl (\\g => n.s ! NCard Masc ++ mil g) ;
-lin pot3plus n m = {s = \\g => n.s ! g ++ mil g ++ m.s ! g ; n = Pl} ;
+lin pot3plus n m = {s = \\g => n.s ! NCard Masc ++ mil g ++ m.s ! g ; n = Pl} ;
 
 oper
   mkTal : (x1,_,_,_,_,_,_,x8 : Str) -> {s : DForm => CardOrd => Str} =