Use {{nextsample}} instead of \nextsample

Author: Matistjati

problemtools/md2html.py

@@ -35,18 +35,9 @@ def convert(problem: str, options: argparse.Namespace) -> bool:
     statement_common.foreach_image(statement_path,
                  lambda img_name: copy_image(problem, img_name))
 
-    with open (statement_path, "r") as source:
-        statement_md = source.read()
-        # Replace \nextsample with \\nextsample to avoid pandoc interpreting it as a newline
-        statement_md = statement_md.replace('\\nextsample', '\\\\nextsample')
-        statement_md = statement_md.replace('\\remainingsamples', '\\\\remainingsamples')
-        with tempfile.NamedTemporaryFile(mode='w', suffix=".md") as temp_file:
-            temp_file.write(statement_md)
-            temp_file.flush()
-
-            command = ["pandoc", temp_file.name, "-t" , "html", "-f", "markdown-raw_html", "--mathjax"]
-            statement_html = subprocess.run(command, capture_output=True, text=True,
-                                            shell=False, check=True).stdout
+    command = ["pandoc", statement_path, "-t" , "html", "-f", "markdown-raw_html", "--mathjax"]
+    statement_html = subprocess.run(command, capture_output=True, text=True,
+        shell=False, check=True).stdout
 
 
     templatepaths = [os.path.join(os.path.dirname(__file__), 'templates/markdown_html'),
@@ -69,7 +60,7 @@ def convert(problem: str, options: argparse.Namespace) -> bool:
 
     samples = statement_common.format_samples(problem, to_pdf=False)
 
-    # Insert samples at \nextsample and \remainingsamples
+    # Insert samples at {{nextsample}} and {{remainingsamples}}
     html_template, remaining_samples = statement_common.inject_samples(html_template, samples, "")
 
     # Insert the remaining samples at the bottom

problemtools/statement_common.py

@@ -106,27 +106,27 @@ def get_problem_name(problem: str, language: Optional[str]) -> Optional[str]:
 
 
 def inject_samples(html, samples, sample_separator):
-    """Injects samples at occurences of \nextsample and \remainingsamples
+    """Injects samples at occurences of {{nextsample}} and {{remainingsamples}}
     Non-destructive, returns the new html and all left-over samples
 
     Returns:
         """
 
     while True:
-        match = re.search(r'\\(nextsample|remainingsamples)', html)
+        match = re.search(r'\{\{(nextsample|remainingsamples)\}\}', html)
         if not match:
             break
         matched_text = match.group(1)
         if matched_text == "nextsample" and len(samples) == 0:
-            raise Exception("Error: called \\nextsample without any samples left")
+            raise Exception("Error: called {{nextsample}} without any samples left")
 
         num_inject = 1 if matched_text == "nextsample" else len(samples)
         to_inject = sample_separator.join(samples[:num_inject])
         samples = samples[num_inject:]
 
         # Always inject, even if to_inject is empty
-        # This will remove all occurences of \nextsample and \remainingsamples
-        # (And also properly throw an error if \nextsample is called with no samples left)
+        # This will remove all occurences of {{nextsample}} and {{remainingsamples}}
+        # (And also properly throw an error if {{nextsample}} is called with no samples left)
         html = html[:match.start()] + to_inject + html[match.end():]
 
     #print(html)