securemark 0.283.3 → 0.283.4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.283.4
+
+- Refactoring.
+
 ## 0.283.3
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.283.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.283.4 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"));
@@ -1031,7 +1031,7 @@ const util_1 = __webpack_require__(4992);
 const visibility_1 = __webpack_require__(6364);
 const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
-exports.dlist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^~[^\S\n]+(?=\S)/, (0, combinator_1.some)((0, combinator_1.inits)([(0, combinator_1.state)(256 /* State.annotation */ | 128 /* State.reference */ | 64 /* State.index */ | 32 /* State.label */ | 16 /* State.link */ | 8 /* State.media */, (0, combinator_1.some)(term)), (0, combinator_1.some)(desc)]))), es => [(0, dom_1.html)('dl', fillTrailingDescription(es))])));
+exports.dlist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^~[^\S\n]+(?=\S)/, (0, combinator_1.some)((0, combinator_1.inits)([(0, combinator_1.state)(128 /* State.annotation */ | 64 /* State.reference */ | 32 /* State.index */ | 16 /* State.label */ | 8 /* State.link */ | 4 /* State.media */, (0, combinator_1.some)(term)), (0, combinator_1.some)(desc)]))), es => [(0, dom_1.html)('dl', fillTrailingDescription(es))])));
 const term = (0, combinator_1.line)((0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.open)(/^~[^\S\n]+(?=\S)/, (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))), true), ns => [(0, dom_1.html)('dt', {
   'data-index': (0, inline_1.dataindex)(ns)
 }, (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))])));
@@ -1965,9 +1965,13 @@ const combinator_1 = __webpack_require__(3484);
 const link_1 = __webpack_require__(3628);
 const source_1 = __webpack_require__(8745);
 const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
-exports.url = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['http://', 'https://'], (0, combinator_1.rewrite)((0, combinator_1.open)(/^https?:\/\/(?=[\x21-\x7E])/, (0, combinator_1.focus)(/^[\x21-\x7E]+/, (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.unescsource, closer)])))), (0, combinator_1.convert)(url => `{ ${url} }`, (0, combinator_1.union)([link_1.unsafelink])))));
-exports.lineurl = (0, combinator_1.lazy)(() => (0, combinator_1.open)(source_1.linebreak, (0, combinator_1.tails)([(0, source_1.str)('!'), (0, combinator_1.focus)(/^https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink))])));
-const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(0, 6 /* Recursion.terminal */, (0, combinator_1.precedence)(1, (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ')'), (0, source_1.str)(')'), true, undefined, undefined, 3 | 8 /* Backtrack.url */), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ']'), (0, source_1.str)(']'), true, undefined, undefined, 3 | 8 /* Backtrack.url */), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), '}'), (0, source_1.str)('}'), true, undefined, undefined, 3 | 8 /* Backtrack.url */), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.some)(source_1.unescsource, '"')), (0, source_1.str)('"'), true, undefined, undefined, 3 | 8 /* Backtrack.url */)]))));
+exports.url = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['http://', 'https://'], (0, combinator_1.rewrite)((0, combinator_1.open)(/^https?:\/\/(?=[\x21-\x7E])/, (0, combinator_1.focus)(/^[\x21-\x7E]+/, (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.unescsource, closer)])))), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.syntax)(0, 1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink))), ({
+  source
+}) => [[source], '']]))));
+exports.lineurl = (0, combinator_1.lazy)(() => (0, combinator_1.open)(source_1.linebreak, (0, combinator_1.focus)(/^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/, (0, combinator_1.tails)([(0, source_1.str)('!'), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.syntax)(0, 1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink))), ({
+  source
+}) => [[source], '']])]))));
+const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(0, 6 /* Recursion.terminal */, (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ')')), (0, source_1.str)(')'), true, undefined, undefined, 3 | 8 /* Backtrack.url */), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ']')), (0, source_1.str)(']'), true, undefined, undefined, 3 | 8 /* Backtrack.url */), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), '}')), (0, source_1.str)('}'), true, undefined, undefined, 3 | 8 /* Backtrack.url */), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.some)(source_1.unescsource, '"')), (0, source_1.str)('"'), true, undefined, undefined, 3 | 8 /* Backtrack.url */)])));
 
 /***/ },
 
@@ -2041,7 +2045,7 @@ const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 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.validate)(['[$', '$'], (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.fmap)((0, combinator_1.constraint)(32 /* State.label */, false, (0, combinator_1.union)([(0, combinator_1.surround)('[', body, ']'), body])), ([text]) => [(0, dom_1.html)('a', {
+exports.label = (0, combinator_1.validate)(['[$', '$'], (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.fmap)((0, combinator_1.constraint)(16 /* State.label */, false, (0, combinator_1.union)([(0, combinator_1.surround)('[', body, ']'), body])), ([text]) => [(0, dom_1.html)('a', {
   class: 'label',
   'data-label': text.slice(text[1] === '-' ? 0 : 1).toLowerCase()
 }, text)])));
@@ -2329,7 +2333,7 @@ exports.segment = (0, combinator_1.block)((0, combinator_1.validate)('#', (0, co
 }) => [[source], ''])))));
 exports.heading = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment,
 // その他の表示制御は各所のCSSで行う。
-(0, combinator_1.state)(256 /* State.annotation */ | 128 /* State.reference */ | 64 /* State.index */ | 32 /* State.label */ | 16 /* State.link */ | 8 /* State.media */, (0, combinator_1.line)((0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.union)([(0, combinator_1.open)((0, source_1.str)(/^##+/), (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))), true), (0, combinator_1.open)((0, source_1.str)('#'), (0, combinator_1.state)(502 /* State.linkers */, (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))), true)]), ([h, ...ns]) => [h.length <= 6 ? (0, dom_1.html)(`h${h.length}`, {
+(0, combinator_1.state)(128 /* State.annotation */ | 64 /* State.reference */ | 32 /* State.index */ | 16 /* State.label */ | 8 /* State.link */ | 4 /* State.media */, (0, combinator_1.line)((0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.union)([(0, combinator_1.open)((0, source_1.str)(/^##+/), (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))), true), (0, combinator_1.open)((0, source_1.str)('#'), (0, combinator_1.state)(251 /* State.linkers */, (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))), true)]), ([h, ...ns]) => [h.length <= 6 ? (0, dom_1.html)(`h${h.length}`, {
   'data-index': (0, inline_1.dataindex)(ns)
 }, (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns))) : (0, dom_1.html)(`h6`, {
   class: 'invalid',
@@ -3233,12 +3237,12 @@ const optspec = {
   rel: ['nofollow']
 };
 Object.setPrototypeOf(optspec, null);
-exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'], (0, combinator_1.union)([exports.medialink, exports.textlink])));
-exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.constraint)(16 /* State.link */, false, (0, combinator_1.syntax)(1, 502 /* State.linkers */ | 8 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 1]])), ']', true, undefined, undefined, 1 | 4 /* Backtrack.bracket */)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/, false, undefined, undefined, 3 | 16 /* Backtrack.link */))])), ([params, content = []], rest, context) => {
+exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.union)([exports.medialink, exports.textlink]));
+exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'], (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.constraint)(8 /* State.link */, false, (0, combinator_1.syntax)(1, 251 /* State.linkers */ | 4 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 1]])), ']', true, undefined, undefined, 1 | 4 /* Backtrack.bracket */)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/, false, undefined, undefined, 3 | 16 /* Backtrack.link */))])), ([params, content = []], rest, context) => {
   if (content.length !== 0 && (0, visibility_1.trimNodeEnd)(content = (0, dom_1.defrag)(content)).length === 0) return;
   return [[parse(content, params, context)], rest];
-})))));
-exports.medialink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.constraint)(16 /* State.link */ | 8 /* State.media */, false, (0, combinator_1.syntax)(1, 502 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => [[parse((0, dom_1.defrag)(content), params, context)], rest])))));
+}))))));
+exports.medialink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'], (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.constraint)(8 /* State.link */ | 4 /* State.media */, false, (0, combinator_1.syntax)(1, 251 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => [[parse((0, dom_1.defrag)(content), params, context)], rest]))))));
 exports.linemedialink = (0, combinator_1.surround)(source_1.linebreak, (0, combinator_1.union)([exports.medialink]), /^(?=[^\S\n]*(?:$|\n))/);
 exports.unsafelink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.precedence)(1, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([source_1.unescsource]), ']'), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => [[parse((0, dom_1.defrag)(content), params, context)], rest]))));
 exports.uri = (0, combinator_1.union)([(0, combinator_1.open)(/^[^\S\n]+/, (0, source_1.str)(/^\S+/)), (0, source_1.str)(/^[^\s{}]+/)]);
@@ -4286,7 +4290,7 @@ const combinator_1 = __webpack_require__(3484);
 const inline_1 = __webpack_require__(7973);
 const visibility_1 = __webpack_require__(6364);
 const dom_1 = __webpack_require__(394);
-exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.surround)('((', (0, combinator_1.constraint)(256 /* State.annotation */, false, (0, combinator_1.syntax)(1, 256 /* State.annotation */ | 8 /* State.media */, (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[/^\\?\n/, 9], [')', 1]])))), '))', false, ([, ns], rest) => [[(0, dom_1.html)('sup', {
+exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.surround)('((', (0, combinator_1.constraint)(128 /* State.annotation */, false, (0, combinator_1.syntax)(1, 128 /* State.annotation */ | 4 /* State.media */, (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[/^\\?\n/, 9], [')', 1]])))), '))', false, ([, ns], rest) => [[(0, dom_1.html)('sup', {
   class: 'annotation'
 }, [(0, dom_1.html)('span', (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))])], rest], undefined, 1 | 4 /* Backtrack.bracket */)));
 
@@ -4330,9 +4334,11 @@ const link_1 = __webpack_require__(3628);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 // https://example/@user must be a user page or a redirect page going there.
-exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('@', (0, combinator_1.tails)([(0, source_1.str)(/^[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//i), (0, source_1.str)(/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*/i)]))), (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
+exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)('@', (0, combinator_1.tails)([(0, source_1.str)(/^[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//i), (0, source_1.str)(/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*/i)])), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.syntax)(0, 1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, link_1.unsafelink), ([el]) => [(0, dom_1.define)(el, {
   class: 'account'
-})]));
+})]))), ({
+  source
+}) => [[source], '']])));
 
 /***/ },
 
@@ -5057,15 +5063,16 @@ const hashtag_1 = __webpack_require__(5764);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
 // https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
-exports.channel = (0, combinator_1.validate)('@', (0, combinator_1.bind)((0, combinator_1.sequence)([account_1.account, (0, combinator_1.some)(hashtag_1.hashtag)]), (es, rest) => {
+exports.channel = (0, combinator_1.validate)('@', (0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.bind)((0, combinator_1.sequence)([account_1.account, (0, combinator_1.some)(hashtag_1.hashtag)]), (es, rest) => {
   const source = (0, util_1.stringify)(es);
   const el = es[0];
+  if (typeof el === 'string') return [es, rest];
   const url = `${el.getAttribute('href')}?ch=${source.slice(source.indexOf('#') + 1).replace(/#/g, '+')}`;
   return [[(0, dom_1.define)(el, {
     class: 'channel',
     href: url
   }, source)], rest];
-}));
+})));
 
 /***/ },
 
@@ -5085,7 +5092,7 @@ const indexee_1 = __webpack_require__(7610);
 const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const dom_1 = __webpack_require__(394);
-exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[#', (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)('[#', (0, combinator_1.constraint)(64 /* State.index */, false, (0, combinator_1.syntax)(1, 502 /* State.linkers */ | 8 /* State.media */, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.inits)([inline_1.inline, exports.signature]), ']', [[/^\\?\n/, 9], [']', 1]])))), ']', false, ([, ns], rest) => [[(0, dom_1.html)('a', {
+exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[#', (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)('[#', (0, combinator_1.constraint)(32 /* State.index */, false, (0, combinator_1.syntax)(1, 251 /* State.linkers */ | 4 /* State.media */, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.inits)([inline_1.inline, exports.signature]), ']', [[/^\\?\n/, 9], [']', 1]])))), ']', false, ([, ns], rest) => [[(0, dom_1.html)('a', {
   'data-index': dataindex(ns)
 }, (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))], rest], undefined, 1 | 4 /* Backtrack.bracket */)), ([el]) => [(0, dom_1.define)(el, {
   id: el.id ? null : undefined,
@@ -5354,7 +5361,7 @@ const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
-exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 4 /* Recursion.inline */, (0, combinator_1.surround)((0, source_1.str)('==', '='), (0, combinator_1.constraint)(4 /* State.mark */, false, (0, combinator_1.syntax)(0, 0 /* State.none */, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('==')), (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '='), exports.mark)]))))), (0, source_1.str)('=='), false, ([, bs], rest, {
+exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 4 /* Recursion.inline */, (0, combinator_1.surround)((0, source_1.str)('==', '='), (0, combinator_1.constraint)(2 /* State.mark */, false, (0, combinator_1.syntax)(0, 0 /* State.none */, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('==')), (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '='), exports.mark)]))))), (0, source_1.str)('=='), false, ([, bs], rest, {
   id
 }) => {
   const el = (0, dom_1.html)('mark', (0, dom_1.defrag)(bs));
@@ -5477,7 +5484,7 @@ class Delimiters {
   constructor() {
     this.registry = (0, memoize_1.memoize)(() => []);
     this.delimiters = [];
-    this.order = [];
+    this.stack = [];
     this.states = [];
   }
   static signature(pattern) {
@@ -5494,9 +5501,9 @@ class Delimiters {
     const {
       registry,
       delimiters,
-      order
+      stack
     } = this;
-    // 構文数x優先順位数以下
+    // シグネチャ数以下
 
     for (let i = 0; i < delims.length; ++i) {
       const {
@@ -5504,9 +5511,9 @@ class Delimiters {
         matcher,
         precedence
       } = delims[i];
-      const stack = registry(signature);
-      const index = stack[0]?.index ?? delimiters.length;
-      if (stack.length === 0 || precedence > delimiters[index].precedence) {
+      const memory = registry(signature);
+      const index = memory[0]?.index ?? delimiters.length;
+      if (memory.length === 0 || precedence > delimiters[index].precedence) {
         const delimiter = {
           index,
           signature,
@@ -5515,10 +5522,10 @@ class Delimiters {
           state: true
         };
         delimiters[index] = delimiter;
-        stack.push(delimiter);
-        order.push(index);
+        memory.push(delimiter);
+        stack.push(index);
       } else {
-        order.push(-1);
+        stack.push(-1);
       }
       // 現状各優先順位は固定
     }
@@ -5527,18 +5534,18 @@ class Delimiters {
     const {
       registry,
       delimiters,
-      order
+      stack
     } = this;
     for (let i = 0; i < count; ++i) {
-      const index = order.pop();
+      const index = stack.pop();
       if (index === -1) continue;
-      const stack = registry(delimiters[index].signature);
-      if (stack.length === 1) {
-        stack.pop();
+      const memory = registry(delimiters[index].signature);
+      if (memory.length === 1) {
+        memory.pop();
         delimiters.pop();
       } else {
-        stack.pop();
-        delimiters[index] = stack.at(-1);
+        memory.pop();
+        delimiters[index] = memory.at(-1);
       }
     }
   }
@@ -5713,14 +5720,15 @@ function precedence(precedence, parser) {
       delimiters,
       precedence: p = 0
     } = context;
-    const shift = precedence > p;
+    const shift = delimiters && precedence > p;
     context.precedence = precedence;
-    shift && delimiters?.shift(precedence);
+    // デリミタはシフト後に設定しなければならない
+    shift && delimiters.shift(precedence);
     const result = parser({
       source,
       context
     });
-    shift && delimiters?.unshift();
+    shift && delimiters.unshift();
     context.precedence = p;
     return result;
   };
@@ -5806,9 +5814,11 @@ const dom_1 = __webpack_require__(394);
 // https://example/hashtags/a must be a hashtag page or a redirect page going there.
 // https://github.com/tc39/proposal-regexp-unicode-property-escapes#matching-emoji
 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.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('#', (0, source_1.str)(new RegExp([/^(?!['_])(?=(?:[0-9]{1,9})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'|_(?=[^\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|'))+/u.source].join('').replace(/emoji/g, exports.emoji), 'u')))), (0, combinator_1.convert)(source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
+exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)('#', (0, source_1.str)(new RegExp([/^(?!['_])(?=(?:[0-9]{1,9})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'|_(?=[^\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|'))+/u.source].join('').replace(/emoji/g, exports.emoji), 'u'))), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.syntax)(0, 1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`, link_1.unsafelink), ([el]) => [(0, dom_1.define)(el, {
   class: 'hashtag'
-})]));
+})]))), ({
+  source
+}) => [[source], '']])));
 
 /***/ },
 
@@ -5856,9 +5866,9 @@ function surround(opener, parser, closer, optional = false, f, g, log = 0) {
       } = context;
       for (let i = 0; i < source.length - mr_.length; ++i) {
         if (source[i] !== source[0]) break;
-        const j = source.length + offset - i;
-        if (!(j in logger)) continue;
-        if (logger[j] & 1 << (log >>> 2)) return;
+        const pos = source.length + offset - i - 1;
+        if (!(pos in logger)) continue;
+        if (logger[pos] & 1 << (log >>> 2)) return;
       }
     }
     const res2 = mr_ !== '' ? parser({
@@ -5880,7 +5890,7 @@ function surround(opener, parser, closer, optional = false, f, g, log = 0) {
         logger = {},
         offset = 0
       } = context;
-      logger[source.length + offset] |= 1 << (log >>> 2);
+      logger[source.length + offset - 1] |= 1 << (log >>> 2);
     }
     return rr ? f ? f([rl, rm, rr], rest, context) : [(0, array_1.push)((0, array_1.unshift)(rl, rm ?? []), rr), rest] : g ? g([rl, rm, mr_], rest, context) : undefined;
   };
@@ -5930,12 +5940,12 @@ const combinator_1 = __webpack_require__(3484);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 // https://html.spec.whatwg.org/multipage/input.html
-exports.email = (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.rewrite)((0, combinator_1.verify)((0, source_1.str)(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z])/i), ([source]) => source.length <= 255), ({
+exports.email = (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.rewrite)((0, combinator_1.verify)((0, source_1.str)(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z])/i), ([source]) => source.length <= 255), (0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.syntax)(0, 1 /* State.autolink */, ({
   source
 }) => [[(0, dom_1.html)('a', {
   class: 'email',
   href: `mailto:${source}`
-}, source)], '']));
+}, source)], '']))));
 
 /***/ },
 
@@ -6053,7 +6063,7 @@ const combinator_1 = __webpack_require__(3484);
 const url_1 = __webpack_require__(2129);
 const media_1 = __webpack_require__(7478);
 const source_1 = __webpack_require__(8745);
-exports.shortmedia = (0, combinator_1.rewrite)((0, combinator_1.constraint)(8 /* State.media */, false, (0, combinator_1.open)('!', url_1.url)), (0, combinator_1.convert)(source => `!{ ${source.slice(1)} }`, (0, combinator_1.union)([media_1.media])));
+exports.shortmedia = (0, combinator_1.rewrite)((0, combinator_1.constraint)(4 /* State.media */, false, (0, combinator_1.open)('!', url_1.url)), (0, combinator_1.convert)(source => `!{ ${source.slice(1)} }`, (0, combinator_1.union)([media_1.media])));
 exports.lineshortmedia = (0, combinator_1.open)(source_1.linebreak, (0, combinator_1.focus)(/^!https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/, (0, combinator_1.convert)(source => `!{ ${source.slice(1)} }`, (0, combinator_1.union)([media_1.media]))));
 
 /***/ },
@@ -7016,7 +7026,7 @@ const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
-exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.syntax)(1, -1 /* State.all */, (0, combinator_1.fmap)((0, combinator_1.sequence)([(0, combinator_1.bind)((0, combinator_1.surround)('[', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']', false, undefined, undefined, 3 | 20 /* Backtrack.ruby */), ([source], rest, context) => {
+exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.fmap)((0, combinator_1.syntax)(1, -1 /* State.all */, (0, combinator_1.sequence)([(0, combinator_1.bind)((0, combinator_1.surround)('[', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']', false, undefined, undefined, 3 | 20 /* Backtrack.ruby */), ([source], rest, context) => {
   const ns = (0, parser_1.eval)(text({
     source,
     context
@@ -7029,7 +7039,7 @@ exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0,
     context
   }), [undefined])[0];
   return ns && [[ns], rest];
-})]), ([texts, rubies]) => {
+})])), ([texts, rubies]) => {
   switch (true) {
     case rubies.length <= texts.length:
       return [(0, dom_1.html)('ruby', attributes(texts, rubies), (0, dom_1.defrag)(texts.reduce((acc, _, i) => (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')])), [])))];
@@ -7038,7 +7048,7 @@ exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[', (0,
     default:
       return [(0, dom_1.html)('ruby', attributes(texts, rubies), (0, dom_1.defrag)((0, array_1.unshift)([texts.join(' ')], [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies.join(' ').trim()), (0, dom_1.html)('rp', ')')])))];
   }
-})))));
+}))));
 const text = (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, ({
   source,
   context
@@ -7176,7 +7186,7 @@ const optspec = {
   rel: undefined
 };
 Object.setPrototypeOf(optspec, null);
-exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['![', '!{'], (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.open)('!', (0, combinator_1.constraint)(8 /* State.media */, false, (0, combinator_1.syntax)(1, ~16 /* State.link */, (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']', [[/^\\?\n/, 9]]), ']', true, undefined, undefined, 1 | 12 /* Backtrack.media */)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/, false, undefined, undefined, 3 | 16 /* Backtrack.link */))]), ([as, bs]) => bs ? [[as.join('').trim() || as.join('')], bs] : [[''], as]), ([[text]]) => text === '' || text.trim() !== ''), ([[text], params], rest, context) => {
+exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['![', '!{'], (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.open)('!', (0, combinator_1.constraint)(4 /* State.media */, false, (0, combinator_1.syntax)(1, ~8 /* State.link */, (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']', [[/^\\?\n/, 9]]), ']', true, undefined, undefined, 1 | 12 /* Backtrack.media */)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/, false, undefined, undefined, 3 | 16 /* Backtrack.link */))]), ([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 ?? location, context.url ?? context.host ?? location), context.host?.href || location.href);
   let cache;
@@ -7192,7 +7202,7 @@ exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['![', '
   if (el.hasAttribute('aspect-ratio')) {
     el.style.aspectRatio = el.getAttribute('aspect-ratio');
   }
-  if (context.state & 16 /* State.link */) return [[el], rest];
+  if (context.state & 8 /* State.link */) return [[el], rest];
   if (cache && cache.tagName !== 'IMG') return [[el], rest];
   return (0, combinator_1.fmap)(link_1.unsafelink, ([link]) => [(0, dom_1.define)(link, {
     class: null,
@@ -7974,7 +7984,7 @@ const hashnum_1 = __webpack_require__(8684);
 const anchor_1 = __webpack_require__(8535);
 const source_1 = __webpack_require__(8745);
 const util_1 = __webpack_require__(4992);
-exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^(?:[@#>0-9a-z]|\S[#>]|[\r\n]!?https?:\/\/)/iu, (0, combinator_1.constraint)(2 /* State.autolink */, false, (0, combinator_1.syntax)(0, ~1 /* State.shortcut */, (0, combinator_1.union)([(0, combinator_1.some)((0, combinator_1.union)([url_1.lineurl])), (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([url_1.url, email_1.email,
+exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^(?:[@#>0-9a-z]|\S[#>]|[\r\n]!?https?:\/\/)/iu, (0, combinator_1.syntax)(0, ~1 /* State.autolink */, (0, combinator_1.union)([(0, combinator_1.some)((0, combinator_1.union)([url_1.lineurl])), (0, combinator_1.fmap)((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-z]+(?:[_.+-][0-9a-z]+)*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i), channel_1.channel, account_1.account,
 // Escape unmatched account-like strings.
@@ -7984,7 +7994,7 @@ exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^(?:
 // 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')),
 // Escape invalid leading characters.
-(0, source_1.str)(/^[0-9a-z](?=>)/iu), anchor_1.anchor])), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)])])))));
+(0, source_1.str)(/^[0-9a-z](?=>)/iu), anchor_1.anchor])), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)])]))));
 
 /***/ },
 
@@ -8188,9 +8198,11 @@ const dom_1 = __webpack_require__(394);
 // cid: YYYY-MMDD-HHMM-SSmmm
 // 内部表現はUnixTimeに統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
-exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('>>', (0, combinator_1.fmap)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.focus)(/^>>(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#:])/i, (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `/@${source.slice(2).replace('/', '/timeline?at=')}` : `?at=${source.slice(2)}`} }`, (0, combinator_1.union)([link_1.unsafelink])))), ([el]) => [(0, dom_1.define)(el, {
+exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('>>', (0, combinator_1.focus)(/^>>(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#:])/i, (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.syntax)(0, 1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `/@${source.slice(2).replace('/', '/timeline?at=')}` : `?at=${source.slice(2)}`} }`, link_1.unsafelink), ([el]) => [(0, dom_1.define)(el, {
   class: 'anchor'
-})])));
+})]))), ({
+  source
+}) => [[source], '']]))));
 
 /***/ },
 
@@ -8478,10 +8490,12 @@ const link_1 = __webpack_require__(3628);
 const hashtag_1 = __webpack_require__(5764);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
-exports.hashnum = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('#', (0, source_1.str)(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, hashtag_1.emoji), 'u')))), (0, combinator_1.convert)(source => `[${source}]{ ${source.slice(1)} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
+exports.hashnum = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)('#', (0, source_1.str)(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, hashtag_1.emoji), 'u'))), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.syntax)(0, 1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.slice(1)} }`, link_1.unsafelink), ([el]) => [(0, dom_1.define)(el, {
   class: 'hashnum',
   href: null
-})]));
+})]))), ({
+  source
+}) => [[source], '']])));
 
 /***/ },
 
@@ -8677,11 +8691,11 @@ const source_1 = __webpack_require__(8745);
 const memoize_1 = __webpack_require__(6925);
 const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
-exports.remark = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[%', (0, combinator_1.creation)(1, 4 /* Recursion.inline */, (0, combinator_1.syntax)(4, 0 /* State.none */, (0, combinator_1.match)(/^\[(%+)\s/, (0, memoize_1.memoize)(([, fence]) => (0, combinator_1.surround)((0, combinator_1.open)((0, source_1.str)(`[${fence}`), (0, combinator_1.some)(source_1.text, new RegExp(String.raw`^\s+${fence}\]|^\S`)), true), (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 4]]), (0, combinator_1.close)((0, combinator_1.some)(source_1.text, /^\S/), (0, source_1.str)(`${fence}]`)), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
+exports.remark = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[%', (0, combinator_1.creation)(1, 4 /* Recursion.inline */, (0, combinator_1.match)(/^\[(%+)\s/, (0, memoize_1.memoize)(([, fence]) => (0, combinator_1.surround)((0, combinator_1.open)((0, source_1.str)(`[${fence}`), (0, combinator_1.some)(source_1.text, new RegExp(String.raw`^\s+${fence}\]|^\S`)), true), (0, combinator_1.syntax)(4, 0 /* State.none */, (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 4]])), (0, combinator_1.close)((0, combinator_1.some)(source_1.text, /^\S/), (0, source_1.str)(`${fence}]`)), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
   class: 'remark'
 }, [(0, dom_1.html)('input', {
   type: 'checkbox'
-}), (0, dom_1.html)('span', (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))])], rest], ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), ([, fence]) => fence.length, {}))))));
+}), (0, dom_1.html)('span', (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))])], rest], ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), ([, fence]) => fence.length, {})))));
 
 /***/ },
 
@@ -8700,7 +8714,7 @@ const inline_1 = __webpack_require__(7973);
 const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const dom_1 = __webpack_require__(394);
-exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.surround)('[[', (0, combinator_1.constraint)(128 /* State.reference */, false, (0, combinator_1.syntax)(1, 256 /* State.annotation */ | 128 /* State.reference */ | 8 /* State.media */, (0, combinator_1.subsequence)([abbr, (0, visibility_1.trimBlankStart)((0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 9], [']', 1]]))]))), ']]', false, ([, ns], rest) => [[(0, dom_1.html)('sup', attributes(ns), [(0, dom_1.html)('span', (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))])], rest], undefined, 1 | 4 /* Backtrack.bracket */)));
+exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.surround)('[[', (0, combinator_1.constraint)(64 /* State.reference */, false, (0, combinator_1.syntax)(1, 128 /* State.annotation */ | 64 /* State.reference */ | 4 /* State.media */, (0, combinator_1.subsequence)([abbr, (0, visibility_1.trimBlankStart)((0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 9], [']', 1]]))]))), ']]', false, ([, ns], rest) => [[(0, dom_1.html)('sup', attributes(ns), [(0, dom_1.html)('span', (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))])], rest], undefined, 1 | 4 /* Backtrack.bracket */)));
 // Chicago-Style
 const abbr = (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?=[A-Z])(?:[0-9A-Za-z]'?|(?:[-.:]|\.?\??,? ?)(?!['\-.:?, ]))+/)]), /^\|?(?=]])|^\|[^\S\n]*/, true, ([, ns], rest) => ns ? [['\n', ns[0].trimEnd()], rest.replace(visibility_1.blank.start, '')] : [[''], `^${rest}`], ([,, rest]) => [[''], `^${rest}`]));
 function attributes(ns) {

package/markdown.d.ts

@@ -603,7 +603,7 @@ export namespace MarkdownParser {
         Block<'reply/cite'>,
         Parser<HTMLSpanElement | HTMLBRElement, Context, [
           SourceParser.StrParser,
-          Parser<HTMLAnchorElement, Context, [
+          Parser<string | HTMLAnchorElement, Context, [
             InlineParser.AutolinkParser.AnchorParser,
             Parser<HTMLAnchorElement, Context, []>,
             Parser<HTMLAnchorElement, Context, []>,
@@ -1147,8 +1147,9 @@ export namespace MarkdownParser {
       export interface UrlParser extends
         // https://host
         Inline<'url'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export namespace UrlParser {
@@ -1156,7 +1157,10 @@ export namespace MarkdownParser {
           Inline<'url/lineurl'>,
           Parser<string | HTMLElement, Context, [
             SourceParser.StrParser,
-            InlineParser.LinkParser.UnsafeLinkParser,
+            Parser<string | HTMLElement, Context, [
+              InlineParser.LinkParser.UnsafeLinkParser,
+              Parser<string, Context, []>,
+            ]>,
           ]> {
         }
         export interface BracketParser extends
@@ -1188,7 +1192,7 @@ export namespace MarkdownParser {
       export interface ChannelParser extends
         // @user#tag
         Inline<'channel'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           InlineParser.AutolinkParser.AccountParser,
           InlineParser.AutolinkParser.HashtagParser,
         ]> {
@@ -1196,29 +1200,33 @@ export namespace MarkdownParser {
       export interface AccountParser extends
         // @user
         Inline<'account'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface HashtagParser extends
         // #tag
         Inline<'hashtag'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface HashnumParser extends
         // #1
         Inline<'hashnum'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface AnchorParser extends
         // >>1
         Inline<'anchor'>,
-        Parser<HTMLAnchorElement, Context, [
+        Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
+          Parser<string, Context, []>,
         ]> {
       }
     }

package/package.json

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

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

@@ -59,10 +59,10 @@ export function surround<T>(
       const { logger = {}, offset = 0 } = context;
       for (let i = 0; i < source.length - mr_.length; ++i) {
         if (source[i] !== source[0]) break;
-        const j = source.length + offset - i;
-        if (!(j in logger)) continue;
+        const pos = source.length + offset - i - 1;
+        if (!(pos in logger)) continue;
         assert(log >>> 2);
-        if (logger[j] & 1 << (log >>> 2)) return;
+        if (logger[pos] & 1 << (log >>> 2)) return;
       }
     }
     const res2 = mr_ !== '' ? parser({ source: mr_, context }) : undefined;
@@ -77,7 +77,7 @@ export function surround<T>(
     if (rest.length === lmr_.length) return;
     if (log & 2 && rr === undefined) {
       const { logger = {}, offset = 0 } = context;
-      logger[source.length + offset] |= 1 << (log >>> 2);
+      logger[source.length + offset - 1] |= 1 << (log >>> 2);
     }
     return rr
       ? f

package/src/combinator/data/parser/context/delimiter.ts

@@ -33,7 +33,7 @@ export class Delimiters {
     this.signature);
   private readonly registry = memoize<(signature: string) => Delimiter[]>(() => []);
   private readonly delimiters: Delimiter[] = [];
-  private readonly order: number[] = [];
+  private readonly stack: number[] = [];
   private readonly states: (readonly number[])[] = [];
   public push(
     delims: readonly {
@@ -42,14 +42,14 @@ export class Delimiters {
       readonly precedence: number;
     }[]
   ): void {
-    const { registry, delimiters, order } = this;
-    // 構文数x優先順位数以下
+    const { registry, delimiters, stack } = this;
+    // シグネチャ数以下
     assert(delimiters.length < 100);
     for (let i = 0; i < delims.length; ++i) {
       const { signature, matcher, precedence } = delims[i];
-      const stack = registry(signature);
-      const index = stack[0]?.index ?? delimiters.length;
-      if (stack.length === 0 || precedence > delimiters[index].precedence) {
+      const memory = registry(signature);
+      const index = memory[0]?.index ?? delimiters.length;
+      if (memory.length === 0 || precedence > delimiters[index].precedence) {
         const delimiter: Delimiter = {
           index,
           signature,
@@ -58,34 +58,34 @@ export class Delimiters {
           state: true,
         };
         delimiters[index] = delimiter;
-        stack.push(delimiter);
-        order.push(index);
+        memory.push(delimiter);
+        stack.push(index);
       }
       else {
-        order.push(-1);
+        stack.push(-1);
       }
       // 現状各優先順位は固定
-      assert(stack.length === 1);
+      assert(memory.length === 1);
     }
   }
   public pop(count: number): void {
     assert(count > 0);
-    const { registry, delimiters, order } = this;
+    const { registry, delimiters, stack } = this;
     for (let i = 0; i < count; ++i) {
-      assert(this.order.length > 0);
-      const index = order.pop()!;
+      assert(this.stack.length > 0);
+      const index = stack.pop()!;
       if (index === -1) continue;
-      const stack = registry(delimiters[index].signature);
-      assert(stack.length > 0);
-      if (stack.length === 1) {
+      const memory = registry(delimiters[index].signature);
+      assert(memory.length > 0);
+      if (memory.length === 1) {
         assert(index === delimiters.length - 1);
-        assert(stack[0] === delimiters.at(-1));
-        stack.pop();
+        assert(memory[0] === delimiters.at(-1));
+        memory.pop();
         delimiters.pop();
       }
       else {
-        stack.pop();
-        delimiters[index] = stack.at(-1)!;
+        memory.pop();
+        delimiters[index] = memory.at(-1)!;
       }
     }
   }

package/src/combinator/data/parser/context.ts

@@ -96,11 +96,12 @@ export function precedence<T>(precedence: number, parser: Parser<T>): Parser<T>
   assert(precedence >= 0);
   return ({ source, context }) => {
     const { delimiters, precedence: p = 0 } = context;
-    const shift = precedence > p;
+    const shift = delimiters && precedence > p;
     context.precedence = precedence;
-    shift && delimiters?.shift(precedence);
+    // デリミタはシフト後に設定しなければならない
+    shift && delimiters.shift(precedence);
     const result = parser({ source, context });
-    shift && delimiters?.unshift();
+    shift && delimiters.unshift();
     context.precedence = p;
     return result;
   };

package/src/parser/context.ts

@@ -1,13 +1,12 @@
 export const enum State {
-  annotation = 1 << 8,
-  reference = 1 << 7,
-  index = 1 << 6,
-  label = 1 << 5,
-  link = 1 << 4,
-  media = 1 << 3,
-  mark = 1 << 2,
-  autolink = 1 << 1,
-  shortcut = 1 << 0,
+  annotation = 1 << 7,
+  reference = 1 << 6,
+  index = 1 << 5,
+  label = 1 << 4,
+  link = 1 << 3,
+  media = 1 << 2,
+  mark = 1 << 1,
+  autolink = 1 << 0,
   none = 0,
   all = ~0,
   linkers = 0

package/src/parser/inline/autolink/account.ts

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { union, tails, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, tails, syntax, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { State } from '../../context';
@@ -7,20 +7,21 @@ import { define } from 'typed-dom/dom';
 
 // https://example/@user must be a user page or a redirect page going there.
 
-export const account: AutolinkParser.AccountParser = lazy(() => fmap(rewrite(
-  constraint(State.shortcut, false,
+export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
   open(
     '@',
     tails([
       str(/^[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//i),
       str(/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*/i),
-    ]))),
-  convert(
-    source =>
-      `[${source}]{ ${
-      source.includes('/')
-        ? `https://${source.slice(1).replace('/', '/@')}`
-        : `/${source}`
-      } }`,
-    union([unsafelink]))),
-  ([el]) => [define(el, { class: 'account' })]));
+    ])),
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+      source =>
+        `[${source}]{ ${source.includes('/')
+          ? `https://${source.slice(1).replace('/', '/@')}`
+          : `/${source}`
+        } }`,
+      unsafelink),
+      ([el]) => [define(el, { class: 'account' })]))),
+    ({ source }) => [[source], ''],
+  ])));

package/src/parser/inline/autolink/anchor.ts

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, validate, focus, convert, fmap, lazy } from '../../../combinator';
+import { union, syntax, constraint, validate, focus, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { State } from '../../context';
 import { define } from 'typed-dom/dom';
@@ -14,16 +14,17 @@ import { define } from 'typed-dom/dom';
 // 内部表現はUnixTimeに統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
 
-export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>', fmap(
-  constraint(State.shortcut, false,
+export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>',
   focus(
     /^>>(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#:])/i,
-    convert(
-      source =>
-        `[${source}]{ ${
-        source.includes('/')
-          ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
-          : `?at=${source.slice(2)}`
-        } }`,
-      union([unsafelink])))),
-  ([el]) => [define(el, { class: 'anchor' })])));
+    union([
+      constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+        source =>
+          `[${source}]{ ${source.includes('/')
+            ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
+            : `?at=${source.slice(2)}`
+          } }`,
+        unsafelink),
+        ([el]) => [define(el, { class: 'anchor' })]))),
+      ({ source }) => [[source], ''],
+    ]))));

package/src/parser/inline/autolink/channel.ts

@@ -1,13 +1,15 @@
 import { AutolinkParser } from '../../inline';
-import { sequence, some, validate, bind } from '../../../combinator';
+import { sequence, some, constraint, validate, bind } from '../../../combinator';
 import { account } from './account';
 import { hashtag } from './hashtag';
+import { State } from '../../context';
 import { stringify } from '../../util';
 import { define } from 'typed-dom/dom';
 
 // https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
 
-export const channel: AutolinkParser.ChannelParser = validate('@', bind(
+export const channel: AutolinkParser.ChannelParser = validate('@',
+  constraint(State.autolink, false, bind(
   sequence([
     account,
     some(hashtag),
@@ -15,6 +17,7 @@ export const channel: AutolinkParser.ChannelParser = validate('@', bind(
   (es, rest) => {
     const source = stringify(es);
     const el = es[0];
+    if (typeof el === 'string') return [es, rest];
     const url = `${el.getAttribute('href')}?ch=${source.slice(source.indexOf('#') + 1).replace(/#/g, '+')}`;
     return [[define(el, { class: 'channel', href: url }, source)], rest];
-  }));
+  })));

package/src/parser/inline/autolink/email.ts

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
-import { creation, verify, rewrite } from '../../../combinator';
+import { syntax, creation, constraint, verify, rewrite } from '../../../combinator';
 import { str } from '../../source';
-import { Recursion } from '../../context';
+import { State, Recursion } from '../../context';
 import { html } from 'typed-dom/dom';
 
 // https://html.spec.whatwg.org/multipage/input.html
@@ -9,4 +9,5 @@ import { html } from 'typed-dom/dom';
 export const email: AutolinkParser.EmailParser = creation(1, Recursion.ignore, rewrite(verify(
   str(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z])/i),
   ([source]) => source.length <= 255),
-  ({ source }) => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], '']));
+  constraint(State.autolink, false, syntax(0, State.autolink,
+    ({ source }) => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], '']))));

package/src/parser/inline/autolink/hashnum.ts

@@ -1,15 +1,17 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, syntax, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { emoji } from './hashtag';
 import { str } from '../../source';
 import { State } from '../../context';
 import { define } from 'typed-dom/dom';
 
-export const hashnum: AutolinkParser.HashnumParser = lazy(() => fmap(rewrite(
-  constraint(State.shortcut, false,
-  open('#', str(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, emoji), 'u')))),
-  convert(
-    source => `[${source}]{ ${source.slice(1)} }`,
-    union([unsafelink]))),
-  ([el]) => [define(el, { class: 'hashnum', href: null })]));
+export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
+  open('#', str(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, emoji), 'u'))),
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+      source => `[${source}]{ ${source.slice(1)} }`,
+      unsafelink),
+      ([el]) => [define(el, { class: 'hashnum', href: null })]))),
+    ({ source }) => [[source], ''],
+  ])));

package/src/parser/inline/autolink/hashtag.ts

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../../inline';
-import { union, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, syntax, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { State } from '../../context';
@@ -10,15 +10,17 @@ import { define } from 'typed-dom/dom';
 // https://github.com/tc39/proposal-regexp-unicode-property-escapes#matching-emoji
 export const emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F`;
 
-export const hashtag: AutolinkParser.HashtagParser = lazy(() => fmap(rewrite(
-  constraint(State.shortcut, false,
+export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
   open(
     '#',
     str(new RegExp([
       /^(?!['_])(?=(?:[0-9]{1,9})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'|_(?=[^\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|'))+/u.source,
-    ].join('').replace(/emoji/g, emoji), 'u')))),
-  convert(
-    source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
-    union([unsafelink]))),
-  ([el]) => [define(el, { class: 'hashtag' })]));
+    ].join('').replace(/emoji/g, emoji), 'u'))),
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, fmap(convert(
+      source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
+      unsafelink),
+      ([el]) => [define(el, { class: 'hashtag' })]))),
+    ({ source }) => [[source], ''],
+  ])));

package/src/parser/inline/autolink/url.ts

@@ -1,8 +1,8 @@
 import { AutolinkParser } from '../../inline';
-import { union, tails, some, creation, precedence, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
+import { union, tails, some, syntax, creation, precedence, constraint, validate, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { linebreak, unescsource, str } from '../../source';
-import { Backtrack, Recursion } from '../../context';
+import { State, Recursion, Backtrack } from '../../context';
 
 const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
 
@@ -10,24 +10,30 @@ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'ht
   open(
     /^https?:\/\/(?=[\x21-\x7E])/,
     focus(/^[\x21-\x7E]+/, some(union([bracket, some(unescsource, closer)])))),
-  convert(
-    url => `{ ${url} }`,
-    union([unsafelink])))));
+  union([
+    constraint(State.autolink, false, syntax(0, State.autolink, convert(
+      url => `{ ${url} }`,
+      unsafelink))),
+    ({ source }) => [[source], ''],
+  ]))));
 
 export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => open(
   linebreak,
-  tails([
-    str('!'),
-    focus(
-      /^https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
-      convert(
-        url => `{ ${url} }`,
-        unsafelink)),
-  ])));
+  focus(
+    /^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
+    tails([
+      str('!'),
+      union([
+        constraint(State.autolink, false, syntax(0, State.autolink, convert(
+          url => `{ ${url} }`,
+          unsafelink))),
+        ({ source }) => [[source], ''],
+      ]),
+    ]))));
 
-const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(0, Recursion.terminal, precedence(1, union([
-  surround(str('('), some(union([bracket, unescsource]), ')'), str(')'), true, undefined, undefined, 3 | Backtrack.url),
-  surround(str('['), some(union([bracket, unescsource]), ']'), str(']'), true, undefined, undefined, 3 | Backtrack.url),
-  surround(str('{'), some(union([bracket, unescsource]), '}'), str('}'), true, undefined, undefined, 3 | Backtrack.url),
+const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => creation(0, Recursion.terminal, union([
+  surround(str('('), precedence(1, some(union([bracket, unescsource]), ')')), str(')'), true, undefined, undefined, 3 | Backtrack.url),
+  surround(str('['), precedence(1, some(union([bracket, unescsource]), ']')), str(']'), true, undefined, undefined, 3 | Backtrack.url),
+  surround(str('{'), precedence(1, some(union([bracket, unescsource]), '}')), str('}'), true, undefined, undefined, 3 | Backtrack.url),
   surround(str('"'), precedence(2, some(unescsource, '"')), str('"'), true, undefined, undefined, 3 | Backtrack.url),
-]))));
+])));

package/src/parser/inline/autolink.ts

@@ -1,5 +1,5 @@
 import { AutolinkParser } from '../inline';
-import { union, some, syntax, constraint, validate, lazy, fmap } from '../../combinator';
+import { union, some, syntax, validate, lazy, fmap } from '../../combinator';
 import { url, lineurl } from './autolink/url';
 import { email } from './autolink/email';
 import { channel } from './autolink/channel';
@@ -13,8 +13,7 @@ import { stringify } from '../util';
 
 export const autolink: AutolinkParser = lazy(() =>
   validate(/^(?:[@#>0-9a-z]|\S[#>]|[\r\n]!?https?:\/\/)/iu,
-  constraint(State.autolink, false,
-  syntax(0, ~State.shortcut,
+  syntax(0, ~State.autolink,
   union([
     some(union([lineurl])),
     fmap(some(union([
@@ -37,4 +36,4 @@ export const autolink: AutolinkParser = lazy(() =>
       anchor,
     ])),
     ns => ns.length === 1 ? ns : [stringify(ns)]),
-  ])))));
+  ]))));

package/src/parser/inline/html.ts

@@ -18,48 +18,50 @@ const attrspecs = {
 Object.setPrototypeOf(attrspecs, null);
 Object.values(attrspecs).forEach(o => Object.setPrototypeOf(o, null));
 
-export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^\S\n]|>)/i, creation(1, Recursion.inline, syntax(3, State.none, union([
-  focus(
-    /^<wbr[^\S\n]*>/i,
-    () => [[h('wbr')], '']),
-  surround(
-    // https://html.spec.whatwg.org/multipage/syntax.html#void-elements
-    str(/^<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[^\S\n]|>)/i), some(union([attribute])), str(/^[^\S\n]*>/), true,
-    ([as, bs = [], cs], rest) =>
-      [[elem(as[0].slice(1), push(unshift(as, bs), cs), [], [])], rest]),
-  match(
-    new RegExp(String.raw`^<(${TAGS.join('|')})(?=[^\S\n]|>)`),
-    memoize(
-    ([, tag]) =>
-      surround<HTMLParser.TagParser, string>(surround(
-        str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
-        subsequence([
-          focus(/^[^\S\n]*\n/, some(inline)),
-          some(open(/^\n?/, some(inline, blankWith('\n', `</${tag}>`), [[blankWith('\n', `</${tag}>`), 3]]), true)),
-        ]),
-        str(`</${tag}>`), true,
-        ([as, bs = [], cs], rest) =>
-          [[elem(tag, as, bs, cs)], rest],
-        ([as, bs = []], rest) =>
-          [[elem(tag, as, bs, [])], rest]))),
-  match(
-    /^<([a-z]+)(?=[^\S\n]|>)/i,
-    memoize(
-    ([, tag]) =>
-      surround<HTMLParser.TagParser, string>(surround(
-        str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
-        subsequence([
-          focus(/^[^\S\n]*\n/, some(inline)),
-          some(inline, `</${tag}>`, [[`</${tag}>`, 3]]),
-        ]),
-        str(`</${tag}>`), true,
-        ([as, bs = [], cs], rest) =>
-          [[elem(tag, as, bs, cs)], rest],
-        ([as, bs = []], rest) =>
-          [[elem(tag, as, bs, [])], rest]),
-    ([, tag]) => tag,
-    new Clock(10000))),
-]))))));
+export const html: HTMLParser = lazy(() => validate('<', validate(/^<[a-z]+(?=[^\S\n]|>)/i, creation(1, Recursion.inline,
+  syntax(3, State.none,
+  union([
+    focus(
+      /^<wbr[^\S\n]*>/i,
+      () => [[h('wbr')], '']),
+    surround(
+      // https://html.spec.whatwg.org/multipage/syntax.html#void-elements
+      str(/^<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[^\S\n]|>)/i), some(union([attribute])), str(/^[^\S\n]*>/), true,
+      ([as, bs = [], cs], rest) =>
+        [[elem(as[0].slice(1), push(unshift(as, bs), cs), [], [])], rest]),
+    match(
+      new RegExp(String.raw`^<(${TAGS.join('|')})(?=[^\S\n]|>)`),
+      memoize(
+      ([, tag]) =>
+        surround<HTMLParser.TagParser, string>(surround(
+          str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
+          subsequence([
+            focus(/^[^\S\n]*\n/, some(inline)),
+            some(open(/^\n?/, some(inline, blankWith('\n', `</${tag}>`), [[blankWith('\n', `</${tag}>`), 3]]), true)),
+          ]),
+          str(`</${tag}>`), true,
+          ([as, bs = [], cs], rest) =>
+            [[elem(tag, as, bs, cs)], rest],
+          ([as, bs = []], rest) =>
+            [[elem(tag, as, bs, [])], rest]))),
+    match(
+      /^<([a-z]+)(?=[^\S\n]|>)/i,
+      memoize(
+      ([, tag]) =>
+        surround<HTMLParser.TagParser, string>(surround(
+          str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
+          subsequence([
+            focus(/^[^\S\n]*\n/, some(inline)),
+            some(inline, `</${tag}>`, [[`</${tag}>`, 3]]),
+          ]),
+          str(`</${tag}>`), true,
+          ([as, bs = [], cs], rest) =>
+            [[elem(tag, as, bs, cs)], rest],
+          ([as, bs = []], rest) =>
+            [[elem(tag, as, bs, [])], rest]),
+      ([, tag]) => tag,
+      new Clock(10000))),
+  ]))))));
 
 export const attribute: HTMLParser.AttributeParser = union([
   str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="[^"\n]*")?(?=[^\S\n]|>)/i),

package/src/parser/inline/link.ts

@@ -15,12 +15,12 @@ const optspec = {
 } as const;
 Object.setPrototypeOf(optspec, null);
 
-export const link: LinkParser = lazy(() => validate(['[', '{'], union([
+export const link: LinkParser = lazy(() => union([
   medialink,
   textlink,
-])));
+]));
 
-export const textlink: LinkParser.TextLinkParser = lazy(() => creation(1, Recursion.ignore,
+export const textlink: LinkParser.TextLinkParser = lazy(() => validate(['[', '{'], creation(1, Recursion.ignore,
   constraint(State.link, false,
   syntax(1, State.linkers | State.media,
   bind(reverse(tails([
@@ -40,9 +40,9 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => creation(1, Recurs
     assert(content[0] !== '');
     if (content.length !== 0 && trimNodeEnd(content = defrag(content)).length === 0) return;
     return [[parse(content, params, context)], rest];
-  })))));
+  }))))));
 
-export const medialink: LinkParser.MediaLinkParser = lazy(() => creation(1, Recursion.ignore,
+export const medialink: LinkParser.MediaLinkParser = lazy(() => validate(['[', '{'], creation(1, Recursion.ignore,
   constraint(State.link | State.media, false,
   syntax(1, State.linkers,
   bind(reverse(sequence([
@@ -53,7 +53,7 @@ export const medialink: LinkParser.MediaLinkParser = lazy(() => creation(1, Recu
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ])),
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) =>
-    [[parse(defrag(content), params, context)], rest])))));
+    [[parse(defrag(content), params, context)], rest]))))));
 
 export const linemedialink: LinkParser.LineMediaLinkParser = surround(
   linebreak,
@@ -61,7 +61,8 @@ export const linemedialink: LinkParser.LineMediaLinkParser = surround(
   /^(?=[^\S\n]*(?:$|\n))/);
 
 export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
-  creation(1, Recursion.ignore, precedence(1,
+  creation(1, Recursion.ignore,
+  precedence(1,
   bind(reverse(tails([
     dup(surround(
       '[',

package/src/parser/inline/remark.ts

@@ -7,13 +7,13 @@ import { memoize } from 'spica/memoize';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const remark: RemarkParser = lazy(() => validate('[%', creation(1, Recursion.inline, syntax(4, State.none, match(
+export const remark: RemarkParser = lazy(() => validate('[%', creation(1, Recursion.inline, match(
   /^\[(%+)\s/,
   memoize(
   ([, fence]) =>
     surround(
       open(str(`[${fence}`), some(text, new RegExp(String.raw`^\s+${fence}\]|^\S`)), true),
-      some(union([inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 4]]),
+      syntax(4, State.none, some(union([inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 4]])),
       close(some(text, /^\S/), str(`${fence}]`)), true,
       ([as, bs = [], cs], rest) => [[
         html('span', { class: 'remark' }, [
@@ -22,4 +22,4 @@ export const remark: RemarkParser = lazy(() => validate('[%', creation(1, Recurs
         ]),
       ], rest],
       ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  ([, fence]) => fence.length, {}))))));
+  ([, fence]) => fence.length, {})))));

package/src/parser/inline/ruby.ts

@@ -8,7 +8,8 @@ import { isStartTightNodes } from '../visibility';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const ruby: RubyParser = lazy(() => validate('[', creation(1, Recursion.ignore, syntax(1, State.all, fmap(
+export const ruby: RubyParser = lazy(() => validate('[', creation(1, Recursion.ignore, fmap(
+  syntax(1, State.all,
   sequence([
     bind(surround('[', str(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']', false, undefined, undefined, 3 | Backtrack.ruby), ([source], rest, context) => {
       const ns = eval(text({ source, context }), [undefined])[0];
@@ -19,7 +20,7 @@ export const ruby: RubyParser = lazy(() => validate('[', creation(1, Recursion.i
       const ns = eval(text({ source, context }), [undefined])[0];
       return ns && [[ns], rest];
     }),
-  ]),
+  ])),
   ([texts, rubies]) => {
     switch (true) {
       case rubies.length <= texts.length:
@@ -50,7 +51,7 @@ export const ruby: RubyParser = lazy(() => validate('[', creation(1, Recursion.i
             [html('rp', '('), html('rt', rubies.join(' ').trim()), html('rp', ')')]))),
         ];
     }
-  })))));
+  }))));
 
 const text: RubyParser.TextParser = creation(1, Recursion.ignore, ({ source, context }) => {
   const acc = [''];

package/src/parser/inline.test.ts

@@ -173,6 +173,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('"[% *"*"*')), [['"', '[%', ' ', '*', '"', '*', '"', '*'], '']);
       assert.deepStrictEqual(inspect(parser('"[% "*"* %]')), [['"', '<span class="remark"><input type="checkbox"><span>[% "*"* %]</span></span>'], '']);
       assert.deepStrictEqual(inspect(parser('"{{""}}')), [['"', '{', '{', '"', '"', '}', '}'], '']);
+      assert.deepStrictEqual(inspect(parser('[#http://a/(<bdi>)]</bdi>')), [['<a class="index" href="#index::http://a/(&lt;bdi&gt;)">http://a/(&lt;bdi&gt;)</a>', '<', '/', 'bdi', '>'], '']);
     });
 
     it('uri', () => {