diff --git a/examples/numerals/french_belgian.gf b/examples/numerals/french_belgian.gf index eb6e23ad9..e6c80549e 100644 --- a/examples/numerals/french_belgian.gf +++ b/examples/numerals/french_belgian.gf @@ -2,49 +2,49 @@ include numerals.Abs.gf ; param DForm = unit | teen | ten ; param Nm = sg | pl ; -param Place = indep | attr ; +param Place + = indep -- stands by itself; as "cents" in "deux cents" + | attr ; -- as in "deux cent trois" -lincat Numeral = {s : Str} ; -lincat Digit = {inh : DForm ; inh1 : Nm ; s : DForm => Str} ; -lincat Sub10 = {inh : Nm ; s : {p1 : DForm ; p2 : Place} => Str} ; -lincat Sub100 = {s : Place => Str} ; -lincat Sub1000 = {s : Place => Str} ; +lincat Numeral = {s : Str} ; +lincat Digit = {inh1 : Nm; -- Nm = pl => quarante et un + -- Nm = sg => quatre-vingt-un + -- (governs whether "et" is required between tens and units) + s : DForm => Str} ; +lincat Sub10 = {inh : Nm ; s : {p2 : Place} => Str} ; +lincat Sub100 = {s : Place => Str} ; +lincat Sub1000 = {s : Place => Str} ; lincat Sub1000000 = {s : Str} ; lin num x0 = {s = x0.s} ; lin n2 = - {inh = unit ; inh1 = sg ; s = table {unit => "deux" ; teen => "douze" ; ten => "vingt" }} ; + {inh1 = sg ; s = table {unit => "deux" ; teen => "douze" ; ten => "vingt" }} ; lin n3 = - {inh = unit ; inh1 = sg ; s = table {unit => "trois" ; teen => "treize" ; ten => "trente" }} ; + {inh1 = sg ; s = table {unit => "trois" ; teen => "treize" ; ten => "trente" }} ; lin n4 = - {inh = unit ; inh1 = sg ; s = table {unit => "quatre" ; teen => "quatorze" ; ten => "quarante" }} ; + {inh1 = sg ; s = table {unit => "quatre" ; teen => "quatorze" ; ten => "quarante" }} ; lin n5 = - {inh = unit ; inh1 = sg ; s = table {unit => "cinq" ; teen => "quinze" ; ten => "cinquante" }} ; + {inh1 = sg ; s = table {unit => "cinq" ; teen => "quinze" ; ten => "cinquante" }} ; lin n6 = - {inh = unit ; inh1 = sg ; s = table {unit => "six" ; teen => "seize" ; ten => "soixante" }} ; + {inh1 = sg ; s = table {unit => "six" ; teen => "seize" ; ten => "soixante" }} ; lin n7 = - {inh = unit ; inh1 = sg ; s = table {unit => "sept" ; teen => "dix" ++ "-" ++ "sept" ; ten => "septante" }} ; + {inh1 = sg ; s = table {unit => "sept" ; teen => "dix" ++ "-" ++ "sept" ; ten => "septante" }} ; lin n8 = - {inh = unit ; inh1 = pl ; s = table {unit => "huit" ; teen => "dix" ++ "-" ++ "huit" ; ten => "quatre" ++ "-" ++ "vingts" }} ; + {inh1 = pl ; s = table {unit => "huit" ; teen => "dix" ++ "-" ++ "huit" ; ten => "quatre-vingt" }} ; lin n9 = - {inh = unit ; inh1 = pl ; s = table {unit => "neuf" ; teen => "dix" ++ "-" ++ "neuf" ; ten => "nonante" }} ; + {inh1 = sg ; s = table {unit => "neuf" ; teen => "dix" ++ "-" ++ "neuf" ; ten => "nonante" }} ; lin pot01 = {inh = sg ; - s = table {{p1 = unit ; p2 = indep} => "un" ; - {p1 = unit ; p2 = attr} => [] ; - {p1 = teen ; p2 = indep} => "onze" ; - {p1 = teen ; p2 = attr} => [] ; - {p1 = ten ; p2 = indep} => "dix" ; - {p1 = ten ; p2 = attr} => [] }} ; + s = table {{p2 = indep} => "un" ; + {p2 = attr} => [] }}; + lin pot0 d = {inh = pl ; - s = table {{p1 = unit ; p2 = indep} => d.s ! unit ; - {p1 = unit ; p2 = attr} => d.s ! unit ; - {p1 = teen ; p2 = indep} => d.s ! teen ; - {p1 = teen ; p2 = attr} => d.s ! teen ; - {p1 = ten ; p2 = indep} => d.s ! ten ; - {p1 = ten ; p2 = attr} => d.s ! ten }} ; + s = table {{p2 = indep} => d.s ! unit ; + {p2 = attr} => d.s ! unit }} ; + +oper pluralMark = table {sg => ""; pl => "s"}; lin pot110 = {s = table {indep => "dix" ; attr => "dix"}} ; @@ -55,17 +55,36 @@ lin pot1to19 d = lin pot0as1 n = {s = table {indep => n.s ! {p1 = unit ; p2 = indep} ; attr => n.s ! {p1 = unit ; p2 = attr}}} ; lin pot1 d = - {s = table {indep => d.s ! ten ; attr => d.s ! ten}} ; + {s = table {indep => (d.s ! ten) ++ (pluralMark ! d.inh1); attr => d.s ! ten}} ; lin pot1plus d e = - {s = table {indep => (d.s ! ten) ++ (table {{p1 = sg ; p2 = sg} => "et" ; {p1 = sg ; p2 = pl} => "-" ; {p1 = pl ; p2 = sg} => "-" ; {p1 = pl ; p2 = pl} => "-"} ! {p1 = d.inh1 ; p2 = e.inh}) ++ e.s ! {p1 = d.inh ; p2 = indep} ; attr => (d.s ! ten) ++ (table {{p1 = sg ; p2 = sg} => "et" ; {p1 = sg ; p2 = pl} => "-" ; {p1 = pl ; p2 = sg} => "-" ; {p1 = pl ; p2 = pl} => "-"} ! {p1 = d.inh1 ; p2 = e.inh}) ++ e.s ! {p1 = d.inh ; p2 = indep}}} ; + {s = table {indep => + (d.s ! ten) ++ (table {{p1 = sg ; p2 = sg} => "et" ; + {p1 = sg ; p2 = pl} => "-" ; + {p1 = pl ; p2 = sg} => "-" ; + {p1 = pl ; p2 = pl} => "-"} ! {p1 = d.inh1 ; p2 = e.inh}) ++ + e.s ! {p2 = indep} ; + attr => + (d.s ! ten) ++ (table {{p1 = sg ; p2 = sg} => "et" ; + {p1 = sg ; p2 = pl} => "-" ; + {p1 = pl ; p2 = sg} => "-" ; + {p1 = pl ; p2 = pl} => "-"} ! {p1 = d.inh1 ; p2 = e.inh}) ++ + e.s ! {p2 = indep}}} ; lin pot1as2 n = {s = table {indep => n.s ! indep ; attr => n.s ! attr}} ; + lin pot2 d = - {s = table {indep => (d.s ! {p1 = unit ; p2 = attr}) ++ table {sg => "cent" ; pl => "cents"} ! (d.inh) ; attr => (d.s ! {p1 = unit ; p2 = attr}) ++ "cent"}} ; + {s = table {indep => + (d.s ! {p1 = unit ; p2 = attr}) ++ + table {sg => "cent" ; pl => "cents"} ! (d.inh) ; + attr => + (d.s ! {p1 = unit ; p2 = attr}) ++ + "cent"}} ; lin pot2plus d e = - {s = table {indep => (d.s ! {p1 = unit ; p2 = attr}) ++ "cent" ++ e.s ! indep ; attr => (d.s ! {p1 = unit ; p2 = attr}) ++ "cent" ++ e.s ! indep}} ; + {s = table {indep => (d.s ! {p1 = unit ; p2 = attr}) ++ "cent" ++ e.s ! indep ; + attr => (d.s ! {p1 = unit ; p2 = attr}) ++ "cent" ++ e.s ! indep}} ; lin pot2as3 n = {s = n.s ! indep} ; + lin pot3 n = {s = (n.s ! attr) ++ "mille"} ; lin pot3plus n m =