diff --git a/src/danish/NumeralDan.gf b/src/danish/NumeralDan.gf index c817b0ce..f8a764d7 100644 --- a/src/danish/NumeralDan.gf +++ b/src/danish/NumeralDan.gf @@ -7,7 +7,7 @@ concrete NumeralDan of Numeral = CatDan [Numeral,Digits,Decimal] ** open MorphoD lincat Digit = {s : DForm => CardOrd => Str} ; Sub10 = {s : DForm => CardOrd => Str ; n : Number} ; - Sub100, Sub1000, Sub1000000 = + Sub100, Sub1000, Sub1000000, Sub1000000000, Sub1000000000000 = {s : CardOrd => Str ; n : Number} ; lin num x = x ; @@ -45,6 +45,9 @@ lin n9 = mkTal "ni" "nitten" "halvfems" "niende" "halvfemsindstyvende" ; pot3 n = numPl (\\g => n.s ! invNum ++ cardOrd "tusind" "tusinde" ! g) ; pot3plus n m = {s = \\g => n.s ! invNum ++ "tusind" ++ "og" ++ m.s ! g ; n =Pl} ; + pot3as4 n = n ; + pot4as5 n = n ; + lincat Dig = TDigit ; diff --git a/src/norwegian/NumeralNor.gf b/src/norwegian/NumeralNor.gf index 08c315bb..fb66dc3f 100644 --- a/src/norwegian/NumeralNor.gf +++ b/src/norwegian/NumeralNor.gf @@ -4,7 +4,7 @@ concrete NumeralNor of Numeral = CatNor [Numeral,Digits,Decimal] ** open MorphoN lincat Digit = {s : DForm => CardOrd => Str} ; Sub10 = {s : DForm => CardOrd => Str ; n : Number} ; - Sub100, Sub1000, Sub1000000 = + Sub100, Sub1000, Sub1000000, Sub1000000000, Sub1000000000000 = {s : CardOrd => Str ; n : Number} ; lin @@ -44,6 +44,9 @@ lin pot3plus n m = {s = \\g => n.s ! invNum ++ "tusen" ++ "og" ++ m.s ! g ; n = Pl} ; + pot3as4 n = n ; + pot4as5 n = n ; + -- Numerals from sequences of digits. lincat diff --git a/src/nynorsk/NumeralNno.gf b/src/nynorsk/NumeralNno.gf index 8334230f..8028e5c1 100644 --- a/src/nynorsk/NumeralNno.gf +++ b/src/nynorsk/NumeralNno.gf @@ -4,7 +4,7 @@ concrete NumeralNno of Numeral = CatNno [Numeral,Digits,Decimal] ** open MorphoN lincat Digit = {s : DForm => CardOrd => Str} ; Sub10 = {s : DForm => CardOrd => Str ; n : Number} ; - Sub100, Sub1000, Sub1000000 = + Sub100, Sub1000, Sub1000000, Sub1000000000, Sub1000000000000 = {s : CardOrd => Str ; n : Number} ; lin @@ -44,6 +44,9 @@ lin pot3plus n m = {s = \\g => n.s ! invNum ++ "tusen" ++ "og" ++ m.s ! g ; n = Pl} ; + pot3as4 n = n ; + pot4as5 n = n ; + -- Numerals from sequences of digits. lincat