securemark 0.272.0 → 0.273.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.273.0
+
+- Rename ParserSettings.footnotes to ParserSettings.notes.
+
 ## 0.272.0
 
 - Change footnote identifiers.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.272.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.273.0 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"));
@@ -3904,7 +3904,7 @@ const block_1 = __webpack_require__(4032);
 const normalize_1 = __webpack_require__(185);
 const header_2 = __webpack_require__(7790);
 const figure_1 = __webpack_require__(9123);
-const footnote_1 = __webpack_require__(7529);
+const note_1 = __webpack_require__(6745);
 const url_1 = __webpack_require__(2261);
 const array_1 = __webpack_require__(8112);
 function bind(target, settings) {
@@ -4015,7 +4015,7 @@ function bind(target, settings) {
         type: 'cancel'
       };
     }
-    for (const el of (0, figure_1.figure)(next(0)?.parentNode ?? target, settings.footnotes, context)) {
+    for (const el of (0, figure_1.figure)(next(0)?.parentNode ?? target, settings.notes, context)) {
       el ? yield {
         type: 'figure',
         value: el
@@ -4026,9 +4026,9 @@ function bind(target, settings) {
         type: 'cancel'
       };
     }
-    for (const el of (0, footnote_1.footnote)(next(0)?.parentNode ?? target, settings.footnotes, context, bottom)) {
+    for (const el of (0, note_1.note)(next(0)?.parentNode ?? target, settings.notes, context, bottom)) {
       el ? yield {
-        type: 'footnote',
+        type: 'note',
         value: el
       } : yield {
         type: 'break'
@@ -4229,7 +4229,7 @@ const block_1 = __webpack_require__(4032);
 const normalize_1 = __webpack_require__(185);
 const header_2 = __webpack_require__(7790);
 const figure_1 = __webpack_require__(9123);
-const footnote_1 = __webpack_require__(7529);
+const note_1 = __webpack_require__(6745);
 const url_1 = __webpack_require__(2261);
 const dom_1 = __webpack_require__(3252);
 function parse(source, opts = {}, context) {
@@ -4265,8 +4265,8 @@ function parse(source, opts = {}, context) {
     }), []));
   }
   if (opts.test) return node;
-  for (const _ of (0, figure_1.figure)(node, opts.footnotes, context));
-  for (const _ of (0, footnote_1.footnote)(node, opts.footnotes, context));
+  for (const _ of (0, figure_1.figure)(node, opts.notes, context));
+  for (const _ of (0, note_1.note)(node, opts.notes, context));
   return node;
 }
 exports.parse = parse;
@@ -4375,7 +4375,7 @@ const markdown = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combina
   });
   const document = (0, parse_1.parse)(source, {
     id: '',
-    footnotes: {
+    notes: {
       references
     }
   }, context);
@@ -4525,7 +4525,7 @@ exports.aside = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, co
   });
   const document = (0, parse_1.parse)(body.slice(0, -1), {
     id: '',
-    footnotes: {
+    notes: {
       references
     }
   }, context);
@@ -4579,7 +4579,7 @@ exports.example = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0,
         });
         const document = (0, parse_1.parse)(body.slice(0, -1), {
           id: '',
-          footnotes: {
+          notes: {
             references
           }
         }, context);
@@ -6928,8 +6928,8 @@ const queue_1 = __webpack_require__(4934);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
 const query_1 = __webpack_require__(6120);
-function* figure(target, footnotes, opts = {}) {
-  const refs = new queue_1.MultiQueue((0, array_1.push)((0, query_1.querySelectorAll)(target, 'a.label:not(.disabled)[data-label]'), footnotes && (0, query_1.querySelectorAll)(footnotes.references, 'a.label:not(.disabled)') || []).map(el => [el.getAttribute('data-label'), el]));
+function* figure(target, notes, opts = {}) {
+  const refs = new queue_1.MultiQueue((0, array_1.push)((0, query_1.querySelectorAll)(target, 'a.label:not(.disabled)[data-label]'), notes && (0, query_1.querySelectorAll)(notes.references, 'a.label:not(.disabled)') || []).map(el => [el.getAttribute('data-label'), el]));
   const labels = new Set();
   const numbers = new Map();
   let base = '0';
@@ -7080,7 +7080,7 @@ function capitalize(label) {
 
 /***/ }),
 
-/***/ 7529:
+/***/ 6745:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -7089,25 +7089,25 @@ function capitalize(label) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.reference = exports.annotation = exports.footnote = void 0;
+exports.reference = exports.annotation = exports.note = void 0;
 const indexee_1 = __webpack_require__(1269);
 const dom_1 = __webpack_require__(3252);
-function* footnote(target, footnotes, opts = {}, bottom = null) {
+function* note(target, notes, opts = {}, bottom = null) {
   for (let es = target.querySelectorAll(`.annotations`), len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
     el.parentNode === target && el.remove();
   }
-  yield* (0, exports.annotation)(target, footnotes?.annotations, opts, bottom);
-  yield* (0, exports.reference)(target, footnotes?.references, opts, bottom);
+  yield* (0, exports.annotation)(target, notes?.annotations, opts, bottom);
+  yield* (0, exports.reference)(target, notes?.references, opts, bottom);
   return;
 }
-exports.footnote = footnote;
+exports.note = note;
 exports.annotation = build('annotation', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
 exports.reference = build('reference', (n, abbr) => `[${abbr || n}]`);
 function build(syntax, marker, splitter = '_') {
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
-  return function* (target, footnote, opts = {}, bottom = null) {
+  return function* (target, note, opts = {}, bottom = null) {
     const defs = new Map();
     const splitters = [];
     for (let es = target.querySelectorAll(splitter), len = es.length, i = 0; i < len; ++i) {
@@ -7166,7 +7166,7 @@ function build(syntax, marker, splitter = '_') {
       const refId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:ref:${refIndex}` : undefined;
       const def =  false || defs.get(identifier) || defs.set(identifier, (0, dom_1.html)('li', {
         id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}` : undefined,
-        'data-marker': !footnote ? marker(total + defs.size + 1, abbr) : undefined
+        'data-marker': !note ? marker(total + defs.size + 1, abbr) : undefined
       }, [(0, dom_1.define)(ref.firstElementChild.cloneNode(true), {
         hidden: null
       }), (0, dom_1.html)('sup')])).get(identifier);
@@ -7191,17 +7191,17 @@ function build(syntax, marker, splitter = '_') {
         title: abbr && (0, indexee_1.text)((0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes)).trim() || undefined
       }, `^${refIndex}`));
     }
-    if (defs.size > 0 || footnote) {
-      yield* proc(defs, footnote ?? target.insertBefore((0, dom_1.html)('ol', {
+    if (defs.size > 0 || note) {
+      yield* proc(defs, note ?? target.insertBefore((0, dom_1.html)('ol', {
         class: `${syntax}s`
       }), splitters[0] ?? bottom));
     }
     return;
   };
-  function* proc(defs, footnote) {
+  function* proc(defs, note) {
     const {
       children
-    } = footnote;
+    } = note;
     const size = defs.size;
     let count = 0;
     let length = children.length;
@@ -7211,16 +7211,16 @@ function build(syntax, marker, splitter = '_') {
       while (length > size) {
         const node = children[count - 1];
         if (equal(node, def)) continue I;
-        yield footnote.removeChild(node);
+        yield note.removeChild(node);
         --length;
       }
       const node = count <= length ? children[count - 1] : null;
       if (node && equal(node, def)) continue;
-      yield footnote.insertBefore(def, node);
+      yield note.insertBefore(def, node);
       ++length;
     }
     while (length > size) {
-      yield footnote.removeChild(children[size]);
+      yield note.removeChild(children[size]);
       --length;
     }
     return;

package/index.d.ts

@@ -32,7 +32,7 @@ export interface ParserSettings {
   readonly id?: string;
   // For editing.
   readonly caches?: Partial<Caches>;
-  readonly footnotes: {
+  readonly notes: {
     readonly references: HTMLOListElement;
   };
   readonly chunk?: boolean;
@@ -42,7 +42,7 @@ export type Progress =
   | { readonly type: 'segment'; readonly value: string; }
   | { readonly type: 'block'; readonly value: HTMLElement; }
   | { readonly type: 'figure'; readonly value: HTMLAnchorElement; }
-  | { readonly type: 'footnote'; readonly value: HTMLLIElement | HTMLElement; }
+  | { readonly type: 'note'; readonly value: HTMLLIElement | HTMLElement; }
   | { readonly type: 'break'; }
   | { readonly type: 'cancel'; };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.272.0",
+  "version": "0.273.0",
   "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

@@ -27,7 +27,7 @@ describe('Unit: parser/api/bind', () => {
       return acc;
     }
 
-    const cfgs = { footnotes: { references: html('ol') } };
+    const cfgs = { notes: { references: html('ol') } };
 
     it('huge input', () => {
       const iter = bind(html('div'), { ...cfgs, id: '' }).parse(`${'\n'.repeat(10 * 1000 ** 2)}`);
@@ -211,7 +211,7 @@ describe('Unit: parser/api/bind', () => {
           ]).outerHTML,
         ]);
       assert.deepStrictEqual(
-        cfgs.footnotes.references?.outerHTML,
+        cfgs.notes.references?.outerHTML,
         html('ol', [
           html('li', { id: 'reference::def:1' }, [
             html('span', '1'),

package/src/parser/api/bind.ts

@@ -9,7 +9,7 @@ import { State } from '../context';
 import { normalize } from './normalize';
 import { headers } from './header';
 import { figure } from '../processor/figure';
-import { footnote } from '../processor/footnote';
+import { note } from '../processor/note';
 import { ReadonlyURL } from 'spica/url';
 import { push, splice } from 'spica/array';
 
@@ -116,17 +116,17 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
       yield { type: 'block', value: el };
       if (rev !== revision) return yield { type: 'cancel' };
     }
-    for (const el of figure(next(0)?.parentNode ?? target, settings.footnotes, context)) {
+    for (const el of figure(next(0)?.parentNode ?? target, settings.notes, context)) {
       assert(rev === revision);
       el
         ? yield { type: 'figure', value: el }
         : yield { type: 'break' };
       if (rev !== revision) return yield { type: 'cancel' };
     }
-    for (const el of footnote(next(0)?.parentNode ?? target, settings.footnotes, context, bottom)) {
+    for (const el of note(next(0)?.parentNode ?? target, settings.notes, context, bottom)) {
       assert(rev === revision);
       el
-        ? yield { type: 'footnote', value: el }
+        ? yield { type: 'note', value: el }
         : yield { type: 'break' };
       if (rev !== revision) return yield { type: 'cancel' };
     }

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

@@ -201,18 +201,18 @@ describe('Unit: parser/api/parse', () => {
         ]);
     });
 
-    it('footnote', () => {
-      const footnotes = { references: html('ol') };
+    it('note', () => {
+      const notes = { references: html('ol') };
       assert.deepStrictEqual(
-        [...parse('$-a\n$$\n$$\n\n(($-a[[b]][[c_d_]]))', { footnotes }).children].map(el => el.outerHTML),
+        [...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" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference"><span>b</span></sup><sup class="reference"><span>c<em>d</em></span></sup></span><a href="#annotation::def:(1)">*1</a></sup></p>',
-          '<ol class="annotations"><li id="annotation::def:(1)" data-marker="*1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference::ref:1" title="b"><span hidden="">b</span><a href="#reference::def:b">[1]</a></sup><sup class="reference" id="reference::ref:2" title="cd"><span hidden="">c<em>d</em></span><a href="#reference::def:cd">[2]</a></sup></span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
+          '<p><sup class="annotation" id="annotation::ref: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</a></sup><sup class="reference" data-abbr="b" id="reference::ref: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)" data-marker="*1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="b" id="reference::ref:2" title="(1)"><span hidden=""></span><a href="#reference::def:b">[b]</a></sup></span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
-        footnotes.references.outerHTML,
-        '<ol><li id="reference::def:b"><span>b</span><sup><a href="#reference::ref:1">^1</a></sup></li><li id="reference::def:cd"><span>c<em>d</em></span><sup><a href="#reference::ref:2">^2</a></sup></li></ol>');
+        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:1" title="(1)">^1</a><a href="#reference::ref:2">^2</a></sup></li></ol>');
     });
 
     it('normalize', () => {

package/src/parser/api/parse.ts

@@ -9,7 +9,7 @@ import { State } from '../context';
 import { normalize } from './normalize';
 import { headers } from './header';
 import { figure } from '../processor/figure';
-import { footnote } from '../processor/footnote';
+import { note } from '../processor/note';
 import { ReadonlyURL } from 'spica/url';
 import { frag } from 'typed-dom/dom';
 
@@ -41,9 +41,9 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
   }
   assert(opts.id !== '' || !node.querySelector('[id], .index[href], .label[href], .annotation > a[href], .reference > a[href]'));
   if (opts.test) return node;
-  for (const _ of figure(node, opts.footnotes, context));
-  for (const _ of footnote(node, opts.footnotes, context));
+  for (const _ of figure(node, opts.notes, context));
+  for (const _ of note(node, opts.notes, context));
   assert(opts.id !== '' || !node.querySelector('[id], .index[href], .label[href], .annotation > a[href], .reference > a[href]'));
-  assert(opts.id !== '' || !opts.footnotes?.references.querySelector('[id], .index[href], .label[href]'));
+  assert(opts.id !== '' || !opts.notes?.references.querySelector('[id], .index[href], .label[href]'));
   return node;
 }

package/src/parser/block/blockquote.ts

@@ -41,7 +41,7 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
         const references = html('ol', { class: 'references' });
         const document = parse(source, {
           id: '',
-          footnotes: {
+          notes: {
             references,
           },
         }, context);

package/src/parser/block/extension/aside.ts

@@ -21,7 +21,7 @@ export const aside: ExtensionParser.AsideParser = block(validate('~~~', fmap(
     const references = html('ol', { class: 'references' });
     const document = parse(body.slice(0, -1), {
       id: '',
-      footnotes: {
+      notes: {
         references,
       },
     }, context);

package/src/parser/block/extension/example.ts

@@ -26,7 +26,7 @@ export const example: ExtensionParser.ExampleParser = block(validate('~~~', fmap
         const references = html('ol', { class: 'references' });
         const document = parse(body.slice(0, -1), {
           id: '',
-          footnotes: {
+          notes: {
             references,
           },
         }, context);

package/src/parser/processor/figure.ts

@@ -6,12 +6,12 @@ import { querySelectorAll } from 'typed-dom/query';
 
 export function* figure(
   target: ParentNode & Node,
-  footnotes?: { readonly references: HTMLOListElement; },
+  notes?: { readonly references: HTMLOListElement; },
   opts: { readonly id?: string; } = {},
 ): Generator<HTMLAnchorElement | undefined, undefined, undefined> {
   const refs = new MultiQueue<string, HTMLAnchorElement>(push(
     querySelectorAll(target, 'a.label:not(.disabled)[data-label]'),
-    footnotes && querySelectorAll(footnotes.references, 'a.label:not(.disabled)') || [])
+    notes && querySelectorAll(notes.references, 'a.label:not(.disabled)') || [])
     .map(el => [el.getAttribute('data-label')!, el]));
   const labels = new Set<string>();
   const numbers = new Map<string, string>();

package/src/parser/processor/{footnote.test.ts → note.test.ts}

@@ -1,44 +1,44 @@
-import { footnote, annotation, reference } from './footnote';
+import { note, annotation, reference } from './note';
 import { parse as parse_ } from '../../parser';
 import { html } from 'typed-dom/dom';
 
 const parse = (s: string) => parse_(s, { test: true });
 
-describe('Unit: parser/processor/footnote', () => {
+describe('Unit: parser/processor/note', () => {
   describe('annotation', () => {
     it('empty', () => {
       const target = parse('');
-      const footnote = html('ol');
-      [...annotation(target, footnote)];
+      const note = html('ol');
+      [...annotation(target, note)];
       assert.deepStrictEqual(
         [...target.children].map(el => el.outerHTML),
         []);
       assert.deepStrictEqual(
-        footnote.outerHTML,
+        note.outerHTML,
         html('ol').outerHTML);
     });
 
     it('1', () => {
       const target = parse('((a b))');
-      const footnote = html('ol');
+      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, footnote)].length, i === 0 ? 2 : 1);
+        assert.deepStrictEqual([...annotation(target, note)].length, i === 0 ? 2 : 1);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             html('p', [
-              html('sup', { class: "annotation", id: "annotation::ref:1", title: "a b" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:1', title: 'a b' }, [
                 html('span', { hidden: '' }, 'a b'),
-                html('a', { href: "#annotation::def:a_b" }, '*1')
+                html('a', { href: '#annotation::def:a_b' }, '*1')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
-          footnote.outerHTML,
+          note.outerHTML,
           html('ol', [
             html('li', { id: 'annotation::def:a_b' }, [
               html('span', 'a b'),
-              html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')])
+              html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')]),
             ]),
           ]).outerHTML);
       }
@@ -46,33 +46,33 @@ describe('Unit: parser/processor/footnote', () => {
 
     it('2', () => {
       const target = parse('((1))((12345678901234567890))');
-      const footnote = html('ol');
+      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, footnote)].length, i === 0 ? 4 : 2);
+        assert.deepStrictEqual([...annotation(target, note)].length, i === 0 ? 4 : 2);
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             html('p', [
-              html('sup', { class: "annotation", id: "annotation::ref:1", title: "1" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:1', title: '1' }, [
                 html('span', { hidden: '' }, '1'),
-                html('a', { href: "#annotation::def:1" }, '*1')
+                html('a', { href: '#annotation::def:1' }, '*1')
               ]),
-              html('sup', { class: "annotation", id: "annotation::ref:2", title: "12345678901234567890" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:2', title: '12345678901234567890' }, [
                 html('span', { hidden: '' }, '12345678901234567890'),
-                html('a', { href: "#annotation::def:12345678901234567890" }, '*2')
+                html('a', { href: '#annotation::def:12345678901234567890' }, '*2')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
-          footnote.outerHTML,
+          note.outerHTML,
           html('ol', [
             html('li', { id: 'annotation::def:1' }, [
               html('span', '1'),
-              html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')])
+              html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')]),
             ]),
             html('li', { id: 'annotation::def:12345678901234567890' }, [
               html('span', '12345678901234567890'),
-              html('sup', [html('a', { href: '#annotation::ref:2' }, '^2')])
+              html('sup', [html('a', { href: '#annotation::ref:2' }, '^2')]),
             ]),
           ]).outerHTML);
       }
@@ -80,41 +80,41 @@ describe('Unit: parser/processor/footnote', () => {
 
     it('unify', () => {
       const target = parse('((1))((2))((3))((2))((4))');
-      const footnote = html('ol');
+      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        [...annotation(target, footnote)];
+        [...annotation(target, note)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             html('p', [
-              html('sup', { class: "annotation", id: "annotation::ref:1", title: "1" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:1', title: '1' }, [
                 html('span', { hidden: '' }, '1'),
-                html('a', { href: "#annotation::def:1" }, '*1')
+                html('a', { href: '#annotation::def:1' }, '*1')
               ]),
-              html('sup', { class: "annotation", id: "annotation::ref:2", title: "2" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:2', title: '2' }, [
                 html('span', { hidden: '' }, '2'),
-                html('a', { href: "#annotation::def:2" }, '*2')
+                html('a', { href: '#annotation::def:2' }, '*2')
               ]),
-              html('sup', { class: "annotation", id: "annotation::ref:3", title: "3" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:3', title: '3' }, [
                 html('span', { hidden: '' }, '3'),
-                html('a', { href: "#annotation::def:3" }, '*3')
+                html('a', { href: '#annotation::def:3' }, '*3')
               ]),
-              html('sup', { class: "annotation", id: "annotation::ref:4", title: "2" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:4', title: '2' }, [
                 html('span', { hidden: '' }, '2'),
-                html('a', { href: "#annotation::def:2" }, '*2')
+                html('a', { href: '#annotation::def:2' }, '*2')
               ]),
-              html('sup', { class: "annotation", id: "annotation::ref:5", title: "4" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:5', title: '4' }, [
                 html('span', { hidden: '' }, '4'),
-                html('a', { href: "#annotation::def:4" }, '*4')
+                html('a', { href: '#annotation::def:4' }, '*4')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
-          footnote.outerHTML,
+          note.outerHTML,
           html('ol', [
             html('li', { id: 'annotation::def:1' }, [
               html('span', '1'),
-              html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')])
+              html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')]),
             ]),
             html('li', { id: 'annotation::def:2' }, [
               html('span', '2'),
@@ -125,17 +125,17 @@ describe('Unit: parser/processor/footnote', () => {
             ]),
             html('li', { id: 'annotation::def:3' }, [
               html('span', '3'),
-              html('sup', [html('a', { href: '#annotation::ref:3' }, '^3')])
+              html('sup', [html('a', { href: '#annotation::ref:3' }, '^3')]),
             ]),
             html('li', { id: 'annotation::def:4' }, [
               html('span', '4'),
-              html('sup', [html('a', { href: '#annotation::ref:5' }, '^5')])
+              html('sup', [html('a', { href: '#annotation::ref:5' }, '^5')]),
             ]),
           ]).outerHTML);
       }
-      [...annotation(parse(''), footnote)];
+      [...annotation(parse(''), note)];
       assert.deepStrictEqual(
-        footnote.outerHTML,
+        note.outerHTML,
         html('ol').outerHTML);
     });
 
@@ -145,9 +145,9 @@ describe('Unit: parser/processor/footnote', () => {
         '~~~~example/markdown\n((3))\n~~~~',
         '((4))',
       ].join('\n\n')).children);
-      const footnote = html('ol');
+      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        [...annotation(target, footnote)];
+        [...annotation(target, note)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
@@ -156,92 +156,92 @@ describe('Unit: parser/processor/footnote', () => {
             '<p><sup class="annotation" id="annotation::ref:1" title="4"><span hidden="">4</span><a href="#annotation::def:4">*1</a></sup></p>',
           ]);
         assert.deepStrictEqual(
-          footnote.outerHTML,
+          note.outerHTML,
           '<ol><li id="annotation::def:4"><span>4</span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>');
       }
     });
 
-    it('id', () => {
-      const target = parse('((a b))');
-      const footnote = html('ol');
-      for (let i = 0; i < 3; ++i) {
-        assert.deepStrictEqual([...annotation(target, footnote, { id: '0' })].length, i === 0 ? 2 : 1);
-        assert.deepStrictEqual(
-          [...target.children].map(el => el.outerHTML),
-          [
-            html('p', [
-              html('sup', { class: "annotation", id: "annotation:0:ref:1", title: "a b" }, [
-                html('span', { hidden: '' }, 'a b'),
-                html('a', { href: "#annotation:0:def:a_b" }, '*1')
-              ]),
-            ]).outerHTML,
-          ]);
-        assert.deepStrictEqual(
-          footnote.outerHTML,
-          html('ol', [
-            html('li', { id: 'annotation:0:def:a_b' }, [
-              html('span', 'a b'),
-              html('sup', [html('a', { href: '#annotation:0:ref:1' }, '^1')])
-            ]),
-          ]).outerHTML);
-      }
-    });
-
     it('split', () => {
       const target = parse('((1))\n\n## a\n\n## b\n\n((2))((3))\n\n## c\n\n((4))');
       for (let i = 0; i < 3; ++i) {
-        [...footnote(target)];
+        [...note(target)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             html('p', [
-              html('sup', { class: "annotation", id: "annotation::ref:1", title: "1" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:1', title: '1' }, [
                 html('span', { hidden: '' }, '1'),
-                html('a', { href: "#annotation::def:1" }, '*1')
+                html('a', { href: '#annotation::def:1' }, '*1')
               ]),
             ]).outerHTML,
             html('ol', { class: 'annotations' }, [
               html('li', { id: 'annotation::def:1', 'data-marker': '*1' }, [
                 html('span', '1'),
-                html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')])
+                html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')]),
               ]),
             ]).outerHTML,
             html('h2', { id: 'index::a' }, 'a').outerHTML,
             html('h2', { id: 'index::b' }, 'b').outerHTML,
             html('p', [
-              html('sup', { class: "annotation", id: "annotation::ref:2", title: "2" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:2', title: '2' }, [
                 html('span', { hidden: '' }, '2'),
-                html('a', { href: "#annotation::def:2" }, '*2')
+                html('a', { href: '#annotation::def:2' }, '*2')
               ]),
-              html('sup', { class: "annotation", id: "annotation::ref:3", title: "3" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:3', title: '3' }, [
                 html('span', { hidden: '' }, '3'),
-                html('a', { href: "#annotation::def:3" }, '*3')
+                html('a', { href: '#annotation::def:3' }, '*3')
               ]),
             ]).outerHTML,
             html('ol', { class: 'annotations' }, [
               html('li', { id: 'annotation::def:2', 'data-marker': '*2' }, [
                 html('span', '2'),
-                html('sup', [html('a', { href: '#annotation::ref:2' }, '^2')])
+                html('sup', [html('a', { href: '#annotation::ref:2' }, '^2')]),
               ]),
               html('li', { id: 'annotation::def:3', 'data-marker': '*3' }, [
                 html('span', '3'),
-                html('sup', [html('a', { href: '#annotation::ref:3' }, '^3')])
+                html('sup', [html('a', { href: '#annotation::ref:3' }, '^3')]),
               ]),
             ]).outerHTML,
             html('h2', { id: 'index::c' }, 'c').outerHTML,
             html('p', [
-              html('sup', { class: "annotation", id: "annotation::ref:4", title: "4" }, [
+              html('sup', { class: 'annotation', id: 'annotation::ref:4', title: '4' }, [
                 html('span', { hidden: '' }, '4'),
-                html('a', { href: "#annotation::def:4" }, '*4')
+                html('a', { href: '#annotation::def:4' }, '*4')
               ]),
             ]).outerHTML,
             html('ol', { class: 'annotations' }, [
               html('li', { id: 'annotation::def:4', 'data-marker': '*4' }, [
                 html('span', '4'),
-                html('sup', [html('a', { href: '#annotation::ref:4' }, '^4')])
+                html('sup', [html('a', { href: '#annotation::ref:4' }, '^4')]),
+              ]),
+            ]).outerHTML,
+          ]);
+      }
+    });
+
+    it('id', () => {
+      const target = parse('((a b))');
+      const note = html('ol');
+      for (let i = 0; i < 3; ++i) {
+        assert.deepStrictEqual([...annotation(target, note, { id: '0' })].length, i === 0 ? 2 : 1);
+        assert.deepStrictEqual(
+          [...target.children].map(el => el.outerHTML),
+          [
+            html('p', [
+              html('sup', { class: 'annotation', id: 'annotation:0:ref:1', title: 'a b' }, [
+                html('span', { hidden: '' }, 'a b'),
+                html('a', { href: '#annotation:0:def:a_b' }, '*1')
               ]),
             ]).outerHTML,
           ]);
+        assert.deepStrictEqual(
+          note.outerHTML,
+          html('ol', [
+            html('li', { id: 'annotation:0:def:a_b' }, [
+              html('span', 'a b'),
+              html('sup', [html('a', { href: '#annotation:0:ref:1' }, '^1')]),
+            ]),
+          ]).outerHTML);
       }
     });
 
@@ -250,55 +250,55 @@ describe('Unit: parser/processor/footnote', () => {
   describe('reference', () => {
     it('1', () => {
       const target = parse('[[a b]]');
-      const footnote = html('ol');
+      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        [...reference(target, footnote)];
+        [...reference(target, note)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             html('p', [
-              html('sup', { class: "reference", id: "reference::ref:1", title: "a b" }, [
+              html('sup', { class: 'reference', id: 'reference::ref:1', title: 'a b' }, [
                 html('span', { hidden: '' }, 'a b'),
-                html('a', { href: "#reference::def:a_b" }, '[1]')
+                html('a', { href: '#reference::def:a_b' }, '[1]')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
-          footnote.outerHTML,
+          note.outerHTML,
           html('ol', [
             html('li', { id: 'reference::def:a_b' }, [
               html('span', 'a b'),
-              html('sup', [html('a', { href: '#reference::ref:1' }, '^1')])
+              html('sup', [html('a', { href: '#reference::ref:1' }, '^1')]),
             ]),
           ]).outerHTML);
       }
     });
 
     it('abbr', () => {
-      const target = parse('[[^a| b]][[^a]][[^a]]');
-      const footnote = html('ol');
+      const target = parse('[[^a|b]][[^a]][[^a]]');
+      const note = html('ol');
       for (let i = 0; i < 3; ++i) {
-        [...reference(target, footnote)];
+        [...reference(target, note)];
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
             html('p', [
-              html('sup', { class: "reference", 'data-abbr': "a", id: "reference::ref:1", title: "b" }, [
+              html('sup', { class: 'reference', 'data-abbr': 'a', id: 'reference::ref:1', title: 'b' }, [
                 html('span', { hidden: '' }, 'b'),
-                html('a', { href: "#reference::def:a" }, '[a]')
+                html('a', { href: '#reference::def:a' }, '[a]')
               ]),
-              html('sup', { class: "reference", 'data-abbr': "a", id: "reference::ref:2", title: "b" }, [
+              html('sup', { class: 'reference', 'data-abbr': 'a', id: 'reference::ref:2', title: 'b' }, [
                 html('span', { hidden: '' }),
-                html('a', { href: "#reference::def:a" }, '[a]')
+                html('a', { href: '#reference::def:a' }, '[a]')
               ]),
-              html('sup', { class: "reference", 'data-abbr': "a", id: "reference::ref:3", title: "b" }, [
+              html('sup', { class: 'reference', 'data-abbr': 'a', id: 'reference::ref:3', title: 'b' }, [
                 html('span', { hidden: '' }),
-                html('a', { href: "#reference::def:a" }, '[a]')
+                html('a', { href: '#reference::def:a' }, '[a]')
               ]),
             ]).outerHTML,
           ]);
         assert.deepStrictEqual(
-          footnote.outerHTML,
+          note.outerHTML,
           html('ol', [
             html('li', { id: 'reference::def:a' }, [
               html('span', 'b'),
@@ -312,6 +312,58 @@ describe('Unit: parser/processor/footnote', () => {
       }
     });
 
+    it('nest', () => {
+      const target = parse('((a[[^b]]))[[^b|c]]');
+      const note = html('ol');
+      for (let i = 0; i < 3; ++i) {
+        [...annotation(target)];
+        [...reference(target, note)];
+        assert.deepStrictEqual(
+          [...target.children].map(el => el.outerHTML),
+          [
+            html('p', [
+              html('sup', { class: 'annotation', id: 'annotation::ref:1', title: 'a' }, [
+                html('span', { hidden: '' }, [
+                  'a',
+                  html('sup', { class: 'reference', 'data-abbr': 'b' }, [
+                    html('span'),
+                  ]),
+                ]),
+                html('a', { href: '#annotation::def:a' }, '*1')
+              ]),
+              html('sup', { class: 'reference', 'data-abbr': 'b', id: 'reference::ref:1', title: 'c' }, [
+                html('span', { hidden: '' }, 'c'),
+                html('a', { href: '#reference::def:b' }, '[b]')
+              ]),
+            ]).outerHTML,
+            html('ol', { class: 'annotations' }, [
+              html('li', { id: 'annotation::def:a', 'data-marker': '*1' }, [
+                html('span', [
+                  'a',
+                  html('sup', { class: 'reference', 'data-abbr': 'b', id: 'reference::ref:2', title: 'c' }, [
+                    html('span', { hidden: '' }),
+                    html('a', { href: '#reference::def:b' }, '[b]')
+                  ]),
+                ]),
+                html('sup', [html('a', { href: '#annotation::ref:1' }, '^1')])
+              ]),
+            ]).outerHTML,
+          ]);
+        assert.deepStrictEqual(
+          note.outerHTML,
+          html('ol', [
+            html('li', { id: 'reference::def:b' }, [
+              html('span', 'c'),
+              html('sup', [
+                html('a', { href: '#reference::ref:1', title: 'c' }, '^1'),
+                html('a', { href: '#reference::ref:2' }, '^2'),
+              ]),
+            ]),
+          ]).outerHTML);
+        target.lastChild?.remove();
+      }
+    });
+
   });
 
 });

package/src/parser/processor/{footnote.ts → note.ts}

@@ -1,9 +1,9 @@
 import { identity, text } from '../inline/extension/indexee';
 import { frag, html, define } from 'typed-dom/dom';
 
-export function* footnote(
+export function* note(
   target: ParentNode & Node,
-  footnotes?: { 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> {
@@ -12,8 +12,8 @@ export function* footnote(
     const el = es[i];
     el.parentNode === target && el.remove();
   }
-  yield* annotation(target, footnotes?.annotations, opts, bottom);
-  yield* reference(target, footnotes?.references, opts, bottom);
+  yield* annotation(target, notes?.annotations, opts, bottom);
+  yield* reference(target, notes?.references, opts, bottom);
   return;
 }
 
@@ -30,7 +30,7 @@ function build(
   // 構文ごとに各1回の処理では不可能
   return function* (
     target: ParentNode & Node,
-    footnote?: HTMLOListElement,
+    note?: HTMLOListElement,
     opts: { readonly id?: string } = {},
     bottom: Node | null = null,
   ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
@@ -104,7 +104,7 @@ function build(
         || defs.set(identifier, html('li',
             {
               id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}` : undefined,
-              'data-marker': !footnote ? marker(total + defs.size + 1, abbr) : undefined,
+              'data-marker': !note ? marker(total + defs.size + 1, abbr) : undefined,
             },
             [define(ref.firstElementChild!.cloneNode(true), { hidden: null }), html('sup')]))
             .get(identifier)!;
@@ -134,14 +134,14 @@ function build(
           },
           `^${refIndex}`));
     }
-    if (defs.size > 0 || footnote) {
-      yield* proc(defs, footnote ?? target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[0] ?? bottom));
+    if (defs.size > 0 || note) {
+      yield* proc(defs, note ?? target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[0] ?? bottom));
     }
     return;
   }
 
-  function* proc(defs: Map<string, HTMLLIElement>, footnote: HTMLOListElement): Generator<HTMLLIElement | undefined, undefined, undefined> {
-    const { children } = footnote;
+  function* proc(defs: Map<string, HTMLLIElement>, note: HTMLOListElement): Generator<HTMLLIElement | undefined, undefined, undefined> {
+    const { children } = note;
     const size = defs.size;
     let count = 0;
     let length = children.length;
@@ -152,7 +152,7 @@ function build(
       while (length > size) {
         const node = children[count - 1] as HTMLLIElement;
         if (equal(node, def)) continue I;
-        yield footnote.removeChild(node);
+        yield note.removeChild(node);
         --length;
         assert(children.length === length);
       }
@@ -160,13 +160,13 @@ function build(
         ? children[count - 1]
         : null;
       if (node && equal(node, def)) continue;
-      assert(def.parentNode !== footnote);
-      yield footnote.insertBefore(def, node);
+      assert(def.parentNode !== note);
+      yield note.insertBefore(def, node);
       ++length;
       assert(children.length === length);
     }
     while (length > size) {
-      yield footnote.removeChild(children[size] as HTMLLIElement);
+      yield note.removeChild(children[size] as HTMLLIElement);
       --length;
       assert(children.length === length);
     }