diff --git a/lib/resource-1.0/mathematical/Symbol.gf b/lib/resource-1.0/mathematical/Symbol.gf index 08137b8fc..346713b9b 100644 --- a/lib/resource-1.0/mathematical/Symbol.gf +++ b/lib/resource-1.0/mathematical/Symbol.gf @@ -12,9 +12,10 @@ fun SymbPN : Symb -> PN ; -- x IntPN : Int -> PN ; -- 27 FloatPN : Float -> PN ; -- 3.14159 - CNIntNP : CN -> Int -> NP ; -- level 53 + CNNumNP : CN -> Num -> NP ; -- level five ; level 5 CNSymbNP : Det -> CN -> [Symb] -> NP ; -- (the) (2) numbers x and y + --2 Sentence consisting of a formula SymbS : Symb -> S ; -- A @@ -37,4 +38,8 @@ cat fun MkSymb : String -> Symb ; +--2 Obsolescent + + CNIntNP : CN -> Int -> NP ; -- level 53 (covered by CNNumNP) + } diff --git a/lib/resource-1.0/mathematical/SymbolEng.gf b/lib/resource-1.0/mathematical/SymbolEng.gf index 4b17a531a..ea46628cc 100644 --- a/lib/resource-1.0/mathematical/SymbolEng.gf +++ b/lib/resource-1.0/mathematical/SymbolEng.gf @@ -12,6 +12,10 @@ lin s = \\c => det.s ++ cn.s ! det.n ! c ++ xs.s ; a = agrP3 det.n } ; + CNNumNP cn i = { + s = \\c => (cn.s ! Sg ! Nom ++ i.s) ; + a = agrP3 Sg + } ; SymbS sy = sy ; diff --git a/lib/resource-1.0/mathematical/SymbolFin.gf b/lib/resource-1.0/mathematical/SymbolFin.gf index 142e43f53..036f8348e 100644 --- a/lib/resource-1.0/mathematical/SymbolFin.gf +++ b/lib/resource-1.0/mathematical/SymbolFin.gf @@ -15,6 +15,11 @@ lin a = detcn.a ; isPron = False } ; + CNNumNP cn i = { + s = \\c => cn.s ! NCase Sg (npform2case Sg c) ++ i.s ! Sg ! Nom ; + a = agrP3 Sg ; + isPron = False + } ; SymbS sy = sy ; diff --git a/lib/resource-1.0/mathematical/SymbolGer.gf b/lib/resource-1.0/mathematical/SymbolGer.gf index 936905fd2..c532c21e9 100644 --- a/lib/resource-1.0/mathematical/SymbolGer.gf +++ b/lib/resource-1.0/mathematical/SymbolGer.gf @@ -15,6 +15,12 @@ lin a = agrP3 det.n ; isPron = False } ; + CNNumNP cn i = { + s = \\c => cn.s ! Weak ! Sg ! Nom ++ i.s ; + a = agrP3 Sg ; + isPron = False + } ; + SymbS sy = {s = \\_ => sy.s} ; SymbNum n = {s = n.s} ; diff --git a/lib/resource-1.0/mathematical/SymbolRomance.gf b/lib/resource-1.0/mathematical/SymbolRomance.gf index eabd3b7d6..c0a169924 100644 --- a/lib/resource-1.0/mathematical/SymbolRomance.gf +++ b/lib/resource-1.0/mathematical/SymbolRomance.gf @@ -16,6 +16,11 @@ lin a = agrP3 g det.n ; hasClit = False } ; + CNNumNP cn i = { + s = \\c => cn.s ! Sg ++ i.s ! Masc ; + a = agrP3 cn.g Sg ; + hasClit = False + } ; SymbS sy = {s = \\_ => sy.s} ; SymbNum n = {s = \\_ => n.s ; isNum = True} ; diff --git a/lib/resource-1.0/mathematical/SymbolScand.gf b/lib/resource-1.0/mathematical/SymbolScand.gf index 25d5585fe..ab240984f 100644 --- a/lib/resource-1.0/mathematical/SymbolScand.gf +++ b/lib/resource-1.0/mathematical/SymbolScand.gf @@ -13,6 +13,10 @@ lin s = \\c => det.s ! cn.isMod ! g ++ cn.s ! det.n ! det.det ! caseNP c ++ xs.s ; a = agrP3 g det.n } ; + CNNumNP cn i = { + s = \\c => (cn.s ! Sg ! DIndef ! Nom ++ i.s ! neutrum) ; + a = agrP3 cn.g Sg + } ; SymbS sy = {s = \\_ => sy.s} ;