securemark 0.274.1 → 0.274.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.274.2
+
+- Fix identifiers of notes.
+
 ## 0.274.1
 
 - Fix identifiers of notes.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.274.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.274.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("Prism"), require("DOMPurify"));
@@ -6645,6 +6645,7 @@ const link_1 = __webpack_require__(9628);
 const html_1 = __webpack_require__(5994);
 const htmlentity_1 = __webpack_require__(1562);
 const source_1 = __webpack_require__(6743);
+const util_1 = __webpack_require__(9437);
 const url_1 = __webpack_require__(2261);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
@@ -6692,32 +6693,19 @@ function sanitize(target, uri, alt) {
     case 'http:':
     case 'https:':
       if (/\/\.\.?(?:\/|$)/.test('/' + uri.source.slice(0, uri.source.search(/[?#]|$/)))) {
-        (0, dom_1.define)(target, {
-          class: void target.classList.add('invalid'),
-          'data-invalid-syntax': 'media',
-          'data-invalid-type': 'argument',
-          'data-invalid-message': 'Dot-segments cannot be used in media paths; use subresource paths instead'
-        });
+        (0, util_1.markInvalid)(target, 'media', 'argument', 'Dot-segments cannot be used in media paths; use subresource paths instead');
         return false;
       }
       break;
     default:
-      (0, dom_1.define)(target, {
-        class: void target.classList.add('invalid'),
-        'data-invalid-syntax': 'media',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': 'Invalid protocol'
-      });
+      (0, util_1.markInvalid)(target, 'media', 'argument', 'Invalid protocol');
       return false;
   }
   if (alt.includes('\x1B')) {
     (0, dom_1.define)(target, {
-      class: void target.classList.add('invalid'),
-      'data-invalid-syntax': 'media',
-      'data-invalid-type': 'content',
-      'data-invalid-message': `Cannot use invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)[0]}"`,
       alt: target.getAttribute('alt')?.replace(/\x1B/g, '')
     });
+    (0, util_1.markInvalid)(target, 'media', 'content', `Cannot use invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)[0]}"`);
     return false;
   }
   return true;
@@ -6924,6 +6912,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.figure = void 0;
 const label_1 = __webpack_require__(466);
+const util_1 = __webpack_require__(9437);
 const queue_1 = __webpack_require__(4934);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
@@ -6946,11 +6935,8 @@ function* figure(target, notes, opts = {}) {
     const label = tagName === 'FIGURE' ? def.getAttribute('data-label') : `$-${increment(index, def)}`;
     if (label.endsWith('-')) continue;
     if (label.endsWith('-0')) {
+      (0, util_1.markInvalid)(def, 'figure', 'argument', 'Invalid base index');
       (0, dom_1.define)(def, {
-        class: void def.classList.add('invalid'),
-        'data-invalid-syntax': 'figure',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': 'Invalid base index',
         hidden: null
       });
       continue;
@@ -6958,32 +6944,23 @@ function* figure(target, notes, opts = {}) {
     if (tagName === 'FIGURE' && label.endsWith('.0')) {
       // $-x.x.0 is disabled.
       if (label.lastIndexOf('.', label.length - 3) !== -1) {
+        (0, util_1.markInvalid)(def, 'figure', 'argument', 'Base index must be $-x.0 format');
         (0, dom_1.define)(def, {
-          class: void def.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 ?? '')) {
+        (0, util_1.markInvalid)(def, 'figure', 'position', messages.declaration);
         (0, dom_1.define)(def, {
-          class: void def.classList.add('invalid'),
-          'data-invalid-syntax': 'figure',
-          'data-invalid-type': 'position',
-          'data-invalid-message': messages.declaration,
           hidden: null
         });
         continue;
       } else if (def.getAttribute('data-invalid-message') === messages.declaration) {
+        (0, util_1.unmarkInvalid)(def);
         (0, dom_1.define)(def, {
-          class: void def.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null,
-          hidden: ''
+          hidden: null
         });
       }
     }
@@ -7008,31 +6985,18 @@ function* figure(target, notes, opts = {}) {
     if (labels.has(label)) {
       if (def.classList.contains('invalid')) continue;
       (0, dom_1.define)(def, {
-        id: null,
-        class: void def.classList.add('invalid'),
-        'data-invalid-syntax': 'figure',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': messages.duplicate
+        id: null
       });
+      (0, util_1.markInvalid)(def, 'figure', 'argument', messages.duplicate);
       continue;
     } else if (def.getAttribute('data-invalid-message') === messages.duplicate) {
-      (0, dom_1.define)(def, {
-        class: void def.classList.remove('invalid'),
-        'data-invalid-syntax': null,
-        'data-invalid-type': null,
-        'data-invalid-message': null
-      });
+      (0, util_1.unmarkInvalid)(def);
     }
     labels.add(label);
     opts.id !== '' && def.setAttribute('id', `label:${opts.id ? `${opts.id}:` : ''}${label}`);
     for (const ref of refs.take(label, Infinity)) {
       if (ref.getAttribute('data-invalid-message') === messages.reference) {
-        (0, dom_1.define)(ref, {
-          class: void ref.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null
-        });
+        (0, util_1.unmarkInvalid)(ref);
       }
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;
       yield (0, dom_1.define)(ref, opts.id !== '' ? {
@@ -7044,12 +7008,7 @@ function* figure(target, notes, opts = {}) {
   }
   for (const [, ref] of refs) {
     if (opts.id !== '' && !ref.classList.contains('invalid')) {
-      (0, dom_1.define)(ref, {
-        class: void ref.classList.add('invalid'),
-        'data-invalid-syntax': 'label',
-        'data-invalid-type': 'reference',
-        'data-invalid-message': messages.reference
-      });
+      (0, util_1.markInvalid)(ref, 'label', 'reference', messages.reference);
     }
     yield ref;
   }
@@ -7091,6 +7050,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.reference = exports.annotation = exports.note = void 0;
 const indexee_1 = __webpack_require__(1269);
+const util_1 = __webpack_require__(9437);
 const dom_1 = __webpack_require__(3252);
 function* note(target, notes, opts = {}, bottom = null) {
   for (let es = target.querySelectorAll(`.annotations`), len = es.length, i = 0; i < len; ++i) {
@@ -7119,10 +7079,10 @@ function build(syntax, marker, splitter = '') {
     const titles = new Map();
     const defIndexes = new Map();
     const refSubindexes = new Map();
-    const defSubindexes = new Map();
-    let refIndex = 0;
+    const defSubindexes = splitter ? new Map() : undefined;
     let total = 0;
-    let style;
+    let format;
+    let refIndex = 0;
     for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
       if (ref.closest('[hidden]')) {
@@ -7146,41 +7106,31 @@ function build(syntax, marker, splitter = '') {
       refSubindexes.set(identifier, refSubindex);
       const refId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:ref:${identifier}:${refSubindex}` : undefined;
       const initial = splitter ? !defs.has(identifier) : refSubindex === 1;
-      const defSubindex = defSubindexes.get(identifier) + 1 || 1;
-      defSubindexes.set(identifier, defSubindex);
+      const defSubindex = defSubindexes?.get(identifier) + +initial || 1;
+      initial && defSubindexes?.set(identifier, defSubindex);
+      const defId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}${splitter && `:${defSubindex}`}` : undefined;
       const def = initial ? (0, dom_1.html)('li', {
-        id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}:${defSubindex}` : undefined,
-        'data-marker': !note ? marker(total + defs.size + 1, abbr) : undefined
+        id: defId,
+        'data-marker': note ? undefined : marker(total + defs.size + 1, abbr)
       }, [(0, dom_1.define)(ref.firstElementChild.cloneNode(true), {
         hidden: null
       }), (0, dom_1.html)('sup')]) : defs.get(identifier);
       initial && defs.set(identifier, def);
       const defIndex = initial ? total + defs.size : defIndexes.get(def);
       initial && defIndexes.set(def, defIndex);
-      const defId = def.id || undefined;
       const title = initial ? (0, indexee_1.text)(ref.firstElementChild) : titles.get(identifier);
       initial && titles.set(identifier, title);
-      style ??= abbr ? 'abbr' : 'count';
-      if (style === 'count' ? abbr : !abbr) {
-        (0, dom_1.define)(ref, {
-          class: void ref.classList.add('invalid'),
-          'data-invalid-syntax': syntax,
-          'data-invalid-type': 'style',
-          'data-invalid-message': `${syntax[0].toUpperCase() + syntax.slice(1)} style must be consistent`
-        });
-      } else if (ref.getAttribute('data-invalid-type') === 'style') {
-        (0, dom_1.define)(ref, {
-          class: void ref.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null
-        });
-      }
-      if (!ref.firstElementChild.hasAttribute('hidden')) {
-        ref.firstElementChild.setAttribute('hidden', '');
-      } else {
-        ref.lastChild?.remove();
+      format ??= abbr ? 'abbr' : 'number';
+      if (!ref.classList.contains('invalid')) {
+        if (format === 'number' ? abbr : !abbr) {
+          (0, util_1.markInvalid)(ref, syntax, 'format', 'Notation format must be consistent with numbers or abbreviations');
+        }
+      } else switch (ref.getAttribute('data-invalid-syntax')) {
+        case 'format':
+        case 'content':
+          (0, util_1.unmarkInvalid)(ref);
       }
+      ref.firstElementChild.hasAttribute('hidden') ? ref.lastElementChild.remove() : ref.firstElementChild.setAttribute('hidden', '');
       (0, dom_1.define)(ref, {
         id: refId,
         class: opts.id !== '' ? undefined : void ref.classList.add('disabled'),
@@ -7195,12 +7145,12 @@ function build(syntax, marker, splitter = '') {
       yield ref.appendChild((0, dom_1.html)('a', {
         href: refId && defId && `#${defId}`
       }, marker(defIndex, abbr)));
-      def.lastChild.appendChild((0, dom_1.html)('a', {
+      def.lastElementChild.appendChild((0, dom_1.html)('a', {
         href: refId && `#${refId}`,
         title: abbr && (0, indexee_1.text)((0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes)).trim() || undefined
       }, `^${++refIndex}`));
     }
-    if (defs.size > 0 || note) {
+    if (note || defs.size > 0) {
       yield* proc(defs, note ?? target.insertBefore((0, dom_1.html)('ol', {
         class: `${syntax}s`
       }), splitters[0] ?? bottom));
@@ -7586,7 +7536,7 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 /***/ }),
 
 /***/ 9437:
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
@@ -7594,7 +7544,26 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.stringify = void 0;
+exports.stringify = exports.unmarkInvalid = exports.markInvalid = void 0;
+const dom_1 = __webpack_require__(3252);
+function markInvalid(el, syntax, type, message) {
+  return (0, dom_1.define)(el, {
+    class: void el.classList.add('invalid'),
+    'data-invalid-syntax': syntax,
+    'data-invalid-type': type,
+    'data-invalid-message': message
+  });
+}
+exports.markInvalid = markInvalid;
+function unmarkInvalid(el) {
+  return (0, dom_1.define)(el, {
+    class: void el.classList.remove('invalid'),
+    'data-invalid-syntax': null,
+    'data-invalid-type': null,
+    'data-invalid-message': null
+  });
+}
+exports.unmarkInvalid = unmarkInvalid;
 function stringify(nodes) {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.274.1",
+  "version": "0.274.2",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

package/src/parser/api/bind.test.ts

@@ -194,34 +194,34 @@ describe('Unit: parser/api/bind', () => {
           html('p', [
             html('sup', { class: "reference", id: "reference::ref:1:1", title: "1" }, [
               html('span', { hidden: '' }, '1'),
-              html('a', { href: "#reference::def:1:1" }, '[1]'),
+              html('a', { href: "#reference::def:1" }, '[1]'),
             ]),
           ]).outerHTML,
           html('p', [
             html('sup', { class: "reference", id: "reference::ref:2:1", title: "2" }, [
               html('span', { hidden: '' }, '2'),
-              html('a', { href: "#reference::def:2:1" }, '[2]'),
+              html('a', { href: "#reference::def:2" }, '[2]'),
             ]),
           ]).outerHTML,
           html('p', [
             html('sup', { class: "reference", id: "reference::ref:3:1", title: "3" }, [
               html('span', { hidden: '' }, '3'),
-              html('a', { href: "#reference::def:3:1" }, '[3]'),
+              html('a', { href: "#reference::def:3" }, '[3]'),
             ]),
           ]).outerHTML,
         ]);
       assert.deepStrictEqual(
         cfgs.notes.references?.outerHTML,
         html('ol', [
-          html('li', { id: 'reference::def:1:1' }, [
+          html('li', { id: 'reference::def:1' }, [
             html('span', '1'),
             html('sup', [html('a', { href: '#reference::ref:1:1' }, '^1')]),
           ]),
-          html('li', { id: 'reference::def:2:1' }, [
+          html('li', { id: 'reference::def:2' }, [
             html('span', '2'),
             html('sup', [html('a', { href: '#reference::ref:2:1' }, '^2')]),
           ]),
-          html('li', { id: 'reference::def:3:1' }, [
+          html('li', { id: 'reference::def:3' }, [
             html('span', '3'),
             html('sup', [html('a', { href: '#reference::ref:3:1' }, '^3')]),
           ]),

package/src/parser/api/parse.test.ts

@@ -207,12 +207,12 @@ describe('Unit: parser/api/parse', () => {
         [...parse('$-a\n$$\n$$\n\n(($-a[[^b]]))[[^b|$-a]]', { notes }).children].map(el => el.outerHTML),
         [
           '<figure data-type="math" data-label="$-a" data-group="$" data-number="1" id="label:$-a"><figcaption><span class="figindex">(1)</span><span class="figtext"></span></figcaption><div><div class="math" translate="no">$$\n$$</div></div></figure>',
-          '<p><sup class="annotation" id="annotation::ref:(1):1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="b"><span></span></sup></span><a href="#annotation::def:(1):1">*1</a></sup><sup class="reference" data-abbr="b" id="reference::ref:b:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><a href="#reference::def:b:1">[b]</a></sup></p>',
-          '<ol class="annotations"><li id="annotation::def:(1):1" data-marker="*1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="b" id="reference::ref:b:2" title="(1)"><span hidden=""></span><a href="#reference::def:b:1">[b]</a></sup></span><sup><a href="#annotation::ref:(1):1">^1</a></sup></li></ol>',
+          '<p><sup class="annotation" id="annotation::ref:(1):1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="b"><span></span></sup></span><a href="#annotation::def:(1):1">*1</a></sup><sup class="reference" data-abbr="b" id="reference::ref:b:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><a href="#reference::def:b">[b]</a></sup></p>',
+          '<ol class="annotations"><li id="annotation::def:(1):1" data-marker="*1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="b" id="reference::ref:b:2" title="(1)"><span hidden=""></span><a href="#reference::def:b">[b]</a></sup></span><sup><a href="#annotation::ref:(1):1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
         notes.references.outerHTML,
-        '<ol><li id="reference::def:b:1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><sup><a href="#reference::ref:b:1" title="(1)">^1</a><a href="#reference::ref:b:2">^2</a></sup></li></ol>');
+        '<ol><li id="reference::def:b"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><sup><a href="#reference::ref:b:1" title="(1)">^1</a><a href="#reference::ref:b:2">^2</a></sup></li></ol>');
     });
 
     it('normalize', () => {

package/src/parser/inline/media.ts

@@ -5,6 +5,7 @@ import { attributes } from './html';
 import { unsafehtmlentity } from './htmlentity';
 import { txt, linebreak, str } from '../source';
 import { Syntax, State } from '../context';
+import { markInvalid } from '../util';
 import { ReadonlyURL } from 'spica/url';
 import { unshift, push } from 'spica/array';
 import { html, define } from 'typed-dom/dom';
@@ -87,32 +88,19 @@ function sanitize(target: HTMLElement, uri: ReadonlyURL, alt: string): boolean {
     case 'https:':
       assert(uri.host);
       if (/\/\.\.?(?:\/|$)/.test('/' + uri.source.slice(0, uri.source.search(/[?#]|$/)))) {
-        define(target, {
-          class: void target.classList.add('invalid'),
-          'data-invalid-syntax': 'media',
-          'data-invalid-type': 'argument',
-          'data-invalid-message': 'Dot-segments cannot be used in media paths; use subresource paths instead',
-        });
+        markInvalid(target, 'media', 'argument',
+          'Dot-segments cannot be used in media paths; use subresource paths instead');
         return false;
       }
       break;
     default:
-      define(target, {
-        class: void target.classList.add('invalid'),
-        'data-invalid-syntax': 'media',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': 'Invalid protocol',
-      });
+      markInvalid(target, 'media', 'argument', 'Invalid protocol');
       return false;
   }
   if (alt.includes('\x1B')) {
-    define(target, {
-      class: void target.classList.add('invalid'),
-      'data-invalid-syntax': 'media',
-      'data-invalid-type': 'content',
-      'data-invalid-message': `Cannot use invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)![0]}"`,
-      alt: target.getAttribute('alt')?.replace(/\x1B/g, ''),
-    });
+    define(target, { alt: target.getAttribute('alt')?.replace(/\x1B/g, '') });
+    markInvalid(target, 'media', 'content',
+      `Cannot use invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)![0]}"`);
     return false;
   }
   return true;

package/src/parser/processor/figure.ts

@@ -1,4 +1,5 @@
 import { number as calculate, isFixed } from '../inline/extension/label';
+import { markInvalid, unmarkInvalid } from '../util';
 import { MultiQueue } from 'spica/queue';
 import { push } from 'spica/array';
 import { define } from 'typed-dom/dom';
@@ -32,46 +33,26 @@ export function* figure(
       : `$-${increment(index, def as HTMLHeadingElement)}`;
     if (label.endsWith('-')) continue;
     if (label.endsWith('-0')) {
-      define(def, {
-        class: void def.classList.add('invalid'),
-        'data-invalid-syntax': 'figure',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': 'Invalid base index',
-        hidden: null,
-      });
+      markInvalid(def, 'figure', 'argument', 'Invalid base index');
+      define(def, { hidden: null });
       continue;
     }
     if (tagName === 'FIGURE' && label.endsWith('.0')) {
       // $-x.x.0 is disabled.
       if (label.lastIndexOf('.', label.length - 3) !== -1) {
-        define(def, {
-          class: void def.classList.add('invalid'),
-          'data-invalid-syntax': 'figure',
-          'data-invalid-type': 'argument',
-          'data-invalid-message': 'Base index must be $-x.0 format',
-          hidden: null,
-        });
+        markInvalid(def, 'figure', 'argument', 'Base index must be $-x.0 format');
+        define(def, { hidden: null });
         continue;
       }
       // $-x.0 after h1-h6.
       if (!/^H[1-6]$/.test(def.previousElementSibling?.tagName ?? '')) {
-        define(def, {
-          class: void def.classList.add('invalid'),
-          'data-invalid-syntax': 'figure',
-          'data-invalid-type': 'position',
-          'data-invalid-message': messages.declaration,
-          hidden: null,
-        });
+        markInvalid(def, 'figure', 'position', messages.declaration);
+        define(def, { hidden: null });
         continue;
       }
       else if (def.getAttribute('data-invalid-message') === messages.declaration) {
-        define(def, {
-          class: void def.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null,
-          hidden: '',
-        });
+        unmarkInvalid(def);
+        define(def, { hidden: null });
       }
     }
     const group = label.split('-', 1)[0];
@@ -120,33 +101,18 @@ export function* figure(
       group === '$' ? figindex : `${figindex}. `);
     if (labels.has(label)) {
       if (def.classList.contains('invalid')) continue;
-      define(def, {
-        id: null,
-        class: void def.classList.add('invalid'),
-        'data-invalid-syntax': 'figure',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': messages.duplicate,
-      });
+      define(def, { id: null });
+      markInvalid(def, 'figure', 'argument', messages.duplicate);
       continue;
     }
     else if (def.getAttribute('data-invalid-message') === messages.duplicate) {
-      define(def, {
-        class: void def.classList.remove('invalid'),
-        'data-invalid-syntax': null,
-        'data-invalid-type': null,
-        'data-invalid-message': null,
-      });
+      unmarkInvalid(def);
     }
     labels.add(label);
     opts.id !== '' && def.setAttribute('id', `label:${opts.id ? `${opts.id}:` : ''}${label}`);
     for (const ref of refs.take(label, Infinity)) {
       if (ref.getAttribute('data-invalid-message') === messages.reference) {
-        define(ref, {
-          class: void ref.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null,
-        });
+        unmarkInvalid(ref);
       }
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;
       yield define(ref,
@@ -156,12 +122,7 @@ export function* figure(
   }
   for (const [, ref] of refs) {
     if (opts.id !== '' && !ref.classList.contains('invalid')) {
-      define(ref, {
-        class: void ref.classList.add('invalid'),
-        'data-invalid-syntax': 'label',
-        'data-invalid-type': 'reference',
-        'data-invalid-message': messages.reference,
-      });
+      markInvalid(ref, 'label', 'reference', messages.reference);
     }
     yield ref;
   }

package/src/parser/processor/note.test.ts

@@ -162,7 +162,7 @@ describe('Unit: parser/processor/note', () => {
     });
 
     it('split', () => {
-      const target = parse('((1))\n\n## a\n\n((2))((1))((3))((2))');
+      const target = parse('((1))\n\n## a\n\n((2))((1))((3))((2))\n\n## b\n\n((2))');
       for (let i = 0; i < 3; ++i) {
         [...note(target)];
         assert.deepStrictEqual(
@@ -216,6 +216,19 @@ describe('Unit: parser/processor/note', () => {
                 html('sup', [html('a', { href: '#annotation::ref:3:1' }, '^4')]),
               ]),
             ]).outerHTML,
+            html('h2', { id: 'index::b' }, 'b').outerHTML,
+            html('p', [
+              html('sup', { class: 'annotation', id: 'annotation::ref:2:3', title: '2' }, [
+                html('span', { hidden: '' }, '2'),
+                html('a', { href: '#annotation::def:2:2' }, '*5')
+              ]),
+            ]).outerHTML,
+            html('ol', { class: 'annotations' }, [
+              html('li', { id: 'annotation::def:2:2', 'data-marker': '*5' }, [
+                html('span', '2'),
+                html('sup', [html('a', { href: '#annotation::ref:2:3' }, '^6')]),
+              ]),
+            ]).outerHTML,
           ]);
       }
     });
@@ -260,14 +273,14 @@ describe('Unit: parser/processor/note', () => {
             html('p', [
               html('sup', { class: 'reference', id: 'reference::ref:a_b:1', title: 'a b' }, [
                 html('span', { hidden: '' }, 'a b'),
-                html('a', { href: '#reference::def:a_b:1' }, '[1]')
+                html('a', { href: '#reference::def:a_b' }, '[1]')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
           note.outerHTML,
           html('ol', [
-            html('li', { id: 'reference::def:a_b:1' }, [
+            html('li', { id: 'reference::def:a_b' }, [
               html('span', 'a b'),
               html('sup', [html('a', { href: '#reference::ref:a_b:1' }, '^1')]),
             ]),
@@ -286,22 +299,22 @@ describe('Unit: parser/processor/note', () => {
             html('p', [
               html('sup', { class: 'reference', 'data-abbr': 'a', id: 'reference::ref:a:1', title: 'b' }, [
                 html('span', { hidden: '' }, 'b'),
-                html('a', { href: '#reference::def:a:1' }, '[a]')
+                html('a', { href: '#reference::def:a' }, '[a]')
               ]),
               html('sup', { class: 'reference', 'data-abbr': 'a', id: 'reference::ref:a:2', title: 'b' }, [
                 html('span', { hidden: '' }),
-                html('a', { href: '#reference::def:a:1' }, '[a]')
+                html('a', { href: '#reference::def:a' }, '[a]')
               ]),
               html('sup', { class: 'reference', 'data-abbr': 'a', id: 'reference::ref:a:3', title: 'b' }, [
                 html('span', { hidden: '' }),
-                html('a', { href: '#reference::def:a:1' }, '[a]')
+                html('a', { href: '#reference::def:a' }, '[a]')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
           note.outerHTML,
           html('ol', [
-            html('li', { id: 'reference::def:a:1' }, [
+            html('li', { id: 'reference::def:a' }, [
               html('span', 'b'),
               html('sup', [
                 html('a', { href: '#reference::ref:a:1', title: 'b' }, '^1'),
@@ -334,7 +347,7 @@ describe('Unit: parser/processor/note', () => {
               ]),
               html('sup', { class: 'reference', 'data-abbr': 'b', id: 'reference::ref:b:1', title: 'c' }, [
                 html('span', { hidden: '' }, 'c'),
-                html('a', { href: '#reference::def:b:1' }, '[b]')
+                html('a', { href: '#reference::def:b' }, '[b]')
               ]),
             ]).outerHTML,
             html('ol', { class: 'annotations' }, [
@@ -343,7 +356,7 @@ describe('Unit: parser/processor/note', () => {
                   'a',
                   html('sup', { class: 'reference', 'data-abbr': 'b', id: 'reference::ref:b:2', title: 'c' }, [
                     html('span', { hidden: '' }),
-                    html('a', { href: '#reference::def:b:1' }, '[b]')
+                    html('a', { href: '#reference::def:b' }, '[b]')
                   ]),
                 ]),
                 html('sup', [html('a', { href: '#annotation::ref:a:1' }, '^1')])
@@ -353,7 +366,7 @@ describe('Unit: parser/processor/note', () => {
         assert.deepStrictEqual(
           note.outerHTML,
           html('ol', [
-            html('li', { id: 'reference::def:b:1' }, [
+            html('li', { id: 'reference::def:b' }, [
               html('span', 'c'),
               html('sup', [
                 html('a', { href: '#reference::ref:b:1', title: 'c' }, '^1'),

package/src/parser/processor/note.ts

@@ -1,9 +1,13 @@
 import { identity, text } from '../inline/extension/indexee';
+import { markInvalid, unmarkInvalid } from '../util';
 import { frag, html, define } from 'typed-dom/dom';
 
 export function* note(
   target: ParentNode & Node,
-  notes?: { readonly annotations?: HTMLOListElement; readonly references: HTMLOListElement; },
+  notes?: {
+    readonly annotations?: HTMLOListElement;
+    readonly references: HTMLOListElement;
+  },
   opts: { readonly id?: string; } = {},
   bottom: Node | null = null,
 ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
@@ -46,10 +50,10 @@ function build(
     const titles = new Map<string, string>();
     const defIndexes = new Map<HTMLLIElement, number>();
     const refSubindexes = new Map<string, number>();
-    const defSubindexes = new Map<string, number>();
-    let refIndex = 0;
+    const defSubindexes = splitter ? new Map<string, number>() : undefined;
     let total = 0;
-    let style: 'count' | 'abbr';
+    let format: 'number' | 'abbr';
+    let refIndex = 0;
     for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
       if (ref.closest('[hidden]')) {
@@ -61,6 +65,7 @@ function build(
         if (defs.size > 0) {
           total += defs.size;
           yield* proc(defs, target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[0]));
+          assert(defs.size === 0);
         }
         else if (splitters.length % 100 === 0) {
           yield;
@@ -77,51 +82,44 @@ function build(
       const initial = splitter
         ? !defs.has(identifier)
         : refSubindex === 1;
-      const defSubindex = defSubindexes.get(identifier)! + 1 || 1;
-      defSubindexes.set(identifier, defSubindex);
+      const defSubindex = defSubindexes?.get(identifier)! + +initial || 1;
+      initial && defSubindexes?.set(identifier, defSubindex);
+      const defId = opts.id !== ''
+        ? `${syntax}:${opts.id ?? ''}:def:${identifier}${splitter && `:${defSubindex}`}`
+        : undefined;
       const def = initial
         ? html('li',
             {
-              id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}:${defSubindex}` : undefined,
-              'data-marker': !note ? marker(total + defs.size + 1, abbr) : undefined,
+              id: defId,
+              'data-marker': note ? undefined : marker(total + defs.size + 1, abbr),
             },
             [define(ref.firstElementChild!.cloneNode(true), { hidden: null }), html('sup')])
         : defs.get(identifier)!;
       initial && defs.set(identifier, def);
-      assert(def.lastChild);
+      assert(def.lastElementChild?.matches('sup'));
       const defIndex = initial
         ? total + defs.size
         : defIndexes.get(def)!;
       initial && defIndexes.set(def, defIndex);
-      const defId = def.id || undefined;
       const title = initial
         ? text(ref.firstElementChild!)
         : titles.get(identifier)!;
       initial && titles.set(identifier, title);
       assert(syntax !== 'annotation' || title);
-      style ??= abbr ? 'abbr' : 'count';
-      if (style === 'count' ? abbr : !abbr) {
-        define(ref, {
-          class: void ref.classList.add('invalid'),
-          'data-invalid-syntax': syntax,
-          'data-invalid-type': 'style',
-          'data-invalid-message': `${syntax[0].toUpperCase() + syntax.slice(1)} style must be consistent`,
-        });
-      }
-      else if (ref.getAttribute('data-invalid-type') === 'style') {
-        define(ref, {
-          class: void ref.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null,
-        });
-      }
-      if (!ref.firstElementChild!.hasAttribute('hidden')) {
-        ref.firstElementChild!.setAttribute('hidden', '');
+      format ??= abbr ? 'abbr' : 'number';
+      if (!ref.classList.contains('invalid')) {
+        if (format === 'number' ? abbr : !abbr) {
+          markInvalid(ref, syntax, 'format', 'Notation format must be consistent with numbers or abbreviations');
+        }
       }
-      else {
-        ref.lastChild?.remove();
+      else switch (ref.getAttribute('data-invalid-syntax')) {
+        case 'format':
+        case 'content':
+          unmarkInvalid(ref);
       }
+      ref.firstElementChild!.hasAttribute('hidden')
+        ? ref.lastElementChild!.remove()
+        : ref.firstElementChild!.setAttribute('hidden', '');
       define(ref, {
         id: refId,
         class: opts.id !== '' ? undefined : void ref.classList.add('disabled'),
@@ -135,7 +133,7 @@ function build(
       });
       yield ref.appendChild(html('a', { href: refId && defId && `#${defId}` }, marker(defIndex, abbr)));
       assert(ref.title || ref.matches('.invalid'));
-      def.lastChild!.appendChild(
+      def.lastElementChild!.appendChild(
         html('a',
           {
             href: refId && `#${refId}`,
@@ -143,7 +141,7 @@ function build(
           },
           `^${++refIndex}`));
     }
-    if (defs.size > 0 || note) {
+    if (note || defs.size > 0) {
       yield* proc(defs, note ?? target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[0] ?? bottom));
     }
     return;

package/src/parser/util.ts

@@ -1,3 +1,29 @@
+import { define } from 'typed-dom/dom';
+
+export function markInvalid<T extends Element>(
+  el: T,
+  syntax: string,
+  type: string,
+  message: string,
+): T {
+  assert(!message.endsWith('.'));
+  return define(el, {
+    class: void el.classList.add('invalid'),
+    'data-invalid-syntax': syntax,
+    'data-invalid-type': type,
+    'data-invalid-message': message,
+  });
+}
+
+export function unmarkInvalid<T extends Element>(el: T): T {
+  return define(el, {
+    class: void el.classList.remove('invalid'),
+    'data-invalid-syntax': null,
+    'data-invalid-type': null,
+    'data-invalid-message': null,
+  });
+}
+
 export function stringify(nodes: readonly (HTMLElement | string)[]): string {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {