securemark 0.247.1 → 0.248.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.248.1
+
+- Fix html parser.
+
+## 0.248.0
+
+- Change html parser not to limit nesting patterns of HTML tags.
+
+## 0.247.2
+
+- Fix math parser.
+
 ## 0.247.1
 
 - Fix math parser.

package/design.md

@@ -278,8 +278,11 @@ CodeMirrorが素では速いがVimModeでは数万文字程度でも耐え難く
 
 ### バックトラック
 
-SecuremarkのAnnotation構文に典型的であるように文脈を変える構文が存在する場合文脈の相違から解析結果を再利用不能な(`αA'β | αAB`)バックトラックが再帰的に生じ、このような言語を線形時間で解析することは基本的に不可能であると思われる。
-このため線形時間で解析可能な文法に制約されるCommonMarkがこの制約を破らずこのような文脈不確定文法を導入することは(リンク構文のような特殊な解決方法を取れる場合を除き)基本的に不可能であるという拡張性の限界が存在する。
+SecuremarkのAnnotation構文に典型的であるように文脈を変更する構文とその文脈に依存し変更される他の構文が存在する場合文脈の相違から解析結果を再利用不能な(`αA'β | αAB`)バックトラックが生じる。ここで解析中に文脈依存構文に遭遇した時、現在の文脈での解析を継続する場合はバックトラックが再帰的に生じ線形時間で解析できず、現在の文脈での解析を中止し直前の文脈を継続または新たな文脈を開始する場合は線形時間で解析できる。
+CommonMarkはLink構文から明らかなように後者の解析方法により線形時間で解析できる言語であるがこれは同時に文脈依存構文の正当な入れ子表現すら解析できず文脈依存構文の存在する数に応じて指数関数的に構文の壊れやすさの増す脆く拡張性の低い言語であることを意味する。
+従って線形時間で解析可能な文法に制約されるCommonMarkには文脈依存構文を入れ子表現の広範な制限ならびに構文の可読性および開始記号の信頼性の指数関数的な低下と引き換えにしか追加できないという拡張性の限界が存在する。
+対してSecuremarkは線形時間で解析不能な前者の解析方法を採用し解析時間と解析範囲の局限により線形時間で解析不能な入力の影響を局限することでこの制限を回避している。
+ただし実際には文脈依存構文の入れ子表現はほとんどがリンクの入れ子不可制約として正当に制限されており開始記号の文字列(終端記号)としての正当な使用も稀と思われるため実用上差異が生じることはほとんどないと思われる。
 
 ### 標準化
 
@@ -296,5 +299,5 @@ MarkdownはGFMのように最初から高機能で完成度の高い拡張不要
 
 ### Data URI
 
-Data URIは保存および転送容量削減ならびに集約的管理のためサポートしない。
-特に規制および公開レベルの媒体別の設定のためテキストとメディアの分離が必須となる。
+Data URIは保存および転送容量削減ならびにユーザーおよび管理者双方の集約的管理のためサポートしない。
+特に規制および公開レベルの媒体別設定の実現のためテキストとメディアの分離が必須となる。

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.247.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.248.1 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"));
@@ -2254,11 +2254,9 @@ const surround_1 = __webpack_require__(7130);
 
 const memoize_1 = __webpack_require__(1808);
 
-const array_1 = __webpack_require__(8112);
-
 function indent(parser, separation = false) {
   return (0, bind_1.bind)((0, block_1.block)((0, match_1.match)(/^(?=(([ \t])\2*))/, (0, memoize_1.memoize)(([, indent]) => (0, some_1.some)((0, line_1.line)((0, surround_1.open)(indent, source => [[unline(source)], '']))), ([, indent]) => indent.length * 2 + +(indent[0] === ' '), [])), separation), (nodes, rest, context) => {
-    const result = parser((0, array_1.join)(nodes, '\n'), context);
+    const result = parser(nodes.join('\n'), context);
     return result && (0, parser_1.exec)(result) === '' ? [(0, parser_1.eval)(result), rest] : global_1.undefined;
   });
 }
@@ -5367,7 +5365,6 @@ exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0,
 
     }
   },
-  state: global_1.undefined,
   delimiters: global_1.undefined
 }, (0, util_1.trimSpaceStart)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, ')', /^\\?\n/)]))))), '))'), ns => [(0, dom_1.html)('sup', {
   class: 'annotation'
@@ -5754,7 +5751,7 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-exports.deletion = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('~~'), (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n?/, '~~')), (0, combinator_1.open)(/^\n?/, (0, combinator_1.some)(inline_1.inline, '~'), true)])), (0, source_1.str)('~~'), false, ([, bs], rest) => [[(0, dom_1.html)('del', (0, dom_1.defrag)(bs))], rest], ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest])));
+exports.deletion = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('~~'), (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n/, '~~')), (0, combinator_1.open)(/^\n/, (0, combinator_1.some)(inline_1.inline, '~'), true)])), (0, source_1.str)('~~'), false, ([, bs], rest) => [[(0, dom_1.html)('del', (0, dom_1.defrag)(bs))], rest], ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest])));
 
 /***/ }),
 
@@ -5915,8 +5912,6 @@ const util_1 = __webpack_require__(9437);
 
 const dom_1 = __webpack_require__(3252);
 
-const array_1 = __webpack_require__(8112);
-
 exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('[#', ']', '\n', (0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.fmap)((0, combinator_1.surround)('[#', (0, combinator_1.guard)(context => context.syntax?.inline?.index ?? true, (0, util_1.startTight)((0, combinator_1.context)({
   syntax: {
     inline: {
@@ -5936,7 +5931,7 @@ exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combi
 }, el.childNodes)]))));
 const signature = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.fmap)((0, combinator_1.open)('|#', (0, util_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.txt]), ']'))), ns => [(0, dom_1.html)('span', {
   class: 'indexer',
-  'data-index': (0, indexee_1.identity)((0, array_1.join)(ns)).slice(6)
+  'data-index': (0, indexee_1.identity)(ns.join('')).slice(6)
 })])));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.txt]), ')'), (0, source_1.str)(')'), true), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.txt]), ']'), (0, source_1.str)(']'), true), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.txt]), '}'), (0, source_1.str)('}'), true), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.some)(source_1.txt, '"'), (0, source_1.str)('"'), true)])));
 
@@ -6076,8 +6071,6 @@ const source_1 = __webpack_require__(6743);
 
 const dom_1 = __webpack_require__(3252);
 
-const array_1 = __webpack_require__(8112);
-
 const body = (0, source_1.str)(/^\$[A-Za-z]*(?:(?:-[A-Za-z][0-9A-Za-z]*)+|-(?:(?:0|[1-9][0-9]*)\.)*(?:0|[1-9][0-9]*)(?![0-9A-Za-z]))/);
 exports.segment = (0, combinator_1.clear)((0, combinator_1.validate)(['[$', '$'], (0, combinator_1.union)([(0, combinator_1.surround)('[', body, ']'), body])));
 exports.label = (0, combinator_1.creator)((0, combinator_1.validate)(['[$', '$'], (0, combinator_1.fmap)((0, combinator_1.guard)(context => context.syntax?.inline?.label ?? true, (0, combinator_1.union)([(0, combinator_1.surround)('[', body, ']'), body])), ([text]) => [(0, dom_1.html)('a', {
@@ -6106,7 +6099,7 @@ function increment(number, position) {
     ms[i] = i < ns.length ? i + 1 < position ? +ns[i] : +ns[i] + 1 : i + 1 < position ? 0 : 1;
   }
 
-  return (0, array_1.join)(ms, '.');
+  return ms.join('.');
 }
 
 /***/ }),
@@ -6184,77 +6177,13 @@ const attrspec = {
 };
 Object.setPrototypeOf(attrspec, null);
 Object.values(attrspec).forEach(o => Object.setPrototypeOf(o, null));
-exports.html = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('<', (0, combinator_1.validate)(/^<[a-z]+(?=[^\S\n]|>)/, (0, combinator_1.union)([(0, combinator_1.match)(/^(?=<(wbr)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.surround)(`<${tag}`, (0, combinator_1.some)((0, combinator_1.union)([exports.attribute])), /^\s*>/, true, ([, bs = []], rest) => [[(0, dom_1.html)(tag, attributes('html', [], attrspec[tag], bs))], rest]), ([, tag]) => tags.indexOf(tag), [])), (0, combinator_1.match)(/^(?=<(sup|sub|small)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.validate)(`<${tag}`, `</${tag}>`, (0, combinator_1.surround)((0, combinator_1.surround)((0, source_1.str)(`<${tag}`), (0, combinator_1.some)(exports.attribute), (0, source_1.str)(/^\s*>/), true), (0, util_1.startLoose)((0, combinator_1.context)((() => {
-  switch (tag) {
-    case 'sup':
-    case 'sub':
-      return {
-        state: {
-          in: {
-            supsub: true
-          }
-        },
-        syntax: {
-          inline: {
-            annotation: false,
-            reference: false,
-            media: false
-          }
-        }
-      };
-
-    case 'small':
-      return {
-        state: {
-          in: {
-            small: true
-          }
-        },
-        syntax: {
-          inline: {
-            media: false
-          }
-        }
-      };
-
-    default:
-      return {};
-  }
-})(), (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n?/, `</${tag}>`)), (0, combinator_1.open)(/^\n?/, (0, combinator_1.some)(inline_1.inline, '</'), true)]), `</${tag}>`)), `</${tag}>`), (0, source_1.str)(`</${tag}>`), false, ([as, bs, cs], rest, context) => [[elem(tag, as, (0, dom_1.defrag)(bs), cs, context)], rest])), ([, tag]) => tags.indexOf(tag), [])), (0, combinator_1.match)(/^(?=<(bdo|bdi)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.validate)(`<${tag}`, `</${tag}>`, (0, combinator_1.surround)((0, combinator_1.surround)((0, source_1.str)(`<${tag}`), (0, combinator_1.some)(exports.attribute), (0, source_1.str)(/^\s*>/), true), (0, util_1.startLoose)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n?/, `</${tag}>`)), (0, combinator_1.open)(/^\n?/, (0, combinator_1.some)(inline_1.inline, '</'), true)]), `</${tag}>`), `</${tag}>`), (0, source_1.str)(`</${tag}>`), false, ([as, bs, cs], rest, context) => [[elem(tag, as, (0, dom_1.defrag)(bs), cs, context)], rest], ([as, bs], rest) => as.length === 1 ? [(0, array_1.unshift)(as, bs), rest] : global_1.undefined)), ([, tag]) => tags.indexOf(tag), [])), (0, combinator_1.match)(/^(?=<([a-z]+)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.validate)(`<${tag}`, `</${tag}>`, (0, combinator_1.surround)((0, combinator_1.surround)((0, source_1.str)(`<${tag}`), (0, combinator_1.some)(exports.attribute), (0, source_1.str)(/^\s*>/), true), (0, util_1.startLoose)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n?/, `</${tag}>`)), (0, combinator_1.open)(/^\n?/, (0, combinator_1.some)(inline_1.inline, '</'), true)]), `</${tag}>`), `</${tag}>`), (0, source_1.str)(`</${tag}>`), false, ([as, bs, cs], rest, context) => [[elem(tag, as, (0, dom_1.defrag)(bs), cs, context)], rest], ([as, bs], rest) => as.length === 1 ? [(0, array_1.unshift)(as, bs), rest] : global_1.undefined)), ([, tag]) => tag, new cache_1.Cache(10000)))])))));
+exports.html = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('<', (0, combinator_1.validate)(/^<[a-z]+(?=[^\S\n]|>)/, (0, combinator_1.union)([(0, combinator_1.match)(/^(?=<(wbr)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.surround)(`<${tag}`, (0, combinator_1.some)((0, combinator_1.union)([exports.attribute])), /^\s*>/, true, ([, bs = []], rest) => [[(0, dom_1.html)(tag, attributes('html', [], attrspec[tag], bs))], rest]), ([, tag]) => tags.indexOf(tag), [])), (0, combinator_1.match)(/^(?=<(sup|sub|small|bdo|bdi)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.surround)((0, combinator_1.surround)((0, source_1.str)(`<${tag}`), (0, combinator_1.some)(exports.attribute), (0, source_1.str)(/^\s*>/), true), (0, util_1.startLoose)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n/, `</${tag}>`)), (0, combinator_1.open)(/^\n/, (0, combinator_1.some)(inline_1.inline, `</${tag}>`), true)]), `</${tag}>`), `</${tag}>`), (0, source_1.str)(`</${tag}>`), false, ([as, bs, cs], rest) => [[elem(tag, as, (0, dom_1.defrag)(bs), cs)], rest]), ([, tag]) => tags.indexOf(tag), [])), (0, combinator_1.match)(/^(?=<([a-z]+)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.surround)((0, combinator_1.surround)((0, source_1.str)(`<${tag}`), (0, combinator_1.some)(exports.attribute), (0, source_1.str)(/^\s*>/), true), (0, util_1.startLoose)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n/, `</${tag}>`)), (0, combinator_1.open)(/^\n/, (0, combinator_1.some)(inline_1.inline, `</${tag}>`), true)]), `</${tag}>`), `</${tag}>`), (0, source_1.str)(`</${tag}>`), false, ([as, bs, cs], rest) => [[elem(tag, as, (0, dom_1.defrag)(bs), cs)], rest]), ([, tag]) => tag, new cache_1.Cache(10000)))])))));
 exports.attribute = (0, combinator_1.union)([(0, source_1.str)(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|>)/)]);
 
-function elem(tag, as, bs, cs, context) {
+function elem(tag, as, bs, cs) {
   if (!tags.includes(tag)) return invalid('tag', `Invalid HTML tag <${tag}>`, as, bs, cs);
-
-  switch (tag) {
-    case 'sup':
-    case 'sub':
-      switch (true) {
-        case context.state?.in?.supsub:
-          return invalid('nest', `<${tag}> HTML tag cannot be used in <sup> or <sub> HTML tag`, as, bs, cs);
-      }
-
-      break;
-
-    case 'small':
-      switch (true) {
-        case context.state?.in?.supsub:
-        case context.state?.in?.small:
-          return invalid('nest', `<${tag}> HTML tag cannot be used in <sup>, <sub>, or <small> HTML tag`, as, bs, cs);
-      }
-
-      break;
-  }
-
   const attrs = attributes('html', [], attrspec[tag], as.slice(1, -1));
-
-  switch (true) {
-    case 'data-invalid-syntax' in attrs:
-      return invalid('attribute', 'Invalid HTML attribute', as, bs, cs);
-
-    default:
-      return (0, dom_1.html)(tag, attrs, bs);
-  }
+  return 'data-invalid-syntax' in attrs ? invalid('attribute', 'Invalid HTML attribute', as, bs, cs) : (0, dom_1.html)(tag, attrs, bs);
 }
 
 function invalid(type, message, as, bs, cs) {
@@ -6285,7 +6214,7 @@ function attributes(syntax, classes, spec, params) {
   invalid ||= !!spec && !requiredAttributes(spec).every(name => name in attrs);
 
   if (invalid) {
-    attrs['class'] = (0, array_1.join)(classes.includes('invalid') ? classes : (0, array_1.unshift)(classes, ['invalid']), ' ');
+    attrs['class'] = (classes.includes('invalid') ? classes : (0, array_1.unshift)(classes, ['invalid'])).join(' ');
     attrs['data-invalid-syntax'] = syntax;
     attrs['data-invalid-type'] = 'argument';
     attrs['data-invalid-message'] = 'Invalid argument';
@@ -6356,7 +6285,7 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('++'), (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n?/, '++')), (0, combinator_1.open)(/^\n?/, (0, combinator_1.some)(inline_1.inline, '+'), true)])), (0, source_1.str)('++'), false, ([, bs], rest) => [[(0, dom_1.html)('ins', (0, dom_1.defrag)(bs))], rest], ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest])));
+exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('++'), (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n/, '++')), (0, combinator_1.open)(/^\n/, (0, combinator_1.some)(inline_1.inline, '+'), true)])), (0, source_1.str)('++'), false, ([, bs], rest) => [[(0, dom_1.html)('ins', (0, dom_1.defrag)(bs))], rest], ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest])));
 
 /***/ }),
 
@@ -6546,7 +6475,7 @@ const dom_1 = __webpack_require__(3252);
 
 const syntax = /^(?:[ "([](?!\$)|\\{(?!\$)|\\[\\}$]?|^`|`(?!`)|[!#%&')\x2A-\x5A\]^_\x61-\x7A|~])+/;
 const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])/i;
-exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('$', (0, combinator_1.rewrite)((0, combinator_1.union)([(0, combinator_1.surround)('$', bracket, '$'), (0, combinator_1.surround)(/^\$(?!\s)/, (0, combinator_1.some)((0, combinator_1.union)([bracket, quote, (0, source_1.str)(syntax)])), /^\$(?![0-9A-Za-z])/)]), (source, {
+exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('$', (0, combinator_1.rewrite)((0, combinator_1.union)([(0, combinator_1.surround)('$', bracket, '$'), (0, combinator_1.surround)(/^\$(?![\s{}])/, (0, combinator_1.some)((0, combinator_1.union)([bracket, quote, (0, source_1.str)(syntax)])), /^\$(?![0-9A-Za-z])/)]), (source, {
   caches: {
     math: cache
   } = {}
@@ -6562,7 +6491,7 @@ exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combin
   'data-invalid-message': `"${source.match(forbiddenCommand)[0]}" command is forbidden`
 }, source)], '']))));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)('{', (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.escsource, /^(?:[{}$]|\\?\n)/)])), '}', true)));
-const quote = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)('``', (0, combinator_1.some)((0, combinator_1.union)([quote, bracket, (0, combinator_1.focus)(/^(?:\\[\\{}$]|`(?!`)|[^`{}"$\n])*/, (0, source_1.str)(syntax))])), /^"?/, true)));
+const quote = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)('``', (0, combinator_1.some)((0, combinator_1.union)([quote, bracket, (0, combinator_1.focus)(/^(?:\\[\\{}$]|`(?!`)|[^`{}"$\n\P{ASCII}])*/u, (0, source_1.str)(syntax))])), /^"?/, true)));
 
 /***/ }),
 
@@ -6602,7 +6531,7 @@ const optspec = {
   rel: global_1.undefined
 };
 Object.setPrototypeOf(optspec, null);
-exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.creator)(10, (0, combinator_1.validate)(['![', '!{'], '}', '\n', (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.open)('!', (0, combinator_1.guard)(context => context.syntax?.inline?.media ?? true, (0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)(/^\[(?!\s*\\\s)/, (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']', /^\\?\n/), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/))]))), ([as, bs]) => bs ? [[(0, array_1.join)(as).trim() || (0, array_1.join)(as)], bs] : [[''], as]), ([[text]]) => text === '' || text.trim() !== ''), ([[text], params], rest, context) => {
+exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.creator)(10, (0, combinator_1.validate)(['![', '!{'], '}', '\n', (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.open)('!', (0, combinator_1.guard)(context => context.syntax?.inline?.media ?? true, (0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)(/^\[(?!\s*\\\s)/, (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']', /^\\?\n/), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/))]))), ([as, bs]) => bs ? [[as.join('').trim() || as.join('')], bs] : [[''], as]), ([[text]]) => text === '' || text.trim() !== ''), ([[text], params], rest, context) => {
   const INSECURE_URI = params.shift();
   const url = new url_1.ReadonlyURL((0, link_1.resolve)(INSECURE_URI, context.host ?? global_1.location, context.url ?? context.host ?? global_1.location), context.host?.href || global_1.location.href);
   let cache;
@@ -6617,7 +6546,7 @@ exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.creator)(10, (0, c
   if (context.syntax?.inline?.link === false || cache && cache.tagName !== 'IMG') return [[el], rest];
   return (0, combinator_1.fmap)(link_1.link, ([link]) => [(0, dom_1.define)(link, {
     target: '_blank'
-  }, [el])])(`{ ${INSECURE_URI}${(0, array_1.join)(params)} }${rest}`, context);
+  }, [el])])(`{ ${INSECURE_URI}${params.join('')} }${rest}`, context);
 }))));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ')'), (0, source_1.str)(')'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']'), (0, source_1.str)(']'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), '}'), (0, source_1.str)('}'), true, global_1.undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, source_1.txt]), '"'), (0, source_1.str)('"'), true)]));
 const option = (0, combinator_1.union)([(0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[1-9][0-9]*x[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` width="${opt.slice(1).split('x')[0]}"`, ` height="${opt.slice(1).split('x')[1]}"`]), (0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[1-9][0-9]*:[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` aspect-ratio="${opt.slice(1).split(':').join('/')}"`]), link_1.option]);
@@ -6700,7 +6629,6 @@ exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, c
 
     }
   },
-  state: global_1.undefined,
   delimiters: global_1.undefined
 }, (0, combinator_1.subsequence)([abbr, (0, combinator_1.focus)(/^\^[^\S\n]*/, source => [['', source], '']), (0, util_1.trimSpaceStart)((0, combinator_1.some)(inline_1.inline, ']', /^\\?\n/))])))), ']]'), ns => [(0, dom_1.html)('sup', attributes(ns), (0, util_1.trimNodeEnd)((0, dom_1.defrag)(ns)))]))));
 const abbr = (0, combinator_1.creator)((0, combinator_1.fmap)((0, combinator_1.verify)((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]*/), (_, rest, context) => (0, util_1.isStartLoose)(rest, context)), ([source]) => [(0, dom_1.html)('abbr', source)]));
@@ -6760,7 +6688,7 @@ exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combin
       return [[(0, dom_1.html)('ruby', attributes(texts, rubies), (0, dom_1.defrag)((0, array_1.push)([...texts[0]].reduce((acc, _, i, texts) => (0, array_1.push)(acc, (0, array_1.unshift)([texts[i]], i < rubies.length && rubies[i] ? [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies[i]), (0, dom_1.html)('rp', ')')] : [(0, dom_1.html)('rt')])), []), tail)))], rest];
 
     default:
-      return [[(0, dom_1.html)('ruby', attributes(texts, rubies), (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)([(0, array_1.join)(texts, ' ')], [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', (0, array_1.join)(rubies, ' ').trim()), (0, dom_1.html)('rp', ')')]), tail)))], rest];
+      return [[(0, dom_1.html)('ruby', attributes(texts, rubies), (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)([texts.join(' ')], [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies.join(' ').trim()), (0, dom_1.html)('rp', ')')]), tail)))], rest];
   }
 }))));
 const text = (0, combinator_1.creator)((source, context) => {
@@ -6797,7 +6725,7 @@ const text = (0, combinator_1.creator)((source, context) => {
     }
   }
 
-  return (0, array_1.join)(acc).trimStart() ? [[acc], ''] : global_1.undefined;
+  return acc.join('').trimStart() ? [[acc], ''] : global_1.undefined;
 });
 
 function attributes(texts, rubies) {
@@ -7092,16 +7020,16 @@ function* figure(target, footnotes, opts = {}) {
     }
 
     const group = label.split('-', 1)[0];
-    let number = (0, label_1.number)(label, numbers.has(group) && !(0, label_1.isFixed)(label) ? (0, array_1.join)(numbers.get(group).split('.').slice(0, bases.length), '.') : base);
+    let number = (0, label_1.number)(label, numbers.has(group) && !(0, label_1.isFixed)(label) ? numbers.get(group).split('.').slice(0, bases.length).join('.') : base);
 
     if (number.endsWith('.0')) {
       if (group !== '$' || tagName === 'FIGURE' && def.firstChild) continue;
 
       if (number.startsWith('0.')) {
-        number = (0, array_1.join)(index.slice(0).reduce((ns, _, i, xs) => {
+        number = index.slice(0).reduce((ns, _, i, xs) => {
           i === ns.length ? xs.length = i : ns[i] = +ns[i] > +xs[i] ? ns[i] : +ns[i] === 0 ? xs[i] : `${+xs[i] + 1}`;
           return ns;
-        }, number.split('.')), '.');
+        }, number.split('.')).join('.');
       }
 
       base = number;
@@ -7180,7 +7108,7 @@ const messages = {
 
 function increment(bases, el) {
   const index = (+el.tagName[1] - 1 || 1) - 1;
-  return index + 1 < bases.length ? (0, array_1.join)(bases.slice(0, index + 2).map((v, i) => {
+  return index + 1 < bases.length ? bases.slice(0, index + 2).map((v, i) => {
     switch (true) {
       case i < index:
         return v;
@@ -7191,7 +7119,7 @@ function increment(bases, el) {
       default:
         return 0;
     }
-  }), '.') : '';
+  }).join('.') : '';
 }
 
 function capitalize(label) {
@@ -7779,7 +7707,7 @@ const memoize_1 = __webpack_require__(1808);
 const array_1 = __webpack_require__(8112);
 
 function blank(prefix, suffix) {
-  return new RegExp(String.raw`^${prefix && prefix.source}(?:\\\s|[^\S\n]+|\n|&(?:${normalize_1.invisibleHTMLEntityNames.join('|')});|<wbr>)?${typeof suffix === 'string' ? suffix.replace(/[*+()\[\]]/g, '\\$&') : suffix.source}`);
+  return new RegExp(String.raw`^(?:${prefix && prefix.source}(?:\\\s|[^\S\n]|\n|&(?:${normalize_1.invisibleHTMLEntityNames.join('|')});|<wbr>)*)?${typeof suffix === 'string' ? suffix.replace(/[*+()\[\]]/g, '\\$&') : suffix.source}`);
 }
 
 exports.blank = blank;

package/markdown.d.ts

@@ -28,12 +28,6 @@ export namespace MarkdownParser {
         readonly autolink?: boolean;
       };
     };
-    readonly state?: {
-      readonly in?: {
-        readonly supsub?: boolean;
-        readonly small?: boolean;
-      };
-    };
     readonly caches?: {
       readonly code?: Collection<string, HTMLElement>;
       readonly math?: Collection<string, HTMLElement>;
@@ -987,7 +981,6 @@ export namespace MarkdownParser {
         HTMLParser.OpenTagParser,
         HTMLParser.TagParser,
         HTMLParser.TagParser,
-        HTMLParser.TagParser,
       ]> {
     }
     export namespace HTMLParser {

package/package.json

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

package/src/combinator/control/manipulation/indent.ts

@@ -7,7 +7,6 @@ import { bind } from '../monad/bind';
 import { match } from './match';
 import { open } from './surround';
 import { memoize } from 'spica/memoize';
-import { join } from 'spica/array';
 
 export function indent<P extends Parser<unknown>>(parser: P, separation?: boolean): P;
 export function indent<T>(parser: Parser<T>, separation = false): Parser<T> {
@@ -19,7 +18,7 @@ export function indent<T>(parser: Parser<T>, separation = false): Parser<T> {
       some(line(open(indent, source => [[unline(source)], '']))),
     ([, indent]) => indent.length * 2 + +(indent[0] === ' '), [])), separation),
     (nodes, rest, context) => {
-      const result = parser(join(nodes, '\n'), context);
+      const result = parser(nodes.join('\n'), context);
       return result && exec(result) === ''
         ? [eval(result), rest]
         : undefined;

package/src/parser/inline/annotation.ts

@@ -19,7 +19,7 @@ export const annotation: AnnotationParser = lazy(() => creator(validate('((', ')
     //label: true,
     //link: true,
     //autolink: true,
-  }}, state: undefined, delimiters: undefined },
+  }}, delimiters: undefined },
   trimSpaceStart(union([some(inline, ')', /^\\?\n/)]))))),
   '))'),
   ns => [html('sup', { class: 'annotation' }, trimNodeEnd(defrag(ns)))]))));

package/src/parser/inline/deletion.ts

@@ -9,8 +9,8 @@ import { unshift } from 'spica/array';
 export const deletion: DeletionParser = lazy(() => creator(surround(
   str('~~'),
   some(union([
-    some(inline, blank(/\n?/, '~~')),
-    open(/^\n?/, some(inline, '~'), true),
+    some(inline, blank(/\n/, '~~')),
+    open(/^\n/, some(inline, '~'), true),
   ])),
   str('~~'), false,
   ([, bs], rest) => [[html('del', defrag(bs))], rest],

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

@@ -6,7 +6,6 @@ import { indexee, identity } from './indexee';
 import { txt, str, stropt } from '../../source';
 import { startTight, trimNodeEnd } from '../../util';
 import { html, define, defrag } from 'typed-dom/dom';
-import { join } from 'spica/array';
 
 import IndexParser = ExtensionParser.IndexParser;
 
@@ -44,7 +43,7 @@ const signature: IndexParser.SignatureParser = lazy(() => creator(fmap(open(
   '|#',
   startTight(some(union([bracket, txt]), ']'))),
   ns => [
-    html('span', { class: 'indexer', 'data-index': identity(join(ns)).slice(6) }),
+    html('span', { class: 'indexer', 'data-index': identity(ns.join('')).slice(6) }),
   ])));
 
 const bracket: IndexParser.SignatureParser.BracketParser = lazy(() => creator(union([

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

@@ -3,7 +3,6 @@ import { ExtensionParser } from '../../inline';
 import { union, validate, guard, creator, surround, clear, fmap } from '../../../combinator';
 import { str } from '../../source';
 import { html } from 'typed-dom/dom';
-import { join } from 'spica/array';
 
 const body = str(/^\$[A-Za-z]*(?:(?:-[A-Za-z][0-9A-Za-z]*)+|-(?:(?:0|[1-9][0-9]*)\.)*(?:0|[1-9][0-9]*)(?![0-9A-Za-z]))/);
 
@@ -48,5 +47,5 @@ function increment(number: string, position: number): string {
           ? 0
           : 1;
   }
-  return join(ms, '.');
+  return ms.join('.');
 }

package/src/parser/inline/html.test.ts

@@ -41,7 +41,7 @@ describe('Unit: parser/inline/html', () => {
       assert.deepStrictEqual(inspect(parser('</small>')), undefined);
       assert.deepStrictEqual(inspect(parser('<small/>')), undefined);
       assert.deepStrictEqual(inspect(parser('<b><b><b>a</b></b></b>')), [['<span class="invalid">&lt;b&gt;<span class="invalid">&lt;b&gt;<span class="invalid">&lt;b&gt;a&lt;/b&gt;</span>&lt;/b&gt;</span>&lt;/b&gt;</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('<small><small><small>a</small></small></small>')), [['<small><span class="invalid">&lt;small&gt;<span class="invalid">&lt;small&gt;a&lt;/small&gt;</span>&lt;/small&gt;</span></small>'], '']);
+      assert.deepStrictEqual(inspect(parser('<small><small><small>a</small></small></small>')), [['<small><small><small>a</small></small></small>'], '']);
       assert.deepStrictEqual(inspect(parser('<x a="*b*"')), undefined);
       assert.deepStrictEqual(inspect(parser('<x a="*b*">')), undefined);
       assert.deepStrictEqual(inspect(parser('<x a="*b*">c')), undefined);
@@ -72,8 +72,8 @@ describe('Unit: parser/inline/html', () => {
     });
 
     it('nest', () => {
-      assert.deepStrictEqual(inspect(parser('<small><small>a</small></small>')), [['<small><span class="invalid">&lt;small&gt;a&lt;/small&gt;</span></small>'], '']);
-      assert.deepStrictEqual(inspect(parser('<small>a<small>b</small>c</small>')), [['<small>a<span class="invalid">&lt;small&gt;b&lt;/small&gt;</span>c</small>'], '']);
+      assert.deepStrictEqual(inspect(parser('<small><small>a</small></small>')), [['<small><small>a</small></small>'], '']);
+      assert.deepStrictEqual(inspect(parser('<small>a<small>b</small>c</small>')), [['<small>a<small>b</small>c</small>'], '']);
       assert.deepStrictEqual(inspect(parser('<small>`a`</small>')), [['<small><code data-src="`a`">a</code></small>'], '']);
     });
 

package/src/parser/inline/html.ts

@@ -1,15 +1,14 @@
 import { undefined } from 'spica/global';
 import { isFrozen, ObjectEntries } from 'spica/alias';
-import { MarkdownParser } from '../../../markdown';
 import { HTMLParser } from '../inline';
-import { union, some, validate, context, creator, surround, open, match, lazy } from '../../combinator';
+import { union, some, validate, creator, surround, open, match, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
 import { startLoose, blank } from '../util';
 import { html as h, defrag } from 'typed-dom/dom';
 import { memoize } from 'spica/memoize';
 import { Cache } from 'spica/cache';
-import { unshift, push, splice, join } from 'spica/array';
+import { unshift, push, splice } from 'spica/array';
 
 const tags = Object.freeze(['wbr', 'sup', 'sub', 'small', 'bdo', 'bdi']);
 const attrspec = {
@@ -31,78 +30,32 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
           [[h(tag as 'span', attributes('html', [], attrspec[tag], bs))], rest]),
     ([, tag]) => tags.indexOf(tag), [])),
   match(
-    /^(?=<(sup|sub|small)(?=[^\S\n]|>))/,
+    /^(?=<(sup|sub|small|bdo|bdi)(?=[^\S\n]|>))/,
     memoize(
     ([, tag]) =>
-      validate(`<${tag}`, `</${tag}>`,
-      surround<HTMLParser.TagParser, string>(surround(
-        str(`<${tag}`), some(attribute), str(/^\s*>/), true),
-        startLoose(
-        context((() => {
-          switch (tag) {
-            case 'sup':
-            case 'sub':
-              return {
-                state: { in: { supsub: true } },
-                syntax: { inline: {
-                  annotation: false,
-                  reference: false,
-                  media: false,
-                }},
-              };
-            case 'small':
-              return {
-                state: { in: { small: true } },
-                syntax: { inline: {
-                  media: false,
-                }},
-              };
-            default:
-              assert(false);
-              return {};
-          }
-        })(),
-        some(union([
-          some(inline, blank(/\n?/, `</${tag}>`)),
-          open(/^\n?/, some(inline, '</'), true),
-        ]), `</${tag}>`)), `</${tag}>`),
-        str(`</${tag}>`), false,
-        ([as, bs, cs], rest, context) =>
-          [[elem(tag, as, defrag(bs), cs, context)], rest])),
-    ([, tag]) => tags.indexOf(tag), [])),
-  match(
-    /^(?=<(bdo|bdi)(?=[^\S\n]|>))/,
-    memoize(
-    ([, tag]) =>
-      validate(`<${tag}`, `</${tag}>`,
       surround<HTMLParser.TagParser, string>(surround(
         str(`<${tag}`), some(attribute), str(/^\s*>/), true),
         startLoose(some(union([
-          some(inline, blank(/\n?/, `</${tag}>`)),
-          open(/^\n?/, some(inline, '</'), true),
+          some(inline, blank(/\n/, `</${tag}>`)),
+          open(/^\n/, some(inline, `</${tag}>`), true),
         ]), `</${tag}>`), `</${tag}>`),
         str(`</${tag}>`), false,
-        ([as, bs, cs], rest, context) =>
-          [[elem(tag, as, defrag(bs), cs, context)], rest],
-        ([as, bs], rest) =>
-          as.length === 1 ? [unshift(as, bs), rest] : undefined)),
+        ([as, bs, cs], rest) =>
+          [[elem(tag, as, defrag(bs), cs)], rest]),
     ([, tag]) => tags.indexOf(tag), [])),
   match(
     /^(?=<([a-z]+)(?=[^\S\n]|>))/,
     memoize(
     ([, tag]) =>
-      validate(`<${tag}`, `</${tag}>`,
       surround<HTMLParser.TagParser, string>(surround(
         str(`<${tag}`), some(attribute), str(/^\s*>/), true),
         startLoose(some(union([
-          some(inline, blank(/\n?/, `</${tag}>`)),
-          open(/^\n?/, some(inline, '</'), true),
+          some(inline, blank(/\n/, `</${tag}>`)),
+          open(/^\n/, some(inline, `</${tag}>`), true),
         ]), `</${tag}>`), `</${tag}>`),
         str(`</${tag}>`), false,
-        ([as, bs, cs], rest, context) =>
-          [[elem(tag, as, defrag(bs), cs, context)], rest],
-        ([as, bs], rest) =>
-          as.length === 1 ? [unshift(as, bs), rest] : undefined)),
+        ([as, bs, cs], rest) =>
+          [[elem(tag, as, defrag(bs), cs)], rest]),
     ([, tag]) => tag,
     new Cache(10000))),
 ])))));
@@ -111,35 +64,16 @@ export const attribute: HTMLParser.TagParser.AttributeParser = union([
   str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|>)/),
 ]);
 
-function elem(tag: string, as: string[], bs: (HTMLElement | string)[], cs: string[], context: MarkdownParser.Context): HTMLElement {
+function elem(tag: string, as: string[], bs: (HTMLElement | string)[], cs: string[]): HTMLElement {
   assert(as.length > 0);
   assert(as[0][0] === '<' && as[as.length - 1].slice(-1) === '>');
   assert(bs.length === defrag(bs).length);
   assert(cs.length === 1);
   if (!tags.includes(tag)) return invalid('tag', `Invalid HTML tag <${tag}>`, as, bs, cs);
-  switch (tag) {
-    case 'sup':
-    case 'sub':
-      switch (true) {
-        case context.state?.in?.supsub:
-          return invalid('nest', `<${tag}> HTML tag cannot be used in <sup> or <sub> HTML tag`, as, bs, cs);
-      }
-      break;
-    case 'small':
-      switch (true) {
-        case context.state?.in?.supsub:
-        case context.state?.in?.small:
-          return invalid('nest', `<${tag}> HTML tag cannot be used in <sup>, <sub>, or <small> HTML tag`, as, bs, cs);
-      }
-      break;
-  }
   const attrs = attributes('html', [], attrspec[tag], as.slice(1, -1));
-  switch (true) {
-    case 'data-invalid-syntax' in attrs:
-      return invalid('attribute', 'Invalid HTML attribute', as, bs, cs);
-    default:
-      return h(tag as 'span', attrs, bs);
-  }
+  return 'data-invalid-syntax' in attrs
+    ? invalid('attribute', 'Invalid HTML attribute', as, bs, cs)
+    : h(tag as 'span', attrs, bs);
 }
 function invalid(type: string, message: string, as: (HTMLElement | string)[], bs: (HTMLElement | string)[], cs: (HTMLElement | string)[]): HTMLElement {
   return h('span', {
@@ -182,7 +116,7 @@ export function attributes(
   }
   invalid ||= !!spec && !requiredAttributes(spec).every(name => name in attrs);
   if (invalid) {
-    attrs['class'] = join(classes.includes('invalid') ? classes : unshift(classes, ['invalid']), ' ');
+    attrs['class'] = (classes.includes('invalid') ? classes : unshift(classes, ['invalid'])).join(' ');
     attrs['data-invalid-syntax'] = syntax;
     attrs['data-invalid-type'] = 'argument';
     attrs['data-invalid-message'] = 'Invalid argument';

package/src/parser/inline/insertion.ts

@@ -9,8 +9,8 @@ import { unshift } from 'spica/array';
 export const insertion: InsertionParser = lazy(() => creator(surround(
   str('++'),
   some(union([
-    some(inline, blank(/\n?/, '++')),
-    open(/^\n?/, some(inline, '+'), true),
+    some(inline, blank(/\n/, '++')),
+    open(/^\n/, some(inline, '+'), true),
   ])),
   str('++'), false,
   ([, bs], rest) => [[html('ins', defrag(bs))], rest],

package/src/parser/inline/math.test.ts

@@ -54,6 +54,9 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser('${a} $')), undefined);
       assert.deepStrictEqual(inspect(parser('${a{b}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${a}b}$')), undefined);
+      assert.deepStrictEqual(inspect(parser('${a}b$')), undefined);
+      assert.deepStrictEqual(inspect(parser('${a}b{c}$')), undefined);
+      assert.deepStrictEqual(inspect(parser('${a}{b}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${$}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${\\}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${\n}$')), undefined);
@@ -128,9 +131,6 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser('${\\a}$')), [['<span class="math" translate="no" data-src="${\\a}$">${\\a}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${\\$}$')), [['<span class="math" translate="no" data-src="${\\$}$">${\\$}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${\\\\}$')), [['<span class="math" translate="no" data-src="${\\\\}$">${\\\\}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${a}b$')), [['<span class="math" translate="no" data-src="${a}b$">${a}b$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${a}b{c}$')), [['<span class="math" translate="no" data-src="${a}b{c}$">${a}b{c}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${a}{b}$')), [['<span class="math" translate="no" data-src="${a}{b}$">${a}{b}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${あ}$')), [['<span class="math" translate="no" data-src="${あ}$">${あ}$</span>'], '']);
     });
 

package/src/parser/inline/math.ts

@@ -10,7 +10,7 @@ export const math: MathParser = lazy(() => creator(validate('$', rewrite(
   union([
     surround('$', bracket, '$'),
     surround(
-      /^\$(?!\s)/,
+      /^\$(?![\s{}])/,
       some(union([
         bracket,
         quote,
@@ -47,7 +47,7 @@ const quote: MathParser.QuoteParser = lazy(() => creator(surround(
   some(union([
     quote,
     bracket,
-    focus(/^(?:\\[\\{}$]|`(?!`)|[^`{}"$\n])*/, str(syntax)),
+    focus(/^(?:\\[\\{}$]|`(?!`)|[^`{}"$\n\P{ASCII}])*/u, str(syntax)),
   ])),
   /^"?/,
   true)));

package/src/parser/inline/media.ts

@@ -7,7 +7,7 @@ import { unsafehtmlentity } from './htmlentity';
 import { txt, str } from '../source';
 import { html, define } from 'typed-dom/dom';
 import { ReadonlyURL } from 'spica/url';
-import { unshift, push, join } from 'spica/array';
+import { unshift, push } from 'spica/array';
 
 const optspec = {
   'width': [],
@@ -28,7 +28,7 @@ export const media: MediaParser = lazy(() => creator(10, validate(['![', '!{'],
       true)),
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ]))),
-  ([as, bs]) => bs ? [[join(as).trim() || join(as)], bs] : [[''], as]),
+  ([as, bs]) => bs ? [[as.join('').trim() || as.join('')], bs] : [[''], as]),
   ([[text]]) => text === '' || text.trim() !== ''),
   ([[text], params], rest, context) => {
     assert(text === text.trim());
@@ -52,7 +52,7 @@ export const media: MediaParser = lazy(() => creator(10, validate(['![', '!{'],
     return fmap(
       link as MediaParser,
       ([link]) => [define(link, { target: '_blank' }, [el])])
-      (`{ ${INSECURE_URI}${join(params)} }${rest}`, context);
+      (`{ ${INSECURE_URI}${params.join('')} }${rest}`, context);
   }))));
 
 const bracket: MediaParser.TextParser.BracketParser = lazy(() => union([

package/src/parser/inline/reference.ts

@@ -19,7 +19,7 @@ export const reference: ReferenceParser = lazy(() => creator(validate('[[', ']]'
     //label: true,
     //link: true,
     //autolink: true,
-  }}, state: undefined, delimiters: undefined },
+  }}, delimiters: undefined },
   subsequence([
     abbr,
     focus(/^\^[^\S\n]*/, source => [['', source], '']),

package/src/parser/inline/ruby.ts

@@ -6,7 +6,7 @@ import { unsafehtmlentity } from './htmlentity';
 import { text as txt } from '../source';
 import { isStartTightNodes } from '../util';
 import { html, defrag } from 'typed-dom/dom';
-import { unshift, push, join } from 'spica/array';
+import { unshift, push } from 'spica/array';
 
 export const ruby: RubyParser = lazy(() => creator(validate('[', ')', '\n', bind(verify(
   sequence([
@@ -39,8 +39,8 @@ export const ruby: RubyParser = lazy(() => creator(validate('[', ')', '\n', bind
       default:
         assert(rubies.length > 0);
         return [[html('ruby', attributes(texts, rubies), defrag(push(unshift(
-          [join(texts, ' ')],
-          [html('rp', '('), html('rt', join(rubies, ' ').trim()), html('rp', ')')]), tail)))
+          [texts.join(' ')],
+          [html('rp', '('), html('rt', rubies.join(' ').trim()), html('rp', ')')]), tail)))
         ], rest];
     }
   }))));
@@ -74,7 +74,7 @@ const text: RubyParser.TextParser = creator((source, context) => {
       }
     }
   }
-  return join(acc).trimStart()
+  return acc.join('').trimStart()
     ? [[acc], '']
     : undefined;
 });

package/src/parser/inline.test.ts

@@ -157,6 +157,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('<http://host>')), [['<', '<a href="http://host" target="_blank">http://host</a>', '>'], '']);
       assert.deepStrictEqual(inspect(parser('<<small>a<</small>')), [['<', '<small>a&lt;</small>'], '']);
       assert.deepStrictEqual(inspect(parser('<sup><sub>a</sub>')), [['<', 'sup', '>', '<sub>a</sub>'], '']);
+      assert.deepStrictEqual(inspect(parser('*<small>*`</small>`')), [['<em>&lt;small&gt;</em>', '<code data-src="`</small>`">&lt;/small&gt;</code>'], '']);
       assert.deepStrictEqual(inspect(parser('[~http://host')), [['[', '~', '<a href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[~a@b')), [['[', '~', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[~~a~~]')), [['[', '<del>a</del>', ']'], '']);

package/src/parser/processor/figure.ts

@@ -2,7 +2,7 @@ import { Infinity, Set, Map } from 'spica/global';
 import { number as calculate, isFixed } from '../inline/extension/label';
 import { define } from 'typed-dom/dom';
 import { MultiMap } from 'spica/multimap';
-import { push, join } from 'spica/array';
+import { push } from 'spica/array';
 
 export function* figure(
   target: ParentNode & Node,
@@ -85,7 +85,7 @@ export function* figure(
     let number = calculate(
       label,
       numbers.has(group) && !isFixed(label)
-        ? join(numbers.get(group)!.split('.').slice(0, bases.length), '.')
+        ? numbers.get(group)!.split('.').slice(0, bases.length).join('.')
         : base);
     assert(def.matches('figure') || number.endsWith('.0'));
     if (number.endsWith('.0')) {
@@ -94,19 +94,18 @@ export function* figure(
       if (group !== '$' || tagName === 'FIGURE' && def.firstChild) continue;
       if (number.startsWith('0.')) {
         assert(number.endsWith('.0'));
-        number = join(
-          index.slice(0)
-            .reduce((ns, _, i, xs) => {
-              i === ns.length
-                ? xs.length = i
-                : ns[i] = +ns[i] > +xs[i]
-                  ? ns[i]
-                  : +ns[i] === 0
-                    ? xs[i]
-                    : `${+xs[i] + 1}`;
-              return ns;
-            }, number.split('.')),
-          '.');
+        number = index.slice(0)
+          .reduce((ns, _, i, xs) => {
+            i === ns.length
+              ? xs.length = i
+              : ns[i] = +ns[i] > +xs[i]
+                ? ns[i]
+                : +ns[i] === 0
+                  ? xs[i]
+                  : `${+xs[i] + 1}`;
+            return ns;
+          }, number.split('.'))
+          .join('.');
       }
       base = number;
       bases = index = base.split('.');
@@ -184,8 +183,8 @@ function increment(bases: readonly string[], el: HTMLHeadingElement): string {
   const index = (+el.tagName[1] - 1 || 1) - 1;
   assert(index >= 0);
   return index + 1 < bases.length
-    ? join(
-        bases.slice(0, index + 2).map((v, i) => {
+    ? bases.slice(0, index + 2)
+        .map((v, i) => {
           switch (true) {
             case i < index:
               return v;
@@ -194,8 +193,8 @@ function increment(bases: readonly string[], el: HTMLHeadingElement): string {
             default:
               return 0;
           }
-        }),
-        '.')
+        })
+        .join('.')
     : '';
 }
 

package/src/parser/util.ts

@@ -10,9 +10,9 @@ import { push } from 'spica/array';
 
 export function blank(prefix: '' | RegExp, suffix: string | RegExp): RegExp {
   return new RegExp(String.raw
-    `^${
+    `^(?:${
       prefix && prefix.source
-    }(?:\\\s|[^\S\n]+|\n|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)?${
+    }(?:\\\s|[^\S\n]|\n|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)*)?${
       typeof suffix === 'string' ? suffix.replace(/[*+()\[\]]/g, '\\$&') : suffix.source
     }`);
 }