simplified 1.5 by removing mathematical/

12 files changed, 70 insertions, 30 deletions

diff --git a/next-lib/src/api/Constructors.gf b/next-lib/src/api/Constructors.gf
index 05f40500c..b34e7a620 100644
--- a/next-lib/src/api/Constructors.gf
+++ b/next-lib/src/api/Constructors.gf
@@ -1510,7 +1510,8 @@ incomplete resource Constructors = open Grammar in {
 	                                 =    \p,i -> TExclMark (PhrUtt NoPConj (UttImpSg p i) NoVoc) TEmpty;
       mkText : Phr -> Text -> Text    -- John walks. ...
                                          =    TFullStop ;
-      mkText : Text -> Text -> Text = \t,u -> {s = t.s ++ u.s ; lock_Text = <>} ;
+      mkText : Text -> Text -> Text 
+        = \t,u -> {s = t.s ++ u.s ; lock_Text = <>} ;
       } ;
 
     mkVP = overload {
diff --git a/next-lib/src/api/Symbolic.gf b/next-lib/src/api/Symbolic.gf
index 2a621cf9c..6ce8478b9 100644
--- a/next-lib/src/api/Symbolic.gf
+++ b/next-lib/src/api/Symbolic.gf
@@ -1,12 +1,11 @@
 --1 Symbolic: Noun Phrases with mathematical symbols
 
-incomplete resource Symbolic = open 
-    Symbol, Syntax, PredefCnc in {
+incomplete resource Symbolic = open Symbol, Grammar in {
 
   oper
     symb : overload {
       symb : Str -> NP ;                       -- x
-      symb : Int -> NP ;                       -- 23
+      symb : Integer -> NP ;                   -- 23
       symb : Float -> NP ;                     -- 0.99
       symb : N  -> Digits -> NP ;              -- level 4
       symb : N  -> Card -> NP ;                -- level four
@@ -14,49 +13,44 @@ incomplete resource Symbolic = open
       symb : Det -> N  -> Card -> NP ;         -- the number four
       symb : Det -> CN -> Card -> NP ;         -- the even number four
       symb : Det -> N  -> Str -> Str -> NP ;   -- the levels i and j
-      symb : Det -> CN -> [Symb] -> NP ;       -- the basic levels i, j, and k
-      symb : Symb -> S ;                       -- A
-      symb : Symb -> Card ;                    -- n
-      symb : Symb -> Ord                       -- n'th
+      symb : Det -> CN -> [Symb] -> NP         -- the basic levels i, j, and k
       } ;
 
-    mkSymb  : Str -> Symb ;
-    mkInt   : Str -> PredefCnc.Int ;
-    mkFloat : Str -> PredefCnc.Float ;
+    mkSymb : Str -> Symb ;
+    mkInteger : Predef.Int -> Integer ;
+    mkFloating : Predef.Float -> Floating ;
 
 --.
 
     symb = overload {
       symb : Str -> NP 
-                          = \s -> mkNP (SymbPN (mkSymb s)) ;
-      symb : Int -> NP 
-                          = \i -> mkNP (IntPN i) ;
-      symb : Float -> NP 
-                          = \i -> mkNP (FloatPN i) ;
+                          = \s -> UsePN (SymbPN (mkSymb s)) ;
+      symb : Integer -> NP 
+                          = \i -> UsePN (IntPN i) ;
+      symb : Floating -> NP 
+                          = \i -> UsePN (FloatPN i) ;
       symb : N -> Digits -> NP 
-                          = \c,i -> CNNumNP (mkCN c) (mkCard i) ;
+                          = \c,i -> CNNumNP (UseN c) (NumDigits i) ;
       symb : N -> Card -> NP 
-                          = \c,n -> CNNumNP (mkCN c) n ;
+                          = \c,n -> CNNumNP (UseN c) n ;
       symb : CN -> Card -> NP 
                           = \c,n -> CNNumNP c n ;
       symb : Det -> N  -> Card -> NP
-                          = \d,n,x -> mkNP d (mkCN (mkCN n) (mkNP (NumPN x))) ;
+                          = \d,n,x -> DetCN d (ApposCN (UseN n) (UsePN (NumPN x))) ;
       symb : Det -> CN -> Card -> NP
-                          = \d,n,x -> mkNP d (mkCN n (mkNP (NumPN x))) ;
+                          = \d,n,x -> DetCN d (ApposCN n (UsePN (NumPN x))) ;
       symb : Det -> N  -> Str -> Str -> NP 
-                          = \c,n,x,y -> CNSymbNP c (mkCN n) (BaseSymb (mkSymb x) (mkSymb y)) ;
+                          = \c,n,x,y -> CNSymbNP c (UseN n) (BaseSymb (mkSymb x) (mkSymb y)) ;
       symb : Det -> CN -> [Symb] -> NP 
-                          = CNSymbNP ;
-      symb : Symb -> S = SymbS ;
-      symb : Symb -> Card = SymbNum ;
-      symb : Symb -> Ord = SymbOrd
-
+                          = CNSymbNP
       } ;
 
     mkSymb : Str -> Symb = \s -> {s = s ; lock_Symb = <>} ;
 
-    mkInt i = {s = i ; lock_Int = <>} ;
-    mkFloat f = {s = f ; lock_Float = <>} ;
+    mkInteger i = {s = Predef.show Predef.Int i ; lock_Int = <>} ;
+    mkFloating f = {s = Predef.show Predef.Float f ; lock_Float = <>} ;
 
+    Integer : Type = {s : Str ; lock_Int : {}} ;
+    Floating : Type = {s : Str ; lock_Float : {}} ;
 
 }
diff --git a/next-lib/src/api/SymbolicCat.gf b/next-lib/src/api/SymbolicCat.gf
new file mode 100644
index 000000000..4c19a02bc
--- /dev/null
+++ b/next-lib/src/api/SymbolicCat.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:prelude
+
+resource SymbolicCat = Symbolic with 
+  (Symbol = SymbolCat),
+  (Syntax = SyntaxCat) ;
diff --git a/next-lib/src/api/SymbolicDan.gf b/next-lib/src/api/SymbolicDan.gf
new file mode 100644
index 000000000..cbbe7e0ad
--- /dev/null
+++ b/next-lib/src/api/SymbolicDan.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicDan = Symbolic with 
+  (Symbol = SymbolDan),
+  (Grammar = GrammarDan) ;
diff --git a/next-lib/src/api/SymbolicEng.gf b/next-lib/src/api/SymbolicEng.gf
index 0ce4725fa..c9b559a22 100644
--- a/next-lib/src/api/SymbolicEng.gf
+++ b/next-lib/src/api/SymbolicEng.gf
@@ -1,5 +1,5 @@
---# -path=.:present:prelude
+--# -path=.:present:mathematical:prelude
 
 resource SymbolicEng = Symbolic with 
   (Symbol = SymbolEng),
-  (Syntax = SyntaxEng) ;
+  (Grammar = GrammarEng) ;
diff --git a/next-lib/src/api/SymbolicFin.gf b/next-lib/src/api/SymbolicFin.gf
new file mode 100644
index 000000000..f8b88526b
--- /dev/null
+++ b/next-lib/src/api/SymbolicFin.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicFin = Symbolic with 
+  (Symbol = SymbolFin),
+  (Grammar = GrammarFin) ;
diff --git a/next-lib/src/api/SymbolicFre.gf b/next-lib/src/api/SymbolicFre.gf
new file mode 100644
index 000000000..ee0b2acc9
--- /dev/null
+++ b/next-lib/src/api/SymbolicFre.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicFre = Symbolic with 
+  (Symbol = SymbolFre),
+  (Grammar = GrammarFre) ;
diff --git a/next-lib/src/api/SymbolicGer.gf b/next-lib/src/api/SymbolicGer.gf
new file mode 100644
index 000000000..8b8d7111d
--- /dev/null
+++ b/next-lib/src/api/SymbolicGer.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicGer = Symbolic with 
+  (Symbol = SymbolGer),
+  (Grammar = GrammarGer) ;
diff --git a/next-lib/src/api/SymbolicIta.gf b/next-lib/src/api/SymbolicIta.gf
new file mode 100644
index 000000000..d4b578c8d
--- /dev/null
+++ b/next-lib/src/api/SymbolicIta.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicIta = Symbolic with 
+  (Symbol = SymbolIta),
+  (Grammar = GrammarIta) ;
diff --git a/next-lib/src/api/SymbolicNor.gf b/next-lib/src/api/SymbolicNor.gf
new file mode 100644
index 000000000..b4eff28e0
--- /dev/null
+++ b/next-lib/src/api/SymbolicNor.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicNor = Symbolic with 
+  (Symbol = SymbolNor),
+  (Grammar = GrammarNor) ;
diff --git a/next-lib/src/api/SymbolicSpa.gf b/next-lib/src/api/SymbolicSpa.gf
new file mode 100644
index 000000000..ae44431f5
--- /dev/null
+++ b/next-lib/src/api/SymbolicSpa.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicSpa = Symbolic with 
+  (Symbol = SymbolSpa),
+  (Grammar = GrammarSpa) ;
diff --git a/next-lib/src/api/SymbolicSwe.gf b/next-lib/src/api/SymbolicSwe.gf
new file mode 100644
index 000000000..193d8e84d
--- /dev/null
+++ b/next-lib/src/api/SymbolicSwe.gf
@@ -0,0 +1,5 @@
+--# -path=.:present:mathematical:prelude
+
+resource SymbolicSwe = Symbolic with 
+  (Symbol = SymbolSwe),
+  (Grammar = GrammarSwe) ;