From: Doug Torrance <dtorrance@debian.org>
Date: Tue, 17 May 2022 02:26:51 +0000 (+0100)
Subject: Fixes for building highlight.js.
X-Git-Tag: archive/raspbian/1.20+ds-4+rpi1^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=59f0192179ecf5898b8a107636885b8cf37d27fc;p=macaulay2.git

Fixes for building highlight.js.

Forwarded: not-needed
Last-Update: 2022-05-16

- Backport to highlight.js 9, which is the version still in Debian.

Gbp-Pq: Name highlightjs.patch
---

diff --git a/M2/Macaulay2/editors/highlightjs/index.js b/M2/Macaulay2/editors/highlightjs/index.js
index ccc2e63..5245dac 100644
--- a/M2/Macaulay2/editors/highlightjs/index.js
+++ b/M2/Macaulay2/editors/highlightjs/index.js
@@ -1,8 +1,11 @@
-import hljs from 'highlight.js/lib/core';
+import hljs from 'highlight.js/lib/highlight';
 import macaulay2 from './macaulay2.js';
 import 'highlight.js/styles/default.css';
 import './highlight-override.css';
 
 hljs.registerLanguage('macaulay2', macaulay2);
-hljs.configure({ cssSelector: 'code' });
-hljs.highlightAll();
+document.addEventListener('DOMContentLoaded', (event) => {
+  document.querySelectorAll('code').forEach((block) => {
+    hljs.highlightBlock(block);
+  });
+});
diff --git a/M2/Macaulay2/editors/highlightjs/macaulay2.js.in b/M2/Macaulay2/editors/highlightjs/macaulay2.js.in
index 10e2d1b..19b35ca 100644
--- a/M2/Macaulay2/editors/highlightjs/macaulay2.js.in
+++ b/M2/Macaulay2/editors/highlightjs/macaulay2.js.in
@@ -28,16 +28,16 @@ export default function(hljs) {
     keywords: {
       keyword: [
 	@M2KEYWORDS@
-      ],
+      ].join(" "),
       type: [
 	@M2DATATYPES@
-      ],
+      ].join(" "),
       built_in: [
 	@M2FUNCTIONS@
-      ],
+      ].join(" "),
       literal: [
 	@M2CONSTANTS@
-      ]
+      ].join(" ")
     }
   }
 }