stop using Base64String

gap-packages · Aug 29, 2024 · 34b60ec · 34b60ec
1 parent b1801b3
commit 34b60ec
Showing 1 changed file with 8 additions and 21 deletions.
diff --git a/gap/JupyterUtil.gi b/gap/JupyterUtil.gi
@@ -89,35 +89,22 @@ function(tikz)
 
     else 
         ltx := Concatenation( "pdf2svg ", Concatenation( fn, ".pdf" ), " ",
-                    svgfile);
+                    svgfile, "; base64 ", svgfile," >> ", b64file );
     fi;
     Exec( ltx );
     if not( IsExistingFile( svgfile ) ) then
         tojupyter := rec( json := true, name := "stdout",
                             data := "No svg was created; pdf2svg is installed in your system?", metadata := rec());
         return JupyterRenderable(tojupyter.data, tojupyter.metadata);
     fi;
-    if ARCH_IS_MAC_OS_X() then 
-        stream := InputTextFile( b64file );
-        if stream <> fail then
-            svgdata := ReadLine( stream );
-            CloseStream( stream );
-        else
-            tojupyter := rec( json := true, name := "stdout",
-                                data := Concatenation( "Unable to render ", tikz ), metadata := rec() );
-            return JupyterRenderable(tojupyter.data, tojupyter.metadata);
-        fi;
+    stream := InputTextFile( b64file );
+    if stream <> fail then
+        svgdata := ReadAll( stream );
+        CloseStream( stream );
     else
-        stream := InputTextFile( svgfile );
-        if stream <> fail then
-            svgdata := ReadAll( stream );
-            svgdata:= SubstitutionSublist(Base64String(svgdata),"\n","");
-            CloseStream( stream );
-        else
-            tojupyter := rec( json := true, name := "stdout",
-                                data := Concatenation( "Unable to render ", tikz ), metadata := rec() );
-            return JupyterRenderable(tojupyter.data, tojupyter.metadata);
-        fi;
+        tojupyter := rec( json := true, name := "stdout",
+                            data := Concatenation( "Unable to render ", tikz ), metadata := rec() );
+        return JupyterRenderable(tojupyter.data, tojupyter.metadata);
     fi;
 
     img:=Concatenation("<img src='data:image/svg+xml;base64,", svgdata,"'>");