Merge pull request #1210 from mathics/fix_to_svg

Fix to svg

Author: rocky

CHANGES.rst

@@ -29,6 +29,7 @@ Enhancements
 * Improvements in handling products with infinite factors: ``0 Infinity``-> ``Indeterminate``, and ``expr Infinity``-> ``DirectedInfinite[expr]`.
 * ``SetDelayed`` now accept several conditions impossed both at LHS as well as RHS.
 
+  
 Bug fixes
 +++++++++
 
@@ -53,6 +54,13 @@ Miscellanea
 Windows under MSYS.
 * Include numpy version in version string. Show in CLI
 * Small CLI tweaks ``--colors=None`` added to match mathicsscript.
+* In the ``BaseExpression`` and derivated classes, the method ``boxes_to_xml`` now are called ``boxes_to_mathml``.
+* In the ``format`` method of the class ``Evaluation``,  the builtin ``ToString`` is called instead of  ``boxes_to_text``
+  In order to control the final form of boxes from the user space in specific symbols and contexts.
+* ``GraphicsBox`` now have two methods:  ``to_svg`` and  ``to_mathml``. The first produces SVG plain text while the second produces ``<mglyph ...>``
+  tags with base64 encoded svgs.
+* Improving the support for ``Inset`` and  ``InsetBox``.
+
 
 2.0.0
 -----

mathics/autoload/formats/SVG/Export.m

@@ -4,13 +4,17 @@
 
 
 SVGExport[filename_, expr_, opts___] := 
-  Module[{strm, data}, 
+  Module[{strm, data, p, q, expr2}, 
     strm = OpenWrite[filename];
     If[strm === $Failed, Return[$Failed]];
-    If[System`$UseSansSerif,
-	    data = StringTake[ToString[MathMLForm[expr]],{23,-8}],
-	    data = StringTake[ToString[MathMLForm[expr]],{23,-8}]];
-    WriteString[strm, "<svg>" <> data <> "</svg>"];
+    expr2 = If[Head[expr]=!=System`Graphics, System`Graphics[{System`Inset[ToString[expr]]}], expr];
+	 expr2= MathMLForm[expr2];
+    data=ToString[expr2];
+    p = StringPosition[data, "data:image/svg+xml;base64"][[1]][[2]];
+    (*Let's assume that the end of the string is reached just before the last quote. *)
+    q = StringPosition[data,"\""][[-1]][[-2]];
+    data = StringTake[data  ,{p+2,q-1}];
+    WriteString[strm, System`Convert`B64Dump`B64Decode[data]];
     Close[strm];
   ]
 

mathics/builtin/base.py

@@ -710,7 +710,7 @@ def get_option_values(self, leaves, **options):
     def boxes_to_text(self, leaves, **options) -> str:
         raise BoxConstructError
 
-    def boxes_to_xml(self, leaves, **options) -> str:
+    def boxes_to_mathml(self, leaves, **options) -> str:
         raise BoxConstructError
 
     def boxes_to_tex(self, leaves, **options) -> str:

mathics/builtin/compilation.py

@@ -198,7 +198,7 @@ def boxes_to_text(self, leaves=None, **options):
             leaves = self._leaves
         return leaves[0].value
 
-    def boxes_to_xml(self, leaves=None, **options):
+    def boxes_to_mathml(self, leaves=None, **options):
         if leaves is None:
             leaves = self._leaves
         return leaves[0].value