Fix activecode

Author: bnmnetp

runestone/activecode/activecode.py

@@ -60,7 +60,22 @@ def setup(app):
     app.connect("env-purge-doc", purge_activecodes)
 
 
-XML_START = """
+XML_EX_START = """
+<exercise xml:id="{divid}">
+    <statement>
+"""
+
+XML_EX_END = """
+    </statement>
+    <program xml:id="{divid}_editor" interactive='activecode' language="{language}">
+        <input>
+{initialcode}
+        </input>
+    </program>
+</exercise>
+"""
+
+XML_LISTING_START = """
 <listing xml:id="{divid}">
     <caption>{caption}</caption>
     <program xml:id="{divid}_editor" interactive='activecode' language="{language}">
@@ -71,6 +86,7 @@ def setup(app):
 </listing>
 """
 
+
 TEMPLATE_START = """
 <div class="%(divclass)s %(optclass)s">
 <div data-component="activecode" id=%(divid)s data-question_label="%(question_label)s">
@@ -96,14 +112,21 @@ class ActivecodeNode(nodes.General, nodes.Element, RunestoneIdNode):
 
 
 def visit_ac_xml(self, node):
-    node["runestone_options"]["initialcode"] = node["runestone_options"]["initialcode"].replace(
-        "<", "&lt;").replace(">", "&gt;")
-    res = XML_START.format(**node["runestone_options"])
-    self.output.append(res)
+    if node["runestone_options"]["has_problem_statement"]:
+        res = XML_EX_START.format(**node["runestone_options"])
+        self.output.append(res)
+    else:
+        node["runestone_options"]["initialcode"] = node["runestone_options"]["initialcode"].replace(
+            "<", "&lt;").replace(">", "&gt;")
 
 
 def depart_ac_xml(self, node):
-    pass
+    if node["runestone_options"]["has_problem_statement"]:
+        res = XML_EX_END.format(**node["runestone_options"])
+        self.output.append(res)
+    else:
+        res = XML_LISTING_START.format(**node["runestone_options"])
+        self.output.append(res)
 
 # self for these functions is an instance of the writer class.  For example
 # in html, self is sphinx.writers.html.SmartyPantsHTMLTranslator
@@ -253,7 +276,13 @@ def run(self):
         else:
             source = "\n"
 
-        self.explain_text = explain_text or ["Not an Exercise"]
+        if explain_text:
+            self.options["has_problem_statement"] = True
+            self.explain_text = explain_text
+        else:
+            self.options["has_problem_statement"] = False
+            self.explain_text = ["Not an Exercise"]
+
         addQuestionToDB(self)
 
         self.options["initialcode"] = source

runestone/common/runestonedirective.py

@@ -324,6 +324,7 @@ def run(self):
             id_ = self.options["divid"]
         if re.match(r"^[0-9_]+", id_):
             print(f"BAD DIVID: {id_}")
+            self.options["divid"] = f"rsid_{id_}"
         self.options["qnumber"] = self.getNumber()
         # print(f"{id_} is number {self.options['qnumber']}")