Pretext from clickable, codelens, and dnd

Author: bnmnetp

runestone/clickableArea/clickable.py

@@ -31,7 +31,7 @@ def setup(app):
     app.add_directive("clickablearea", ClickableArea)
 
     app.add_node(ClickableAreaNode, html=(visit_ca_html, depart_ca_html),
-                 xml=(substitute_visitor, substitute_departure))
+                 xml=(visit_ca_xml, depart_ca_xml))
 
     app.add_config_value("clickable_div_class", "", "html")
 
@@ -46,6 +46,11 @@ def setup(app):
 </div>
 """
 
+XML_START = """
+<exercise xml:id="{divid}">
+    <statement><p>{question}</p></statement>
+"""
+
 
 class ClickableAreaNode(nodes.General, nodes.Element, RunestoneIdNode):
     pass
@@ -97,6 +102,29 @@ def depart_ca_html(self, node):
     self.body.remove(node["delimiter"])
 
 
+def visit_ca_xml(self, node):
+    res = XML_START.format(**node["runestone_options"])
+    if node["runestone_options"]["feedback"]:
+        res += "<feedback><p>{feedback}</p></feedback>\n".format(
+            **node["runestone_options"])
+    res += "<areas>\n"
+    if "iscode" in node["runestone_options"]:
+        # The case where iscode is not in options makes no sense and probably does not exist in
+        # any runestone books
+        for row in node["runestone_options"]["raw_source"]:
+            row = row.replace("\n", "")
+            row = row.replace(":click-correct:", "<area correct='yes'>")
+            row = row.replace(":click-incorrect:", "<area>")
+            row = row.replace(":endclick", "</area>")
+            row = "<cline>" + row + "</cline>\n"
+            res += row
+    self.output.append(res)
+
+
+def depart_ca_xml(self, node):
+    self.output.append("</areas></exercise>")
+
+
 class ClickableArea(RunestoneIdDirective):
     """
 .. clickablearea:: identifier
@@ -159,6 +187,7 @@ def run(self):
             source = source.replace(":endclick:", "</span>")
             source = "<pre>" + source + "</pre>"
             self.options["clickcode"] = source
+            self.options["raw_source"] = self.content
         else:
             self.options["clickcode"] = ""
         clickNode = ClickableAreaNode()

runestone/codelens/visualizer.py

@@ -61,6 +61,14 @@ def setup(app):
 </div>
 """
 
+PTX_TEMPLATE = """
+<program xml:id="{divid} interactive="codelens" language="{language}>
+    <input>
+{source}
+    </input>
+</program>
+"""
+
 
 class CodeLensNode(nodes.General, nodes.Element, RunestoneIdNode):
     pass
@@ -73,18 +81,8 @@ def visit_codelens_xml(self, node):
     if "tracedata" in node["runestone_options"]:
         node["runestone_options"]["tracedata"] = node["runestone_options"]["tracedata"].replace(
             "<", "&lt;").replace(">", "&gt;")
-        html += DATA
-    else:
-        html += "</div>"
-    html = html % node["runestone_options"]
 
-    self.output.append(
-        "<exercise runestone='{divid}' />".format(**node["runestone_options"]))
-    with open("rs-substitutes.xml", "a") as subfile:
-        subfile.write("<substitute xml:id='{divid}'>".format(
-            **node["runestone_options"]))
-        subfile.write(html)
-        subfile.write("</substitute>")
+    res = PTX_TEMPLATE.format(**node["runestone_options"])
 
 
 def visit_codelens_html(self, node):
@@ -209,7 +207,7 @@ def js_var_finalizer(input_code, output_trace):
             source = "\n".join(self.content)
         else:
             source = "\n"
-
+        self.options["source"] = source.replace("<", "&lt;")
         CUMULATIVE_MODE = False
         self.JS_VARNAME = self.options["divid"] + "_trace"
         env = self.state.document.settings.env

runestone/dragndrop/dragndrop.py

@@ -33,7 +33,8 @@
 def setup(app):
     app.add_directive("dragndrop", DragNDrop)
 
-    app.add_node(DragNDropNode, html=(visit_dnd_html, depart_dnd_html))
+    app.add_node(DragNDropNode, html=(visit_dnd_html, depart_dnd_html),
+                 xml=(visit_dnd_xml, depart_dnd_xml))
 
     app.add_config_value("dragndrop_div_class", "runestone", "html")
 
@@ -51,6 +52,12 @@ def setup(app):
 """
 TEMPLATE_END = """</ul></div>"""
 
+XML_START = """
+<exercise xml:id="{divid}">
+    <statement><p>{question}</p></statement>
+    {feedback}
+"""
+
 
 class DragNDropNode(nodes.General, nodes.Element, RunestoneIdNode):
     pass
@@ -61,11 +68,34 @@ class DragNDropNode(nodes.General, nodes.Element, RunestoneIdNode):
 
 
 def visit_dnd_xml(self, node):
-    write_substitute(self, node)
+    res = XML_START
+
+    if "feedback" in node["runestone_options"]:
+        node["runestone_options"]["feedback"] = (
+            "<feedback><p>"
+            + node["runestone_options"]["feedback"]
+            + "</p></feedback>"
+        )
+    else:
+        node["runestone_options"]["feedback"] = ""
+
+    res = res.format(**node["runestone_options"])
+    self.output.append(res)
 
 
 def depart_dnd_xml(self, node):
-    pass
+    self.output.append("<matches>")
+    okeys = list(node["runestone_options"].keys())
+    okeys.sort()
+    for k in okeys:
+        if "match" in k:
+            x, ix = k.split("_")
+            dragE, dropE = node["runestone_options"][k].split("|||")
+            self.output.append(f'<match order="{ix}">')
+            self.output.append(f"<premise>{dragE}</premise>")
+            self.output.append(f"<response>{dropE}</response>")
+            self.output.append("</match>")
+    self.output.append("</matches></exercise>")
 
 
 def visit_dnd_html(self, node):