Merge branch 'master' into improve_latex_form

Author: mmatera

mathics/builtin/box/layout.py

@@ -147,6 +147,10 @@ def eval_tagbox(self, expr, form: Symbol, evaluation: Evaluation):
         assert isinstance(expr, BoxElementMixin), f"{expr}"
         return FormBox(expr, form, **options)
 
+    @property
+    def is_multiline(self) -> bool:
+        return self.boxes.is_multiline
+
 
 class FractionBox(BoxExpression):
     """
@@ -335,6 +339,10 @@ def eval_display(self, boxexpr, evaluation):
         """DisplayForm[boxexpr_InterpretationBox]"""
         return boxexpr.boxes
 
+    @property
+    def is_multiline(self) -> bool:
+        return self.boxes.is_multiline
+
 
 class PaneBox(BoxExpression):
     """
@@ -379,6 +387,10 @@ def eval_display(boxexpr, evaluation):
         """DisplayForm[boxexpr_PaneBox]"""
         return boxexpr.elements[0]
 
+    @property
+    def is_multiline(self) -> bool:
+        return self.boxes.is_multiline
+
 
 class RowBox(BoxExpression):
     """
@@ -445,6 +457,10 @@ def check_item(item):
 
         self.items = tuple((check_item(item) for item in items))
 
+    @property
+    def is_multiline(self) -> bool:
+        return any(item.is_multiline for item in self.items)
+
 
 class ShowStringCharacters(Builtin):
     """
@@ -587,6 +603,10 @@ def init(self, boxes, style=None, **options):
             self.boxes, BoxElementMixin
         ), f"{type(self.boxes)},{self.boxes}"
 
+    @property
+    def is_multiline(self) -> bool:
+        return self.boxes.is_multiline
+
 
 class SubscriptBox(BoxExpression):
     """
@@ -768,6 +788,10 @@ def eval_tagbox(self, expr, form: Symbol, evaluation: Evaluation):
         assert isinstance(expr, BoxElementMixin), f"{expr}"
         return TagBox(expr, form, **options)
 
+    @property
+    def is_multiline(self) -> bool:
+        return self.boxes.is_multiline
+
 
 class TemplateBox(BoxExpression):
     """

mathics/core/atoms/strings.py

@@ -93,6 +93,10 @@ def is_literal(self) -> bool:
         """
         return True
 
+    @property
+    def is_multiline(self) -> bool:
+        return "\n" in self.value
+
     def sameQ(self, rhs) -> bool:
         """Mathics SameQ"""
         return isinstance(rhs, String) and self.value == rhs.value

mathics/core/element.py

@@ -407,6 +407,10 @@ class BoxElementMixin(ImmutableValueMixin):
     elements
     """
 
+    @property
+    def is_multiline(self) -> bool:
+        return True
+
     def boxes_to_format(self, format: str, **options) -> str:
         from mathics.core.formatter import boxes_to_format
 

test/format/test_makeboxes.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
-from test.helper import check_evaluation
+from test.helper import check_evaluation, session
 
 import pytest
 import yaml
@@ -478,3 +478,64 @@ def test_makeboxes_custom2(str_expr, str_expected, msg):
         to_python_expected=False,
         failure_message=msg,
     )
+
+
+@pytest.mark.parametrize(
+    ["expr", "expect"],
+    (
+        (
+            '"Hola"',
+            False,
+        ),
+        (
+            '"Hola\nqué tal?"',
+            True,
+        ),
+        (
+            "a/b//MakeBoxes",
+            True,
+        ),
+        (
+            "Sqrt[a]//MakeBoxes",
+            True,
+        ),
+        (
+            "a + b * c//MakeBoxes",
+            False,
+        ),
+        (
+            "a + b / c//MakeBoxes",
+            True,
+        ),
+        (
+            "a + b * c // InputForm//MakeBoxes",
+            False,
+        ),
+        (
+            "a + b / c //InputForm//MakeBoxes",
+            False,
+        ),
+        (
+            "a + b * c // OutputForm//MakeBoxes",
+            False,
+        ),
+        (
+            "a + b / c // OutputForm//MakeBoxes",
+            False,
+        ),
+        (
+            "a + b * c // FullForm//MakeBoxes",
+            False,
+        ),
+        (
+            "a + b / c // FullForm//MakeBoxes",
+            False,
+        ),
+    ),
+)
+def test_multiline(expr, expect):
+    boxexpr = session.evaluate(expr)
+    print(expr, "->", boxexpr, (expect))
+    assert (
+        boxexpr.is_multiline == expect
+    ), f"{boxexpr} must {'not ' if not expect else ''}be multiline. Got ({boxexpr.is_multiline})"