Extend 2D PointBox to handle (roughly) PointSize.

Numerous other small adjustments were made too.

Author: rocky

mathics/builtin/graphics.py

@@ -1279,7 +1279,6 @@ class Point(Builtin):
         <dd>represents a number of point primitives.
     </dl>
 
-    >> Graphics[Point[{0,0}]]
     = -Graphics-
 
     >> Graphics[Point[Table[{Sin[t], Cos[t]}, {t, 0, 2. Pi, Pi / 15.}]]]
@@ -1292,10 +1291,29 @@ class Point(Builtin):
     pass
 
 
+# FIXME: We model points as line segments which
+# is kind of  wrong.
 class PointBox(_Polyline):
+    """
+    A Bounding box for a list of points.
+    object attributes:
+    edge_color: _Color
+    point_radius: radius of each point
+    """
     def init(self, graphics, style, item=None):
         super(PointBox, self).init(graphics, item, style)
         self.edge_color, self.face_color = style.get_style(_Color, face_element=True)
+
+        # Handle PointSize in a hacky way for now.
+        point_size, _ = style.get_style(PointSize, face_element=False)
+        if point_size is None:
+            point_size = PointSize(self.graphics, value=0.005)
+
+        # FIXME: we don't have graphics options. Until we do, we'll
+        # just assume an image width of 400
+        image_width = 400
+        self.point_radius = (image_width * point_size.value)
+
         if item is not None:
             if len(item.leaves) != 1:
                 raise BoxConstructError
@@ -1307,6 +1325,19 @@ def init(self, graphics, style, item=None):
         else:
             raise BoxConstructError
 
+    def extent(self):
+        """Returns a list of bounding-box coordinates each point in the PointBox"""
+        l = self.point_radius
+        result = []
+        for line in self.lines:
+            for c in line:
+                x, y = c.pos()
+                result.extend(
+                    [(x - l, y - l), (x - l, y + l), (x + l, y - l), (x + l, y + l)]
+                )
+        return result
+
+
 
 class Line(Builtin):
     """
@@ -2382,6 +2413,7 @@ def __init__(self, content, evaluation, neg_y=False):
         self.xmin = self.ymin = self.pixel_width = None
         self.pixel_height = self.extent_width = self.extent_height = None
         self.view_width = None
+        self.content = content
 
     def translate(self, coords):
         if self.pixel_width is not None:
@@ -2512,8 +2544,8 @@ def _get_image_size(self, options, graphics_options, max_width):
     def _prepare_elements(self, leaves, options, neg_y=False, max_width=None):
         if not leaves:
             raise BoxConstructError
-        graphics_options = self.get_option_values(leaves[1:], **options)
-        background = graphics_options["System`Background"]
+        self.graphics_options = self.get_option_values(leaves[1:], **options)
+        background = self.graphics_options["System`Background"]
         if (
             isinstance(background, Symbol)
             and background.get_name() == "System`Automatic"
@@ -2523,10 +2555,10 @@ def _prepare_elements(self, leaves, options, neg_y=False, max_width=None):
             self.background_color = _Color.create(background)
 
         base_width, base_height, size_multiplier, size_aspect = self._get_image_size(
-            options, graphics_options, max_width
+            options, self.graphics_options, max_width
         )
 
-        plot_range = graphics_options["System`PlotRange"].to_python()
+        plot_range = self.graphics_options["System`PlotRange"].to_python()
         if plot_range == "System`Automatic":
             plot_range = ["System`Automatic", "System`Automatic"]
 
@@ -2658,7 +2690,7 @@ def get_range(min, max):
         ymax += h * 0.02
 
         axes.extend(
-            self.create_axes(elements, graphics_options, xmin, xmax, ymin, ymax)
+            self.create_axes(elements, self.graphics_options, xmin, xmax, ymin, ymax)
         )
 
         return elements, calc_dimensions
@@ -2725,6 +2757,7 @@ def boxes_to_mathml(self, leaves=None, **options) -> str:
         elements, calc_dimensions = self._prepare_elements(leaves, options, neg_y=True)
         xmin, xmax, ymin, ymax, w, h, width, height = calc_dimensions()
         data = (elements, xmin, xmax, ymin, ymax, w, h, width, height)
+        elements.view_width = w
 
         # FIXME: SVG is the only thing we can convert MathML into.
         # Handle other graphics formats.

mathics/doc/tex/Makefile

@@ -16,6 +16,11 @@ doc_tex_data.pcl:
 mathics.pdf: mathics.tex documentation.tex logo-text-nodrop.pdf logo-heptatom.pdf doc_tex_data.pcl
 	$(LATEXMK) -f -pdf -pdflatex="$(XETEX) -halt-on-error" mathics
 
+#: Build test PDF
+mathics-test.pdf: mathics-test.tex
+	$(LATEXMK) -f -pdf -pdflatex="$(XETEX) -halt-on-error" mathics-test
+
+
 #: Generate logos used in the titlepage
 logo-heptatom.pdf logo-text-nodrop.pdf:
 	(cd .. && $(BASH) ./images.sh)
@@ -34,3 +39,4 @@ clean:
 	rm -f mathics_*.* || true
 	rm -f mathics-*.* documentation.tex || true
 	rm -f mathics.pdf mathics.dvi data_tex_data.pcl || true
+	rm -f mathics-test.pdf mathics-test.dvi || true

mathics/formatter/svg.py

@@ -133,6 +133,7 @@ def components():
 add_conversion_fn(FilledCurveBox, filled_curve_box)
 
 def graphics_box(self, leaves=None, **options) -> str:
+
         if not leaves:
             leaves = self._leaves
 
@@ -164,17 +165,6 @@ def graphics_box(self, leaves=None, **options) -> str:
                 svg_body,
             )
 
-
-        # FIXME:
-        # Length calculation with PointBox is off by PointSize
-        # point_size, _ = self.style.get_style(PointSize, face_element=False)
-        # For others, I guess we just have this extra margin around the edge.
-        point_size = 14.06 # Really 14.05333..5
-        xmin -= point_size
-        ymin -= point_size
-        w += 2 * point_size
-        h += 2 * point_size
-
         if options.get("noheader", False):
             return svg_body
         svg_main = """

test/test_formatter/test_svg.py

@@ -76,7 +76,7 @@ def test_svg_point():
     # Circles are implemented as ellipses with equal major and minor axes.
     # Check for that.
     print(inner_svg)
-    matches = re.match(r'^<circle cx="(\S+)" cy="(\S+)" r="(\S+)" .*/>', inner_svg)
+    matches = re.match(r'^<circle cx="(\S+)" cy="(\S+)"', inner_svg)
     assert matches
     assert matches.group(1) == matches.group(2)