mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-06 09:42:50 -06:00
New order among numerals.
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
include numerals.Abs.gf ;
|
||||
|
||||
-- by Patrik Jansson, Chalmers
|
||||
-- Small change by HH i.e
|
||||
-- ö in kettö should be ö with tilted long Hungarian dots ad-hoc written o%
|
||||
|
||||
param DForm = ental | tiotal ;
|
||||
param Place = attr | indep ;
|
||||
@@ -13,9 +11,9 @@ lincat Sub100 = {s : Place => Str} ;
|
||||
lincat Sub1000 = {s : Place => Str} ;
|
||||
lincat Sub1000000 = {s : Str} ;
|
||||
lin num x0 =
|
||||
{s = "/L" ++ x0.s ++ "L/"} ; -- the Latin-A-Supplement environment} ;
|
||||
{s = x0.s} ;
|
||||
lin n2 =
|
||||
{s = table {<ental,indep> => "ketto%" ;
|
||||
{s = table {<ental,indep> => "kettö" ;
|
||||
<tiotal,indep> => "húsz" ;
|
||||
<ental,attr> => "két" ;
|
||||
<tiotal, attr> => "huszon"}} ;
|
||||
@@ -40,24 +38,24 @@ lin pot0 d =
|
||||
lin pot110 =
|
||||
{s = table {p => "tíz"}} ;
|
||||
lin pot111 =
|
||||
{s = table {p => "tizen" + "egy"}} ;
|
||||
{s = table {p => "tizen" ++ "egy"}} ;
|
||||
lin pot1to19 d =
|
||||
{s = table {p => "tizen" ++ d.s ! <ental,indep>}} ; -- Glue!
|
||||
{s = table {p => "tizen" ++ d.s ! <ental,indep>}} ;
|
||||
lin pot0as1 n =
|
||||
{s = table {p => n.s ! <ental,p>}} ;
|
||||
lin pot1 d =
|
||||
{s = table {p => d.s ! <tiotal,indep>}} ;
|
||||
lin pot1plus d e =
|
||||
{s = table {p => (d.s ! <tiotal,attr>) ++ e.s ! <ental,indep>}} ; -- Glue!
|
||||
{s = table {p => (d.s ! <tiotal,attr>) ++ e.s ! <ental,indep>}} ;
|
||||
lin pot1as2 n =
|
||||
{s = table {p => n.s ! p}} ;
|
||||
lin pot2 d =
|
||||
{s = table {p => (d.s ! <ental,attr>) ++ "száz"}} ; -- Glue!
|
||||
{s = table {p => (d.s ! <ental,attr>) ++ "száz"}} ;
|
||||
lin pot2plus d e =
|
||||
{s = table {p => (d.s ! <ental,attr>) ++ "száz" ++ e.s ! indep}} ; -- Glue!
|
||||
{s = table {p => (d.s ! <ental,attr>) ++ "száz" ++ e.s ! indep}} ;
|
||||
lin pot2as3 n =
|
||||
{s = n.s ! indep} ;
|
||||
lin pot3 n =
|
||||
{s = n.s ! attr ++ "ezer"} ; -- Glue!
|
||||
{s = n.s ! attr ++ "ezer"} ;
|
||||
lin pot3plus n m =
|
||||
{s = n.s ! attr ++ "ezer" ++ m.s ! indep} ; -- Glue!
|
||||
{s = n.s ! attr ++ "ezer" ++ m.s ! indep} ;
|
||||
|
||||
Reference in New Issue
Block a user