securemark 0.297.2 → 0.297.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.297.3
+
+- Fix note processing.
+
 ## 0.297.2
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.297.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.297.3 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"));
@@ -7129,7 +7129,7 @@ function baseR(n, r) {
   return acc;
 }
 function signature(target) {
-  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol, .label[data-label]'), len = es.length, i = 0; i < len; ++i) {
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol, .label[data-label]'), i = es.length; i--;) {
     const el = es[i];
     switch (el.className) {
       case 'math':
@@ -7138,10 +7138,15 @@ function signature(target) {
       case 'label':
         el.replaceWith(`[$${el.getAttribute('data-label').replace('$', '')}]`);
         continue;
-      case 'checkbox':
-      case 'remark':
       case 'annotation':
+        el.replaceWith(`((${el.textContent}))`);
+        continue;
       case 'reference':
+        const abbr = el.getAttribute('data-abbr');
+        el.replaceWith(`[[${abbr ? `^${abbr}` : el.textContent}]]`);
+        continue;
+      case 'checkbox':
+      case 'remark':
         el.remove();
         continue;
     }
@@ -7165,16 +7170,21 @@ function signature(target) {
 }
 exports.signature = signature;
 function text(target) {
-  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol'), len = es.length, i = 0; i < len; ++i) {
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol'), i = es.length; i--;) {
     const el = es[i];
     switch (el.className) {
       case 'math':
         el.replaceWith(el.getAttribute('data-src'));
         continue;
-      case 'checkbox':
-      case 'remark':
       case 'annotation':
+        el.replaceWith(`((${el.textContent}))`);
+        continue;
       case 'reference':
+        const abbr = el.getAttribute('data-abbr');
+        el.replaceWith(`[[${abbr ? `^${abbr}` : el.textContent}]]`);
+        continue;
+      case 'checkbox':
+      case 'remark':
         el.remove();
         continue;
     }
@@ -8271,25 +8281,33 @@ function capitalize(label) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.reference = exports.annotation = exports.note = void 0;
+exports.note = void 0;
 const indexee_1 = __webpack_require__(7610);
 const util_1 = __webpack_require__(4992);
 const memoize_1 = __webpack_require__(6925);
 const dom_1 = __webpack_require__(394);
 function* note(target, notes, opts = {}, bottom = null) {
-  yield* (0, exports.annotation)(target, notes?.annotations, opts, bottom);
-  yield* (0, exports.reference)(target, notes?.references, opts, bottom);
+  const referenceRefMemory = referenceRefsMemoryCaller(target);
+  const annotationRefMemory = annotationRefsMemoryCaller(target);
+  for (const memory of [referenceRefMemory, annotationRefMemory]) {
+    for (const [ref, {
+      content
+    }] of memory) {
+      ref.replaceChildren(content);
+    }
+    memory.clear();
+  }
+  yield* reference(referenceRefMemory, target, notes?.references, opts, bottom);
+  yield* annotation(annotationRefMemory, target, notes?.annotations, opts, bottom);
 }
 exports.note = note;
-exports.annotation = build('annotation', 'annotations', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
-exports.reference = build('reference', 'references', (n, abbr) => `[${abbr || n}]`);
-// Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
-// 構文ごとに各1回の処理では不可能
-function build(syntax, plural, marker, splitter = '') {
-  splitter &&= `${splitter}, .${plural}`;
-  const refMemoryCaller = (0, memoize_1.memoize)(target => new Map() ?? target, new WeakMap());
-  return function* (target, note, opts = {}, bottom = null) {
-    const refMemory = refMemoryCaller(target);
+const annotationRefsMemoryCaller = (0, memoize_1.memoize)(target => new Map() ?? target, new WeakMap());
+const referenceRefsMemoryCaller = (0, memoize_1.memoize)(target => new Map() ?? target, new WeakMap());
+const annotation = build('annotation', 'annotations', '.annotation:not(:is(.annotations, .references) .annotation, .disabled)', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
+const reference = build('reference', 'references', '.reference:not(:is(.annotations, .references) .reference, .disabled)', (n, abbr) => `[${abbr || n}]`);
+function build(syntax, list, query, marker, splitter = '') {
+  splitter &&= `${splitter}, .${list}`;
+  return function* (memory, target, note, opts = {}, bottom = null) {
     const refInfoCaller = (0, memoize_1.memoize)(ref => {
       const content = ref.firstElementChild;
       const abbr = ref.getAttribute('data-abbr') ?? '';
@@ -8302,15 +8320,9 @@ function build(syntax, plural, marker, splitter = '') {
         abbr,
         text: txt
       };
-    }, refMemory);
-    for (const [ref, {
-      content
-    }] of refMemory) {
-      ref.replaceChildren(content);
-    }
-    refMemory.clear();
+    }, memory);
     const defs = new Map();
-    const refs = target.querySelectorAll(`.${syntax}:not(.disabled)`);
+    const refs = target.querySelectorAll(query);
     const identifierInfoCaller = (0, memoize_1.memoize)(identifier => ({
       defIndex: 0,
       defSubindex: 0,
@@ -8326,18 +8338,19 @@ function build(syntax, plural, marker, splitter = '') {
     let refIndex = 0;
     for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
-      if (splitter) for (let el; el = splitters[iSplitters], el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING; ++iSplitters) {
+      if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
+        const pos = splitter?.compareDocumentPosition(ref) ?? 0;
+        if (pos & (Node.DOCUMENT_POSITION_PRECEDING | Node.DOCUMENT_POSITION_DISCONNECTED)) break;
         if (~iSplitters << 32 - 8 === 0) yield;
-        if (!scope && el.parentNode !== target) continue;
-        if (el.tagName === 'OL' && (el.nextElementSibling !== splitters[iSplitters + 1] || defs.size === 0)) {
-          el.remove();
+        if (splitter.classList.contains(list) && defs.size === 0) {
+          splitter.remove();
           continue;
         }
         if (defs.size > 0) {
           total += defs.size;
-          const note = el.tagName === 'OL' ? el : target.insertBefore((0, dom_1.html)('ol', {
-            class: plural
-          }), el);
+          const note = splitter.classList.contains(list) ? splitter : target.insertBefore((0, dom_1.html)('ol', {
+            class: list
+          }), splitter);
           yield* proc(defs, note);
         }
       }
@@ -8399,17 +8412,15 @@ function build(syntax, plural, marker, splitter = '') {
       }, `^${++refIndex}`));
     }
     if (note || defs.size > 0) {
-      const el = splitters[iSplitters];
-      note ??= el?.tagName === 'OL' && el.nextElementSibling == splitters[iSplitters + 1] ? (++iSplitters, el) : target.insertBefore((0, dom_1.html)('ol', {
-        class: plural
-      }), splitters[iSplitters] ?? bottom);
-      yield* proc(defs, note);
+      const splitter = splitters[iSplitters++];
+      yield* proc(defs, note ?? (splitter?.classList.contains(list) ? splitter : target.insertBefore((0, dom_1.html)('ol', {
+        class: list
+      }), splitter ?? bottom)));
     }
-    if (splitter) for (let el; el = splitters[iSplitters]; ++iSplitters) {
+    if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
-      if (!scope && el.parentNode !== target) continue;
-      if (el.tagName === 'OL') {
-        el.remove();
+      if (splitter.classList.contains(list)) {
+        splitter.remove();
       }
     }
   };
@@ -9345,7 +9356,7 @@ const math_1 = __webpack_require__(3165);
 const media_1 = __webpack_require__(3567);
 const memoize_1 = __webpack_require__(6925);
 const query_1 = __webpack_require__(2282);
-const selector = 'img.media:not(.invalid):not([src])[data-src], a > :not(img).media:not(.invalid), pre.code:not(.invalid), .math:not(.invalid)';
+const selector = ':not(.invalid):is(.media:is(img:not([src])[data-src], a > :not(img).media), pre.code, .math)';
 const extend = (0, memoize_1.reduce)(opts => ({
   code: code_1.code,
   math: math_1.math,

package/package.json

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

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

@@ -216,12 +216,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:[$-a]:1" title="(1)"><a href="#annotation::def:[$-a]:1">*1</a></sup><sup class="reference" data-abbr="B" id="reference::ref:B:1" title="(1)"><a href="#reference::def:B">[B]</a></sup></p>',
-          '<ol class="annotations"><li id="annotation::def:[$-a]: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)"><a href="#reference::def:B">[B]</a></sup></span><sup><a href="#annotation::ref:[$-a]:1">^1</a></sup></li></ol>',
+          '<p><sup class="annotation" id="annotation::ref:[$-a][[^B]]:1" title="(1)[[^B]]"><a href="#annotation::def:[$-a][[^B]]:1">*1</a></sup><sup class="reference" data-abbr="B" id="reference::ref:B:2" title="(1)"><a href="#reference::def:B">[B]</a></sup></p>',
+          '<ol class="annotations"><li id="annotation::def:[$-a][[^B]]: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:1" title="(1)"><a href="#reference::def:B">[B]</a></sup></span><sup><a href="#annotation::ref:[$-a][[^B]]:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
         notes.references.outerHTML,
-        '<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>');
+        '<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">^1</a><a href="#reference::ref:B:2" title="(1)">^2</a></sup></li></ol>');
       assert.deepStrictEqual(
         [...parse([
           '[[^A 1|b]]',

package/src/parser/inline/extension/indexee.ts

@@ -110,7 +110,7 @@ export function signature(target: Element | DocumentFragment): string {
   assert(!target.parentNode);
   assert(!target.querySelector('br:not(:has(+ :is(ul, ol)))') || target.nodeName === 'MARK');
   for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol, .label[data-label]'),
-           len = es.length, i = 0; i < len; ++i) {
+           i = es.length; i--;) {
     const el = es[i];
     switch (el.className) {
       case 'math':
@@ -119,10 +119,15 @@ export function signature(target: Element | DocumentFragment): string {
       case 'label':
         el.replaceWith(`[$${el.getAttribute('data-label')!.replace('$', '')}]`);
         continue;
-      case 'checkbox':
-      case 'remark':
       case 'annotation':
+        el.replaceWith(`((${el.textContent}))`);
+        continue;
       case 'reference':
+        const abbr = el.getAttribute('data-abbr');
+        el.replaceWith(`[[${abbr ? `^${abbr}` : el.textContent}]]`);
+        continue;
+      case 'checkbox':
+      case 'remark':
         el.remove();
         continue;
     }
@@ -149,16 +154,21 @@ export function text(target: Element | DocumentFragment): string {
   assert(!target.parentNode);
   assert(!target.querySelector('br:not(:has(+ :is(ul, ol)))'));
   for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, :is(.annotation, .reference) > a, .checkbox, ul, ol'),
-           len = es.length, i = 0; i < len; ++i) {
+           i = es.length; i--;) {
     const el = es[i];
     switch (el.className) {
       case 'math':
         el.replaceWith(el.getAttribute('data-src')!);
         continue;
-      case 'checkbox':
-      case 'remark':
       case 'annotation':
+        el.replaceWith(`((${el.textContent}))`);
+        continue;
       case 'reference':
+        const abbr = el.getAttribute('data-abbr');
+        el.replaceWith(`[[${abbr ? `^${abbr}` : el.textContent}]]`);
+        continue;
+      case 'checkbox':
+      case 'remark':
         el.remove();
         continue;
     }

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

@@ -1,4 +1,4 @@
-import { note, annotation, reference } from './note';
+import { note } from './note';
 import { parse as parse_ } from '../../parser';
 import { html } from 'typed-dom/dom';
 
@@ -8,7 +8,7 @@ describe('Unit: parser/processor/note', () => {
   describe('annotation', () => {
     it('empty', () => {
       const target = parse('');
-      [...annotation(target)];
+      [...note(target)];
       assert.deepStrictEqual(
         [...target.children].map(el => el.outerHTML),
         []);
@@ -17,7 +17,7 @@ describe('Unit: parser/processor/note', () => {
     it('1', () => {
       const target = parse('((a b))');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target)].length, i === 0 ? 2 : 3);
+        assert.deepStrictEqual([...note(target)].length, i === 0 ? 2 : 3);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -39,7 +39,7 @@ describe('Unit: parser/processor/note', () => {
     it('2', () => {
       const target = parse('((1))((12345678901234567890))');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target)].length, i === 0 ? 4 : 6);
+        assert.deepStrictEqual([...note(target)].length, i === 0 ? 4 : 6);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -68,7 +68,7 @@ describe('Unit: parser/processor/note', () => {
     it('unify', () => {
       const target = parse('((1))((2))((3))((2))((4))');
       for (let i = 0; i < 3; ++i) {
-        [...annotation(target)];
+        [...note(target)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -121,7 +121,7 @@ describe('Unit: parser/processor/note', () => {
         '((4))',
       ].join('\n\n')).children);
       for (let i = 0; i < 3; ++i) {
-        [...annotation(target)];
+        [...note(target)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -202,7 +202,7 @@ describe('Unit: parser/processor/note', () => {
     it('id', () => {
       const target = parse('((a b))');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, undefined, { id: '0' })].length, i === 0 ? 2 : 3);
+        assert.deepStrictEqual([...note(target, undefined, { id: '0' })].length, i === 0 ? 2 : 3);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -222,37 +222,39 @@ describe('Unit: parser/processor/note', () => {
     });
 
     it('nest', () => {
-      const target = parse('((a((b((c))))))((a))((b))');
+      const target = parse('((a((b((c))))))((a))((b))((c))');
       for (let i = 0; i < 3; ++i) {
-        [...annotation(target)];
+        [...note(target)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             html('p', [
+              html('sup', { class: 'annotation', id: 'annotation::ref:a((b((c)))):1', title: 'a((b((c))))' }, [
+                html('a', { href: '#annotation::def:a((b((c)))):1' }, '*1')
+              ]),
               html('sup', { class: 'annotation', id: 'annotation::ref:a:1', title: 'a' }, [
-                html('a', { href: '#annotation::def:a:1' }, '*1')
+                html('a', { href: '#annotation::def:a:1' }, '*4')
               ]),
-              html('sup', { class: 'annotation', id: 'annotation::ref:a:2', title: 'a' }, [
-                html('a', { href: '#annotation::def:a:1' }, '*1')
+              html('sup', { class: 'annotation', id: 'annotation::ref:b:1', title: 'b' }, [
+                html('a', { href: '#annotation::def:b:1' }, '*5')
               ]),
-              html('sup', { class: 'annotation', id: 'annotation::ref:b:2', title: 'b' }, [
-                html('a', { href: '#annotation::def:b:1' }, '*2')
+              html('sup', { class: 'annotation', id: 'annotation::ref:c:2', title: 'c' }, [
+                html('a', { href: '#annotation::def:c:1' }, '*3')
               ]),
             ]).outerHTML,
             html('ol', { class: 'annotations' }, [
-              html('li', { id: 'annotation::def:a:1', 'data-marker': '*1' }, [
+              html('li', { id: 'annotation::def:a((b((c)))):1', 'data-marker': '*1' }, [
                 html('span', [
                   'a',
-                  html('sup', { class: 'annotation', id: 'annotation::ref:b:1', title: 'b' }, [
-                    html('a', { href: '#annotation::def:b:1' }, '*2')
+                  html('sup', { class: 'annotation', id: 'annotation::ref:b((c)):1', title: 'b((c))' }, [
+                    html('a', { href: '#annotation::def:b((c)):1' }, '*2')
                   ]),
                 ]),
                 html('sup', [
-                  html('a', { href: '#annotation::ref:a:1' }, '^1'),
-                  html('a', { href: '#annotation::ref:a:2' }, '^4'),
+                  html('a', { href: '#annotation::ref:a((b((c)))):1' }, '^1'),
                 ])
               ]),
-              html('li', { id: 'annotation::def:b:1', 'data-marker': '*2' }, [
+              html('li', { id: 'annotation::def:b((c)):1', 'data-marker': '*2' }, [
                 html('span', [
                   'b',
                   html('sup', { class: 'annotation', id: 'annotation::ref:c:1', title: 'c' }, [
@@ -260,8 +262,7 @@ describe('Unit: parser/processor/note', () => {
                   ]),
                 ]),
                 html('sup', [
-                  html('a', { href: '#annotation::ref:b:1' }, '^2'),
-                  html('a', { href: '#annotation::ref:b:2' }, '^5'),
+                  html('a', { href: '#annotation::ref:b((c)):1' }, '^2'),
                 ])
               ]),
               html('li', { id: 'annotation::def:c:1', 'data-marker': '*3' }, [
@@ -270,6 +271,23 @@ describe('Unit: parser/processor/note', () => {
                 ]),
                 html('sup', [
                   html('a', { href: '#annotation::ref:c:1' }, '^3'),
+                  html('a', { href: '#annotation::ref:c:2' }, '^6'),
+                ])
+              ]),
+              html('li', { id: 'annotation::def:a:1', 'data-marker': '*4' }, [
+                html('span', [
+                  'a',
+                ]),
+                html('sup', [
+                  html('a', { href: '#annotation::ref:a:1' }, '^4'),
+                ])
+              ]),
+              html('li', { id: 'annotation::def:b:1', 'data-marker': '*5' }, [
+                html('span', [
+                  'b',
+                ]),
+                html('sup', [
+                  html('a', { href: '#annotation::ref:b:1' }, '^5'),
                 ])
               ]),
             ]).outerHTML,
@@ -282,9 +300,9 @@ describe('Unit: parser/processor/note', () => {
   describe('reference', () => {
     it('1', () => {
       const target = parse('[[a b]]');
-      const note = html('ol');
+      const notes = { references: html('ol') };
       for (let i = 0; i < 3; ++i) {
-        [...reference(target, note)];
+        [...note(target, notes)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -295,7 +313,7 @@ describe('Unit: parser/processor/note', () => {
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
-          [note.outerHTML],
+          [notes.references.outerHTML],
           [
             html('ol', [
               html('li', { id: 'reference::def:a_b' }, [
@@ -309,9 +327,9 @@ describe('Unit: parser/processor/note', () => {
 
     it('abbr', () => {
       const target = parse('[[^A 1]][[^A 1|b]][[^A 1]]');
-      const note = html('ol');
+      const notes = { references: html('ol') };
       for (let i = 0; i < 3; ++i) {
-        [...reference(target, note)];
+        [...note(target, notes)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -328,7 +346,7 @@ describe('Unit: parser/processor/note', () => {
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
-          [note.outerHTML],
+          [notes.references.outerHTML],
           [
             html('ol', [
               html('li', { id: 'reference::def:A_1' }, [
@@ -346,42 +364,41 @@ describe('Unit: parser/processor/note', () => {
 
     it('nest', () => {
       const target = parse('((a[[^B]]))[[^B|c]]');
-      const note = html('ol');
+      const notes = { references: html('ol') };
       for (let i = 0; i < 3; ++i) {
-        [...annotation(target)];
-        [...reference(target, note)];
+        [...note(target, notes)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             html('p', [
-              html('sup', { class: 'annotation', id: 'annotation::ref:a:1', title: 'a' }, [
-                html('a', { href: '#annotation::def:a:1' }, '*1')
+              html('sup', { class: 'annotation', id: 'annotation::ref:a[[^B]]:1', title: 'a[[^B]]' }, [
+                html('a', { href: '#annotation::def:a[[^B]]:1' }, '*1')
               ]),
-              html('sup', { class: 'reference', 'data-abbr': 'B', id: 'reference::ref:B:1', title: 'c' }, [
+              html('sup', { class: 'reference', 'data-abbr': 'B', id: 'reference::ref:B:2', title: 'c' }, [
                 html('a', { href: '#reference::def:B' }, '[B]')
               ]),
             ]).outerHTML,
             html('ol', { class: 'annotations' }, [
-              html('li', { id: 'annotation::def:a:1', 'data-marker': '*1' }, [
+              html('li', { id: 'annotation::def:a[[^B]]:1', 'data-marker': '*1' }, [
                 html('span', [
                   'a',
-                  html('sup', { class: 'reference', 'data-abbr': 'B', id: 'reference::ref:B:2', title: 'c' }, [
+                  html('sup', { class: 'reference', 'data-abbr': 'B', id: 'reference::ref:B:1', title: 'c' }, [
                     html('a', { href: '#reference::def:B' }, '[B]')
                   ]),
                 ]),
-                html('sup', [html('a', { href: '#annotation::ref:a:1' }, '^1')])
+                html('sup', [html('a', { href: '#annotation::ref:a[[^B]]:1' }, '^1')])
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
-          [note.outerHTML],
+          [notes.references.outerHTML],
           [
             html('ol', [
               html('li', { id: 'reference::def:B' }, [
                 html('span', 'c'),
                 html('sup', [
-                  html('a', { href: '#reference::ref:B:1', title: 'c' }, '^1'),
-                  html('a', { href: '#reference::ref:B:2' }, '^2'),
+                  html('a', { href: '#reference::ref:B:1' }, '^1'),
+                  html('a', { href: '#reference::ref:B:2', title: 'c' }, '^2'),
                 ]),
               ]),
             ]).outerHTML,

package/src/parser/processor/note.ts

@@ -12,45 +12,66 @@ export function* note(
   opts: { readonly id?: string; } = {},
   bottom: Node | null = null,
 ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
-  yield* annotation(target, notes?.annotations, opts, bottom);
-  yield* reference(target, notes?.references, opts, bottom);
+  const referenceRefMemory = referenceRefsMemoryCaller(target);
+  const annotationRefMemory = annotationRefsMemoryCaller(target);
+  for (const memory of [referenceRefMemory, annotationRefMemory]) {
+    for (const [ref, { content }] of memory) {
+      ref.replaceChildren(content);
+    }
+    memory.clear();
+  }
+  yield* reference(referenceRefMemory, target, notes?.references, opts, bottom);
+  yield* annotation(annotationRefMemory, target, notes?.annotations, opts, bottom);
+}
+
+interface RefMemory {
+  readonly content: Element;
+  readonly identifier: string;
+  readonly abbr: string;
+  readonly text: string;
 }
 
-export const annotation = build(
+const annotationRefsMemoryCaller = memoize((target: Node) =>
+  new Map<HTMLElement, RefMemory>() ?? target,
+  new WeakMap());
+
+const referenceRefsMemoryCaller = memoize((target: Node) =>
+  new Map<HTMLElement, {
+    readonly content: Element;
+    readonly identifier: string;
+    readonly abbr: string;
+    readonly text: string;
+  }>() ?? target,
+  new WeakMap());
+
+const annotation = build(
   'annotation',
   'annotations',
+  '.annotation:not(:is(.annotations, .references) .annotation, .disabled)',
   n => `*${n}`,
   'h1, h2, h3, h4, h5, h6, aside.aside, hr');
-export const reference = build(
+const reference = build(
   'reference',
   'references',
+  '.reference:not(:is(.annotations, .references) .reference, .disabled)',
   (n, abbr) => `[${abbr || n}]`);
 
-// Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
-// 構文ごとに各1回の処理では不可能
 function build(
   syntax: string,
-  plural: string,
+  list: string,
+  query: string,
   marker: (index: number, abbr: string) => string,
   splitter: string = '',
 ) {
   assert(syntax.match(/^[a-z]+$/));
-  splitter &&= `${splitter}, .${plural}`;
-  const refMemoryCaller = memoize((target: Node) =>
-    new Map<HTMLElement, {
-      readonly content: Element;
-      readonly identifier: string;
-      readonly abbr: string;
-      readonly text: string;
-    }>() ?? target,
-    new WeakMap());
+  splitter &&= `${splitter}, .${list}`;
   return function* (
+    memory: Map<HTMLElement, RefMemory>,
     target: ParentNode & Node,
     note?: HTMLOListElement,
     opts: { readonly id?: string } = {},
     bottom: Node | null = null,
   ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
-    const refMemory = refMemoryCaller(target);
     const refInfoCaller = memoize((ref: HTMLElement) => {
       const content = ref.firstElementChild!;
       const abbr = ref.getAttribute('data-abbr') ?? '';
@@ -72,13 +93,9 @@ function build(
         abbr,
         text: txt,
       };
-    }, refMemory);
-    for (const [ref, { content }] of refMemory) {
-      ref.replaceChildren(content);
-    }
-    refMemory.clear();
+    }, memory);
     const defs = new Map<string, HTMLLIElement>();
-    const refs = target.querySelectorAll<HTMLElement>(`.${syntax}:not(.disabled)`);
+    const refs = target.querySelectorAll<HTMLElement>(query);
     const identifierInfoCaller = memoize((identifier: string) => ({
       defIndex: 0,
       defSubindex: 0,
@@ -94,23 +111,21 @@ function build(
     let refIndex = 0;
     for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
-      if (splitter) for (
-        let el: Element;
-        el = splitters[iSplitters],
-        el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING;
-        ++iSplitters) {
+      if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
+        const pos = splitter?.compareDocumentPosition(ref) ?? 0;
+        if (pos & (Node.DOCUMENT_POSITION_PRECEDING | Node.DOCUMENT_POSITION_DISCONNECTED)) break;
         if (~iSplitters << 32 - 8 === 0) yield;
-        if (!scope && el.parentNode !== target) continue;
-        if (el.tagName === 'OL' && (el.nextElementSibling !== splitters[iSplitters + 1] || defs.size === 0)) {
-          assert(el.matches(`.${plural}`));
-          el.remove();
+        if (splitter.classList.contains(list) && defs.size === 0) {
+          assert(splitter.matches(`.${list}`));
+          splitter.remove();
           continue;
         }
         if (defs.size > 0) {
           total += defs.size;
-          const note = el.tagName === 'OL'
-            ? el as HTMLOListElement
-            : target.insertBefore(html('ol', { class: plural }), el);
+          assert(splitter.parentNode);
+          const note = splitter.classList.contains(list)
+            ? splitter as HTMLOListElement
+            : target.insertBefore(html('ol', { class: list }), splitter);
           assert(note.parentNode);
           yield* proc(defs, note);
           assert(defs.size === 0);
@@ -183,19 +198,16 @@ function build(
           `^${++refIndex}`));
     }
     if (note || defs.size > 0) {
-      const el = splitters[iSplitters];
-      note ??= el?.tagName === 'OL' && el.nextElementSibling == splitters[iSplitters + 1]
-        ? (++iSplitters, el as HTMLOListElement)
-        : target.insertBefore(html('ol', { class: plural }), splitters[iSplitters] ?? bottom);
-      yield* proc(defs, note);
+      const splitter = splitters[iSplitters++];
+      yield* proc(defs, note ?? (splitter?.classList.contains(list)
+        ? splitter as HTMLOListElement
+        : target.insertBefore(html('ol', { class: list }), splitter ?? bottom)));
       assert(defs.size === 0);
     }
-    if (splitter) for (let el: Element; el = splitters[iSplitters]; ++iSplitters) {
+    if (splitter) for (let splitter; splitter = splitters[iSplitters]; ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
-      if (!scope && el.parentNode !== target) continue;
-      if (el.tagName === 'OL') {
-        assert(el.matches(`.${plural}`));
-        el.remove();
+      if (splitter.classList.contains(list)) {
+        splitter.remove();
       }
     }
   }

package/src/renderer/render.ts

@@ -5,7 +5,7 @@ import { media } from './render/media';
 import { reduce } from 'spica/memoize';
 import { querySelectorAllWith } from 'typed-dom/query';
 
-const selector = 'img.media:not(.invalid):not([src])[data-src], a > :not(img).media:not(.invalid), pre.code:not(.invalid), .math:not(.invalid)';
+const selector = ':not(.invalid):is(.media:is(img:not([src])[data-src], a > :not(img).media), pre.code, .math)';
 
 const extend = reduce((opts: RenderingOptions): RenderingOptions =>
   ({ code, math, media: {}, ...opts }));