Merge branch 'master' into operator-info-from-JSON

Author: mmatera

.github/ISSUE_TEMPLATE/bug_report.md

@@ -51,7 +51,7 @@ If this is too long, then try narrowing the problem to something short.
 
 ## Your Environment
 
-<!-- _This information can be helpful..
+<!-- _This information can be helpful...
 
 **All: Mathics version, Installed Python Python packages.
 

COPYING.txt

@@ -1,28 +1,28 @@
-This file is about the copyright on Mathics and all included components. 
- 
+This file is about the copyright on Mathics3 and all included components.
+
 * ORIGINAL MATHICS CODE:
 
-  All original Mathics code is distributed under the terms of the 
+  All original Mathics code is distributed under the terms of the
   GNU General Public License, version 3.
- 
+
      This code is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      General Public License for more details.
- 
+
 The full text of the GPL is available below in this file. Details of
 the licenses of the components of Mathics are included below as well.
- 
+
 * LICENSES OF INCLUDED DATA:
 
-Mathics includes data from Wikipedia that is published under the Creative 
-Commons Attribution-Sharealike 3.0 Unported License and the GNU Free 
-Documentation License contributed by the respective authors that are listed 
+Mathics includes data from Wikipedia that is published under the Creative
+Commons Attribution-Sharealike 3.0 Unported License and the GNU Free
+Documentation License contributed by the respective authors that are listed
 on the websites specified in "data/elements.txt".
 
 
 * LICENSES OF INCLUDED SOFTWARE:
- 
+
 SOFTWARE                           LICENSE
 ----------------------------------------------
 scripaculous                       MIT
@@ -31,14 +31,14 @@ MathJax                            Apache 2.0
 Three.js                           MIT
 pymimemagic                        BSD 3-Clause
 SciPy                              BSD 3-Clause
- 
+
 CONTACT INFO:
-     Jan Poeschko; [email protected]; 
+     Jan Poeschko; [email protected];
      https://mathics.org/
 
 =========================================================================
- 
- 
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -713,7 +713,7 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
- 
+
 ================================================================================
 
 scriptaculous:

admin-tools/make-op-tables.sh

@@ -13,3 +13,5 @@ mathics3-generate-json-table \
     --field=operator-to-unicode \
     -o op-tables.json
 mathics3-generate-operator-json-table -o operator-tables.json
+# tokenizer looks for the table in the default place...
+mathics3-generate-operator-json-table

examples/symbolic_logic/gries_schneider/GS1.m

@@ -1,6 +1,6 @@
 (* ****************************************************************************
 
-    by Brian Beckman. License the same as for mathics.
+    by Brian Beckman. License the same as for Mathics3: GPL3.
 
     Oct 2020
 
@@ -32,8 +32,8 @@
 (* Section 1.2 Textual substitution, page 8
  _____        _             _   ___      _       _   _ _        _   _
 |_   _|____ _| |_ _  _ __ _| | / __|_  _| |__ __| |_(_) |_ _  _| |_(_)___ _ _
-  | |/ -_) \ /  _| || / _` | | \__ \ || | '_ (_-<  _| |  _| || |  _| / _ \ ' \
-  |_|\___/_\_\\__|\_,_\__,_|_| |___/\_,_|_.__/__/\__|_|\__|\_,_|\__|_\___/_||_|
+  | |/ -_) \ /  _| || / _` | | |__ \ || | '_ (_-<  _| |  _| || |  _| / _ \ ' \
+  |_||___/_|_||__||_,_|__,_|_| |___/|_,_|_.__/__/|__|_||__||_,_||__|_|___/_||_|
 
     Mathics gives us direct syntax for Gries & Schneider's (G&S)'s "textual
     substitution:"
@@ -245,13 +245,13 @@
 
 (* Inference Rule Substitution (1.1), page 10
  ___       __                           ___      _     _
-|_ _|_ _  / _|___ _ _ ___ _ _  __ ___  | _ \_  _| |___(_)
- | || ' \|  _/ -_) '_/ -_) ' \/ _/ -_) |   / || | / -_)_
-|___|_||_|_| \___|_| \___|_||_\__\___| |_|_\\_,_|_\___(_)
+|_ _|_ _  / _|___ _ _ ___ _ _  __ ___  | _ |_  _| |___(_)
+ | || ' ||  _/ -_) '_/ -_) ' |/ _/ -_) |   / || | / -_)_
+|___|_||_|_| |___|_| |___|_||_|__|___| |_|_||_,_|_|___(_)
  ___      _       _   _ _        _   _
 / __|_  _| |__ __| |_(_) |_ _  _| |_(_)___ _ _
-\__ \ || | '_ (_-<  _| |  _| || |  _| / _ \ ' \
-|___/\_,_|_.__/__/\__|_|\__|\_,_|\__|_\___/_||_|
+|__ | || | '_ (_-<  _| |  _| || |  _| / _ | ' |
+|___/|_,_|_.__/__/|__|_||__||_,_||__|_|___/_||_|
 
     The inference rule 'Substitution' takes in a top-line expression e, a list
     of variables v, and a corresponding list of replacement expressions f, and
@@ -335,12 +335,12 @@
 (* Section 1.3 Textual substitution and equality, page 11
  _____        _             _   ___      _       _   _ _        _   _
 |_   _|____ _| |_ _  _ __ _| | / __|_  _| |__ __| |_(_) |_ _  _| |_(_)___ _ _
-  | |/ -_) \ /  _| || / _` | | \__ \ || | '_ (_-<  _| |  _| || |  _| / _ \ ' \
-  |_|\___/_\_\\__|\_,_\__,_|_| |___/\_,_|_.__/__/\__|_|\__|\_,_|\__|_\___/_||_|
+  | |/ -_) | /  _| || / _` | | |__ | || | '_ (_-<  _| |  _| || |  _| / _ | ' |
+  |_||___/_|_||__||_,_|__,_|_| |___/|_,_|_.__/__/|__|_||__||_,_||__|_|___/_||_|
               _   ___                _ _ _
  __ _ _ _  __| | | __|__ _ _  _ __ _| (_) |_ _  _
-/ _` | ' \/ _` | | _|/ _` | || / _` | | |  _| || |
-\__,_|_||_\__,_| |___\__, |\_,_\__,_|_|_|\__|\_, |
+/ _` | ' |/ _` | | _|/ _` | || / _` | | |  _| || |
+|__,_|_||_|__,_| |___|__, ||_,_|__,_|_|_||__||_, |
                         |_|                  |__/
 
     Going forward, we want more inference and less evaluation. This is tricky in
@@ -1054,8 +1054,8 @@ over and over (google "don't repeat yourself"), introduce "Postfix notation
 (*  Here is a cheat sheet of all the rules we've defined so far.
   ___ _             _     ___ _            _                __
  / __| |_  ___ __ _| |_  / __| |_  ___ ___| |_   ___ ___   / _|__ _ _ _
-| (__| ' \/ -_) _` |  _| \__ \ ' \/ -_) -_)  _| (_-</ _ \ |  _/ _` | '_|
- \___|_||_\___\__,_|\__| |___/_||_\___\___|\__| /__/\___/ |_| \__,_|_|
+| (__| ' |/ -_) _` |  _| |__ | ' |/ -_) -_)  _| (_-</ _ | |  _/ _` | '_|
+ |___|_||_|___|__,_||__| |___/_||_|___|___||__| /__/|___/ |_| |__,_|_|
 
     (* 1.1 *) substitutionInferenceRule[e_, v_:List, f_:List] :=
         Module[{ rules = MapThread[ Rule, {v, f} ] }, e /. rules ]
@@ -1091,13 +1091,13 @@ over and over (google "don't repeat yourself"), introduce "Postfix notation
 
 (* Section 1.4 Leibniz's rule and function evaluation, page 13
  _        _ _         _    _      ___      _                    _
-| |   ___(_) |__ _ _ (_)__( )___ | _ \_  _| |___   __ _ _ _  __| |
-| |__/ -_) | '_ \ ' \| |_ //|_ / |   / || | / -_) / _` | ' \/ _` |
-|____\___|_|_.__/_||_|_/__| /__| |_|_\\_,_|_\___| \__,_|_||_\__,_|
+| |   ___(_) |__ _ _ (_)__( )___ | _ |_  _| |___   __ _ _ _  __| |
+| |__/ -_) | '_ | ' || |_ //|_ / |   / || | / -_) / _` | ' |/ _` |
+|____|___|_|_.__/_||_|_/__| /__| |_|_||_,_|_|___| |__,_|_||_|__,_|
  ___             _   _            ___          _           _   _
 | __|  _ _ _  __| |_(_)___ _ _   | __|_ ____ _| |_  _ __ _| |_(_)___ _ _
-| _| || | ' \/ _|  _| / _ \ ' \  | _|\ V / _` | | || / _` |  _| / _ \ ' \
-|_| \_,_|_||_\__|\__|_\___/_||_| |___|\_/\__,_|_|\_,_\__,_|\__|_\___/_||_|
+| _| || | ' |/ _|  _| / _ | ' |  | _|| V / _` | | || / _` |  _| / _ | ' |
+|_| |_,_|_||_|__||__|_|___/_||_| |___||_/|__,_|_||_,_|__,_||__|_|___/_||_|
 
     Start at the bottom of page 13. A lot of this we can do without prose, now,
     because we're getting accustomed to the style.
@@ -1524,9 +1524,9 @@ calculus is (from page 42)
 
 (* Section 1.6, The assignment statement, page 16
    _          _                         _
-  /_\   _____(_)__ _ _ _  _ __  ___ _ _| |_
- / _ \ (_-<_-< / _` | ' \| '  \/ -_) ' \  _|
-/_/ \_\/__/__/_\__, |_||_|_|_|_\___|_||_\__|
+  /_|   _____(_)__ _ _ _  _ __  ___ _ _| |_
+ / _ | (_-<_-< / _` | ' || '  |/ -_) ' |  _|
+/_/ |_|/__/__/_|__, |_||_|_|_|_|___|_||_|__|
                |___/
 
     Here we exhibit the first instance of a "type." It's just a head and some
@@ -1675,8 +1675,8 @@ enclosing our variables in curly braces (List brackets).
 (* Exercises for Chapter 1, pages 21-23
  ___                _               ___ _        _
 | __|_ _____ _ _ __(_)___ ___ ___  / __| |_     / |
-| _|\ \ / -_) '_/ _| (_-</ -_|_-< | (__| ' \ _  | |
-|___/_\_\___|_| \__|_/__/\___/__/  \___|_||_(_) |_|
+| _|| | / -_) '_/ _| (_-</ -_|_-< | (__| ' | _  | |
+|___/_|_|___|_| |__|_/__/|___/__/  |___|_||_(_) |_|
 
  *************************************************************************** *)
 

mathics/builtin/no_meaning.py

@@ -23,6 +23,9 @@
 )
 from mathics.core.parser.operators import OPERATOR_DATA
 
+# This tells documentation how to sort this module
+sort_order = "mathics.builtin.operators-without-built-in-meanings"
+
 
 def init():
     # Generate no-meaning Mathics3 Builtin class from the operator name,
@@ -66,7 +69,6 @@ def init():
 
 init()
 
-
 class DirectedEdge(InfixOperator):
     # This will be used to create a docstring
     r"""