changed Callbacks to Output; added methods for svg/img xml production

Author: poke1024

mathics/builtin/graphics.py

@@ -1463,14 +1463,8 @@ def boxes_to_xml(self, leaves, **options):
         w += 2
         h += 2
 
-        xml = (
-            '<svg xmlns:svg="http://www.w3.org/2000/svg" '
-            'xmlns="http://www.w3.org/2000/svg"\nversion="1.0" width="%f" '
-            'height="%f" viewBox="%f %f %f %f">%s</svg>') % (
-                width, height, xmin, ymin, w, h, svg)
-
-        xml = """<mtable><mtr><mtd>%s</mtd></mtr></mtable>""" % xml
-        return xml
+        return options['evaluation'].output.svg_xml(
+            data=svg, width=width, height=height, viewbox=[xmin, ymin, w, h])
 
     def axis_ticks(self, xmin, xmax):
         def round_to_zero(value):

mathics/core/evaluation.py

@@ -144,16 +144,26 @@ def get_data(self):
         }
 
 
-class Callbacks(object):
-    def __init__(self, out=None, clear_output=None, display_data=None):
-        self.out = out
-        self.clear_output = clear_output
-        self.display_data = display_data
+class Output(object):
+    def out(self, out):
+        pass
+
+    def clear_output(wait=False):
+        raise NotImplementedError
+
+    def display_data(self, result):
+        raise NotImplementedError
+
+    def svg_xml(self, data, width, height, viewbox):
+        raise NotImplementedError
+
+    def img_xml(self, data, width, height):
+        raise NotImplementedError
 
 
 class Evaluation(object):
     def __init__(self, definitions=None,
-                 callbacks=None, format='text', catch_interrupt=True):
+                 output=None, format='text', catch_interrupt=True):
         from mathics.core.definitions import Definitions
 
         if definitions is None:
@@ -163,7 +173,7 @@ def __init__(self, definitions=None,
         self.timeout = False
         self.stopped = False
         self.out = []
-        self.callbacks = callbacks if callbacks else Callbacks()
+        self.output = output if output else Output()
         self.listeners = {}
         self.options = None
         self.predetermined_out = None
@@ -364,17 +374,15 @@ def message(self, symbol, tag, *args):
             'StringForm', text, *(from_python(arg) for arg in args)), 'text')
 
         self.out.append(Message(symbol_shortname, tag, text))
-        if self.callbacks.out:
-            self.callbacks.out(self.out[-1])
+        self.output.out(self.out[-1])
 
     def print_out(self, text):
         from mathics.core.expression import from_python
 
         text = self.format_output(from_python(text), 'text')
 
         self.out.append(Print(text))
-        if self.callbacks.out:
-            self.callbacks.out(self.out[-1])
+        self.output.out(self.out[-1])
         if settings.DEBUG_PRINT:
             print('OUT: ' + text)
 

mathics/main.py

@@ -13,7 +13,7 @@
 
 from mathics.core.definitions import Definitions
 from mathics.core.expression import strip_context
-from mathics.core.evaluation import Evaluation, Callbacks
+from mathics.core.evaluation import Evaluation, Output
 from mathics.core.parser import LineFeeder, FileLineFeeder
 from mathics import version_string, license_string, __version__
 from mathics import settings
@@ -176,6 +176,14 @@ def empty(self):
         return False
 
 
+class TerminalOutput(Output):
+    def __init__(self, shell):
+        self.shell = shell
+
+    def out(self, out):
+        return self.shell.out_callback(out)
+
+
 def main():
     argparser = argparse.ArgumentParser(
         prog='mathics',
@@ -238,7 +246,7 @@ def main():
     if args.execute:
         for expr in args.execute:
             print(shell.get_in_prompt() + expr)
-            evaluation = Evaluation(shell.definitions, callbacks=Callbacks(out=shell.out_callback))
+            evaluation = Evaluation(shell.definitions, output=TerminalOutput(shell))
             result = evaluation.parse_evaluate(expr, timeout=settings.TIMEOUT)
             shell.print_result(result)
 
@@ -250,7 +258,7 @@ def main():
         try:
             while not feeder.empty():
                 evaluation = Evaluation(
-                    shell.definitions, callbacks=Callbacks(out=shell.out_callback), catch_interrupt=False)
+                    shell.definitions, output=TerminalOutput(shell), catch_interrupt=False)
                 query = evaluation.parse_feeder(feeder)
                 if query is None:
                     continue
@@ -271,7 +279,7 @@ def main():
 
     while True:
         try:
-            evaluation = Evaluation(shell.definitions, callbacks=Callbacks(out=shell.out_callback))
+            evaluation = Evaluation(shell.definitions, output=TerminalOutput(shell))
             query = evaluation.parse_feeder(shell)
             if query is None:
                 continue

mathics/web/views.py

@@ -18,14 +18,15 @@
 from django.contrib.auth.models import User
 
 from mathics.core.definitions import Definitions
-from mathics.core.evaluation import Evaluation, Message, Result
+from mathics.core.evaluation import Evaluation, Message, Result, Output
 
 from mathics.web.models import Query, Worksheet
 from mathics.web.forms import LoginForm, SaveForm
 from mathics.doc import documentation
 from mathics.doc.doc import DocPart, DocChapter, DocSection
 import six
 from six.moves import range
+from string import Template
 
 if settings.DEBUG:
     JSON_CONTENT_TYPE = 'text/html'
@@ -44,6 +45,47 @@ def __init__(self, result={}):
         super(JsonResponse, self).__init__(response, content_type=JSON_CONTENT_TYPE)
 
 
+class WebOutput(Output):
+    svg = Template('''
+        <mtable>
+            <mtr>
+                <mtd>
+                    <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+                        version="1.1" width="$width" height="$height" viewBox="$viewbox">
+                        $data
+                    </svg>
+                </mtd>
+            </mtr>
+        </mtable>
+        ''')
+
+    img = Template('''
+        <mtext>
+            <img src="$data" width="$width" height="$height" />
+        </mtext>
+        ''')
+
+    def out(self, out):
+        pass
+
+    def clear_output(wait=False):
+        raise NotImplementedError
+
+    def display_data(self, result):
+        raise NotImplementedError
+
+    def svg_xml(self, data, width, height, viewbox):
+        svg = self.svg.substitute(
+            data=data, width='%d' % width, height='%d' % height,
+            viewbox=' '.join(['%f' % t for t in viewbox]))
+        print(svg)
+        return svg
+
+    def img_xml(self, data, width, height):
+        return self.img.substitue(
+            data=data, width=width, height=height)
+
+
 def require_ajax_login(func):
     def new_func(request, *args, **kwargs):
         if not request.user.is_authenticated():
@@ -102,7 +144,7 @@ def query(request):
 
     user_definitions = request.session.get('definitions')
     definitions.set_user_definitions(user_definitions)
-    evaluation = Evaluation(definitions, format='xml')
+    evaluation = Evaluation(definitions, format='xml', output=WebOutput())
     feeder = MultiLineFeeder(input, '<notebook>')
     results = []
     try: