@@ -65,7 +79,7 @@
@@ -82,17 +96,24 @@
-
+
-
+
+
+
+
+
+
@@ -154,8 +175,9 @@
break;
case "finished_topic":
+ $('#submit').css("visibility", "hidden");
+ $("#content").html(response["params"]["question"]);
$('#topic_progress').css('width', '100%').attr('aria-valuenow', 100);
- $("#content").html('
');
$("#content").animateCSS('tada');
setTimeout(function(){ window.location.replace('/'); }, 2000);
break;
diff --git a/tools.py b/tools.py
index 48392fe..dcba666 100644
--- a/tools.py
+++ b/tools.py
@@ -1,18 +1,141 @@
+# builtin
+from os import path
import subprocess
import logging
+import re
+
+# packages
import yaml
-import markdown
+import mistune
+from pygments import highlight
+from pygments.lexers import get_lexer_by_name
+from pygments.formatters import HtmlFormatter
# setup logger for this module
logger = logging.getLogger(__name__)
+
+# ---------------------------------------------------------------------------
+# Markdown to HTML renderer with support for LaTeX equations
+# Inline math: $x$
+# Block math: $$x$$ or \begin{equation}x\end{equation}
+# ---------------------------------------------------------------------------
+class MathBlockGrammar(mistune.BlockGrammar):
+ block_math = re.compile(r"^\$\$(.*?)\$\$", re.DOTALL)
+ latex_environment = re.compile(r"^\\begin\{([a-z]*\*?)\}(.*?)\\end\{\1\}", re.DOTALL)
+
+
+class MathBlockLexer(mistune.BlockLexer):
+ default_rules = ['block_math', 'latex_environment'] + mistune.BlockLexer.default_rules
+
+ def __init__(self, rules=None, **kwargs):
+ if rules is None:
+ rules = MathBlockGrammar()
+ super().__init__(rules, **kwargs)
+
+ def parse_block_math(self, m):
+ """Parse a $$math$$ block"""
+ self.tokens.append({
+ 'type': 'block_math',
+ 'text': m.group(1)
+ })
+
+ def parse_latex_environment(self, m):
+ self.tokens.append({
+ 'type': 'latex_environment',
+ 'name': m.group(1),
+ 'text': m.group(2)
+ })
+
+
+class MathInlineGrammar(mistune.InlineGrammar):
+ math = re.compile(r"^\$(.+?)\$", re.DOTALL)
+ block_math = re.compile(r"^\$\$(.+?)\$\$", re.DOTALL)
+ text = re.compile(r'^[\s\S]+?(?=[\\" + header + body + ""
+
+ # def image(self, src, title, text):
+ # if src.startswith('javascript:'):
+ # src = ''
+ # text = mistune.escape(text, quote=True)
+ # if title:
+ # title = mistune.escape(title, quote=True)
+ # html = '
' % html
+ # return '%s>' % html
+
+
+ # Pass math through unaltered - mathjax does the rendering in the browser
+ def block_math(self, text):
+ return fr'$$ {text} $$'
+
+ def latex_environment(self, name, text):
+ return fr'\begin{{{name}}} {text} \end{{{name}}}'
+
+ def inline_math(self, text):
+ return fr'$$$ {text} $$$'
+
+
+markdown = MarkdownWithMath(HighlightRenderer(escape=False)) # hard_wrap=True to insert
on newline
+
+def md_to_html(text, q=None):
+ return markdown(text)
+
# ---------------------------------------------------------------------------
# load data from yaml file
# ---------------------------------------------------------------------------
def load_yaml(filename, default=None):
try:
- f = open(filename, 'r', encoding='utf-8')
+ f = open(path.expanduser(filename), 'r', encoding='utf-8')
except IOError:
logger.error(f'Can\'t open file "{filename}"')
return default
@@ -22,14 +145,14 @@ def load_yaml(filename, default=None):
return yaml.load(f)
except yaml.YAMLError as e:
mark = e.problem_mark
- logger.error('In YAML file "{0}" near line {1}, column {2}.'.format(filename, mark.line, mark.column+1))
+ logger.error(f'In YAML file "{filename}" near line {mark.line}, column {mark.column+1}.')
return default
# ---------------------------------------------------------------------------
# Runs a script and returns its stdout parsed as yaml, or None on error.
-# Note: requires python 3.5+
# ---------------------------------------------------------------------------
def run_script(script, stdin='', timeout=5):
+ script = path.expanduser(script)
try:
p = subprocess.run([script],
input=stdin,
@@ -39,76 +162,20 @@ def run_script(script, stdin='', timeout=5):
timeout=timeout,
)
except FileNotFoundError:
- logger.error('Script not found: "{0}".'.format(script))
+ logger.error(f'Could not execute script "{script}": not found.')
except PermissionError:
- logger.error('Script "{0}" not executable (wrong permissions?).'.format(script))
+ logger.error(f'Could not execute script "{script}": wrong permissions.')
+ except OSError:
+ logger.error(f'Could not execute script "{script}": unknown reason.')
except subprocess.TimeoutExpired:
- logger.error('Timeout {0}s exceeded while running script "{1}"'.format(timeout, script))
+ logger.error(f'Timeout exceeded ({timeout}s) while running "{script}".')
else:
if p.returncode != 0:
- logger.error('Script "{0}" returned error code {1}.'.format(script, p.returncode))
+ logger.error(f'Script "{script}" returned error code {p.returncode}.')
else:
try:
output = yaml.load(p.stdout)
except:
- logger.error('Error parsing yaml output of script "{0}"'.format(script))
+ logger.error(f'Error parsing yaml output of "{script}"')
else:
return output
-
-
-
-# markdown helper
-# returns a function md() that renders markdown with extensions
-# this function is passed to templates for rendering
-def md(text):
- return markdown.markdown(text,
- extensions=[
- 'markdown.extensions.tables',
- 'markdown.extensions.fenced_code',
- 'markdown.extensions.codehilite',
- 'markdown.extensions.def_list',
- 'markdown.extensions.sane_lists'
- ])
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# def md_to_html(text, ref=None, files={}):
-# if ref is not None:
-# # given q['ref'] and q['files'] replaces references to files by a
-# # GET to /file?ref=???;name=???
-# for k in files:
-# text = text.replace(k, '/file?ref={};name={}'.format(ref, k))
-# return markdown.markdown(text, extensions=[
-# 'markdown.extensions.tables',
-# 'markdown.extensions.fenced_code',
-# 'markdown.extensions.codehilite',
-# 'markdown.extensions.def_list',
-# 'markdown.extensions.sane_lists'
-# ])
-
-# def md_to_html_review(text, q):
-# for k,f in q['files'].items():
-# text = text.replace(k, '/absfile?name={}'.format(q['files'][k]))
-# return markdown.markdown(text, extensions=[
-# 'markdown.extensions.tables',
-# 'markdown.extensions.fenced_code',
-# 'markdown.extensions.codehilite',
-# 'markdown.extensions.def_list',
-# 'markdown.extensions.sane_lists'
-# ])
--
libgit2 0.21.2