fix Graphics3D

Author: mmatera

mathics/builtin/graphics.py

@@ -470,7 +470,6 @@ class Graphics(Builtin):
     def apply_makeboxes(self, content, evaluation, options):
         """MakeBoxes[%(name)s[content_, OptionsPattern[%(name)s]],
         StandardForm|TraditionalForm|OutputForm]"""
-
         def convert(content):
             head = content.get_head_name()
 
@@ -511,11 +510,9 @@ def convert(content):
         #box_name = "Graphics" + self.box_suffix
         from mathics.builtin.graphics3d import Graphics3DBox, Graphics3D
         if type(self) is Graphics:
-            ret = GraphicsBox(convert(content), *options_to_rules(options))
-            return ret
-        elif type(self) is Graphics3D:            
-            ret = Graphics3DBox(convert(content), *options_to_rules(options))
-            return ret
+            return GraphicsBox(convert(content), *options_to_rules(options))
+        elif type(self) is Graphics3D:
+            return Graphics3DBox(convert(content), *options_to_rules(options))
 
 
 class _GraphicsElement(InstancableBuiltin):
@@ -2774,7 +2771,6 @@ class _GraphicsElements(object):
     def __init__(self, content, evaluation):
         self.evaluation = evaluation
         self.elements = []
-
         builtins = evaluation.definitions.builtin
 
         def get_options(name):
@@ -2801,9 +2797,6 @@ def stylebox_style(style, specs):
 
                     new_style.set_option(name, create(style.graphics, expr))
                 else:
-                    print("stylebox_style")
-                    print("spec=", spec)
-                    print("head_name=", head_name)
                     raise BoxConstructError
             return new_style
 
@@ -3875,6 +3868,7 @@ class Large(Builtin):
 style_options = system_symbols_dict(
     {
         "FontColor": _style,
+        "ImageSizeMultipliers": (lambda *x: x[1])
     }
 )
 

mathics/core/evaluation.py

@@ -342,6 +342,7 @@ def evaluate():
                 self.definitions.add_rule(
                     "Out", Rule(Expression("Out", line_no), stored_result)
                 )
+
             if self.last_eval != self.SymbolNull:
                 if check_io_hook("System`$PrePrint"):
                     self.last_eval = Expression(

mathics/core/expression.py

@@ -451,7 +451,9 @@ def format_expr(expr):
             if head in formats:
                 expr = expr.do_format(evaluation, form)
             elif (head != 'System`NumberForm' and not expr.is_atom() and
-                  head != 'System`Graphics'):
+                  head != 'System`Graphics' and
+                  head != 'System`Graphics3D'):
+                # print("Not inside graphics or numberform, and not is atom")
                 new_leaves = [leaf.do_format(evaluation, form)
                               for leaf in expr.leaves]
                 formathead = expr.head.do_format(evaluation, form)