GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 08:58:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

comma instead of dot and space separator in Romance decimals

Browse Source
This commit is contained in:
Krasimir Angelov
2024-01-31 12:02:46 +01:00
parent b746a425d5
commit a8b0e5d94b
6 changed files with 86 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/catalan/NumeralCat.gf
View File

@@ -140,11 +140,12 @@ param
Dig = TDigit ;
lin
IDig d = d ;
IDig d = d ** {tail = T1} ;
IIDig d i = {
s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = Pl
s = \\o => d.s ! NCard Masc ++ spaceIf i.tail ++ i.s ! o ;
n = Pl ;
tail = inc i.tail
} ;
D_0 = mkDig "0" ;
@@ -166,12 +167,24 @@ param
} ;
IFrac d i = {
s = \\o => d.s ! NCard Masc ++
if_then_Str d.hasDot BIND (BIND++"."++BIND) ++
if_then_Str d.hasDot BIND (BIND++","++BIND) ++
i.s ! o ;
n = Pl ;
hasDot=True
} ;
oper
spaceIf : DTail -> Str = \t -> case t of {
T3 => SOFT_SPACE ;
_ => BIND
} ;
inc : DTail -> DTail = \t -> case t of {
T1 => T2 ;
T2 => T3 ;
T3 => T1
} ;
oper
mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
mkDig : Str -> TDigit = \c -> mk2Dig c (c + ":o") ;

21
src/french/NumeralFre.gf
View File

@@ -153,11 +153,12 @@ oper hyphen = BIND ++ "-" ++ BIND ;
Dig = TDigit ;
lin
IDig d = d ;
IDig d = d ** {tail = T1} ;
IIDig d i = {
s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = Pl
s = \\o => d.s ! NCard Masc ++ spaceIf i.tail ++ i.s ! o ;
n = Pl ;
tail = inc i.tail
} ;
D_0 = mkDig "0" ;
@@ -179,12 +180,24 @@ oper hyphen = BIND ++ "-" ++ BIND ;
} ;
IFrac d i = {
s = \\o => d.s ! NCard Masc ++
if_then_Str d.hasDot BIND (BIND++"."++BIND) ++
if_then_Str d.hasDot BIND (BIND++","++BIND) ++
i.s ! o ;
n = Pl ;
hasDot=True
} ;
oper
spaceIf : DTail -> Str = \t -> case t of {
T3 => SOFT_SPACE ;
_ => BIND
} ;
inc : DTail -> DTail = \t -> case t of {
T1 => T2 ;
T2 => T3 ;
T3 => T1
} ;
oper
mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
mkDig : Str -> TDigit = \c -> mk2Dig c (c + "ème") ;

21
src/italian/NumeralIta.gf
View File

@@ -120,11 +120,12 @@ param Pred = pred | indip ;
Dig = TDigit ;
lin
IDig d = d ;
IDig d = d ** {tail = T1} ;
IIDig d i = {
s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = Pl
s = \\o => d.s ! NCard Masc ++ spaceIf i.tail ++ i.s ! o ;
n = Pl ;
tail = inc i.tail
} ;
D_0 = mkDig "0" ;
@@ -146,12 +147,24 @@ param Pred = pred | indip ;
} ;
IFrac d i = {
s = \\o => d.s ! NCard Masc ++
if_then_Str d.hasDot BIND (BIND++"."++BIND) ++
if_then_Str d.hasDot BIND (BIND++","++BIND) ++
i.s ! o;
n = Pl ;
hasDot=True
} ;
oper
spaceIf : DTail -> Str = \t -> case t of {
T3 => SOFT_SPACE ;
_ => BIND
} ;
inc : DTail -> DTail = \t -> case t of {
T1 => T2 ;
T2 => T3 ;
T3 => T1
} ;
oper
mkDig : Str -> TDigit = \c -> mk2Dig c Pl ;

21
src/portuguese/NumeralPor.gf
View File

@@ -189,11 +189,12 @@ concrete NumeralPor of Numeral = CatPor [Numeral,Digits,Decimal] **
Dig = TDigit ;
lin
IDig d = d ;
IDig d = d ** {tail = T1} ;
IIDig d i = {
s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = Pl
s = \\o => d.s ! NCard Masc ++ spaceIf i.tail ++ i.s ! o ;
n = Pl ;
tail = inc i.tail
} ;
D_0 = mkDig "0" Sg ;
@@ -215,12 +216,24 @@ concrete NumeralPor of Numeral = CatPor [Numeral,Digits,Decimal] **
} ;
IFrac d i = {
s = \\o => d.s ! NCard Masc ++
if_then_Str d.hasDot BIND (BIND++"."++BIND) ++
if_then_Str d.hasDot BIND (BIND++","++BIND) ++
i.s ! o;
n = Pl ;
hasDot=True
} ;
oper
spaceIf : DTail -> Str = \t -> case t of {
T3 => SOFT_SPACE ;
_ => BIND
} ;
inc : DTail -> DTail = \t -> case t of {
T1 => T2 ;
T2 => T3 ;
T3 => T1
} ;
oper
mk4Dig : Str -> Str -> Str -> Number -> TDigit = \c,o,a,n -> {
s = table {

2
src/romance/CatRomance.gf
View File

@@ -89,7 +89,7 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol,MU]
-- Numeral
Numeral = {s : CardOrd => Str ; n : Number} ;
Digits = {s : CardOrd => Str ; n : Number} ;
Digits = {s : CardOrd => Str ; n : Number ; tail : DTail} ;
Decimal = {s : CardOrd => Str ; n : Number ; hasDot : Bool} ;
-- Structural

21
src/spanish/NumeralSpa.gf
View File

@@ -114,11 +114,12 @@ param
Dig = TDigit ;
lin
IDig d = d ;
IDig d = d ** {tail = T1} ;
IIDig d i = {
s = \\o => d.s ! NCard Masc ++ BIND ++ i.s ! o ;
n = Pl
s = \\o => d.s ! NCard Masc ++ spaceIf i.tail ++ i.s ! o ;
n = Pl ;
tail = inc i.tail
} ;
D_0 = mkDig "0" ;
@@ -140,12 +141,24 @@ param
} ;
IFrac d i = {
s = \\o => d.s ! NCard Masc ++
if_then_Str d.hasDot BIND (BIND++"."++BIND) ++
if_then_Str d.hasDot BIND (BIND++","++BIND) ++
i.s ! o ;
n = Pl ;
hasDot=True
} ;
oper
spaceIf : DTail -> Str = \t -> case t of {
T3 => SOFT_SPACE ;
_ => BIND
} ;
inc : DTail -> DTail = \t -> case t of {
T1 => T2 ;
T2 => T3 ;
T3 => T1
} ;
oper
mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
mkDig : Str -> TDigit = \c -> mk2Dig c (c + ":o") ;