forked from GitHub/gf-core
use BIND to glue the digits in IIDig for the Bulgarian, English and Swedish grammmars
This commit is contained in:
@@ -95,7 +95,7 @@ lin pot3plus n m = {
|
||||
IDig d = d ** {tail = T1} ;
|
||||
|
||||
IIDig d i = {
|
||||
s = \\o => d.s ! NCard (CFMasc Indef NonHuman) ++ commaIf i.tail ++ i.s ! o ;
|
||||
s = \\o => d.s ! NCard (CFMasc Indef NonHuman) ++ spaceIf i.tail ++ i.s ! o ;
|
||||
n = Pl ;
|
||||
tail = inc i.tail
|
||||
} ;
|
||||
@@ -112,9 +112,9 @@ lin pot3plus n m = {
|
||||
D_9 = mk3Dig "9" "9èìà" "9òè" Pl ;
|
||||
|
||||
oper
|
||||
commaIf : DTail -> Str = \t -> case t of {
|
||||
T3 => comma ;
|
||||
_ => []
|
||||
spaceIf : DTail -> Str = \t -> case t of {
|
||||
T3 => SOFT_BIND ;
|
||||
_ => BIND
|
||||
} ;
|
||||
|
||||
inc : DTail -> DTail = \t -> case t of {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
concrete NumeralEng of Numeral = CatEng [Numeral,Digits] ** open ResEng in {
|
||||
concrete NumeralEng of Numeral = CatEng [Numeral,Digits] ** open Prelude, ResEng in {
|
||||
|
||||
lincat
|
||||
Digit = {s : DForm => CardOrd => Case => Str} ;
|
||||
@@ -69,8 +69,8 @@ lin pot3plus n m = {
|
||||
|
||||
oper
|
||||
commaIf : DTail -> Str = \t -> case t of {
|
||||
T3 => frontComma ;
|
||||
_ => []
|
||||
T3 => BIND ++ "," ++ BIND ;
|
||||
_ => BIND
|
||||
} ;
|
||||
|
||||
inc : DTail -> DTail = \t -> case t of {
|
||||
|
||||
@@ -50,7 +50,7 @@ lin
|
||||
IDig d = d ;
|
||||
|
||||
IIDig d i = {
|
||||
s = \\o => d.s ! NCard neutrum ++ i.s ! o ;
|
||||
s = \\o => d.s ! NCard neutrum ++ BIND ++ i.s ! o ;
|
||||
n = Pl
|
||||
} ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user