Merge branch 'master' of github.com:mathics/Mathics

Author: rocky

mathics/builtin/assignment.py

@@ -1003,12 +1003,13 @@ def _get_usage_string(symbol, evaluation, htmlout=False):
         from mathics.doc.common_doc import XMLDoc
 
         docstr = bio.builtin.__class__.__doc__
+        title = bio.builtin.__class__.__name__
         if docstr is None:
             return None
         if htmlout:
-            usagetext = XMLDoc(docstr).html()
+            usagetext = XMLDoc(docstr, title).html()
         else:
-            usagetext = XMLDoc(docstr).text(0)
+            usagetext = XMLDoc(docstr, title).text(0)
         usagetext = re.sub(r"\$([0-9a-zA-Z]*)\$", r"\1", usagetext)
         return usagetext
     return None

mathics/builtin/box/graphics3d.py

@@ -303,12 +303,6 @@ def calc_dimensions(final_pass=True):
                             light["target"][j] * boxscale[j] for j in range(3)
                         ]
 
-                # Rescale viewpoint
-                self.viewpoint = [
-                    vp * max([xmax - xmin, ymax - ymin, zmax - zmin])
-                    for vp in self.viewpoint
-                ]
-
             w = 0 if (xmin is None or xmax is None) else xmax - xmin
             h = 0 if (ymin is None or ymax is None) else ymax - ymin
 
@@ -394,6 +388,7 @@ def boxes_to_json(self, leaves=None, **options):
                 },
                 "lighting": self.lighting,
                 "viewpoint": self.viewpoint,
+                "protocol": "1.0",
             }
         )
 
@@ -601,7 +596,11 @@ def boxes_to_tex(self, leaves=None, **options):
 """.format(
             asy_number(width / 60),
             asy_number(height / 60),
-            self.viewpoint,
+            # Rescale viewpoint
+            [
+                vp * max([xmax - xmin, ymax - ymin, zmax - zmin])
+                for vp in self.viewpoint
+            ],
             asy,
             boundbox_asy,
         )

mathics/doc/common_doc.py

@@ -1489,7 +1489,7 @@ class XMLDoc(object):
     Mathics core also uses this in getting usage strings (`??`).
     """
 
-    def __init__(self, doc, title, section):
+    def __init__(self, doc, title, section=None):
         self.title = title
         if section:
             chapter = section.chapter

mathics/format/svg.py

@@ -178,13 +178,13 @@ def density_plot_box(self, **options):
     for index, triangle_coords in enumerate(self.lines):
         triangle = [coords.pos() for coords in triangle_coords]
         colors = [rgb.to_js() for rgb in self.vertex_colors[index]]
-        r = (colors[0][0] + colors[1][0] + colors[2][0]) / 3.0
-        g = (colors[0][1] + colors[1][1] + colors[2][1]) / 3.0
-        b = (colors[0][2] + colors[1][2] + colors[2][1]) / 3.0
-        mid_color = r"rgb(%f%%, %f%%, %f%%)" % (r * 100, g * 100, b * 100)
+        r = (colors[0][0] + colors[1][0] + colors[2][0]) / 3
+        g = (colors[0][1] + colors[1][1] + colors[2][1]) / 3
+        b = (colors[0][2] + colors[1][2] + colors[2][1]) / 3
+        mid_color = r"rgb(%f, %f, %f)" % (r * 255, g * 255, b * 255)
 
         points = " ".join("%f,%f" % (point[0], point[1]) for point in triangle)
-        svg_data.append(f'<polygon points="{points}" style="fill: {mid_color}" />')
+        svg_data.append(f'<polygon points="{points}" fill="{mid_color}" />')
 
     svg = "\n".join(svg_data)
     # print("DensityPlot: ", svg)