diff --git a/lib/src/dutch/NumeralDut.gf b/lib/src/dutch/NumeralDut.gf index dbe814d5f..f85880c0f 100644 --- a/lib/src/dutch/NumeralDut.gf +++ b/lib/src/dutch/NumeralDut.gf @@ -3,47 +3,50 @@ concrete NumeralDut of Numeral = CatDut ** open ResDut, Prelude in { flags optimize = all_subs ; lincat - Digit = {s : DForm => CardOrd => Str} ; - Sub10 = {s : DForm => CardOrd => Str ; n : Number} ; + Digit = {s : DForm => CardOrd => Str ; en : Str} ; + Sub10 = {s : DForm => CardOrd => Str ; n : Number ; en : Str ; attr : Str} ; Sub100, Sub1000, Sub1000000 = - {s : CardOrd => Str ; n : Number} ; + {s : CardOrd => Str ; n : Number ; attr : Str} ; lin num x = x ; n2 = mkDigit "twee" "twaalf" "twintig" "tweede" ; n3 = mkDigit "drie" "dertien" "dertig" "derde" ; - n4 = mkDigit "vier" "veertien" "veertig" "vierde" ; - n5 = mkDigit "vijf" "vijftien" "vijftig" "vijfde" ; - n6 = mkDigit "zes" "zestien" "zestig" "zesde" ; + n4 = mkDigit "vier" "veertien" "veertig" "vierde" ; + n5 = mkDigit "vijf" "vijftien" "vijftig" "vijfde" ; + n6 = mkDigit "zes" "zestien" "zestig" "zesde" ; n7 = mkDigit "zeven" "zeventien" "zeventig" "zevende" ; - n8 = mkDigit "acht" "achttien" "tachtig" "achtste" ; + n8 = mkDigit "acht" "achttien" "tachtig" "achtste" ; n9 = mkDigit "negen" "negentien" "negentig" "negende" ; pot01 = { s = \\f => table { - NCard g _ => "één" ; + NCard g _ => "een" ; ---- "één" ; NOrd af => (regAdjective "eerst").s ! Posit ! af } ; - n = Sg + n = Sg ; + attr = [] ; + en = "en" } ; - pot0 d = {s = \\f,g => d.s ! f ! g ; n = Pl} ; - pot110 = {s = cardOrd "tien" "tiende" ; n = Pl} ; - pot111 = {s = cardOrd "elf" "elfde" ; n = Pl} ; - pot1to19 d = {s = d.s ! DTeen; n = Pl} ; - pot0as1 n = {s = n.s ! DUnit; n = n.n } ; - pot1 d = {s = d.s ! DTen; n = Pl} ; - pot1plus d e = {s = \\g => e.s ! DUnit ! invNum ++ "en" ++ d.s ! DTen ! g; n = Pl} ; + pot0 d = {s = \\f,g => d.s ! f ! g ; n = Pl ; en = d.en ; attr = d.s ! DUnit ! invNum ++ BIND} ; + pot110 = {s = cardOrd "tien" "tiende" ; n = Pl ; attr = "tien" ++ BIND} ; + pot111 = {s = cardOrd "elf" "elfde" ; n = Pl ; attr = "elf" ++ BIND} ; + pot1to19 d = addAttr {s = d.s ! DTeen ; n = Pl} ; + pot0as1 n = {s = n.s ! DUnit; n = n.n ; attr = n.attr} ; + pot1 d = addAttr {s = d.s ! DTen ; n = Pl} ; + pot1plus d e = addAttr {s = \\g => + e.s ! DUnit ! invNum ++ BIND ++ e.en ++ BIND ++ d.s ! DTen ! g ; n = Pl} ; pot1as2 n = n ; pot2 d = - {s = \\g => d.s ! DUnit ! invNum ++ cardOrd "honderd" "honderdste" ! g ; n = Pl} ; + addAttr {s = \\g => d.attr ++ cardOrd "honderd" "honderdste" ! g ; n = Pl} ; pot2plus d e = - {s = \\g => d.s ! DUnit ! invNum ++ "duizend" ++ e.s ! g ; n = Pl} ; + addAttr {s = \\g => d.attr ++ "honderd" ++ BIND ++ e.s ! g ; n = Pl} ; pot2as3 n = n ; pot3 n = - {s = \\g => n.s ! invNum ++ cardOrd "duizend" "duizendste" ! g ; n = Pl} ; + addAttr {s = \\g => n.attr ++ cardOrd "duizend" "duizendste" ! g ; n = Pl} ; pot3plus n m = - {s = \\g => n.s ! invNum ++ "duizend" ++ m.s ! g ; n = Pl} ; + addAttr {s = \\g => n.attr ++ "duizend" ++ m.s ! g ; n = Pl} ; lincat @@ -82,7 +85,7 @@ lin s : CardOrd => Str } ; - LinDigit = {s : DForm => CardOrd => Str} ; + LinDigit = {s : DForm => CardOrd => Str ; en : Str} ; cardOrd : Str -> Str -> CardOrd => Str = \drei,dritte -> let dritt = init dritte in @@ -97,8 +100,12 @@ lin DUnit => cardOrd drei dritte ; DTeen => cardOrd dreizehn (dreizehn + "de") ; DTen => cardOrd dreissig (dreissig + "ste") - } + } ; + en = case drei of {_ + "e" => "ën" ; _ => "en"} } ; invNum : CardOrd = NCard Utr Nom ; + addAttr : {s : CardOrd => Str ; n : Number} -> + {s : CardOrd => Str ; n : Number ; attr : Str} = \n -> n ** {attr = n.s ! invNum ++ BIND} ; + } diff --git a/lib/src/dutch/QuestionDut.gf b/lib/src/dutch/QuestionDut.gf index 62055470a..6d28f92d4 100644 --- a/lib/src/dutch/QuestionDut.gf +++ b/lib/src/dutch/QuestionDut.gf @@ -93,6 +93,8 @@ concrete QuestionDut of Question = CatDut ** open ResDut in { s = \\g => idet.s ! n ! g ++ num.s ; n = n } ; + + AdvIAdv i a = {s = i.s ++ a.s} ; CompIAdv a = {s = \\_ => a.s} ; diff --git a/lib/src/dutch/StructuralDut.gf b/lib/src/dutch/StructuralDut.gf index 542c5b1a7..9364b3b41 100644 --- a/lib/src/dutch/StructuralDut.gf +++ b/lib/src/dutch/StructuralDut.gf @@ -42,7 +42,7 @@ concrete StructuralDut of Structural = CatDut, Prelude ** how8many_IDet = mkDet "hoeveel" "hoeveel" Pl ; if_Subj = ss "als" ; in8front_Prep = mkPrep "voor" ; - i_Pron = mkPronoun "ik" "me" "m'n" "ik" "mij" "mijn" "mijne" Utr Sg P1 ; + i_Pron = mkPronoun "ik" "me" "mijn" "ik" "mij" "mijn" "mijne" Utr Sg P1 ; in_Prep = ss "in" ; it_Pron = mkPronoun "het" "het" "zijn" "het" "het" "zijn" "zijne" Neutr Sg P3 ;