Fixes - thinkcspy

Author: bnmnetp

runestone/activecode/activecode.py

@@ -63,13 +63,12 @@ def setup(app):
 XML_START = """
 <listing xml:id="{divid}">
     <caption>{caption}</caption>
-    <program xml:id="{divid}_editor" interactive='yes' language="{language}">
+    <program xml:id="{divid}_editor" interactive='activecode' language="{language}">
         <input>
-        {initialcode}
+{initialcode}
         </input>
     </program>
 </listing>
-
 """
 
 TEMPLATE_START = """
@@ -97,6 +96,8 @@ 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)
 

runestone/common/runestonedirective.py

@@ -19,6 +19,7 @@
 from collections import defaultdict
 import binascii
 import os
+import re
 
 from docutils import nodes
 from docutils.parsers.rst import directives
@@ -321,7 +322,8 @@ def run(self):
             id_ = self.options["divid"] = self.arguments[0]
         else:
             id_ = self.options["divid"]
-
+        if re.match(r"^[0-9_]+", id_):
+            print(f"BAD DIVID: {id_}")
         self.options["qnumber"] = self.getNumber()
         # print(f"{id_} is number {self.options['qnumber']}")
 

runestone/parsons/parsons.py

@@ -72,7 +72,9 @@ def visit_parsons_xml(self, node):
         node["runestone_options"]["adaptive"] = "adaptive='yes'"
 
     if not node["runestone_options"]["noindent"]:
-        node["runestone_options"]["noindent"] = "indent='yes'"
+        node["runestone_options"]["noindent"] = "indent='show'"
+    else:
+        node["runestone_options"]["noindent"] = "indent='hide'"
 
     if node["runestone_options"]["language"]:
         node["runestone_options"]["language"] = node["runestone_options"]["language"].replace(

runestone/quizly/quizly.py

@@ -118,7 +118,7 @@ class Quizly(RunestoneIdDirective):
     optional_arguments = 0
     has_content = True
     option_spec = RunestoneIdDirective.option_spec.copy()
-    option_spec.update( {} )
+    option_spec.update({})
 
     def run(self):
         super(Quizly, self).run()
@@ -136,6 +136,7 @@ def run(self):
             self.options["controls"] = self.content[:plstart]
 
         quizly_node = QuizlyNode()
+        quizly_node["runestone_options"] = self.options
         quizly_node["quizname"] = str(self.options['controls'][0])
         quizly_node["quizname"] = str.strip(quizly_node["quizname"][10:])
         quizly_node["template"] = QUIZLY_TEMPLATE.replace(

runestone/shortanswer/shortanswer.py

@@ -49,7 +49,7 @@ def setup(app):
 """
 
 XML_START = """
-<exercise xml:id={divid} {optional}>
+<exercise xml:id="{divid}"  {optional}>
     <statement>
 """