From 205cce250ff81dbb8410370fdd1d80f338b98552 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Sun, 14 Sep 2025 16:53:34 +0200
Subject: [PATCH 1/8] Display some unrelated formula for easier testing

---
 webapp/templates/jury/clarification.html.twig | 9 +++++++++
 webapp/templates/jury/menu.html.twig          | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/webapp/templates/jury/clarification.html.twig b/webapp/templates/jury/clarification.html.twig
index e7e7c4d24b..b04d3ab454 100644
--- a/webapp/templates/jury/clarification.html.twig
+++ b/webapp/templates/jury/clarification.html.twig
@@ -18,7 +18,16 @@
             </div>
         {% endif %}
 
+
+
         {% for clar in list %}
+            <div style="height: 100px;"></div>
+            <div>Pure body:<br>{{ clar.body }}</div>
+            <div>Markdown converted:<br>{{ clar.body | markdown_to_html }}</div>
+            <div>DOMjudge Markdown converted:<br>{{ clar.body | domjudge_markdown_to_html }}</div>
+            <div>Sanitized:<br>{{ clar.body | sanitize_html('app.clarification_sanitizer') }}</div>
+            <div>All:<br>{{ clar.body | domjudge_markdown_to_html | sanitize_html('app.clarification_sanitizer') }}</div>
+            <div>DOMjudge all:<br>{{ clar.body | domjudge_markdown_to_html | sanitize_html('app.clarification_sanitizer') }}</div>
             <div class="card mb-3 {% if clar.from_team is not defined %}border-primary{% endif %}">
                 <div class="card-header">
                     <div class="row">
diff --git a/webapp/templates/jury/menu.html.twig b/webapp/templates/jury/menu.html.twig
index 12bddba889..b523955afc 100644
--- a/webapp/templates/jury/menu.html.twig
+++ b/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">
 

From b679ae16164667d69c06312fbe1fb221aa661c54 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Thu, 30 Oct 2025 22:39:13 +0100
Subject: [PATCH 2/8] Display clarifications when queue has been removed

---
 webapp/templates/jury/export/clarifications.html.twig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webapp/templates/jury/export/clarifications.html.twig b/webapp/templates/jury/export/clarifications.html.twig
index 0ee58eacb3..65bcb418d8 100644
--- a/webapp/templates/jury/export/clarifications.html.twig
+++ b/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>

From 36577245f013907e88c7dfb700f414b8f6ba2f2b Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Wed, 5 Nov 2025 09:37:03 +0100
Subject: [PATCH 3/8] Remove unneeded newlines

---
 webapp/templates/jury/clarification.html.twig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapp/templates/jury/clarification.html.twig b/webapp/templates/jury/clarification.html.twig
index b04d3ab454..28b7fabb79 100644
--- a/webapp/templates/jury/clarification.html.twig
+++ b/webapp/templates/jury/clarification.html.twig
@@ -18,8 +18,6 @@
             </div>
         {% endif %}
 
-
-
         {% for clar in list %}
             <div style="height: 100px;"></div>
             <div>Pure body:<br>{{ clar.body }}</div>

From b2e5e98d77bfd3edb573fca0aef54419511fc210 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Sat, 27 Sep 2025 00:53:44 +0200
Subject: [PATCH 4/8] Use our own markdown_to_html convertor

Which stashes LaTeX during conversion and pops it afterwards.

Otherwise things like `\\` get replaced with `\` which failed with:
https://github.com/DOMjudge/domjudge/pull/3099#issuecomment-3293328981
---
 webapp/src/Twig/TwigExtension.php | 33 +++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/webapp/src/Twig/TwigExtension.php b/webapp/src/Twig/TwigExtension.php
index 60df1de6cc..bb71508235 100644
--- a/webapp/src/Twig/TwigExtension.php
+++ b/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('domjudge_markdown_to_html', $this->domjudgeMarkdownToHTML(...), ['is_safe' => ['html']]),
         ];
     }
 
@@ -1406,4 +1408,35 @@ public function extensionToMime(string $extension): string
     {
         return DOMJudgeService::EXTENSION_TO_MIMETYPE[$extension];
     }
+
+    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;
+    }
 }

From db01ee925f5b870df916e0ea91966a05ca71fe40 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Tue, 28 Oct 2025 21:43:44 +0100
Subject: [PATCH 5/8] Get MathJax from yarn

---
 webapp/package.json |  1 +
 webapp/yarn.lock    | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/webapp/package.json b/webapp/package.json
index 80d349ca3c..f9c789eb44 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -5,6 +5,7 @@
     "d3": "3.5.17",
     "file-saver": "^2.0.5",
     "jquery-debounce-throttle": "^1.0.6-rc.0",
+    "mathjax": "^4.0.0",
     "monaco": "^1.201704190613.0",
     "nvd3": "1.8.6",
     "select2": "^4.0.13"
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 4290963e43..c9452cf09c 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@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"
@@ -34,6 +39,13 @@ jquery@>=1.7:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
   integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
 
+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@^1.201704190613.0:
   version "1.201704190613.0"
   resolved "https://registry.npmjs.org/monaco/-/monaco-1.201704190613.0.tgz"

From 63ceeb515219ea205eb4a26784b0e1e2a941d3ea Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Thu, 30 Oct 2025 19:13:03 +0100
Subject: [PATCH 6/8] Render MathJax in clarifications

---
 webapp/public/js/domjudge.js                   |  1 +
 webapp/public/js/tex-chtml.js                  |  1 +
 webapp/public/mathjax                          |  1 +
 webapp/public/mathjaxfonts                     |  1 +
 .../AddContentSecurityPolicyListener.php       |  2 +-
 webapp/templates/base.html.twig                |  1 +
 webapp/templates/jury/export/layout.html.twig  |  1 +
 .../templates/partials/mathjaxhead.html.twig   | 18 ++++++++++++++++++
 .../partials/clarification_content.html.twig   |  4 ++++
 .../team/partials/clarification_list.html.twig |  5 ++++-
 10 files changed, 33 insertions(+), 2 deletions(-)
 create mode 120000 webapp/public/js/tex-chtml.js
 create mode 120000 webapp/public/mathjax
 create mode 120000 webapp/public/mathjaxfonts
 create mode 100644 webapp/templates/partials/mathjaxhead.html.twig

diff --git a/webapp/public/js/domjudge.js b/webapp/public/js/domjudge.js
index 371ae20e92..fdb21bb8be 100644
--- a/webapp/public/js/domjudge.js
+++ b/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)]);
         });
     }
 }
diff --git a/webapp/public/js/tex-chtml.js b/webapp/public/js/tex-chtml.js
new file mode 120000
index 0000000000..47467ad03c
--- /dev/null
+++ b/webapp/public/js/tex-chtml.js
@@ -0,0 +1 @@
+../../node_modules/mathjax/tex-chtml.js
\ No newline at end of file
diff --git a/webapp/public/mathjax b/webapp/public/mathjax
new file mode 120000
index 0000000000..3a045cb444
--- /dev/null
+++ b/webapp/public/mathjax
@@ -0,0 +1 @@
+../node_modules/mathjax
\ No newline at end of file
diff --git a/webapp/public/mathjaxfonts b/webapp/public/mathjaxfonts
new file mode 120000
index 0000000000..89fd736689
--- /dev/null
+++ b/webapp/public/mathjaxfonts
@@ -0,0 +1 @@
+../node_modules/@mathjax/mathjax-newcm-font/chtml/woff2
\ No newline at end of file
diff --git a/webapp/src/EventListener/AddContentSecurityPolicyListener.php b/webapp/src/EventListener/AddContentSecurityPolicyListener.php
index d244aa0796..7b04339aaa 100644
--- a/webapp/src/EventListener/AddContentSecurityPolicyListener.php
+++ b/webapp/src/EventListener/AddContentSecurityPolicyListener.php
@@ -17,7 +17,7 @@ public function __invoke(ResponseEvent $event): void
         // the profiler requires 'unsafe-eval' for script-src 'self'.
         $response = $event->getResponse();
         $cspExtra = $this->profiler ? "'unsafe-eval'" : "";
-        $csp = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' $cspExtra; img-src 'self' data:; worker-src 'self' blob:";
+        $csp = "font-src 'self' data:; default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' $cspExtra; img-src 'self' data:; worker-src 'self' blob:";
         $response->headers->set('Content-Security-Policy', $csp);
     }
 }
diff --git a/webapp/templates/base.html.twig b/webapp/templates/base.html.twig
index e953356b67..ecf48113bc 100644
--- a/webapp/templates/base.html.twig
+++ b/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') %}
diff --git a/webapp/templates/jury/export/layout.html.twig b/webapp/templates/jury/export/layout.html.twig
index 4e465a2aab..39d6ae36a3 100644
--- a/webapp/templates/jury/export/layout.html.twig
+++ b/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="">
diff --git a/webapp/templates/partials/mathjaxhead.html.twig b/webapp/templates/partials/mathjaxhead.html.twig
new file mode 100644
index 0000000000..9fc2607c12
--- /dev/null
+++ b/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>
diff --git a/webapp/templates/team/partials/clarification_content.html.twig b/webapp/templates/team/partials/clarification_content.html.twig
index 7e38c1e53c..a3d2e03e52 100644
--- a/webapp/templates/team/partials/clarification_content.html.twig
+++ b/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>
diff --git a/webapp/templates/team/partials/clarification_list.html.twig b/webapp/templates/team/partials/clarification_list.html.twig
index daa60a8b53..f43303e00e 100644
--- a/webapp/templates/team/partials/clarification_list.html.twig
+++ b/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') }}
                     </a>
+                    <script>
+                        MathJax.typeset([document.getElementsByClassName('card-body')]);
+                    </script>
                 </td>
             </tr>
         {%- endfor %}

From ecfc063be45e75e4321e1dec17f12bf7f84189eb Mon Sep 17 00:00:00 2001
From: MCJ Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Sat, 1 Nov 2025 10:21:18 +0100
Subject: [PATCH 7/8] Install needed tools for CodeQL test

Those should be added to the base image later.
---
 .github/workflows/codeql-analysis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 60d5fba2a1..cd04077745 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,6 +36,13 @@ jobs:
       with:
         languages: ${{ matrix.language }}
 
+    - name: Install yarn files
+      if: ${{ contains(env.COMPILED, matrix.language) }}
+      run: |
+        cd webapp
+        sudo apt-get update; sudo apt-get install yarnpkg -y
+        sudo yarnpkg install
+
     - name: Install composer files
       if: ${{ contains(env.COMPILED, matrix.language) }}
       run: |

From a509c97d4f6509336570834288579cde948728cd Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Tue, 4 Nov 2025 22:39:16 +0100
Subject: [PATCH 8/8] Base image should already have yarnpkg

---
 .github/jobs/baseinstall.sh           | 1 -
 .github/workflows/codeql-analysis.yml | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/.github/jobs/baseinstall.sh b/.github/jobs/baseinstall.sh
index 40d1ab2103..719f065608 100755
--- a/.github/jobs/baseinstall.sh
+++ b/.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
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cd04077745..60d5fba2a1 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,13 +36,6 @@ jobs:
       with:
         languages: ${{ matrix.language }}
 
-    - name: Install yarn files
-      if: ${{ contains(env.COMPILED, matrix.language) }}
-      run: |
-        cd webapp
-        sudo apt-get update; sudo apt-get install yarnpkg -y
-        sudo yarnpkg install
-
     - name: Install composer files
       if: ${{ contains(env.COMPILED, matrix.language) }}
       run: |