Skip to content

Commit 9de867a

Browse files
committed
Merge remote-tracking branch 'upstream/master' into newcellstotexfixes2
2 parents e646493 + e2bbf66 commit 9de867a

61 files changed

Lines changed: 4736 additions & 3451 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGES.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Enhancements
2626
``Compile[] and CompiledFunction[]`` every expression can have a compiled form,
2727
as a Python function.
2828
* ``Equal[]`` now compares complex against other numbers properly.
29-
29+
* Improvements in handling products with infinite factors: ``0 Infinity``-> ``Indeterminate``, and ``expr Infinity``-> ``DirectedInfinite[expr]``
3030

3131
Bug fixes
3232
+++++++++

mathics/autoload/settings.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
Unprotect[Settings`$TraceGet]
88

99

10-
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";
10+
Settings`$PreferredBackendMethod::usage = "Set this do whether to use mpmath, numpy or Sympy for numeric and symbolic constants and methods when there is a choice";
1111
Settings`$PreferredBackendMethod = "sympy"
1212
Unprotect[Settings`$PreferredBackendMethod]
1313

1414
(* Some packages like Feyncalc, test for whether a they are being used
1515
inside a notbook. *)
16-
System`$Notebooks::usage = "Set True if the Mathics is being used with a notebookbased front end.";
16+
System`$Notebooks::usage = "Set True if the Mathics is being used with a notebook-based front end.";
1717
System`$Notebooks = False;
18-
Unprotect[System`Notebooks];
18+
Unprotect[System`$Notebooks];

0 commit comments

Comments
 (0)