Merge branch 'master' into local

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
 build lectures:
   stage: build
   before_script:
-    - pip install -U mkdocs mkdocs-material python-markdown-math notedown ics
+    - pip install -Ur requirements.txt
   script:
     - python convert_timetable.py
     - python execute.py

extra_markdown.tpl

@@ -22,7 +22,11 @@
 {% else %}
 <pre class="thebelab-code" data-executable="true" data-language="python">{{cell.source}}</pre>
 <div class="thebelab-output" data-output="true" markdown="1">
+{% if output.data['text/html'] %}
+{{ output.data['text/html'] }}
+{% else %}
 {{ super() }}
+{% endif %}
 </div>
 {% endif %}
 {% endblock %}

requirements.txt

@@ -12,3 +12,4 @@ notedown
 mkdocs
 mkdocs-material
 python-markdown-math
+ics