securemark 0.235.3 → 0.237.1

package/src/parser/processor/figure.ts

@@ -1,4 +1,4 @@
-import { Infinity, Map } from 'spica/global';
+import { Infinity, Set, Map } from 'spica/global';
 import { number as calculate, isFixed } from '../inline/extension/label';
 import { define } from 'typed-dom';
 import { MultiMap } from 'spica/multimap';
@@ -16,30 +16,68 @@ export function* figure(
     footnotes?.annotations.querySelectorAll<HTMLAnchorElement>('a.label:not(.disabled)') ?? []),
     footnotes?.references.querySelectorAll<HTMLAnchorElement>('a.label:not(.disabled)') ?? [])
     .map(el => [el.getAttribute('data-label')!, el]));
+  const labels = new Set<string>();
   const numbers = new Map<string, string>();
   let base = '0';
   let bases: readonly string[] = base.split('.');
   let index: readonly string[] = bases;
   // Bug: Firefox
-  //for (let defs = target.querySelectorAll(':scope > figure[data-label], :scope > h1, :scope > h2, :scope > h3'), i = 0, len = defs.length; i < len; ++i) {
+  //for (let defs = target.querySelectorAll(':scope > figure[data-label], :scope > h1, :scope > h2'), i = 0, len = defs.length; i < len; ++i) {
   for (
-    let defs = target.querySelectorAll('figure[data-label], h1, h2, h3'),
+    let defs = target.querySelectorAll('figure[data-label], h1, h2'),
         i = 0, len = defs.length; i < len; ++i) {
     yield;
     const def = defs[i];
     if (def.parentNode !== target) continue;
-    if (bases.length === 1 && def.tagName[0] === 'H') continue;
+    const { tagName, classList } = def;
+    if (bases.length === 1 && tagName[0] === 'H') continue;
     assert(base === '0' || bases.length > 1);
-    const label = def.tagName === 'FIGURE'
+    const label = tagName === 'FIGURE'
       ? def.getAttribute('data-label')!
       : `$-${increment(index, def as HTMLHeadingElement)}`;
     if (label.endsWith('-')) continue;
-    if (label.endsWith('-0')) continue;
-    if (def.tagName === 'FIGURE' && label.endsWith('.0')) {
-      // $-x.0 after h1 or h2.
-      if (label.lastIndexOf('.', label.length - 3) < 0 && !(+def.previousElementSibling?.tagName[1]! <= 2)) continue;
+    if (label.endsWith('-0')) {
+      define(def, {
+        class: void classList.add('invalid'),
+        'data-invalid-syntax': 'figure',
+        'data-invalid-type': 'argument',
+        'data-invalid-message': 'Invalid base index',
+        hidden: null,
+      });
+      continue;
+    }
+    if (tagName === 'FIGURE' && label.endsWith('.0')) {
       // $-x.x.0 is disabled.
-      if (label.lastIndexOf('.', label.length - 3) > 0) continue;
+      if (label.lastIndexOf('.', label.length - 3) !== -1) {
+        define(def, {
+          class: void classList.add('invalid'),
+          'data-invalid-syntax': 'figure',
+          'data-invalid-type': 'argument',
+          'data-invalid-message': 'Base index must be $-x.0 format',
+          hidden: null,
+        });
+        continue;
+      }
+      // $-x.0 after h1-h6.
+      if (!/^H[1-6]$/.test(def.previousElementSibling?.tagName ?? '')) {
+        define(def, {
+          class: void classList.add('invalid'),
+          'data-invalid-syntax': 'figure',
+          'data-invalid-type': 'position',
+          'data-invalid-message': 'Base index declarations must be after level 1 or 2 headings',
+          hidden: null,
+        });
+        continue;
+      }
+      else {
+        classList.contains('invalid') && define(def, {
+          class: void classList.remove('invalid'),
+          'data-invalid-syntax': null,
+          'data-invalid-type': null,
+          'data-invalid-message': null,
+          hidden: '',
+        });
+      }
     }
     const group = label.split('-', 1)[0];
     assert(label && group);
@@ -52,31 +90,31 @@ export function* figure(
     assert(def.matches('figure') || number.endsWith('.0'));
     if (number.endsWith('.0')) {
       assert(isFixed(label));
-      if (number.split('.').length > 2) continue;
-      if (group !== '$' || def.tagName === 'FIGURE' && def.firstChild) continue;
+      assert(number.split('.').length <= 2);
+      if (group !== '$' || tagName === 'FIGURE' && def.firstChild) continue;
       if (number.startsWith('0.')) {
         assert(number.endsWith('.0'));
         number = join(
           index.slice(0)
-            .reduce((ns, _, i, bs) => {
+            .reduce((ns, _, i, xs) => {
               i === ns.length
-                ? bs.length = i
-                : ns[i] = +ns[i] > +bs[i]
+                ? xs.length = i
+                : ns[i] = +ns[i] > +xs[i]
                   ? ns[i]
                   : +ns[i] === 0
-                    ? bs[i]
-                    : `${+bs[i] + 1}`;
+                    ? xs[i]
+                    : `${+xs[i] + 1}`;
               return ns;
             }, number.split('.')),
           '.');
       }
       base = number;
       bases = index = base.split('.');
-      numbers.clear();
+      tagName !== 'FIGURE' && numbers.clear();
       assert(def.tagName !== 'FIGURE' || !+def.setAttribute('data-number', number));
       continue;
     }
-    assert(def.matches('figure:not([style])'));
+    assert(def.matches('figure:not([hidden])'));
     assert(number.split('.').pop() !== '0');
     !isFixed(label) && numbers.set(group, number);
     assert(!+def.setAttribute('data-number', number));
@@ -87,6 +125,27 @@ export function* figure(
     define(
       def.querySelector(':scope > figcaption > .figindex')!,
       group === '$' ? figindex : `${figindex}. `);
+    if (labels.has(label)) {
+      if (classList.contains('invalid') &&
+          def.getAttribute('data-invalid-message') !== 'Duplicate label') continue;
+      define(def, {
+        id: null,
+        class: void classList.add('invalid'),
+        'data-invalid-syntax': 'figure',
+        'data-invalid-type': 'argument',
+        'data-invalid-message': 'Duplicate label',
+      });
+      continue;
+    }
+    else {
+      labels.add(label);
+      define(def, {
+        class: void classList.remove('invalid'),
+        'data-invalid-syntax': null,
+        'data-invalid-type': null,
+        'data-invalid-message': null,
+      });
+    }
     for (const ref of refs.take(label, Infinity)) {
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;
       yield define(ref,
@@ -100,7 +159,7 @@ export function* figure(
         class: `${ref.className} disabled invalid`,
         'data-invalid-syntax': 'label',
         'data-invalid-type': 'reference',
-        'data-invalid-description': 'Missing the reference.',
+        'data-invalid-message': 'Missing the target figure',
       });
     }
     yield ref;

package/src/parser/processor/footnote.ts

@@ -53,10 +53,10 @@ function build(
       style ??= abbr ? 'abbr' : 'count';
       if (style === 'count' ? abbr : !abbr) {
         define(ref, {
-          class: `${ref.className} invalid`,
+          class: void ref.classList.add('invalid'),
           'data-invalid-syntax': syntax,
           'data-invalid-type': 'style',
-          'data-invalid-description': `${syntax[0].toUpperCase() + syntax.slice(1)} style must be consistent.`,
+          'data-invalid-message': `${syntax[0].toUpperCase() + syntax.slice(1)} style must be consistent`,
         });
       }
       if (ref.firstElementChild?.getAttribute('hidden') !== '') {
@@ -96,7 +96,7 @@ function build(
             class: void ref.classList.remove('invalid'),
             'data-invalid-syntax': null,
             'data-invalid-type': null,
-            'data-invalid-description': null,
+            'data-invalid-message': null,
           });
         }
       }
@@ -110,7 +110,7 @@ function build(
           : { class: void ref.classList.add('invalid'),
               'data-invalid-syntax': syntax,
               'data-invalid-type': 'content',
-              'data-invalid-description': 'Missing the content.',
+              'data-invalid-message': 'Missing the content',
             },
       });
       yield ref.appendChild(html('a', { href: refId && defId && `#${defId}` }, marker(defIndex, abbr)));

package/src/util/quote.ts

@@ -1,3 +1,4 @@
+import { Element } from 'spica/global';
 import { exec } from '../combinator/data/parser';
 import { cite } from '../parser/block/reply/cite';
 import { define } from 'typed-dom';