diff --git a/lib/src/finnish/NumeralFin.gf b/lib/src/finnish/NumeralFin.gf index 2103788ac..e682cdc2e 100644 --- a/lib/src/finnish/NumeralFin.gf +++ b/lib/src/finnish/NumeralFin.gf @@ -51,20 +51,20 @@ lin n = Pl } ; - pot111 = {n = Pl ; s = \\_,c => yksiN.s ! c ++"toista"} ; ---- yhdes - pot1to19 d = {n = Pl ; s = \\_,c => d.s ! c ++"toista"} ; + pot111 = {n = Pl ; s = \\_,c => yksiN.s ! c ++ BIND ++ "toista"} ; ---- yhdes + pot1to19 d = {n = Pl ; s = \\_,c => d.s ! c ++ BIND ++ "toista"} ; pot0as1 n = n ; - pot1 d = {n = Pl ; s = \\_,c => d.s ! c ++ kymmentaN.s ! c} ; + pot1 d = {n = Pl ; s = \\_,c => d.s ! c ++ BIND ++ kymmentaN.s ! c} ; pot1plus d e = { n = Pl ; - s = \\_,c => d.s ! c ++ kymmentaN.s ! c ++ e.s ! NumIndep ! c + s = \\_,c => d.s ! c ++ BIND ++ kymmentaN.s ! c ++ BIND ++ e.s ! NumIndep ! c } ; pot1as2 n = n ; - pot2 d = {n = Pl ; s = \\_,c => d.s ! NumAttr ! c ++ sataaN.s ! d.n ! c} ; ---- + pot2 d = {n = Pl ; s = \\_,c => d.s ! NumAttr ! c ++ BIND ++ sataaN.s ! d.n ! c} ; ---- pot2plus d e = { n = Pl ; - s = \\_,c => d.s ! NumAttr ! c ++ sataaN.s ! d.n ! c ++ e.s ! NumIndep ! c + s = \\_,c => d.s ! NumAttr ! c ++ BIND ++ sataaN.s ! d.n ! c ++ e.s ! NumIndep ! c } ; pot2as3 n = {n = n.n ; s = n.s ! NumIndep} ; pot3 d = {n = Pl ; s = \\c => d.s ! NumAttr ! c ++ tuhattaN.s ! d.n ! c} ; ---- diff --git a/lib/src/swedish/NumeralSwe.gf b/lib/src/swedish/NumeralSwe.gf index bf4186be2..7c06a702e 100644 --- a/lib/src/swedish/NumeralSwe.gf +++ b/lib/src/swedish/NumeralSwe.gf @@ -1,4 +1,4 @@ -concrete NumeralSwe of Numeral = CatSwe ** open ResSwe, MorphoSwe in { +concrete NumeralSwe of Numeral = CatSwe ** open ResSwe, MorphoSwe, Prelude in { lincat Digit = {s : DForm => CardOrd => Str} ; @@ -31,17 +31,17 @@ lin pot1to19 d = numPl (d.s ! ton) ; pot0as1 n = {s = n.s ! ental ; n = n.n} ; pot1 d = numPl (d.s ! tiotal) ; - pot1plus d e = {s = \\g => d.s ! tiotal ! invNum ++ e.s ! ental ! g ; n = Pl} ; + pot1plus d e = {s = \\g => d.s ! tiotal ! invNum ++ BIND ++ e.s ! ental ! g ; n = Pl} ; pot1as2 n = n ; pot2 d = - numPl (\\g => d.s ! ental ! invNum ++ cardOrd "hundra" "hundrade" ! g) ; + numPl (\\g => d.s ! ental ! invNum ++ BIND ++ cardOrd "hundra" "hundrade" ! g) ; pot2plus d e = - {s = \\g => d.s ! ental ! invNum ++ "hundra" ++ e.s ! g ; n = Pl} ; + {s = \\g => d.s ! ental ! invNum ++ BIND ++ "hundra" ++ e.s ! g ; n = Pl} ; pot2as3 n = n ; pot3 n = numPl (\\g => n.s ! invNum ++ cardOrd "tusen" "tusende" ! g) ; pot3plus n m = - {s = \\g => n.s ! invNum ++ "tusen" ++ m.s ! g ; n = Pl} ; + {s = \\g => n.s ! invNum ++ BIND ++ "tusen" ++ m.s ! g ; n = Pl} ; lincat Dig = TDigit ;