MathML tweaks

mathics/builtin/forms/print.py

@@ -161,7 +161,6 @@ class OutputForm(FormBaseClass):
     in_outputforms = True
     in_printforms = True
 
-    formats = {"OutputForm[s_String]": "s"}
     summary_text = "format expression in plain text"
 
 

mathics/doc/doc_entries.py

@@ -10,7 +10,6 @@
 import logging
 import re
 from abc import ABC
-from os import getenv
 from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Sequence, Tuple
 
 from mathics.core.evaluation import Message, Print, _Out

mathics/format/render/mathml.py

@@ -2,11 +2,32 @@
 """
 Mathics3 Box rendering to MathML strings.
 
-MathML rendering is usually initiated via MathMLForm[].
-"""
+MathML formatting is usually initiated in Mathics via MathMLForm[].
+
+For readability, and following WMA MathML generated code,  tags \
+containing sub-tags are split on several lines, one by
+sub element. For example, the Box expression
+
+>> FractionBox[RowBox[{"a", "+", SuperscriptBox["b", "c"]}], "d"]
+
+produces
+```
+<mfrac>
+<mrow>
+<mi>a</mi>
+<mo>+</mo>
+<msup>
+<mi>b</mi>
+<mi>c</mi>
+</msup>
+</mrow>
+<mi>d</mi>
+</mfrac>
+```
+In WMA, each line would be also indented adding one space on each \
+level of indentation.
 
-# Please see the developer note in __init__ about the use of "%s" in
-# format strings.
+"""
 
 import base64
 
@@ -53,6 +74,7 @@ def encode_mathml(text: str) -> str:
     return text
 
 
+# "Operators" which are not in display_operators_set
 extra_operators = {
     ",",
     "(",
@@ -72,15 +94,18 @@ def encode_mathml(text: str) -> str:
     named_characters["DifferentialD"],
 }
 
+
 add_conversion_fn(FormBox, convert_inner_box)
 
 
 def fractionbox(box: FractionBox, **options) -> str:
     # Note: values set in `options` take precedence over `box_options`
     child_options = {**options, **box.box_options}
+
     num_text = convert_box_to_format(box.num, **child_options)
     den_text = convert_box_to_format(box.den, **child_options)
-    return "<mfrac>%s %s</mfrac>" % (num_text, den_text)
+
+    return "<mfrac>\n%s\n%s\n</mfrac>" % (num_text, den_text)
 
 
 add_conversion_fn(FractionBox, fractionbox)
@@ -89,7 +114,7 @@ def fractionbox(box: FractionBox, **options) -> str:
 def graphics3dbox(box: Graphics3DBox, elements=None, **options) -> str:
     """Turn the Graphics3DBox into a MathML string"""
     result = box.boxes_to_js(**options)
-    result = f"<mtable><mtr><mtd>{result}</mtd></mtr></mtable>"
+    result = f"<mtable>\n<mtr>\n<mtd>\n{result}\n</mtd>\n</mtr>\n</mtable>"
     return result
 
 
@@ -156,15 +181,39 @@ def gridbox(box: GridBox, elements=None, **box_options) -> str:
                 f"<mtd {joined_attrs} columnspan={num_fields}>%s</mtd>"
                 % convert_box_to_format(item, **box_options)
             )
-
         result += "</mtr>\n"
     result += "</mtable>"
     # print(f"gridbox: {result}")
     return result
 
 
 add_conversion_fn(GridBox, gridbox)
-add_conversion_fn(InterpretationBox, convert_inner_box)
+
+
+def interpretation_box(box: InterpretationBox, **options):
+    origin = box.expr
+    child_options = {**options, **box.box_options}
+    box = box.inner_box
+    if origin.has_form("InputForm", None):
+        # InputForm produce outputs of the form
+        # InterpretationBox[Style[_String, ...], origin_InputForm, opts___]
+        assert isinstance(box, StyleBox), f"boxes={box} is not a StyleBox."
+        box = box.inner_box
+        child_options["System`ShowStringCharacters"] = SymbolTrue
+        assert isinstance(box, String)
+    elif origin.has_form("OutputForm", None):
+        # OutputForm produce outputs of the form
+        # InterpretationBox[PaneBox[_String, ...], origin_OutputForm, opts___]
+        assert box.has_form("PaneBox", 1, None)
+        box = box.inner_box
+        assert isinstance(box, String)
+        # Remove the outer quotes
+        box = String(box.value)
+
+    return convert_box_to_format(box, **child_options)
+
+
+add_conversion_fn(InterpretationBox, interpretation_box)
 
 
 def pane_box(box: PaneBox, **options):
@@ -239,20 +288,24 @@ def is_list_interior(content):
 
     # print(f"mrow: {result}")
 
-    return "<mrow>%s</mrow>" % " ".join(result)
+    return "<mrow>\n%s\n</mrow>" % "\n".join(result)
 
 
 add_conversion_fn(RowBox, rowbox)
 
 
 def sqrtbox(box: SqrtBox, **options):
+    # Note: values set in `options` take precedence over `box_options`
+    child_options = {**options, **box.box_options}
     if box.index:
         return "<mroot> %s %s </mroot>" % (
-            convert_inner_box_field(box, "radicand", **options),
-            convert_inner_box_field(box, "index", **options),
+            convert_inner_box_field(box, "radicand", **child_options),
+            convert_inner_box_field(box, "index", **child_options),
         )
 
-    return "<msqrt> %s </msqrt>" % convert_inner_box_field(box, "radicand", **options)
+    return "<msqrt>\n%s\n</msqrt>" % convert_inner_box_field(
+        box, "radicand", **child_options
+    )
 
 
 add_conversion_fn(SqrtBox, sqrtbox)
@@ -274,13 +327,10 @@ def render(format, string):
         return format % encoded_text
 
     if text.startswith('"') and text.endswith('"'):
-        if show_string_characters:
-            return render("<ms>%s</ms>", text[1:-1])
-        else:
-            outtext = ""
-            for line in text[1:-1].split("\n"):
-                outtext += render("<mtext>%s</mtext>", line)
-            return outtext
+        text = text[1:-1]
+        if not show_string_characters:
+            return render("<mtext>%s</mtext>", text)
+        return render("<ms>%s</ms>", text)
     elif (
         text
         and (number_as_text is SymbolFalse)
@@ -295,31 +345,28 @@ def render(format, string):
             # Mathics-Django:
             if text == "":
                 return ""
-            if text == "\u2146":
-                return render(
-                    '<mo form="prefix" lspace="0.2em" rspace="0">%s</mo>', text
-                )
-            if text == "\u2062":
+            if text == named_characters["InvisibleTimes"]:
                 return render(
                     '<mo form="prefix" lspace="0" rspace="0.2em">%s</mo>', text
                 )
             return render("<mo>%s</mo>", text)
         elif is_symbol_name(text):
             return render("<mi>%s</mi>", text)
         else:
-            outtext = ""
-            for line in text.split("\n"):
-                outtext += render("<mtext>%s</mtext>", line)
-            return outtext
+            return "".join(
+                render("<mtext>%s</mtext>", line) for line in text.split("\n")
+            )
 
 
 add_conversion_fn(String, string)
 
 
 def subscriptbox(box: SubscriptBox, **options):
-    return "<msub>%s %s</msub>" % (
-        convert_inner_box_field(box, "base", **options),
-        convert_inner_box_field(box, "subindex", **options),
+    # Note: values set in `options` take precedence over `box_options`
+    child_options = {**options, **box.box_options}
+    return "<msub>\n%s\n%s\n</msub>" % (
+        convert_inner_box_field(box, "base", **child_options),
+        convert_inner_box_field(box, "subindex", **child_options),
     )
 
 
@@ -328,11 +375,12 @@ def subscriptbox(box: SubscriptBox, **options):
 
 def subsuperscriptbox(box: SubsuperscriptBox, **options):
     # Note: values set in `options` take precedence over `box_options`
+    child_options = {**box.box_options, **options}
     box.base.inside_row = box.subindex.inside_row = box.superindex.inside_row = True
-    return "<msubsup>%s %s %s</msubsup>" % (
-        convert_inner_box_field(box, "base", **options),
-        convert_inner_box_field(box, "subindex", **options),
-        convert_inner_box_field(box, "superindex", **options),
+    return "<msubsup>\n%s\n%s\n%s\n</msubsup>" % (
+        convert_inner_box_field(box, "base", **child_options),
+        convert_inner_box_field(box, "subindex", **child_options),
+        convert_inner_box_field(box, "superindex", **child_options),
     )
 
 
@@ -341,9 +389,10 @@ def subsuperscriptbox(box: SubsuperscriptBox, **options):
 
 def superscriptbox(box: SuperscriptBox, **options):
     # Note: values set in `options` take precedence over `box_options`
-    return "<msup>%s %s</msup>" % (
-        convert_inner_box_field(box, "base", **options),
-        convert_inner_box_field(box, "superindex", **options),
+    child_options = {**options, **box.box_options}
+    return "<msup>\n%s\n%s\n</msup>" % (
+        convert_inner_box_field(box, "base", **child_options),
+        convert_inner_box_field(box, "superindex", **child_options),
     )
 
 

test/builtin/box/test_custom_boxexpression.py

@@ -6,7 +6,7 @@
 from mathics.core.builtin import Predefined
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
-from mathics.core.rules import BaseRule, FunctionApplyRule, Rule
+from mathics.core.rules import FunctionApplyRule
 from mathics.core.symbols import Symbol
 
 SymbolCustomGraphicsBox = Symbol("CustomGraphicsBox")

test/builtin/test_system.py

@@ -4,7 +4,6 @@
 """
 
 
-import os
 from test.helper import check_evaluation
 
 import pytest