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 ccc2e633a555f35ea94d79d470ca5781f8bee796..5245dac698ff5b32f92aae2b9619d02b21316dfc 100644 (file)
--- 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 10e2d1b1ad8f577cf0acdc017893db64ce41b1c8..19b35ca2e4c0458b25bbec78ae34a75cd96ac9e1 100644 (file)
--- 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(" ")
     }
   }
 }