Times should have always at least 2 elements

mmatera · mmatera · commit 80e69153f6f3 · 2023-07-28T22:13:41.000-03:00
Rework arithmetic format
diff --git a/mathics/builtin/arithfns/basic.py b/mathics/builtin/arithfns/basic.py
diff --git a/mathics/builtin/arithmetic.py b/mathics/builtin/arithmetic.py
@@ -524,7 +524,8 @@ class DirectedInfinity(SympyFunction):
 
     formats = {
         "DirectedInfinity[1]": "HoldForm[Infinity]",
-        "DirectedInfinity[-1]": "HoldForm[-Infinity]",
+        "DirectedInfinity[-1]": "HoldForm[Minus[Infinity]]",
+        "DirectedInfinity[-I]": "HoldForm[Minus[Infinity] I]",
         "DirectedInfinity[]": "HoldForm[ComplexInfinity]",
         "DirectedInfinity[DirectedInfinity[z_]]": "DirectedInfinity[z]",
         "DirectedInfinity[z_?NumericQ]": "HoldForm[z Infinity]",
diff --git a/mathics/builtin/forms/output.py b/mathics/builtin/forms/output.py
@@ -1060,9 +1060,9 @@ class MatrixForm(TableForm):
 
     ## Issue #182
     #> {{2*a, 0},{0,0}}//MatrixForm
-     = 2 ⁢ a   0
+     = 2 a   0
      .
-     . 0       0
+     . 0     0
     """
 
     in_outputforms = True
diff --git a/mathics/builtin/layout.py b/mathics/builtin/layout.py
@@ -500,7 +500,7 @@ class Superscript(Builtin):
 
     summary_text = "format an expression with a superscript"
     rules = {
-        "MakeBoxes[Superscript[x_, y_], f:StandardForm|TraditionalForm]": (
+        "MakeBoxes[Superscript[x_, y_], f:OutputForm|StandardForm|TraditionalForm]": (
             "SuperscriptBox[MakeBoxes[x, f], MakeBoxes[y, f]]"
         )
     }
diff --git a/mathics/builtin/numbers/calculus.py b/mathics/builtin/numbers/calculus.py
@@ -1714,7 +1714,7 @@ class Series(Builtin):
     >> Clear[s];
     We can also expand over multiple variables
     >> Series[Exp[x-y], {x, 0, 2}, {y, 0, 2}]
-     = (1 - y + 1 / 2 y ^ 2 + O[y] ^ 3) + (1 - y + 1 / 2 y ^ 2 + O[y] ^ 3) x + (1 / 2 + (-1 / 2) y + 1 / 4 y ^ 2 + O[y] ^ 3) x ^ 2 + O[x] ^ 3
+     = 1 - y + 1 / 2 y ^ 2 + O[y] ^ 3 + (1 - y + 1 / 2 y ^ 2 + O[y] ^ 3) x + (1 / 2 - 1 / 2 y + 1 / 4 y ^ 2 + O[y] ^ 3) x ^ 2 + O[x] ^ 3
 
     """
 
@@ -2097,7 +2097,7 @@ def pre_makeboxes(self, x, x0, data, nmin, nmax, den, form, evaluation: Evaluati
             Expression(SymbolPlus, *expansion),
             Expression(SymbolPower, Expression(SymbolO, variable), powers[-1]),
         )
-        return Expression(SymbolInfix, expansion, String("+"), Integer(300), SymbolLeft)
+        return Expression(SymbolInfix, expansion, String("+"), Integer(299), SymbolLeft)
 
     def eval_makeboxes(
         self,
diff --git a/mathics/builtin/quantum_mechanics/angular.py b/mathics/builtin/quantum_mechanics/angular.py
@@ -107,7 +107,7 @@ class PauliMatrix(SympyFunction):
      = True
 
     >> MatrixExp[I \[Phi]/2 PauliMatrix[3]]
-     = {{E ^ (I / 2 ϕ), 0}, {0, E ^ ((-I / 2) ϕ)}}
+     = {{E ^ (I / 2 ϕ), 0}, {0, E ^ (-I / 2 ϕ)}}
 
     >> % /. \[Phi] -> 2 Pi
      = {{-1, 0}, {0, -1}}
diff --git a/mathics/builtin/statistics/orderstats.py b/mathics/builtin/statistics/orderstats.py
@@ -263,7 +263,7 @@ class Sort(Builtin):
     Sort uses 'OrderedQ' to determine ordering by default.
     You can sort patterns according to their precedence using 'PatternsOrderedQ':
     >> Sort[{items___, item_, OptionsPattern[], item_symbol, item_?test}, PatternsOrderedQ]
-     = {item_symbol, item_ ? test, item_, items___, OptionsPattern[]}
+     = {item_symbol, (item_) ? test, item_, items___, OptionsPattern[]}
 
     When sorting patterns, values of atoms do not matter:
     >> Sort[{a, b/;t}, PatternsOrderedQ]
diff --git a/mathics/core/convert/sympy.py b/mathics/core/convert/sympy.py
@@ -463,7 +463,10 @@ def old_from_sympy(expr) -> BaseElement:
                     else:
                         factors.append(Expression(SymbolPower, slot, from_sympy(exp)))
             if factors:
-                result.append(Expression(SymbolTimes, *factors))
+                if len(factors) == 1:
+                    result.append(factors[0])
+                else:
+                    result.append(Expression(SymbolTimes, *factors))
             else:
                 result.append(Integer1)
         return Expression(SymbolFunction, Expression(SymbolPlus, *result))
diff --git a/mathics/core/systemsymbols.py b/mathics/core/systemsymbols.py
@@ -190,6 +190,7 @@
 SymbolPolygon = Symbol("System`Polygon")
 SymbolPossibleZeroQ = Symbol("System`PossibleZeroQ")
 SymbolPrecision = Symbol("System`Precision")
+SymbolPrecedenceForm = Symbol("System`PrecedenceForm")
 SymbolQuantity = Symbol("System`Quantity")
 SymbolQuiet = Symbol("System`Quiet")
 SymbolQuotient = Symbol("System`Quotient")
diff --git a/mathics/doc/documentation/1-Manual.mdoc b/mathics/doc/documentation/1-Manual.mdoc
@@ -1186,15 +1186,15 @@ A dice object shall be displayed as a rectangle with the given number of points
   #> Definition[Dice]
     = Attributes[Dice] = {Orderless}
    .
-   . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], MathMLForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
+   . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], MathMLForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1*p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1*p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]
    .
-   . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], OutputForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
+   . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], OutputForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1*p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1*p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]
    .
-   . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], StandardForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
+   . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], StandardForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1*p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1*p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]
    .
-   . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], TeXForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
+   . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], TeXForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1*p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1*p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]
    .
-   . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], TraditionalForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
+   . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], TraditionalForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1*p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1*p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1*p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]
 
 The empty series of dice shall be displayed as an empty dice:
   >> Format[Dice[]] := Graphics[{EdgeForm[Black], White, Rectangle[]}, ImageSize -> Tiny]
diff --git a/mathics/eval/makeboxes.py b/mathics/eval/makeboxes.py
@@ -81,9 +81,7 @@ def eval_fullform_makeboxes(
     return Expression(SymbolMakeBoxes, expr, form).evaluate(evaluation)
 
 
-def eval_makeboxes(
-    self, expr, evaluation: Evaluation, form=SymbolStandardForm
-) -> Expression:
+def eval_makeboxes(expr, evaluation: Evaluation, form=SymbolStandardForm) -> Expression:
     """
     This function takes the definitions provided by the evaluation
     object, and produces a boxed fullform for expr.
@@ -334,13 +332,21 @@ def parenthesize(
     elif element.has_form("PrecedenceForm", 2):
         element_prec = element.elements[1].value
     # If "element" is a negative number, we need to parenthesize the number. (Fixes #332)
-    elif isinstance(element, (Integer, Real)) and element.value < 0:
-        # Force parenthesis by adjusting the surrounding context's precedence value,
-        # We can't change the precedence for the number since it, doesn't
-        # have a precedence value.
-        element_prec = precedence
+    elif isinstance(element, (Integer, Real)):
+        if element.value < 0:
+            # Force parenthesis by adjusting the surrounding context's precedence value,
+            # We can't change the precedence for the number since it, doesn't
+            # have a precedence value.
+            element_prec = 480
+        else:
+            element_prec = 999
+            when_equal = False
+    elif isinstance(element, Symbol):
+        precedence = precedence
+        element_prec = 999
+        when_equal = False
     else:
-        element_prec = builtins_precedence.get(element.get_head())
+        element_prec = builtins_precedence.get(element.get_head(), 670)
     if precedence is not None and element_prec is not None:
         if precedence > element_prec or (precedence == element_prec and when_equal):
             return Expression(
diff --git a/mathics/format/latex.py b/mathics/format/latex.py
@@ -146,9 +146,31 @@ def fractionbox(self, **options) -> str:
     _options = self.box_options.copy()
     _options.update(options)
     options = _options
+
+    # This removes the auxiliar parentheses in
+    # numerator and denominator if they are not
+    # needed. See comment in `mathics.builtin.arithfns.basic.Divide`
+
+    def remove_trivial_parentheses(x):
+        if not isinstance(x, RowBox):
+            return x
+        elements = x.elements
+        if len(elements) != 3:
+            return x
+        left, center, right = elements
+        if not (isinstance(left, String) and isinstance(right, String)):
+            return x
+        open_p, close_p = elements[0].value, elements[-1].value
+        if open_p == "(" and close_p == ")":
+            return center
+        return x
+
+    num = remove_trivial_parentheses(self.num)
+    den = remove_trivial_parentheses(self.den)
+
     return "\\frac{%s}{%s}" % (
-        lookup_conversion_method(self.num, "latex")(self.num, **options),
-        lookup_conversion_method(self.den, "latex")(self.den, **options),
+        lookup_conversion_method(num, "latex")(num, **options),
+        lookup_conversion_method(den, "latex")(den, **options),
     )
 
 
diff --git a/mathics/format/mathml.py b/mathics/format/mathml.py
@@ -114,9 +114,30 @@ def fractionbox(self, **options) -> str:
     _options = self.box_options.copy()
     _options.update(options)
     options = _options
+
+    # This removes the auxiliar parentheses in
+    # numerator and denominator if they are not
+    # needed. See comment in `mathics.builtin.arithfns.basic.Divide`
+    def remove_trivial_parentheses(x):
+        if not isinstance(x, RowBox):
+            return x
+        elements = x.elements
+        if len(elements) != 3:
+            return x
+        left, center, right = elements
+        if not (isinstance(left, String) and isinstance(right, String)):
+            return x
+        open_p, close_p = elements[0].value, elements[-1].value
+        if open_p == "(" and close_p == ")":
+            return center
+        return x
+
+    num = remove_trivial_parentheses(self.num)
+    den = remove_trivial_parentheses(self.den)
+
     return "<mfrac>%s %s</mfrac>" % (
-        lookup_conversion_method(self.num, "mathml")(self.num, **options),
-        lookup_conversion_method(self.den, "mathml")(self.den, **options),
+        lookup_conversion_method(num, "mathml")(num, **options),
+        lookup_conversion_method(den, "mathml")(den, **options),
     )
 
 
diff --git a/mathics/format/text.py b/mathics/format/text.py
@@ -47,9 +47,9 @@ def fractionbox(self, **options) -> str:
     num_text = boxes_to_text(self.num, **options)
     den_text = boxes_to_text(self.den, **options)
     if isinstance(self.num, RowBox):
-        num_text = f"({num_text})"
+        num_text = f"{num_text}"
     if isinstance(self.den, RowBox):
-        den_text = f"({den_text})"
+        den_text = f"{den_text}"
 
     return " / ".join([num_text, den_text])
 
diff --git a/test/builtin/arithmetic/test_basic.py b/test/builtin/arithmetic/test_basic.py
@@ -131,23 +131,25 @@ def test_multiply(str_expr, str_expected, msg):
     [
         (
             "a  b  DirectedInfinity[1. + 2. I]",
-            "a b ((0.447214 + 0.894427 I) Infinity)",
+            "a b (0.447214 + 0.894427 I) Infinity",
             "symbols times floating point complex directed infinity",
         ),
-        ("a  b  DirectedInfinity[I]", "a b (I Infinity)", ""),
+        ("a  b  DirectedInfinity[I]", "a b I Infinity", ""),
         (
             "a  b (-1 + 2 I) Infinity",
-            "a b ((-1 / 5 + 2 I / 5) Sqrt[5] Infinity)",
+            "a b (-1 / 5 + 2 I / 5) Sqrt[5] Infinity",
             "symbols times algebraic exact factor times infinity",
         ),
         (
             "a  b (-1 + 2 Pi I) Infinity",
-            "a b (Infinity (-1 + 2 I Pi) / Sqrt[1 + 4 Pi ^ 2])",
+            "a b (-0.157177 + 0.98757 I) Infinity",
+            # TODO: Improve handling irrational directions
+            # "a b Infinity (-1 + 2 I Pi) / Sqrt[1 + 4 Pi ^ 2]",
             "complex irrational exact",
         ),
         (
             "a  b  DirectedInfinity[(1 + 2 I)/ Sqrt[5]]",
-            "a b ((1 / 5 + 2 I / 5) Sqrt[5] Infinity)",
+            "a b (1 / 5 + 2 I / 5) Sqrt[5] Infinity",
             "symbols times algebraic complex directed infinity",
         ),
         ("a  b  DirectedInfinity[q]", "a b (q Infinity)", ""),
diff --git a/test/format/test_format.py b/test/format/test_format.py
@@ -411,13 +411,13 @@
             "System`StandardForm": "<msup><mi>a</mi> <mfrac><mi>b</mi> <mi>c</mi></mfrac></msup>",
             "System`TraditionalForm": "<msup><mi>a</mi> <mfrac><mi>b</mi> <mi>c</mi></mfrac></msup>",
             "System`InputForm": "<mrow><mi>a</mi> <mo>^</mo> <mrow><mo>(</mo> <mrow><mi>b</mi> <mtext>&nbsp;/&nbsp;</mtext> <mi>c</mi></mrow> <mo>)</mo></mrow></mrow>",
-            "System`OutputForm": "<mrow><mi>a</mi> <mtext>&nbsp;^&nbsp;</mtext> <mrow><mo>(</mo> <mrow><mi>b</mi> <mtext>&nbsp;/&nbsp;</mtext> <mi>c</mi></mrow> <mo>)</mo></mrow></mrow>",
+            "System`OutputForm": r"<mrow><mi>a</mi> <mtext>&nbsp;^&nbsp;</mtext> <mrow><mo>(</mo> <mfrac><mi>b</mi> <mi>c</mi></mfrac> <mo>)</mo></mrow></mrow>",
         },
         "latex": {
             "System`StandardForm": "a^{\\frac{b}{c}}",
             "System`TraditionalForm": "a^{\\frac{b}{c}}",
             "System`InputForm": "a{}^{\\wedge}\\left(b\\text{ / }c\\right)",
-            "System`OutputForm": "a\\text{ ${}^{\\wedge}$ }\\left(b\\text{ / }c\\right)",
+            "System`OutputForm": "a\\text{ ${}^{\\wedge}$ }\\left(\\frac{b}{c}\\right)",
         },
     },
     "1/(1+1/(1+1/a))": {
@@ -442,15 +442,20 @@
                 "Fragile!",
             ),
             "System`OutputForm": (
-                "<mrow><mn>1</mn> <mtext>&nbsp;/&nbsp;</mtext> <mrow><mo>(</mo> <mrow><mn>1</mn> <mtext>&nbsp;+&nbsp;</mtext> <mrow><mn>1</mn> <mtext>&nbsp;/&nbsp;</mtext> <mrow><mo>(</mo> <mrow><mn>1</mn> <mtext>&nbsp;+&nbsp;</mtext> <mrow><mn>1</mn> <mtext>&nbsp;/&nbsp;</mtext> <mi>a</mi></mrow></mrow> <mo>)</mo></mrow></mrow></mrow> <mo>)</mo></mrow></mrow>",
+                (
+                    r"<mfrac><mn>1</mn> <mrow><mn>1</mn> <mtext>&nbsp;+&nbsp;</mtext> "
+                    r"<mfrac><mn>1</mn> <mrow><mn>1</mn> <mtext>&nbsp;+&nbsp;</mtext> "
+                    r"<mfrac><mn>1</mn> <mi>a</mi></mfrac></mrow></mfrac></mrow>"
+                    r"</mfrac>"
+                ),
                 "Fragile!",
             ),
         },
         "latex": {
             "System`StandardForm": "\\frac{1}{1+\\frac{1}{1+\\frac{1}{a}}}",
             "System`TraditionalForm": "\\frac{1}{1+\\frac{1}{1+\\frac{1}{a}}}",
             "System`InputForm": "1\\text{ / }\\left(1\\text{ + }1\\text{ / }\\left(1\\text{ + }1\\text{ / }a\\right)\\right)",
-            "System`OutputForm": "1\\text{ / }\\left(1\\text{ + }1\\text{ / }\\left(1\\text{ + }1\\text{ / }a\\right)\\right)",
+            "System`OutputForm": r"\frac{1}{1\text{ + }\frac{1}{1\text{ + }\frac{1}{a}}}",
         },
     },
     "Sqrt[1/(1+1/(1+1/a))]": {
@@ -475,15 +480,19 @@
                 "Fragile!",
             ),
             "System`OutputForm": (
-                "<mrow><mi>Sqrt</mi> <mo>[</mo> <mrow><mn>1</mn> <mtext>&nbsp;/&nbsp;</mtext> <mrow><mo>(</mo> <mrow><mn>1</mn> <mtext>&nbsp;+&nbsp;</mtext> <mrow><mn>1</mn> <mtext>&nbsp;/&nbsp;</mtext> <mrow><mo>(</mo> <mrow><mn>1</mn> <mtext>&nbsp;+&nbsp;</mtext> <mrow><mn>1</mn> <mtext>&nbsp;/&nbsp;</mtext> <mi>a</mi></mrow></mrow> <mo>)</mo></mrow></mrow></mrow> <mo>)</mo></mrow></mrow> <mo>]</mo></mrow>",
+                (
+                    r"<mrow><mi>Sqrt</mi> <mo>[</mo> <mfrac><mn>1</mn> <mrow><mn>1</mn> <mtext>&nbsp;+&nbsp;</mtext> "
+                    r"<mfrac><mn>1</mn> <mrow><mn>1</mn> <mtext>&nbsp;+&nbsp;</mtext> <mfrac><mn>1</mn> <mi>a</mi>"
+                    r"</mfrac></mrow></mfrac></mrow></mfrac> <mo>]</mo></mrow>"
+                ),
                 "Fragile!",
             ),
         },
         "latex": {
             "System`StandardForm": "\\sqrt{\\frac{1}{1+\\frac{1}{1+\\frac{1}{a}}}}",
             "System`TraditionalForm": "\\sqrt{\\frac{1}{1+\\frac{1}{1+\\frac{1}{a}}}}",
             "System`InputForm": "\\text{Sqrt}\\left[1\\text{ / }\\left(1\\text{ + }1\\text{ / }\\left(1\\text{ + }1\\text{ / }a\\right)\\right)\\right]",
-            "System`OutputForm": "\\text{Sqrt}\\left[1\\text{ / }\\left(1\\text{ + }1\\text{ / }\\left(1\\text{ + }1\\text{ / }a\\right)\\right)\\right]",
+            "System`OutputForm": r"\text{Sqrt}\left[\frac{1}{1\text{ + }\frac{1}{1\text{ + }\frac{1}{a}}}\right]",
         },
     },
     # Grids, arrays and matrices

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ class Superscript(Builtin):`
`500`	`500`
`501`	`501`	`summary_text = "format an expression with a superscript"`
`502`	`502`	`rules = {`
`503`		`- "MakeBoxes[Superscript[x_, y_], f:StandardForm\|TraditionalForm]": (`
	`503`	`+ "MakeBoxes[Superscript[x_, y_], f:OutputForm\|StandardForm\|TraditionalForm]": (`
`504`	`504`	`"SuperscriptBox[MakeBoxes[x, f], MakeBoxes[y, f]]"`
`505`	`505`	`)`
`506`	`506`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1186,15 +1186,15 @@ A dice object shall be displayed as a rectangle with the given number of points`
`1186`	`1186`	`#> Definition[Dice]`
`1187`	`1187`	`= Attributes[Dice] = {Orderless}`
`1188`	`1188`	`.`
`1189`		- . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], MathMLForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
	`1189`	`+ . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], MathMLForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]`
`1190`	`1190`	`.`
`1191`		- . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], OutputForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
	`1191`	`+ . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], OutputForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]`
`1192`	`1192`	`.`
`1193`		- . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], StandardForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
	`1193`	`+ . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], StandardForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]`
`1194`	`1194`	`.`
`1195`		- . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], TeXForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
	`1195`	`+ . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], TeXForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]`
`1196`	`1196`	`.`
`1197`		- . Format[Dice[n_Integer ? (1 <= #1 <= 6&)], TraditionalForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, Plus[1, Times[-1, p]]}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{Plus[1, Times[-1, p]], p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{Plus[1, Times[-1, p]], 0.5}, r]}]}, ImageSize -> Tiny]]
	`1197`	`+ . Format[Dice[(n_Integer) ? (1 <= #1 <= 6&)], TraditionalForm] = Block[{p = 0.2, r = 0.05}, Graphics[{EdgeForm[Black], White, Rectangle[], Black, EdgeForm[], If[OddQ[n], Disk[{0.5, 0.5}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{p, p}, r]], If[MemberQ[{2, 3, 4, 5, 6}, n], Disk[{1 - 1p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{p, 1 - 1p}, r]], If[MemberQ[{4, 5, 6}, n], Disk[{1 - 1p, p}, r]], If[n === 6, {Disk[{p, 0.5}, r], Disk[{1 - 1*p, 0.5}, r]}]}, ImageSize -> Tiny]]`
`1198`	`1198`
`1199`	`1199`	`The empty series of dice shall be displayed as an empty dice:`
`1200`	`1200`	`>> Format[Dice[]] := Graphics[{EdgeForm[Black], White, Rectangle[]}, ImageSize -> Tiny]`