Merge remote-tracking branch 'upstream/master' into extensecmptests

Author: mmatera

CHANGES.rst

@@ -14,6 +14,7 @@ New builtins
 * ``FileNames``
 * ``NIntegrate``
 * ``PartitionsP``
+* ``$Notebooks``
 
 Enhancements
 ++++++++++++
@@ -22,9 +23,9 @@ Enhancements
 * Automatic detection for the best strategy to numeric evaluation of constants.
 * ``FileNameJoin`` - implement ``OperatingSystem`` option
 * Mathics functions are accepted by ``Compile[]``. The return value or type will be
-  ``Compiled[] and CompiledFunction[]``  every expression can have a compiled form,
+  ``Compile[] and CompiledFunction[]``  every expression can have a compiled form,
   as a Python function.
-* ``EqualQ[]`` now compares complex against other numbers properly.
+* ``Equal[]`` now compares complex against other numbers properly.
 
 
 Bug fixes

README.rst

@@ -28,7 +28,7 @@ mathicsserver: a Django-based Web interface
 Installing and Running
 ----------------------
 
-See the `readthe docs guide <https://mathics-development-guide.readthedocs.io/en/latest/>`_ for instructions on `installing <https://mathics-development-guide.readthedocs.io/en/latest/installing.html>`_ and `running <https://mathics-development-guide.readthedocs.io/en/latest/running.html>`_.
+See the `read the docs guide <https://mathics-development-guide.readthedocs.io/en/latest/>`_ for instructions on `installing <https://mathics-development-guide.readthedocs.io/en/latest/installing.html>`_ and `running <https://mathics-development-guide.readthedocs.io/en/latest/running.html>`_.
 
 Contributing
 ------------

mathics/autoload/settings.m

@@ -10,3 +10,9 @@
 Settings`$PreferredBackendMethod::usage = "Set this do whether to use mpmath, numpy or Sympy for numeric and symbolic constants and methods when there is s choice";
 Settings`$PreferredBackendMethod = "sympy"
 Unprotect[Settings`$PreferredBackendMethod]
+
+(* Some packages like Feyncalc, test for whether a they are being used
+inside a notbook. *)
+System`$Notebooks::usage = "Set True if the Mathics is being used with a notebook‐based front end.";
+System`$Notebooks = False;
+Unprotect[System`Notebooks];

mathics/builtin/comparison.py

@@ -452,14 +452,16 @@ class Equal(_EqualityOperator, SympyComparison):
      = True
 
     Strings are allowed:
-    Equal["11", "11"]
+
+    >> Equal["11", "11"]
      = True
 
-    Equal["121", "11"]
+    >> Equal["121", "11"]
      = False
 
     Comparision to mismatched types is False:
-    Equal[11, "11"]
+
+    >> Equal[11, "11"]
      = False
 
     Lists are compared based on their elements:

mathics/builtin/compilation.py

@@ -17,9 +17,9 @@
 class Compile(Builtin):
     """
     <dl>
-    <dt>'Compile[{x1, x2, ...}, expr_]'
+    <dt>'Compile[{$x1$, $x2$, ...}, $expr$]'
       <dd>Compiles $expr$ assuming each $xi$ is a $Real$ number.
-    <dt>'Compile[{{x1, t1} {x2, t1} ...}, expr_]'
+    <dt>'Compile[{{$x1$, $t1$} {$x2$, $t1$} ...}, $expr$]'
       <dd>Compiles assuming each $xi$ matches type $ti$.
     </dl>
 
@@ -51,7 +51,7 @@ class Compile(Builtin):
     #> cf[x + y]
      = CompiledFunction[{x, y}, Sin[x + y], -CompiledCode-][x + y]
 
-    Compile supports basic flow control
+    Compile supports basic flow control:
     >> cf = Compile[{{x, _Real}, {y, _Integer}}, If[x == 0.0 && y <= 0, 0.0, Sin[x ^ y] + 1 / Min[x, 0.5]] + 0.5]
      = CompiledFunction[{x, y}, ..., -CompiledCode-]
     >> cf[3.5, 2]

mathics/builtin/numbertheory.py

@@ -674,7 +674,7 @@ class PartitionsP(SympyFunction):
     """
     <dl>
       <dt>'PartitionsP[$n$]'
-      <dd>return the number p(n) of unrestricted partitions of the integer $n$.
+      <dd>return the number $p$($n$) of unrestricted partitions of the integer $n$.
     </dl>
 
     >> Table[PartitionsP[k], {k, -2, 12}]

mathics/builtin/numeric.py

@@ -433,13 +433,13 @@ class NIntegrate(Builtin):
     >> NIntegrate[1 / z, {z, -1 - I, 1 - I, 1 + I, -1 + I, -1 - I}, Tolerance->1.*^-4]
      : Integration over a complex domain is not implemented yet
      = NIntegrate[1 / z, {z, -1 - I, 1 - I, 1 + I, -1 + I, -1 - I}, Tolerance -> 0.0001]
-     # = 6.2832 I
+     ## = 6.2832 I
 
-    Integrate singularities with weak divergences
+    Integrate singularities with weak divergences:
     >> Table[NIntegrate[x^(1./k-1.),{x,0,1.},Tolerance->1*^-6], {k,1,7.}]
      = {1., 2., 3., 4., 5., 6., 7.}
 
-    Iterated Integral
+    Iterated Integral:
     >> NIntegrate[x * y,{x, 0, 1},{y, 0, 1}]
      = 0.25
     """

mathics/doc/documentation/1-Manual.mdoc

@@ -995,7 +995,7 @@ It looks like this:
 <imgpng src="menubar.png" title="Mathic Menu Bar" label="menubar">
 
 
-<section title="Saving and Loading Worksheets">
+<section title="Saving, Loading, and Deleting Worksheets">
 
 <subsection title="Saving Worksheets">
 
@@ -1005,14 +1005,16 @@ Worksheets exist in the browser window only and are not stored on the server, by
 
 Depending on browser, desktop, and OS-settings, the "Ctrl+S" key combination may do the same thing.
 
-<subsection title="Loading Worksheets">
+<subsection title="Loading and Deleting Worksheets">
 
-Saved worksheets can be loaded again using the <em>File Open</em> button which is the left-most button in the menu bar. It looks like this:
+Saved worksheets can be loaded or deleted using the <em>File Open</em> button which is the left-most button in the menu bar. It looks like this:
 
 <imgpng src="file-open-button.png" title="Mathic File Open Button" label="file-open-button">
 
 Depending on browser, desktop, and OS-settings, the "Ctrl+O" key combination may do the same thing.
 
+A popup menu should appear with the list of saved worksheets with an option to either load or delete the worksheet.
+
 </section>
 
 <section title="Persistence of Mathics Definitions in a Session">

setup.py

@@ -82,7 +82,7 @@ def read(*rnames):
 INSTALL_REQUIRES += [
     "Mathics_Scanner>=1.0.0,<1.1.0",
     "sympy>=1.7, <= 1.8dev",
-    "mpmath>=1.1.0",
+    "mpmath>=1.2.0",
     "numpy",
     "palettable",
     "pint",