From 822cfc4bef8f69868abfd67252aa1989cb9a1041 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Fri, 17 Apr 2020 14:46:44 +0200
Subject: [PATCH] (Hun) Change lincat of Ord + add OrdSuperl, DetQuantOrd

---
 src/hungarian/AdjectiveHun.gf |  2 +-
 src/hungarian/CatHun.gf       |  2 +-
 src/hungarian/NounHun.gf      | 16 +++++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/hungarian/AdjectiveHun.gf b/src/hungarian/AdjectiveHun.gf
index 08128e15f..5bb3feb49 100644
--- a/src/hungarian/AdjectiveHun.gf
+++ b/src/hungarian/AdjectiveHun.gf
@@ -38,7 +38,7 @@ concrete AdjectiveHun of Adjective = CatHun ** open ResHun, Prelude in {
 -- The superlative use is covered in $Ord$.
 
   -- : Ord -> AP ;       -- warmest
-  -- AdjOrd ord = emptyAP ** ord ;
+  AdjOrd ord = emptyAP ** ord ;
 
 -- Sentence and question complements defined for all adjectival
 -- phrases, although the semantics is only clear for some adjectives.
diff --git a/src/hungarian/CatHun.gf b/src/hungarian/CatHun.gf
index a4471e71d..423c2f775 100644
--- a/src/hungarian/CatHun.gf
+++ b/src/hungarian/CatHun.gf
@@ -66,7 +66,7 @@ concrete CatHun of Cat = CommonX ** open ResHun, Prelude in {
     Quant = ResHun.Quant ;
     Num = ResHun.Num ;
     Ord = {
-      s : Str ; -- Number => Case => Str ; -- Ord can come from AP and become AP again
+      s : Number => Str ; -- Number => Case => Str ; -- Ord can come from AP and become AP again
       n : Number -- Ord can come from Num, which has inherent number
       } ;
     DAP = ResHun.Determiner ;
diff --git a/src/hungarian/NounHun.gf b/src/hungarian/NounHun.gf
index 20cefd26f..98e351ec4 100644
--- a/src/hungarian/NounHun.gf
+++ b/src/hungarian/NounHun.gf
@@ -67,9 +67,11 @@ concrete NounHun of Noun = CatHun ** open ResHun, Prelude in {
     } ;
 
   -- : Quant -> Num -> Ord -> Det ;  -- these five best
-  -- DetQuantOrd quant num ord =
-  --   let theseFive = DetQuant quant num in theseFive ** {
-  --     } ;
+  DetQuantOrd quant num ord =
+    let theseFive = DetQuant quant num in theseFive ** {
+      s = \\c => theseFive.s ! c ++ ord.s ! num.n ;
+      sp = \\c => theseFive.sp ! c ++ ord.s ! num.n ;
+      } ;
 
 -- Whether the resulting determiner is singular or plural depends on the
 -- cardinal.
@@ -106,18 +108,18 @@ concrete NounHun of Noun = CatHun ** open ResHun, Prelude in {
   OrdNumeral num = num ** {
     s = \\_ => num.ord
     } ;
-
+-}
   -- : A       -> Ord ;
   OrdSuperl a = {
-    s = \\af => "제일" ++ a.s ! af ;
+    s = a.s ! Superl ;
     n = Sg -- ?? is this meaningful?
     } ;
 
 -- One can combine a numeral and a superlative.
 
   -- : Numeral -> A -> Ord ; -- third largest
-  OrdNumeralSuperl num a = num ** {  } ;
--}
+  -- OrdNumeralSuperl num a = num ** {  } ;
+
   -- : Quant
   DefArt = {
     s,