basic typechecking

css/elements.css

@@ -776,7 +776,7 @@ table.lightweight-table th {
     background-color: rgba(249, 241, 172, 1);
   }
   100% {
-    background-color: rgba(249, 241, 172, 0)
+    background-color: rgba(249, 241, 172, 0);
   }
 }
 #spec-container :target:not(emu-annex, emu-clause, emu-intro, emu-note, body) {

filter-entities.js

@@ -9,11 +9,17 @@
 let fs = require('fs');
 let entities = require('./entities.json');
 
-let transformed = Object.fromEntries(Object.entries(entities).map(([k, v]) => {
-  // whitespace, default-ignorable, combining characters, control characters
-  if (v.characters === '&' || v.characters === '<' || /\p{White_Space}|\p{DI}|\p{gc=M}|\p{gc=C}/u.test(v.characters)) {
-    return [k, null];
-  }
-  return [k, v.characters];
-}));
+let transformed = Object.fromEntries(
+  Object.entries(entities).map(([k, v]) => {
+    // whitespace, default-ignorable, combining characters, control characters
+    if (
+      v.characters === '&' ||
+      v.characters === '<' ||
+      /\p{White_Space}|\p{DI}|\p{gc=M}|\p{gc=C}/u.test(v.characters)
+    ) {
+      return [k, null];
+    }
+    return [k, v.characters];
+  })
+);
 fs.writeFileSync('./entities-processed.json', JSON.stringify(transformed), 'utf8');

src/Algorithm.ts

@@ -34,16 +34,22 @@ export default class Algorithm extends Builder {
     context.inAlg = true;
     const { spec, node, clauseStack } = context;
 
-    const innerHTML = node.innerHTML; // TODO use original slice, forward this from linter
-
     let emdTree: AlgorithmNode | null = null;
+    let innerHTML;
     if ('ecmarkdownTree' in node) {
       emdTree = (node as AlgorithmElementWithTree).ecmarkdownTree;
+      innerHTML = (node as AlgorithmElementWithTree).originalHtml;
     } else {
+      const location = spec.locate(node);
+      const source =
+        location?.source == null || location.endTag == null
+          ? node.innerHTML
+          : location.source.slice(location.startTag.endOffset, location.endTag.startOffset);
+      innerHTML = source;
       try {
-        emdTree = emd.parseAlgorithm(innerHTML);
+        emdTree = emd.parseAlgorithm(source);
         (node as AlgorithmElementWithTree).ecmarkdownTree = emdTree;
-        (node as AlgorithmElementWithTree).originalHtml = innerHTML;
+        (node as AlgorithmElementWithTree).originalHtml = source;
       } catch (e) {
         warnEmdFailure(spec.warn, node, e as SyntaxError);
       }