moving and renaming modules

Mathics3 · Nov 9, 2024 · 1cd0bc8 · 1cd0bc8
1 parent c5faf8f
commit 1cd0bc8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/mathics/builtin/forms/output.py b/mathics/builtin/forms/output.py
@@ -35,7 +35,6 @@
     StringFromPython,
 )
 from mathics.core.builtin import Builtin
-from mathics.core.convert.prettyprint import expression_to_2d_text
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import BoxError, Expression
 from mathics.core.list import ListExpression
@@ -67,6 +66,7 @@
 )
 from mathics.eval.makeboxes import StringLParen, StringRParen, format_element
 from mathics.eval.testing_expressions import expr_min
+from mathics.format.prettyprint import expression_to_2d_text
 
 MULTI_NEWLINE_RE = re.compile(r"\n{2,}")
 

diff --git a/mathics/eval/makeboxes.py b/mathics/eval/makeboxes.py
@@ -211,13 +211,14 @@ def make_output_form(expr, evaluation, form):
     Build a 2D text representation of the expression.
     """
     from mathics.builtin.box.layout import InterpretationBox, PaneBox
-    from mathics.core.convert.prettyprint import expression_to_2d_text
+    from mathics.format.prettyprint import expression_to_2d_text
 
     use_2d = (
         evaluation.definitions.get_ownvalues("System`$Use2DOutputForm")[0].replace
         is SymbolTrue
     )
     text2d = expression_to_2d_text(expr, evaluation, form, **{"2d": use_2d}).text
+
     if "\n" in text2d:
         text2d = "\n" + text2d
     elem1 = PaneBox(String(text2d))

diff --git a/mathics/core/prettyprint.py → mathics/format/pane_text.py b/mathics/core/prettyprint.py → mathics/format/pane_text.py
@@ -1,5 +1,8 @@
 """
 This module produces a "pretty-print" inspired 2d text representation.
+
+This code is completely independent from Mathics objects, so it could live
+alone in a different package.
 """
 
 from typing import List, Optional, Union

diff --git a/mathics/core/convert/prettyprint.py → mathics/format/prettyprint.py b/mathics/core/convert/prettyprint.py → mathics/format/prettyprint.py
@@ -17,7 +17,18 @@
 from mathics.core.evaluation import Evaluation
 from mathics.core.expression import Expression
 from mathics.core.list import ListExpression
-from mathics.core.prettyprint import (
+from mathics.core.symbols import Atom, Symbol, SymbolTimes
+from mathics.core.systemsymbols import (
+    SymbolDerivative,
+    SymbolInfix,
+    SymbolNone,
+    SymbolOutputForm,
+    SymbolPower,
+    SymbolStandardForm,
+    SymbolTraditionalForm,
+)
+from mathics.eval.makeboxes import compare_precedence, do_format  # , format_element
+from mathics.format.pane_text import (
     TextBlock,
     bracket,
     fraction,
@@ -30,17 +41,6 @@
     subsuperscript,
     superscript,
 )
-from mathics.core.symbols import Atom, Symbol, SymbolTimes
-from mathics.core.systemsymbols import (
-    SymbolDerivative,
-    SymbolInfix,
-    SymbolNone,
-    SymbolOutputForm,
-    SymbolPower,
-    SymbolStandardForm,
-    SymbolTraditionalForm,
-)
-from mathics.eval.makeboxes import compare_precedence, do_format  # , format_element
 
 SymbolNonAssociative = Symbol("System`NonAssociative")
 SymbolPostfix = Symbol("System`Postfix")