ordinals

lib/resource/english/MorphoEng.gf

@@ -310,12 +310,32 @@ oper
 
 -- From $numerals$.
 
-param DForm = unit  | teen  | ten  ;
-oper mkNum : Str -> Str -> Str -> {s : DForm => Str} = 
-  \two -> \twelve -> \twenty -> 
-  {s = table {unit => two ; teen => twelve ; ten => twenty}} ;
-oper regNum : Str -> {s : DForm => Str} = 
-  \six -> mkNum six (six + "teen") (six + "ty") ;
+param 
+  DForm = unit  | teen  | ten  ;
+  CardOrd = NCard | NOrd ;
+
+oper 
+  mkNum : Str -> Str -> Str -> Str -> {s : DForm => CardOrd => Str} = 
+  \two -> \twelve -> \twenty -> \second ->
+  {s = table {
+     unit => table {NCard => two ; NOrd => second} ; 
+     teen => \\c => mkCard c twelve ; 
+     ten  => \\c => mkCard c twenty
+     }
+   } ;
+
+  regNum : Str -> {s : DForm => CardOrd => Str} = 
+    \six -> mkNum six (six + "teen") (six + "ty") (regOrd six) ;
+
+  regCardOrd : Str -> {s : CardOrd => Str} = \ten ->
+    {s = table {NCard => ten ; NOrd => regOrd ten}} ;
+
+  mkCard : CardOrd -> Str -> Str = \c,ten -> (regCardOrd ten).s ! c ; 
+
+  regOrd : Str -> Str = \ten -> case last ten of {
+    "y" => init ten + "ieth" ;
+    _   => ten + "th"
+    } ;
 
 } ;
 

lib/resource/english/NumeralsEng.gf

@@ -1,35 +1,45 @@
 concrete NumeralsEng of Numerals = open Prelude, MorphoEng in {
 
-lincat Numeral = {s : Str ; n : Number} ;
-lincat Digit = {s : DForm => Str} ;
-lincat Sub10 = {s : DForm => Str ; n : Number} ;
-  Sub100 = {s : Str ; n : Number} ;
-  Sub1000 = {s : Str ; n : Number} ;
-  Sub1000000 = {s : Str ; n : Number} ;
+lincat Numeral = {s : CardOrd => Str ; n : Number} ;
+lincat Digit = {s : DForm => CardOrd => Str} ;
+lincat 
+  Sub10 = {s : DForm => CardOrd => Str ; n : Number} ;
+  Sub100     = {s : CardOrd => Str ; n : Number} ;
+  Sub1000    = {s : CardOrd => Str ; n : Number} ;
+  Sub1000000 = {s : CardOrd => Str ; n : Number} ;
 
 lin num x = x ;
-lin n2 = mkNum "two"   "twelve"   "twenty" ;
-lin n3 = mkNum "three" "thirteen" "thirty" ;
-lin n4 = mkNum "four"  "fourteen" "forty" ;
-lin n5 = mkNum "five"  "fifteen"  "fifty" ;
+lin n2 = let two = mkNum "two"   "twelve"   "twenty" "second" in
+         {s = \\f,c => case <f,c> of {
+             <teen,NOrd> => "twelfth" ;
+             _ => two.s ! f ! c
+             }
+         } ;
+
+lin n3 = mkNum "three" "thirteen" "thirty" "third" ;
+lin n4 = mkNum "four"  "fourteen" "forty" "fourth" ;
+lin n5 = mkNum "five"  "fifteen"  "fifty" "fifth" ;
 lin n6 = regNum "six" ;
 lin n7 = regNum "seven" ;
-lin n8 = mkNum "eight" "eighteen" "eighty" ;
+lin n8 = mkNum "eight" "eighteen" "eighty" "eighth" ;
 lin n9 = regNum "nine" ;
 
-lin pot01 = {s = table {f => "one"} ; n = Sg} ;
-lin pot0 d = {s = table {f => d.s ! f} ; n = Pl} ;
-lin pot110 = ss "ten" ** {n = Pl} ;
-lin pot111 = ss "eleven" ** {n = Pl} ;
+lin pot01 = mkNum "one" "eleven" "ten" "first" ** {n = Sg} ;
+lin pot0 d = d ** {n = Pl} ;
+lin pot110 = regCardOrd "ten" ** {n = Pl} ;
+lin pot111 = regCardOrd "eleven" ** {n = Pl} ;
 lin pot1to19 d = {s = d.s ! teen} ** {n = Pl} ;
 lin pot0as1 n = {s = n.s ! unit}  ** {n = n.n} ;
 lin pot1 d = {s = d.s ! ten} ** {n = Pl} ;
-lin pot1plus d e = {s = d.s ! ten ++ "-" ++ e.s ! unit} ** {n = Pl} ;
+lin pot1plus d e = {
+   s = \\c => d.s ! ten ! NCard ++ "-" ++ e.s ! unit ! c ; n = Pl} ;
 lin pot1as2 n = n ;
-lin pot2 d = {s = d.s ! unit ++ "hundred"}  ** {n = Pl} ;
-lin pot2plus d e = {s = d.s ! unit ++ "hundred" ++ "and" ++ e.s} ** {n = Pl} ;
+lin pot2 d = {s = \\c => d.s ! unit ! NCard ++ mkCard c "hundred"}  ** {n = Pl} ;
+lin pot2plus d e = {
+  s = \\c => d.s ! unit ! NCard ++ "hundred" ++ "and" ++ e.s ! c ; n = Pl} ;
 lin pot2as3 n = n ;
-lin pot3 n = {s = n.s ++ "thousand"}  ** {n = Pl} ;
-lin pot3plus n m = {s = n.s ++ "thousand" ++ m.s}  ** {n = Pl} ;
-
+lin pot3 n = {
+  s = \\c => n.s ! NCard ++ mkCard c "thousand" ; n = Pl} ;
+lin pot3plus n m = {
+  s = \\c => n.s ! NCard ++ "thousand" ++ m.s ! c ; n = Pl} ;
 }

lib/resource/english/StructuralEng.gf

@@ -10,7 +10,8 @@ concrete StructuralEng of Structural =
   flags optimize=all ;
 
   lin
-  UseNumeral i = {s = table {Nom => i.s ; Gen => i.s ++ "'s"} ; n = i.n} ; ---
+  UseNumeral i = {
+   s = table {Nom => i.s ! NCard ; Gen => i.s ! NCard ++ "'s"} ; n = i.n} ; ---
 
 
   above_Prep = ss "above" ;

lib/resource/english/TimeEng.gf

@@ -1,5 +1,5 @@
 concrete TimeEng of Time = NumeralsEng ** 
-  open Prelude, CategoriesEng, ParadigmsEng in {
+  open Prelude, CategoriesEng, ParadigmsEng, MorphoEng in {
 
 lincat
 Date = SS ;
@@ -17,8 +17,8 @@ PastTime h m = ss (m.s ++ "past" ++ h.s) ;
 ToTime h m = ss (m.s ++ "to" ++ h.s) ;
 ExactTime h = ss (h.s ++ "sharp") ;
 
-NumHour n = n ;
-NumMinute n = n ;
+NumHour n = {s = n.s ! NCard} ;
+NumMinute n = {s = n.s ! NCard} ;
 
 monday = regN "Monday" ;
 tuesday = regN "Tuesday" ;