extended AP with Ord and compar in 1.5

2 files changed, 15 insertions, 34 deletions

diff --git a/next-lib/src/romance/AdjectiveRomance.gf b/next-lib/src/romance/AdjectiveRomance.gf
index 5ff9babb0..eec0783a7 100644
--- a/next-lib/src/romance/AdjectiveRomance.gf
+++ b/next-lib/src/romance/AdjectiveRomance.gf
@@ -11,6 +11,17 @@ incomplete concrete AdjectiveRomance of Adjective =
       s = \\af => a.s ! Compar ! af ++ conjThan ++ np.s ! Ton Nom ; 
       isPre = False
       } ;
+    UseComparA a = {
+      s = \\af => a.s ! Compar ! af ;
+      isPre = a.isPre
+      } ;
+    AdjOrd ord = {
+      s = \\af => ord.s ! (case af of {
+        AF g n => aagr g n ; 
+        _ => aagr Masc Sg ----
+        }) ;
+      isPre = False ----
+      } ;
 
 -- $SuperlA$ belongs to determiner syntax in $Noun$.
 
@@ -36,6 +47,9 @@ incomplete concrete AdjectiveRomance of Adjective =
       isPre = ap.isPre
       } ;
 
-    UseA2 a = a ** {isPre = False} ;
+    UseA2 a = {
+      s = a.s ! Posit ;
+      isPre = False ---- A2 has no isPre
+      } ;
 
 }
diff --git a/next-lib/src/romance/NounRomance.gf b/next-lib/src/romance/NounRomance.gf
index 5f5d16020..a5de71f99 100644
--- a/next-lib/src/romance/NounRomance.gf
+++ b/next-lib/src/romance/NounRomance.gf
@@ -93,30 +93,6 @@ incomplete concrete NounRomance of Noun =
 
     OrdSuperl adj = {s = \\a => adj.s ! Superl ! AF a.g a.n} ;
 
-{-
-    DetArtSg det cn = 
-      let 
-        g = cn.g ;
-        n = Sg
-      in {
-        s = \\c => let cs = npform2case c in 
-              det.s ! False ! n ! g ! cs ++ cn.s ! n ;
-        a = agrP3 g n ;
-        hasClit = False
-        } ;
-
-    DetArtPl det cn = 
-      let 
-        g = cn.g ;
-        n = Pl
-      in {
-        s = \\c => let cs = npform2case c in 
-              det.s ! False ! n ! g ! cs ++ cn.s ! n ;
-        a = agrP3 g n ;
-        hasClit = False
-        } ;
--}
-
     DefArt = {
       s = \\_,n,g,c => artDef g n c ;  
       sp = \\n,g,c => artDef g n c ; ---- not for Fre 
@@ -138,15 +114,6 @@ incomplete concrete NounRomance of Noun =
         hasClit = False
         } ;
 
-{---b
-    MassDet = {
-      s = \\b,n,g,c => case <b,n> of {
-        <False,Sg> => partitive g c ;
-        _ => prepCase genitive ----
-        }
-      } ;
--}
-
 -- This is based on record subtyping.
 
     UseN, UseN2 = \noun -> noun ;