MathJax demo

.github/jobs/baseinstall.sh

@@ -30,7 +30,6 @@ section_end
 
 section_start "Install JS frontend dependencies"
 cd webapp
-apt-get update; apt-get install -y yarnpkg
 yarnpkg install
 cd ..
 section_end

webapp/package.json

@@ -11,6 +11,7 @@
     "file-saver": "^2.0.5",
     "flag-icons": "^7.5.0",
     "jquery-debounce-throttle": "^1.0.6-rc.0",
+    "mathjax": "^4.0.0",
     "monaco-editor": "^0.54.0",
     "nvd3": "1.8.6",
     "select2": "^4.0.13",

webapp/public/js/domjudge.js

@@ -939,6 +939,7 @@ function previewClarification($input, $previewDiv) {
             }
         }).done(function (data) {
             $previewDiv.html(data.html);
+            MathJax.typesetPromise([document.getElementById($previewDiv[0].id)]);
         });
     }
 }

webapp/public/js/tex-chtml.js

@@ -0,0 +1 @@
+../../node_modules/mathjax/tex-chtml.js

webapp/public/mathjax

@@ -0,0 +1 @@
+../node_modules/mathjax

webapp/public/mathjaxfonts

@@ -0,0 +1 @@
+../node_modules/@mathjax/mathjax-newcm-font/chtml/woff2

webapp/src/Twig/TwigExtension.php

@@ -37,6 +37,7 @@
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\Extension\GlobalsInterface;
+use Twig\Extra\Markdown\MarkdownRuntime;
 use Twig\Runtime\EscaperRuntime;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
@@ -124,6 +125,7 @@ public function getFilters(): array
             new TwigFilter('medalType', $this->awards->medalType(...)),
             new TwigFilter('numTableActions', $this->numTableActions(...)),
             new TwigFilter('extensionToMime', $this->extensionToMime(...)),
+            new TwigFilter('domjudgeMarkdownToHtml', $this->domjudgeMarkdownToHTML(...), ['is_safe' => ['html']]),
         ];
     }
 
@@ -1406,4 +1408,39 @@ public function extensionToMime(string $extension): string
     {
         return DOMJudgeService::EXTENSION_TO_MIMETYPE[$extension];
     }
+
+    /**
+     * Extract all LaTeX code from the given string, sanitize the markdown and
+     * inject the original LaTeX code back so MathJax can render it.
+     */
+    public function domjudgeMarkdownToHTML(string $markdown): string
+    {
+        $latexFound = [];
+        while (true) {
+            $start = strpos($markdown, '$$');
+            $end = strpos(substr($markdown, $start+2), '$$');
+            if ($start === false || $end === false) {
+                break;
+            }
+            $latexFound[] = substr($markdown, $start, $end+2+2);
+            $newMarkdown = substr($markdown, 0, $start);
+            $newMarkdown .= '$LaTeX$';
+            $newMarkdown .= substr($markdown, $end+$start+4);
+            $markdown = $newMarkdown;
+        }
+
+        /** @var MarkdownRuntime $runtime */
+        $runtime = $this->twig->getRuntime(MarkdownRuntime::class);
+        $markdown = (string)$runtime->convert($markdown);
+
+        $new = '';
+        foreach ($latexFound as $inlineLatex) {
+            $replacedStart = strpos($markdown, '$LaTeX$');
+            $new = substr($markdown, 0, $replacedStart);
+            $new .= $inlineLatex;
+            $new .= substr($markdown, $replacedStart+strlen('$LaTeX$'));
+            $markdown = $new;
+        }
+        return $markdown;
+    }
 }

webapp/templates/base.html.twig

@@ -13,6 +13,7 @@
     <script src="{{ asset("js/jquery.min.js") }}"></script>
     <script src="{{ asset("js/jquery.debounce.min.js") }}"></script>
     <script src="{{ asset("js/bootstrap.bundle.min.js") }}"></script>
+    {% include 'partials/mathjaxhead.html.twig' %}
 
     <script src="{{ asset("js/domjudge.js") }}"></script>
     {% for file in customAssetFiles('js') %}

webapp/templates/jury/clarification.html.twig

@@ -110,7 +110,7 @@
 
                     <hr/>
 
-                    <div class="card-text">{{ clar.body | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}</div>
+                    <div class="card-text">{{ clar.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}</div>
 
                 </div>
             </div>

webapp/templates/jury/config.html.twig

@@ -218,7 +218,7 @@
                                                 {{ errors[option.name] }}
                                             </div>
                                         {% endif %}
-                                        <div class="small text-muted">{{ option.description | markdown_to_html }}</div>
+                                        <div class="small text-muted">{{ option.description | domjudgeMarkdownToHtml }}</div>
                                     </div>
                                 </li>
                             {% endfor %}

webapp/templates/jury/config_check.html.twig

@@ -99,7 +99,7 @@
         {% if testresult.escape is not defined or testresult.escape %}
           {% set description = description | escape %}
         {% endif %}
-        {{ description | markdown_to_html }}
+        {{ description | domjudgeMarkdownToHtml }}
       </div>
     </div>
   </div>

webapp/templates/jury/export/clarifications.html.twig

@@ -45,7 +45,11 @@
             <div class="page-break"></div>
             <h1>{{ title }}</h1>
         {% endif %}
-        <h2>{{ queues[queue] }}</h2>
+        {% if queues[queue] is defined %}
+            <h2>{{ queues[queue] }}</h2>
+        {%  else %}
+            <h2><i>Unknown queue: {{ queue }}</h2>
+        {% endif %}
         <table class="table">
             <thead>
             <tr>
@@ -94,7 +98,7 @@
                 <tr>
                     <td><b>Content</b></td>
                     <td colspan="5">
-                        <div class="card-text">{{ clarification.body | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}</div>
+                        <div class="card-text">{{ clarification.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}</div>
                     </td>
                 </tr>
                 {% if clarification.replies is not empty %}
@@ -110,7 +114,7 @@
                                 </b>
                             </td>
                             <td colspan="5">
-                                <div class="card-text">{{ reply.body | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}</div>
+                                <div class="card-text">{{ reply.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}</div>
                             </td>
                         </tr>
                     {% endfor %}

webapp/templates/jury/export/layout.html.twig

@@ -108,6 +108,7 @@
             color: darkgrey;
         }
     </style>
+    {% include 'partials/mathjaxhead.html.twig' %}
 </head>
 <body>
 <main role="main" class="">

webapp/templates/jury/menu.html.twig

@@ -7,6 +7,8 @@
 
     {% set current_route = app.request.attributes.get('_route') %}
 
+    <span>Euler's identity: $( e^{i\pi} + 1 = 0 )$</span>
+    <span>$$\vec{a} \times \vec{b} = \begin{vmatrix} \mathbf{i} & \mathbf{j} & \mathbf{k} \\ a_x & a_y & a_z \\ b_x & b_y & b_z \end{vmatrix}$$</span>
     <div class="collapse navbar-collapse" id="menuDefault" data-update-url="{{ path('jury_ajax_updates') }}">
         <ul class="navbar-nav me-auto">
 

webapp/templates/partials/mathjaxhead.html.twig

@@ -0,0 +1,18 @@
+<script>
+    window.MathJax = {
+        tex: {
+            inlineMath: [['$', '$'], ['\\(', '\\)']]
+        },
+        chtml: {
+            fontURL: "{{ app.request.basePath }}/mathjaxfonts",
+            scale: 1.0
+        },
+        loader: {
+            paths: {
+                mathjax: "{{ app.request.basePath }}/mathjax"
+            },
+            load: ['input/tex', 'output/chtml']
+        }
+    };
+</script>
+<script src="{{ app.request.basePath }}/mathjax/tex-chtml.js"></script>

webapp/templates/team/partials/clarification.html.twig

@@ -40,7 +40,7 @@
         <hr/>
 
         <div class="card-text">
-            {{ clarification.body | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}
+            {{ clarification.body | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}
         </div>
     </div>
 </div>

webapp/templates/team/partials/clarification_content.html.twig

@@ -24,3 +24,7 @@
         {{ form_end(form) }}
     </div>
 </div>
+
+<script>
+    MathJax.typeset([document.getElementsByClassName('card-body')]);
+</script>

webapp/templates/team/partials/clarification_list.html.twig

@@ -62,10 +62,13 @@
                     </td>
                 {% endif %}
 
-                <td>
+                <td class="clarification-text">
                     <a data-ajax-modal data-ajax-modal-after="markSeen" href="{{ link }}">
-                        {{ clarification.summary | markdown_to_html | sanitize_html('app.clarification_sanitizer') }}
+                        {{ clarification.summary | domjudgeMarkdownToHtml | sanitize_html('app.clarification_sanitizer') }}
                     </a>
+                    <script>
+                        MathJax.typeset([document.getElementsByClassName('card-body')]);
+                    </script>
                 </td>
             </tr>
         {%- endfor %}

webapp/yarn.lock

@@ -7,6 +7,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-7.1.0.tgz#8eb76278515341720aa74485266f8be121089529"
   integrity sha512-+WxNld5ZCJHvPQCr/GnzCTVREyStrAJjisUPtUxG5ngDA8TMlPnKp6dddlTpai4+1GNmltAeuk1hJEkBohwZYA==
 
+"@mathjax/mathjax-newcm-font@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@mathjax/mathjax-newcm-font/-/mathjax-newcm-font-4.0.0.tgz#01afa8b20f2114665dc1d9a7fbc623a23ddb54e4"
+  integrity sha512-kpsJgIF4FpWiwIkFgOPmWwy5GXfL25spmJJNg27HQxPddmEL8Blx0jn2BuU/nlwjM/9SnYpEfDrWiAMgLPlB8Q==
+
 "@melloware/coloris@^0.25.0":
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/@melloware/coloris/-/coloris-0.25.0.tgz#7012c10dc510dca1660b3692ed3c812344aec6ca"
@@ -79,6 +84,13 @@ marked@14.0.0:
   resolved "https://registry.yarnpkg.com/marked/-/marked-14.0.0.tgz#79a1477358a59e0660276f8fec76de2c33f35d83"
   integrity sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==
 
+mathjax@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-4.0.0.tgz#ff7aa8b6bfdc7e97e41091a9ed6d8c8f8eefd2a0"
+  integrity sha512-ThMPHiPl9ibZBInAmfoTCNq9MgCdH7ChIQ9YhKFc325noJ4DMzy9/Q14qdcuPzVJjEmC3kyXhwnERZWX3hbWzQ==
+  dependencies:
+    "@mathjax/mathjax-newcm-font" "^4.0.0"
+
 monaco-editor@^0.54.0:
   version "0.54.0"
   resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.54.0.tgz#c0d6ebb46b83f1bef6f67f6aa471e38ba7ef8231"