securemark 0.252.0 → 0.253.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.253.0
+
+- Change annotation processing.
+
 ## 0.252.0
 
 - Remove indentblock syntax.

package/design.md

@@ -29,15 +29,6 @@
 
 ゆえに構文はレンダリング後の操作により表示する内容および状態を変化させる構文を備えない。
 
-### アクセント設定
-
-ドキュメントは漫然と読まれないよう緩急をつけられなければならない。
-よって構文は他の構文に続けて漫然と読み流せない異質な視覚表現を持ちアクセントとなる構文を備えなければならない。
-なおこのためアクセント構文は他の構文と完全に統一されたデザインであってはならず若干異質なデザインでなければならない。
-
-ゆえに構文は着色およびデザインにより視覚的刺激を与えるMessage構文を備える。
-またAside構文は関心の変化により認知的刺激を与える。
-
 ### モノクロプリント対応
 
 構文はモノクロ表示および印刷に対応していなければならない。
@@ -135,11 +126,17 @@
 
 ゆえに引用構文は引用文をパースしない。
 
+### 改行不変性
+
+改行は表示文字列とこれを入力とする再出力で不変でなければならない。
+
+ゆえに改行は入力と出力で一貫することを標準とする。
+
 ### オートリンク不変性
 
-オートリンクは原則としてコピー＆ペーストによる引用等を経た際にその解釈が変わってはならない。
+オートリンクは表示文字列とこれを入力とする再出力において解釈が不変でなければならない。
 
-ゆえにハッシュタグ構文は構文が表示文字列と一致する構文であるオートリンク構文としてのみ構文化され、表示文字列からの構文の範囲の特定が不可能となる通常の構文を持たない。
+ゆえにハッシュタグ構文は構文が表示文字列と一致する構文であるオートリンク構文(`#tag`)としてのみ構文化され、表示文字列から構文の範囲が特定不可能となる通常構文の形態(`#{tag}`)を持たない。
 
 ### 自動附番
 
@@ -148,6 +145,15 @@
 ゆえに参照箇所に実体を記述する注釈構文および識別に文字列を使用する図表構文を採用し、その表示方法は任意とする。
 脚注構文は附番が手作業となり参照と実体の対応の管理が困難であるため不採用とし注釈構文により生成可能とする。
 
+### アクセント設定
+
+ドキュメントは漫然と読まれないよう緩急をつけられなければならない。
+よって構文は他の構文に続けて漫然と読み流せない異質な視覚表現を持ちアクセントとなる構文を備えなければならない。
+なおこのためアクセント構文は他の構文と完全に統一されたデザインであってはならず若干異質なデザインでなければならない。
+
+ゆえに構文は着色およびデザインにより視覚的刺激を与えるMessage構文を備える。
+またAside構文は関心の変化により認知的刺激を与える。
+
 ### 羅列的知識への非依存
 
 構文はその使用のために羅列的知識を求めてはならない。

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.252.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.253.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("DOMPurify"), require("Prism"));
@@ -3703,20 +3703,16 @@ const unindent = source => source.replace(/(^|\n)>(?:[^\S\n]|(?=>*(?:$|\s)))|\n$
 
 const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, source)), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (0, combinator_1.fmap)((0, combinator_1.some)(autolink_1.autolink), ns => [(0, dom_1.html)('pre', (0, dom_1.defrag)(ns))])))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
 const markdown = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, markdown)), (0, combinator_1.creator)(99, (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (source, context) => {
-  const annotations = (0, dom_1.html)('ol', {
-    class: 'annotations'
-  });
   const references = (0, dom_1.html)('ol', {
     class: 'references'
   });
   const document = (0, parse_1.parse)(source, {
     id: '',
     footnotes: {
-      annotations,
       references
     }
   }, context);
-  return [[(0, dom_1.html)('section', [document, annotations, references])], ''];
+  return [[(0, dom_1.html)('section', [document, references])], ''];
 })))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
 
 /***/ }),
@@ -3901,16 +3897,12 @@ exports.aside = (0, combinator_1.creator)(100, (0, combinator_1.block)((0, combi
     'data-invalid-type': !closer || overflow ? 'fence' : 'argument',
     'data-invalid-message': !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : 'Invalid argument'
   }, `${opener}${body}${overflow || closer}`)];
-  const annotations = (0, dom_1.html)('ol', {
-    class: 'annotations'
-  });
   const references = (0, dom_1.html)('ol', {
     class: 'references'
   });
   const document = (0, parse_1.parse)(body.slice(0, -1), {
     id: '',
     footnotes: {
-      annotations,
       references
     }
   }, context);
@@ -3927,7 +3919,7 @@ exports.aside = (0, combinator_1.creator)(100, (0, combinator_1.block)((0, combi
   return [(0, dom_1.html)('aside', {
     id: (0, indexee_1.identity)((0, indexee_1.text)(heading)),
     class: 'aside'
-  }, [document, annotations, references])];
+  }, [document, references])];
 }))));
 
 /***/ }),
@@ -3967,16 +3959,12 @@ exports.example = (0, combinator_1.creator)(100, (0, combinator_1.block)((0, com
   switch (type) {
     case 'markdown':
       {
-        const annotations = (0, dom_1.html)('ol', {
-          class: 'annotations'
-        });
         const references = (0, dom_1.html)('ol', {
           class: 'references'
         });
         const document = (0, parse_1.parse)(body.slice(0, -1), {
           id: '',
           footnotes: {
-            annotations,
             references
           }
         }, context);
@@ -3985,7 +3973,7 @@ exports.example = (0, combinator_1.creator)(100, (0, combinator_1.block)((0, com
           'data-type': 'markdown'
         }, [(0, dom_1.html)('pre', {
           translate: 'no'
-        }, body.slice(0, -1)), (0, dom_1.html)('hr'), (0, dom_1.html)('section', [document, annotations, references])])];
+        }, body.slice(0, -1)), (0, dom_1.html)('hr'), (0, dom_1.html)('section', [document, references])])];
       }
 
     case 'math':
@@ -4717,8 +4705,6 @@ const olist_1 = __webpack_require__(7471);
 
 const inline_1 = __webpack_require__(1160);
 
-const source_1 = __webpack_require__(6743);
-
 const dom_1 = __webpack_require__(3252);
 
 exports.ilist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^[-+*](?=[^\S\n]|\n[^\S\n]*\S)/, (0, combinator_1.context)({
@@ -4728,7 +4714,7 @@ exports.ilist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combina
     }
   }
 }, exports.ilist_))));
-exports.ilist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^[-+*](?:$|\s)/, (0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^[-+*](?:$|\s)/, (0, combinator_1.trim)((0, combinator_1.some)(inline_1.inline)), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, olist_1.olist_, exports.ilist_]))]), (0, combinator_1.rewrite)(source_1.contentline, source => [[(0, dom_1.html)('span', source.replace('\n', ''))], ''])), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)((0, ulist_1.fillFirstLine)(ns)))])])))), es => [(0, dom_1.html)('ul', {
+exports.ilist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^[-+*](?:$|\s)/, (0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^[-+*](?:$|\s)/, (0, combinator_1.some)(inline_1.inline), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, olist_1.olist_, exports.ilist_]))]), olist_1.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)((0, ulist_1.fillFirstLine)(ns)))])])))), es => [(0, dom_1.html)('ul', {
   class: 'invalid',
   'data-invalid-syntax': 'list',
   'data-invalid-type': 'syntax',
@@ -4784,7 +4770,7 @@ exports.mathblock = (0, combinator_1.block)((0, combinator_1.validate)('$$', (0,
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.olist_ = exports.olist = void 0;
+exports.invalid = exports.olist_ = exports.olist = void 0;
 
 const global_1 = __webpack_require__(4128);
 
@@ -4806,11 +4792,13 @@ const memoize_1 = __webpack_require__(1808);
 
 const array_1 = __webpack_require__(8112);
 
+const tuple_1 = __webpack_require__(5341);
+
 const openers = {
-  '.': /^([0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*(?![^\S\n])\.?(?=$|\s)/,
-  '(': /^\(([0-9]*|[a-z]*)(?![^)\n])\)?(?:-(?!-)[0-9]*)*(?=$|\s)/
+  '.': /^([0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*(?![^\S\n])\.?(?:$|\s)/,
+  '(': /^\(([0-9]*|[a-z]*)(?![^)\n])\)?(?:-(?!-)[0-9]*)*(?:$|\s)/
 };
-exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)([/^([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\.(?=[^\S\n]|\n[^\S\n]*\S)/, /^\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S)/], (0, combinator_1.context)({
+exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(new RegExp([/^([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\.(?=[^\S\n]|\n[^\S\n]*\S)/.source, /^\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S)/.source].join('|')), (0, combinator_1.context)({
   syntax: {
     inline: {
       media: false
@@ -4819,15 +4807,15 @@ exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combina
 }, exports.olist_))));
 exports.olist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.union)([(0, combinator_1.match)(openers['.'], (0, memoize_1.memoize)(ms => list(type(ms[1]), '.'), ms => type(ms[1]).charCodeAt(0) || 0, [])), (0, combinator_1.match)(openers['('], (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => type(ms[1]).charCodeAt(0) || 0, []))])));
 
-const list = (type, form) => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(heads[form], (0, combinator_1.trim)((0, combinator_1.subsequence)([ulist_1.checkbox, (0, util_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))])), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, exports.olist_, ilist_1.ilist_]))]), invalid), ns => [(0, dom_1.html)('li', {
-  'data-marker': ns[0]
+const list = (type, form) => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(heads[form], (0, combinator_1.subsequence)([ulist_1.checkbox, (0, util_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, exports.olist_, ilist_1.ilist_]))]), exports.invalid), ns => [(0, dom_1.html)('li', {
+  'data-marker': ns[0] || global_1.undefined
 }, (0, dom_1.defrag)((0, ulist_1.fillFirstLine)((0, array_1.shift)(ns)[1])))]), true)]))), es => [format((0, dom_1.html)('ol', es), type, form)]);
 
 const heads = {
-  '.': (0, combinator_1.focus)(openers['.'], source => [[`${source.split('.', 1)[0]}.`], '']),
-  '(': (0, combinator_1.focus)(openers['('], source => [[source.replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')], ''])
+  '.': (0, combinator_1.focus)(openers['.'], source => [[source.trimEnd().split('.', 1)[0] + '.'], '']),
+  '(': (0, combinator_1.focus)(openers['('], source => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')], ''])
 };
-const invalid = (0, combinator_1.rewrite)(source_1.contentline, source => [['', (0, dom_1.html)('span', {
+exports.invalid = (0, combinator_1.rewrite)((0, combinator_1.inits)([source_1.contentline, (0, combinator_1.indent)(s => [(0, tuple_1.tuple)(s), ''])]), source => [['', (0, dom_1.html)('span', {
   class: 'invalid',
   'data-invalid-syntax': 'listitem',
   'data-invalid-type': 'syntax',
@@ -5199,8 +5187,6 @@ const ilist_1 = __webpack_require__(238);
 
 const inline_1 = __webpack_require__(1160);
 
-const source_1 = __webpack_require__(6743);
-
 const util_1 = __webpack_require__(9437);
 
 const dom_1 = __webpack_require__(3252);
@@ -5214,16 +5200,10 @@ exports.ulist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combina
     }
   }
 }, exports.ulist_))));
-exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^-(?:$|\s)/, (0, combinator_1.trim)((0, combinator_1.subsequence)([exports.checkbox, (0, util_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))])), true)), (0, combinator_1.indent)((0, combinator_1.union)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]), true)])))), es => [format((0, dom_1.html)('ul', es))])));
+exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^-(?:$|\s)/, (0, combinator_1.subsequence)([exports.checkbox, (0, util_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), olist_1.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]), true)])))), es => [format((0, dom_1.html)('ul', es))])));
 exports.checkbox = (0, combinator_1.focus)(/^\[[xX ]\](?=$|\s)/, source => [[(0, dom_1.html)('span', {
   class: 'checkbox'
 }, source[1].trimStart() ? '☑' : '☐')], '']);
-const invalid = (0, combinator_1.rewrite)(source_1.contentline, source => [[(0, dom_1.html)('span', {
-  class: 'invalid',
-  'data-invalid-syntax': 'listitem',
-  'data-invalid-type': 'syntax',
-  'data-invalid-message': 'Fix the indent or the head of the list item'
-}, source.replace('\n', ''))], '']);
 
 function fillFirstLine(ns) {
   return ns.length === 1 && typeof ns[0] === 'object' && ['UL', 'OL'].includes(ns[0].tagName) ? (0, array_1.unshift)([(0, dom_1.html)('br')], ns) : ns;
@@ -5426,7 +5406,7 @@ exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0,
   delimiters: global_1.undefined
 }, (0, util_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', /^\\?\n/)))), '))'), ns => [(0, dom_1.html)('sup', {
   class: 'annotation'
-}, (0, dom_1.defrag)(ns))]))));
+}, [(0, dom_1.html)('span', (0, dom_1.defrag)(ns))])]))));
 
 /***/ }),
 
@@ -5464,8 +5444,8 @@ const util_1 = __webpack_require__(9437);
 exports.autolink = (0, combinator_1.fmap)((0, combinator_1.validate)(/^(?:[@#>0-9A-Za-z]|\S#)/, (0, combinator_1.guard)(context => context.syntax?.inline?.autolink ?? true, (0, combinator_1.some)((0, combinator_1.union)([url_1.url, email_1.email, // Escape unmatched email-like strings.
 (0, source_1.str)(/^[0-9A-Za-z]+(?:[.+_-][0-9A-Za-z]+)*(?:@(?:[0-9A-Za-z]+(?:[.-][0-9A-Za-z]+)*)?)+/), channel_1.channel, account_1.account, // Escape unmatched account-like strings.
 (0, source_1.str)(/^@+[0-9A-Za-z]*(?:-[0-9A-Za-z]+)*/), // Escape invalid leading characters.
-(0, source_1.str)(new RegExp(String.raw`^(?:[^\p{C}\p{S}\p{P}\s]|${hashtag_1.emoji}|['_])(?=#)`, 'u')), hashtag_1.hashtag, hashnum_1.hashnum, // Escape unmatched hashtag-like strings.
-(0, source_1.str)(new RegExp(String.raw`^#+(?:[^\p{C}\p{S}\p{P}\s]|${hashtag_1.emoji}|['_])*`, 'u')), anchor_1.anchor])))), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)]);
+(0, source_1.str)(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])(?=#)/u.source.replace('emoji', hashtag_1.emoji), 'u')), hashtag_1.hashtag, hashnum_1.hashnum, // Escape unmatched hashtag-like strings.
+(0, source_1.str)(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])*/u.source.replace('emoji', hashtag_1.emoji), 'u')), anchor_1.anchor])))), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)]);
 
 /***/ }),
 
@@ -5619,7 +5599,7 @@ const source_1 = __webpack_require__(6743);
 
 const dom_1 = __webpack_require__(3252);
 
-exports.hashnum = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.open)('#', (0, source_1.str)(new RegExp(String.raw`^[0-9]{1,16}(?![^\p{C}\p{S}\p{P}\s]|${hashtag_1.emoji}|['_])`, 'u'))), (0, combinator_1.context)({
+exports.hashnum = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.open)('#', (0, source_1.str)(new RegExp(/^[0-9]{1,16}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, hashtag_1.emoji), 'u'))), (0, combinator_1.context)({
   syntax: {
     inline: {
       link: true,
@@ -5655,7 +5635,7 @@ const dom_1 = __webpack_require__(3252); // https://example/hashtags/a must be a
 
 
 exports.emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F`;
-exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.open)('#', (0, combinator_1.tails)([(0, combinator_1.verify)((0, source_1.str)(/^[0-9A-Za-z](?:(?:[0-9A-Za-z]|-(?=\w)){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-(?=\w)){0,61}[0-9A-Za-z])?)*\//), ([source]) => source.length <= 253 + 1), (0, combinator_1.verify)((0, source_1.str)(new RegExp(['^', String.raw`(?=[0-9]{0,127}_?(?:[^\d\p{C}\p{S}\p{P}\s]|${exports.emoji}))`, String.raw`(?:[^\p{C}\p{S}\p{P}\s]|${exports.emoji}|_(?=[^\p{C}\p{S}\p{P}\s]|${exports.emoji})){1,128}`, String.raw`(?!_?(?:[^\p{C}\p{S}\p{P}\s]|${exports.emoji})|')`].join(''), 'u')), ([source]) => source.length <= 128)])), (0, combinator_1.context)({
+exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.open)('#', (0, combinator_1.tails)([(0, combinator_1.verify)((0, source_1.str)(/^[0-9A-Za-z](?:(?:[0-9A-Za-z]|-(?=\w)){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-(?=\w)){0,61}[0-9A-Za-z])?)*\//), ([source]) => source.length <= 253 + 1), (0, combinator_1.verify)((0, source_1.str)(new RegExp([/^(?=[0-9]{0,127}_?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji))/u.source, /(?:[^\p{C}\p{S}\p{P}\s]|emoji|_(?=[^\p{C}\p{S}\p{P}\s]|emoji)){1,128}/u.source, /(?!_?(?:[^\p{C}\p{S}\p{P}\s]|emoji)|')/u.source].join('').replace(/emoji/g, exports.emoji), 'u')), ([source]) => source.length <= 128)])), (0, combinator_1.context)({
   syntax: {
     inline: {
       link: true,
@@ -6690,7 +6670,7 @@ exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, c
     }
   },
   delimiters: global_1.undefined
-}, (0, combinator_1.subsequence)([abbr, (0, combinator_1.open)((0, source_1.stropt)(/^(?=\^)/), (0, combinator_1.some)(inline_1.inline, ']', /^\\?\n/)), (0, util_1.trimBlank)((0, combinator_1.some)(inline_1.inline, ']', /^\\?\n/))]))), ']]'), ns => [(0, dom_1.html)('sup', attributes(ns), (0, dom_1.defrag)(ns))]))));
+}, (0, combinator_1.subsequence)([abbr, (0, combinator_1.open)((0, source_1.stropt)(/^(?=\^)/), (0, combinator_1.some)(inline_1.inline, ']', /^\\?\n/)), (0, util_1.trimBlank)((0, combinator_1.some)(inline_1.inline, ']', /^\\?\n/))]))), ']]'), ns => [(0, dom_1.html)('sup', attributes(ns), [(0, dom_1.html)('span', (0, dom_1.defrag)(ns))])]))));
 const abbr = (0, combinator_1.creator)((0, combinator_1.bind)((0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?![0-9]+\s?[|\]])[0-9A-Za-z]+(?:(?:-|(?=\W)(?!'\d)'?(?!\.\d)\.?(?!,\S),? ?)[0-9A-Za-z]+)*(?:-|'?\.?,? ?)?/)]), /^\|?(?=]])|^\|[^\S\n]*/), ([source], rest) => [[(0, dom_1.html)('abbr', source)], rest.replace(util_1.regBlankStart, '')]));
 
 function attributes(ns) {
@@ -7017,7 +6997,7 @@ const multimap_1 = __webpack_require__(940);
 const array_1 = __webpack_require__(8112);
 
 function* figure(target, footnotes, opts = {}) {
-  const refs = new multimap_1.MultiMap((0, array_1.push)((0, array_1.push)((0, array_1.push)([], target.querySelectorAll('a.label:not(.disabled)[data-label]')), footnotes?.annotations.querySelectorAll('a.label:not(.disabled)') ?? []), footnotes?.references.querySelectorAll('a.label:not(.disabled)') ?? []).map(el => [el.getAttribute('data-label'), el]));
+  const refs = new multimap_1.MultiMap((0, array_1.push)((0, array_1.push)((0, array_1.push)([], target.querySelectorAll('a.label:not(.disabled)[data-label]')), footnotes?.annotations?.querySelectorAll('a.label:not(.disabled)') ?? []), footnotes?.references.querySelectorAll('a.label:not(.disabled)') ?? []).map(el => [el.getAttribute('data-label'), el]));
   const labels = new global_1.Set();
   const numbers = new global_1.Map();
   let base = '0';
@@ -7209,37 +7189,54 @@ const dom_1 = __webpack_require__(3252);
 
 const multimap_1 = __webpack_require__(940);
 
-const memoize_1 = __webpack_require__(1808);
+const array_1 = __webpack_require__(8112);
 
 function* footnote(target, footnotes, opts = {}) {
-  yield* (0, exports.reference)(target, footnotes?.references, opts, footnotes?.annotations && [footnotes.annotations]);
-  yield* (0, exports.annotation)(target, footnotes?.annotations, opts, []);
+  yield* (0, exports.reference)(target, footnotes?.references, opts);
+  yield* (0, exports.annotation)(target, footnotes?.annotations, opts);
   return;
 }
 
 exports.footnote = footnote;
-exports.annotation = build('annotation', n => `*${n}`);
+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) {
+function build(syntax, marker, splitter) {
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
-  const identify = (0, memoize_1.memoize)(ref => `${+!ref.querySelector('.label')}:${ref.getAttribute('data-abbr') || '_' + ref.innerHTML}`, new global_1.WeakMap());
-  const contentify = (0, memoize_1.memoize)(ref => (0, dom_1.frag)(ref.cloneNode(true).childNodes), new global_1.WeakMap());
-  return function* (target, footnote, opts = {}, footnotes = []) {
+  return function* (target, footnote, opts = {}) {
+    //assert(syntax !== 'annotation' || !footnote);
     const defs = new global_1.Map();
     const buffer = new multimap_1.MultiMap();
-    const titles = new global_1.Map();
-    const check = footnotes.some(el => target.contains(el));
+    const titles = new global_1.Map(); // Bug: Firefox
+    //const splitters = push([], target.querySelectorAll(`:scope > :is(${splitter ?? '_'})`));
+
+    const splitters = (0, array_1.push)([], target.querySelectorAll(splitter ?? '_')).filter(el => el.parentNode === target); // Bug: Firefox
+    //target.querySelectorAll(`:scope > .${syntax}s`).forEach(el => el.remove());
+
+    target.querySelectorAll(`.${syntax}s`).forEach(el => el.parentNode === target && el.remove());
+    let offset = 0;
     let style;
 
     for (let refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`), i = 0, len = refs.length; i < len; ++i) {
       yield;
       const ref = refs[i];
-      if (check && footnotes.some(el => el.contains(ref))) continue;
-      const identifier = identify(ref);
+
+      while (+splitters[0]?.compareDocumentPosition(ref) & global_1.Node.DOCUMENT_POSITION_FOLLOWING) {
+        if (defs.size > 0) {
+          offset += defs.size;
+          yield* proc(defs, target.insertBefore((0, dom_1.html)('ol', {
+            class: `${syntax}s`
+          }), splitters[0] ?? null));
+        }
+
+        splitters.shift();
+      }
+
+      if (syntax === 'annotation' && ref.closest('#annotations, .annotations, #references, .references')) continue;
+      const identifier = `${+!ref.querySelector('.label')}:${ref.getAttribute('data-abbr') || '_' + ref.firstElementChild.innerHTML}`;
       const abbr = ref.getAttribute('data-abbr') || global_1.undefined;
-      const content = contentify(ref);
+      const content = (0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes);
       style ??= abbr ? 'abbr' : 'count';
 
       if (style === 'count' ? abbr : !abbr) {
@@ -7249,12 +7246,17 @@ function build(syntax, marker) {
           '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?.getAttribute('hidden') !== '') {
-        ref.replaceChildren((0, dom_1.html)('span', {
-          hidden: ''
-        }, ref.childNodes));
+      if (!ref.firstElementChild.hasAttribute('hidden')) {
+        ref.firstElementChild.setAttribute('hidden', '');
       } else {
         ref.lastChild?.remove();
       }
@@ -7265,7 +7267,8 @@ function build(syntax, marker) {
       const refIndex = i + 1;
       const refId = opts.id !== '' ? ref.id || `${syntax}:${opts.id ? `${opts.id}:` : ''}ref:${refIndex}` : global_1.undefined;
       const def = global_1.undefined || defs.get(identifier) || defs.set(identifier, (0, dom_1.html)('li', {
-        id: opts.id !== '' ? `${syntax}:${opts.id ? `${opts.id}:` : ''}def:${defs.size + 1}` : global_1.undefined
+        id: opts.id !== '' ? `${syntax}:${opts.id ? `${opts.id}:` : ''}def:${defs.size + offset + 1}` : global_1.undefined,
+        'data-marker': !footnote ? marker(defs.size + offset + 1, abbr) : global_1.undefined
       }, [content.cloneNode(true), (0, dom_1.html)('sup')])).get(identifier);
 
       if (title && !blank && def.childNodes.length === 1) {
@@ -7283,7 +7286,7 @@ function build(syntax, marker) {
         }
       }
 
-      const defIndex = +def.id.slice(def.id.lastIndexOf(':') + 1) || defs.size;
+      const defIndex = +def.id.slice(def.id.lastIndexOf(':') + 1) || defs.size + offset;
       const defId = def.id || global_1.undefined;
       (0, dom_1.define)(ref, {
         id: refId,
@@ -7306,7 +7309,16 @@ function build(syntax, marker) {
       }, `^${refIndex}`));
     }
 
-    if (!footnote) return;
+    if (defs.size > 0 || footnote) {
+      yield* proc(defs, footnote ?? target.insertBefore((0, dom_1.html)('ol', {
+        class: `${syntax}s`
+      }), splitters[0] ?? target.querySelector(':scope > :is(#annotations, #references)')));
+    }
+
+    return;
+  };
+
+  function* proc(defs, footnote) {
     const {
       children
     } = footnote;
@@ -7314,7 +7326,8 @@ function build(syntax, marker) {
     let count = 0;
     let length = children.length;
 
-    I: for (const def of defs.values()) {
+    I: for (const [key, def] of defs) {
+      defs.delete(key);
       ++count;
 
       while (length > size) {
@@ -7336,7 +7349,7 @@ function build(syntax, marker) {
     }
 
     return;
-  };
+  }
 }
 
 function equal(a, b) {
@@ -7768,7 +7781,7 @@ const memoize_1 = __webpack_require__(1808);
 
 const array_1 = __webpack_require__(8112);
 
-exports.regBlankStart = new RegExp(String.raw`^(?:\\?[^\S\n]|&(?:${normalize_1.invisibleHTMLEntityNames.join('|')});|<wbr>)+`);
+exports.regBlankStart = new RegExp(/^(?:\\?[^\S\n]|&IHN;|<wbr>)+/.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`));
 
 function blankWith(starting, delimiter) {
   if (delimiter === global_1.undefined) return blankWith('', starting);
@@ -7778,7 +7791,7 @@ function blankWith(starting, delimiter) {
 exports.blankWith = blankWith;
 
 function visualize(parser) {
-  const blankline = new RegExp(String.raw`^(?:\\$|\\?[^\S\n]|&(?:${normalize_1.invisibleHTMLEntityNames.join('|')});|<wbr>)+$`, 'gm');
+  const blankline = new RegExp(/^(?:\\$|\\?[^\S\n]|&IHN;|<wbr>)+$/.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`), 'gm');
   return (0, combinator_1.union)([(0, combinator_1.convert)(source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')), (0, combinator_1.verify)(parser, (ns, rest, context) => !rest && hasVisible(ns, context))), (0, combinator_1.some)((0, combinator_1.union)([source_1.linebreak, source_1.unescsource]))]);
 }
 
@@ -8477,13 +8490,13 @@ exports.info = void 0;
 
 const scope_1 = __webpack_require__(5202);
 
-const query_1 = __webpack_require__(6120);
+const array_1 = __webpack_require__(8112);
 
 function info(source) {
   const match = (0, scope_1.scope)(source, '.invalid');
   return {
-    url: find('a:not(.email):not(.account):not(.channel):not(.hashtag):not(.hashnum):not(.anchor)').filter(el => ['http:', 'https:'].includes(el.protocol)),
-    tel: find('a:not(.email):not(.account):not(.channel):not(.hashtag):not(.hashnum):not(.anchor)').filter(el => ['tel:'].includes(el.protocol)),
+    url: find('a:not(:is(.email, .account, .channel, .hashtag, .hashnum, .anchor))').filter(el => ['http:', 'https:'].includes(el.protocol)),
+    tel: find('a:not(:is(.email, .account, .channel, .hashtag, .hashnum, .anchor))').filter(el => ['tel:'].includes(el.protocol)),
     email: find('a.email'),
     account: find('a.account'),
     channel: find('a.channel'),
@@ -8495,7 +8508,7 @@ function info(source) {
   };
 
   function find(selector) {
-    return (0, query_1.querySelectorAll)(source, selector).filter(match);
+    return (0, array_1.push)([], source.querySelectorAll(selector)).filter(match);
   }
 }
 
@@ -8668,29 +8681,21 @@ const array_1 = __webpack_require__(8112); // Bug: Firefox
 //const selector = 'h1 h2 h3 h4 h5 h6 aside.aside'.split(' ').map(s => `:scope > ${s}[id]`).join();
 
 
-const selector = 'h1 h2 h3 h4 h5 h6 aside.aside'.split(' ').map(s => `${s}[id]`).join();
+const selector = ':is(h1, h2, h3, h4, h5, h6, aside.aside)[id]';
 
 function toc(source) {
-  const es = source.querySelectorAll(selector);
-  const hs = (0, global_1.Array)(es.length);
-
-  for (let i = 0; i < hs.length; ++i) {
-    const el = es[i];
-
+  const hs = (0, array_1.push)([], source.querySelectorAll(selector)).map(el => {
     switch (el.tagName) {
       case 'ASIDE':
-        hs[i] = (0, dom_1.html)(el.firstElementChild.tagName.toLowerCase(), {
+        return (0, dom_1.html)(el.firstElementChild.tagName.toLowerCase(), {
           id: el.id,
           class: 'aside'
         }, el.firstElementChild.cloneNode(true).childNodes);
-        continue;
 
       default:
-        hs[i] = el;
-        continue;
+        return el;
     }
-  }
-
+  });
   return parse(cons(hs));
 }
 

package/index.d.ts

@@ -33,7 +33,7 @@ export interface ParserSettings {
   // For editing.
   readonly caches?: Partial<Caches>;
   readonly footnotes: {
-    readonly annotations: HTMLOListElement;
+    readonly annotations?: HTMLOListElement;
     readonly references: HTMLOListElement;
   };
   readonly chunk?: boolean;

package/package.json

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

package/src/combinator/data/parser.ts

@@ -14,7 +14,7 @@ export interface Ctx {
   delimiters?: Delimiters;
 }
 export type Tree<P extends Parser<unknown>> = P extends Parser<infer T> ? T : never;
-export type SubParsers<P extends Parser<unknown>> = P extends Parser<unknown, any, infer D> ? D : never;
+export type SubParsers<P extends Parser<unknown>> = P extends Parser<unknown, Ctx, infer D> ? D : never;
 export type Context<P extends Parser<unknown>> = P extends Parser<unknown, infer C> ? C : never;
 export type SubTree<P extends Parser<unknown>> = ExtractSubTree<SubParsers<P>>;
 export type IntermediateParser<P extends Parser<unknown>> = Parser<SubTree<P>, Context<P>, SubParsers<P>>;

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

@@ -175,17 +175,17 @@ describe('Unit: parser/api/bind', () => {
       assert.deepStrictEqual(
         [...el.children].map(el => el.outerHTML),
         [
-          html('p', [html('sup', { class: "annotation" }, '1'),]).outerHTML,
-          html('p', [html('sup', { class: "annotation" }, '2'),]).outerHTML,
+          html('p', [html('sup', { class: "annotation" }, [html('span', '1')]),]).outerHTML,
+          html('p', [html('sup', { class: "annotation" }, [html('span', '2')]),]).outerHTML,
         ]);
       inspect(iter, 1);
       el.appendChild(chunk);
       assert.deepStrictEqual(
         [...el.children].map(el => el.outerHTML),
         [
-          html('p', [html('sup', { class: "annotation" }, '1'),]).outerHTML,
-          html('p', [html('sup', { class: "annotation" }, '2'),]).outerHTML,
-          html('p', [html('sup', { class: "annotation" }, '3'),]).outerHTML,
+          html('p', [html('sup', { class: "annotation" }, [html('span', '1')]),]).outerHTML,
+          html('p', [html('sup', { class: "annotation" }, [html('span', '2')]),]).outerHTML,
+          html('p', [html('sup', { class: "annotation" }, [html('span', '3')]),]).outerHTML,
         ]);
       inspect(iter);
       assert.deepStrictEqual(
@@ -211,7 +211,7 @@ describe('Unit: parser/api/bind', () => {
           ]).outerHTML,
         ]);
       assert.deepStrictEqual(
-        cfgs.footnotes.annotations.outerHTML,
+        cfgs.footnotes.annotations?.outerHTML,
         html('ol', [
           html('li', { id: 'annotation:def:1' }, [
             '1',

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

@@ -137,6 +137,7 @@ describe('Unit: parser/api/parse', () => {
           '<p><a href="https://source/x/a" target="_blank"><img class="media" data-src="https://source/x/a" alt=""></a></p>',
           '<p><a href="/z/a" target="_blank"><img class="media" data-src="/z/a" alt=""></a></p>',
           '<p><a href="https://source/a" target="_blank"><img class="media" data-src="https://source/a" alt=""></a></p>',
+          '<ol class="annotations"><li id="annotation:def:1" data-marker="*1">a<sup><a href="#annotation:ref:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
         [...parse([
@@ -197,7 +198,7 @@ describe('Unit: parser/api/parse', () => {
         [
           `<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="https://example/x"><span class="field-name">URL</span>: <span class="field-value">https://example/x</span>\n</span></details></aside>`,
           '<pre class="invalid" translate="no" data-invalid-syntax="header" data-invalid-type="syntax" data-invalid-message="Invalid syntax">---\nURL: https://example/y\n---\n</pre>',
-          '<aside class="example" data-type="markdown"><pre translate="no">---\nURL: https://example/y\n---\n\n{#}</pre><hr><section><aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="https://example/y"><span class="field-name">URL</span>: <span class="field-value">https://example/y</span>\n</span></details></aside><p><a href="https://example/y#" target="_blank">#</a></p><ol class="annotations"></ol><ol class="references"></ol></section></aside>',
+          '<aside class="example" data-type="markdown"><pre translate="no">---\nURL: https://example/y\n---\n\n{#}</pre><hr><section><aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="https://example/y"><span class="field-name">URL</span>: <span class="field-value">https://example/y</span>\n</span></details></aside><p><a href="https://example/y#" target="_blank">#</a></p><ol class="references"></ol></section></aside>',
           '<p><a href="https://example/x#" target="_blank">#</a></p>',
         ]);
     });

package/src/parser/api/parse.ts

@@ -40,7 +40,7 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
   for (const _ of figure(node, opts.footnotes, context));
   for (const _ of footnote(node, opts.footnotes, context));
   assert(opts.id !== '' || !node.querySelector('[id], .index[href], .label[href], .annotation > a[href], .reference > a[href]'));
-  assert(opts.id !== '' || !opts.footnotes?.annotations.querySelector('[id], .index[href], .label[href]'));
+  assert(opts.id !== '' || !opts.footnotes?.annotations?.querySelector('[id], .index[href], .label[href]'));
   assert(opts.id !== '' || !opts.footnotes?.references.querySelector('[id], .index[href], .label[href]'));
   return node;
 }