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} ;
|
IDig d = d ** {tail = T1} ;
|
||||||
|
|
||||||
IIDig d i = {
|
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 ;
|
n = Pl ;
|
||||||
tail = inc i.tail
|
tail = inc i.tail
|
||||||
} ;
|
} ;
|
||||||
@@ -112,9 +112,9 @@ lin pot3plus n m = {
|
|||||||
D_9 = mk3Dig "9" "9èìà" "9òè" Pl ;
|
D_9 = mk3Dig "9" "9èìà" "9òè" Pl ;
|
||||||
|
|
||||||
oper
|
oper
|
||||||
commaIf : DTail -> Str = \t -> case t of {
|
spaceIf : DTail -> Str = \t -> case t of {
|
||||||
T3 => comma ;
|
T3 => SOFT_BIND ;
|
||||||
_ => []
|
_ => BIND
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
inc : DTail -> DTail = \t -> case t of {
|
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
|
lincat
|
||||||
Digit = {s : DForm => CardOrd => Case => Str} ;
|
Digit = {s : DForm => CardOrd => Case => Str} ;
|
||||||
@@ -69,8 +69,8 @@ lin pot3plus n m = {
|
|||||||
|
|
||||||
oper
|
oper
|
||||||
commaIf : DTail -> Str = \t -> case t of {
|
commaIf : DTail -> Str = \t -> case t of {
|
||||||
T3 => frontComma ;
|
T3 => BIND ++ "," ++ BIND ;
|
||||||
_ => []
|
_ => BIND
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
inc : DTail -> DTail = \t -> case t of {
|
inc : DTail -> DTail = \t -> case t of {
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ lin
|
|||||||
IDig d = d ;
|
IDig d = d ;
|
||||||
|
|
||||||
IIDig d i = {
|
IIDig d i = {
|
||||||
s = \\o => d.s ! NCard neutrum ++ i.s ! o ;
|
s = \\o => d.s ! NCard neutrum ++ BIND ++ i.s ! o ;
|
||||||
n = Pl
|
n = Pl
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user