diff --git a/lib/resource-1.0/mathematical/Symbol.gf b/lib/resource-1.0/mathematical/Symbol.gf index 346713b9b..57aff8946 100644 --- a/lib/resource-1.0/mathematical/Symbol.gf +++ b/lib/resource-1.0/mathematical/Symbol.gf @@ -12,6 +12,7 @@ fun SymbPN : Symb -> PN ; -- x IntPN : Int -> PN ; -- 27 FloatPN : Float -> PN ; -- 3.14159 + NumPN : Num -> PN ; CNNumNP : CN -> Num -> NP ; -- level five ; level 5 CNSymbNP : Det -> CN -> [Symb] -> NP ; -- (the) (2) numbers x and y diff --git a/lib/resource-1.0/mathematical/SymbolEng.gf b/lib/resource-1.0/mathematical/SymbolEng.gf index 6c328baad..53ff3aec0 100644 --- a/lib/resource-1.0/mathematical/SymbolEng.gf +++ b/lib/resource-1.0/mathematical/SymbolEng.gf @@ -4,6 +4,7 @@ lin SymbPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c IntPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c FloatPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c + NumPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c CNIntNP cn i = { s = \\c => (cn.s ! Sg ! Nom ++ i.s) ; a = agrP3 Sg diff --git a/lib/resource-1.0/mathematical/SymbolFin.gf b/lib/resource-1.0/mathematical/SymbolFin.gf index 036f8348e..5e2cbd19e 100644 --- a/lib/resource-1.0/mathematical/SymbolFin.gf +++ b/lib/resource-1.0/mathematical/SymbolFin.gf @@ -4,6 +4,7 @@ lin SymbPN i = {s = \\c => i.s} ; --- c IntPN i = {s = \\c => i.s} ; --- c FloatPN i = {s = \\c => i.s} ; --- c + NumPN i = {s = \\c => i.s!Sg!Nom } ; --- c CNIntNP cn i = { s = \\c => cn.s ! NCase Sg (npform2case Sg c) ++ i.s ; diff --git a/lib/resource-1.0/mathematical/SymbolGer.gf b/lib/resource-1.0/mathematical/SymbolGer.gf index 5a6828e65..5dd0f77a4 100644 --- a/lib/resource-1.0/mathematical/SymbolGer.gf +++ b/lib/resource-1.0/mathematical/SymbolGer.gf @@ -4,6 +4,7 @@ lin SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c IntPN i = {s = \\c => i.s ; g = Neutr} ; --- c FloatPN i = {s = \\c => i.s ; g = Neutr} ; --- c + NumPN i = {s = \\c => i.s ; g = Neutr} ; --- c CNIntNP cn i = { s = \\c => cn.s ! Weak ! Sg ! Nom ++ i.s ; diff --git a/lib/resource-1.0/mathematical/SymbolRomance.gf b/lib/resource-1.0/mathematical/SymbolRomance.gf index ba9fa6528..82899c242 100644 --- a/lib/resource-1.0/mathematical/SymbolRomance.gf +++ b/lib/resource-1.0/mathematical/SymbolRomance.gf @@ -5,6 +5,7 @@ lin SymbPN i = {s = i.s ; g = Masc} ; IntPN i = {s = i.s ; g = Masc} ; FloatPN i = {s = i.s ; g = Masc} ; + NumPN i = {s = i.s!Masc ; g = Masc} ; CNIntNP cn i = { s = \\c => cn.s ! Sg ++ i.s ; diff --git a/lib/resource-1.0/mathematical/SymbolScand.gf b/lib/resource-1.0/mathematical/SymbolScand.gf index ab240984f..614232a6b 100644 --- a/lib/resource-1.0/mathematical/SymbolScand.gf +++ b/lib/resource-1.0/mathematical/SymbolScand.gf @@ -5,6 +5,7 @@ lin SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c IntPN i = {s = \\c => i.s ; g = Neutr} ; --- c FloatPN i = {s = \\c => i.s ; g = Neutr} ; --- c + NumPN i = {s = \\c => i.s!neutrum ; g = Neutr} ; --- c CNIntNP cn i = { s = \\c => (cn.s ! Sg ! DIndef ! Nom ++ i.s) ; a = agrP3 cn.g Sg