Math to mathematical/Symbol

examples/tram/TramEng.gf

@@ -1,5 +1,5 @@
---# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/english:prelude
+--# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/english:prelude:resource-1.0/mathematical
 
 concrete TramEng of Tram = TramI with 
   (Multimodal = MultimodalEng),
-  (Math = MathEng) ;
+  (Symbol = SymbolEng) ;

examples/tram/TramFre.gf

@@ -1,5 +1,5 @@
---# -path=.:resource-1.0/abstract:resource-1.0/french:resource-1.0/common:resource-1.0/multimodal:resource-1.0/romance:prelude
+--# -path=.:resource-1.0/abstract:resource-1.0/french:resource-1.0/common:resource-1.0/multimodal:resource-1.0/romance:prelude:resource-1.0/mathematical
 
 concrete TramFre of Tram = TramI with 
   (Multimodal = MultimodalFre), 
-  (Math = MathFre) ;
+  (Symbol = SymbolFre) ;

examples/tram/TramGer.gf

@@ -1,5 +1,5 @@
---# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/multimodal:resource-1.0/german:prelude
+--# -path=.:resource-1.0/abstract:resource-1.0/common:resource-1.0/mathematical:resource-1.0/multimodal:resource-1.0/german:prelude
 
 concrete TramGer of Tram = TramI with 
   (Multimodal = MultimodalGer),
-  (Math = MathGer) ;
+  (Symbol = SymbolGer) ;

examples/tram/TramI.gf

@@ -1,4 +1,4 @@
-incomplete concrete TramI of Tram = open Multimodal, Math in {
+incomplete concrete TramI of Tram = open Multimodal, Symbol in {
 
 flags startcat=Query ; lexer=textlit ;
 

examples/tram/TramSwe.gf

@@ -1,5 +1,5 @@
---# -path=.:resource-1.0/abstract:resource-1.0/swedish:resource-1.0/common:resource-1.0/multimodal:resource-1.0/scandinavian:prelude
+--# -path=.:resource-1.0/abstract:resource-1.0/swedish:resource-1.0/common:resource-1.0/multimodal:resource-1.0/scandinavian:prelude:resource-1.0/mathematical
 
 concrete TramSwe of Tram = TramI with 
   (Multimodal = MultimodalSwe), 
-  (Math = MathSwe) ;
+  (Symbol = SymbolSwe) ;

lib/resource-1.0/french/MathFre.gf

@@ -1,2 +0,0 @@
-concrete MathFre of Math = CatFre ** MathRomance with
-  (ResRomance = ResFre) ;

lib/resource-1.0/mathematical/Symbol.gf

@@ -3,16 +3,17 @@
 -- *Note*. This module is not automatically included in the main
 -- grammar [Lang Lang.html].
 
-abstract Math = Cat ** {
+abstract Symbol = Cat ** {
 
---2 Noun phrases with symbols
+--2 Noun phrases with symbols and numbers
 
 fun
 
-  SymbPN      : Symb -> PN ;                -- x
-  IntPN       : Int -> PN ;                 -- 27
-  CNIntNP     : CN -> Int -> NP ;           -- level 53
-  CNSymbNP    : Det -> CN -> [Symb] -> NP ; -- (the) (2) numbers x and y
+  SymbPN   : Symb -> PN ;                -- x
+  IntPN    : Int -> PN ;                 -- 27
+  FloatPN  : Float -> PN ;               -- 3.14159
+  CNIntNP  : CN -> Int -> NP ;           -- level 53
+  CNSymbNP : Det -> CN -> [Symb] -> NP ; -- (the) (2) numbers x and y
 
 --2 Symbol lists
 

lib/resource-1.0/mathematical/SymbolEng.gf

@@ -1,4 +1,4 @@
-concrete MathEng of Math = CatEng ** open Prelude, ResEng in {
+concrete SymbolEng of Symbol = CatEng ** open Prelude, ResEng in {
 
 lin
   SymbPN i = {s = \\c => i.s ; a = agrP3 Sg} ; --- c

lib/resource-1.0/mathematical/SymbolFre.gf

@@ -0,0 +1,2 @@
+concrete SymbolFre of Symbol = CatFre ** SymbolRomance with
+  (ResRomance = ResFre) ;

lib/resource-1.0/mathematical/SymbolGer.gf

@@ -1,4 +1,4 @@
-concrete MathGer of Math = CatGer ** open Prelude, ResGer in {
+concrete SymbolGer of Symbol = CatGer ** open Prelude, ResGer in {
 
 lin
   SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c

lib/resource-1.0/mathematical/SymbolRomance.gf

@@ -1,4 +1,4 @@
-incomplete concrete MathRomance of Math = 
+incomplete concrete SymbolRomance of Symbol = 
   CatRomance ** open Prelude, CommonRomance, ResRomance in {
 
 lin

lib/resource-1.0/mathematical/SymbolScand.gf

@@ -1,5 +1,5 @@
-incomplete concrete MathScand of Math = 
-  CatScand ** open Prelude, ResScand, DiffScand in {
+incomplete concrete SymbolScand of Symbol = 
+  CatScand ** open Prelude, ResScand, CommonScand in {
 
 lin
   SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c

lib/resource-1.0/mathematical/SymbolSwe.gf

@@ -0,0 +1,2 @@
+concrete SymbolSwe of Symbol = CatSwe ** SymbolScand with
+  (ResScand = ResSwe) ;

lib/resource-1.0/multimodal/Demonstrative.gf

@@ -1,4 +1,4 @@
-abstract Demonstrative = Cat, Tense ** {
+abstract Demonstrative = Cat ** {
 
 -- Naming convention: $M$ prepended to 'unimodal' names.
 -- Exceptions: lexical units, those without unimodal counterparts.

lib/resource-1.0/multimodal/DemonstrativeEng.gf

@@ -1,4 +1,4 @@
 --# -path=.:../english/:../abstract:../common:prelude
 
-concrete DemonstrativeEng of Demonstrative = CatEng, TenseX ** DemonstrativeI with
+concrete DemonstrativeEng of Demonstrative = CatEng ** DemonstrativeI with
   (Lang = LangEng) ;

lib/resource-1.0/multimodal/DemonstrativeFre.gf

@@ -1,2 +1,2 @@
-concrete DemonstrativeFre of Demonstrative = CatFre, TenseX ** DemonstrativeI with
+concrete DemonstrativeFre of Demonstrative = CatFre ** DemonstrativeI with
   (Lang = LangFre) ;

lib/resource-1.0/multimodal/DemonstrativeGer.gf

@@ -1,4 +1,4 @@
 --# -path=.:../german/:../abstract:../common:prelude
 
-concrete DemonstrativeGer of Demonstrative = CatGer, TenseX ** DemonstrativeI with
+concrete DemonstrativeGer of Demonstrative = CatGer ** DemonstrativeI with
   (Lang = LangGer) ;

lib/resource-1.0/multimodal/DemonstrativeI.gf

@@ -1,4 +1,4 @@
-incomplete concrete DemonstrativeI of Demonstrative = Cat, TenseX **
+incomplete concrete DemonstrativeI of Demonstrative = Cat **
   open Prelude, Lang, ParamX, DemRes in {
 
   lincat

lib/resource-1.0/multimodal/DemonstrativeSwe.gf

@@ -1,4 +1,4 @@
-concrete DemonstrativeSwe of Demonstrative = CatSwe, TenseX ** DemonstrativeI with
+concrete DemonstrativeSwe of Demonstrative = CatSwe ** DemonstrativeI with
   (Lang = LangSwe) ;
 
 

lib/resource-1.0/swedish/MathSwe.gf

@@ -1,2 +0,0 @@
-concrete MathSwe of Math = CatSwe ** MathScand with
-  (ResScand = ResSwe) ;