securemark 0.277.0 → 0.279.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.279.0
+
+- Change media syntax not to be included in inline syntax.
+
+## 0.278.0
+
+- Extend account syntax.
+
 ## 0.277.0
 
 - Revert emphasis syntax and strong syntax.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.277.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.279.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("Prism"), require("DOMPurify"));
@@ -4350,6 +4350,7 @@ const mathblock_1 = __webpack_require__(3754);
 const extension_1 = __webpack_require__(4751);
 const sidefence_1 = __webpack_require__(4078);
 const blockquote_1 = __webpack_require__(7859);
+const mediablock_1 = __webpack_require__(785);
 const reply_1 = __webpack_require__(9978);
 const paragraph_1 = __webpack_require__(6457);
 const random_1 = __webpack_require__(7325);
@@ -4359,7 +4360,7 @@ exports.block = (0, combinator_1.creation)(1, false, error((0, combinator_1.rese
     clock: 50 * 1000,
     recursion: 20
   }
-}, (0, combinator_1.union)([source_1.emptyline, pagebreak_1.pagebreak, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, extension_1.extension, sidefence_1.sidefence, blockquote_1.blockquote, reply_1.reply, paragraph_1.paragraph]))));
+}, (0, combinator_1.union)([source_1.emptyline, pagebreak_1.pagebreak, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, extension_1.extension, sidefence_1.sidefence, blockquote_1.blockquote, mediablock_1.mediablock, reply_1.reply, paragraph_1.paragraph]))));
 function error(parser) {
   return (0, combinator_1.recover)((0, combinator_1.fallback)((0, combinator_1.open)('\x07', ({
     source
@@ -4736,7 +4737,7 @@ const dom_1 = __webpack_require__(3252);
 exports.segment = (0, combinator_1.block)((0, combinator_1.match)(/^(~{3,})(?:figure[^\S\n])?(?=\[?\$)/, (0, memoize_1.memoize)(([, fence], closer = new RegExp(String.raw`^${fence}[^\S\n]*(?:$|\n)`)) => (0, combinator_1.close)((0, combinator_1.sequence)([source_1.contentline, (0, combinator_1.inits)([
 // All parsers which can include closing terms.
 (0, combinator_1.union)([codeblock_1.segment_, mathblock_1.segment_, table_2.segment_, blockquote_1.segment, placeholder_1.segment_, (0, combinator_1.some)(source_1.contentline, closer)]), source_1.emptyline, (0, combinator_1.union)([source_1.emptyline, (0, combinator_1.some)(source_1.contentline, closer)])])]), closer), ([, fence]) => fence.length, [])));
-exports.figure = (0, combinator_1.block)((0, combinator_1.fallback)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.fmap)((0, combinator_1.convert)(source => source.slice(source.match(/^~+(?:\w+\s+)?/)[0].length, source.trimEnd().lastIndexOf('\n')), (0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.sequence)([label_1.label, (0, source_1.str)(/^(?=\s).*\n/)])), (0, combinator_1.inits)([(0, combinator_1.block)((0, combinator_1.union)([ulist_1.ulist, olist_1.olist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, example_1.example, table_2.table, blockquote_1.blockquote, placeholder_1.placeholder, (0, combinator_1.line)(inline_1.media), (0, combinator_1.line)(inline_1.shortmedia)])), source_1.emptyline, (0, combinator_1.block)((0, combinator_1.state)(8 /* State.media */, (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)(inline_1.inline)))))])])), ([label, param, content, ...caption]) => [(0, dom_1.html)('figure', attributes(label.getAttribute('data-label'), param, content, caption), [(0, dom_1.html)('figcaption', [(0, dom_1.html)('span', {
+exports.figure = (0, combinator_1.block)((0, combinator_1.fallback)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.fmap)((0, combinator_1.convert)(source => source.slice(source.match(/^~+(?:\w+\s+)?/)[0].length, source.trimEnd().lastIndexOf('\n')), (0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.sequence)([label_1.label, (0, source_1.str)(/^(?=\s).*\n/)])), (0, combinator_1.inits)([(0, combinator_1.block)((0, combinator_1.union)([ulist_1.ulist, olist_1.olist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, example_1.example, table_2.table, blockquote_1.blockquote, placeholder_1.placeholder, (0, combinator_1.line)(inline_1.media), (0, combinator_1.line)(inline_1.shortmedia)])), source_1.emptyline, (0, combinator_1.block)((0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)(inline_1.inline))))])])), ([label, param, content, ...caption]) => [(0, dom_1.html)('figure', attributes(label.getAttribute('data-label'), param, content, caption), [(0, dom_1.html)('figcaption', [(0, dom_1.html)('span', {
   class: 'figindex'
 }), (0, dom_1.html)('span', {
   class: 'figtext'
@@ -4857,6 +4858,7 @@ const codeblock_1 = __webpack_require__(1849);
 const mathblock_1 = __webpack_require__(3754);
 const sidefence_1 = __webpack_require__(4078);
 const blockquote_1 = __webpack_require__(7859);
+const mediablock_1 = __webpack_require__(785);
 const paragraph_1 = __webpack_require__(6457);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
@@ -4903,7 +4905,7 @@ function title(type) {
   }
 }
 // Must not have indexed blocks.
-const content = (0, combinator_1.union)([source_1.emptyline, ulist_1.ulist, olist_1.olist, ilist_1.ilist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, sidefence_1.sidefence, blockquote_1.blockquote, paragraph_1.paragraph]);
+const content = (0, combinator_1.union)([source_1.emptyline, ulist_1.ulist, olist_1.olist, ilist_1.ilist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, sidefence_1.sidefence, blockquote_1.blockquote, mediablock_1.mediablock, paragraph_1.paragraph]);
 
 /***/ }),
 
@@ -4985,8 +4987,8 @@ const row = (0, combinator_1.lazy)(() => (0, combinator_1.dup)((0, combinator_1.
 const alignment = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)/;
 const align = (0, combinator_1.line)((0, combinator_1.fmap)((0, combinator_1.union)([(0, source_1.str)(alignment)]), ([s]) => s.split('/').map(s => s.split(''))));
 const delimiter = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|^[#:](?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=\s)/;
-const head = (0, combinator_1.creation)(1, false, (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(/^#(?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=\s)/), (0, combinator_1.rewrite)((0, combinator_1.inits)([source_1.anyline, (0, combinator_1.some)(source_1.contentline, delimiter)]), (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.inline])))), true)), true), ns => [(0, dom_1.html)('th', attributes(ns.shift()), (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))]), false));
-const data = (0, combinator_1.creation)(1, false, (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(/^:(?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=\s)/), (0, combinator_1.rewrite)((0, combinator_1.inits)([source_1.anyline, (0, combinator_1.some)(source_1.contentline, delimiter)]), (0, combinator_1.open)(/^(?:\s*\n|\s)/, (0, visibility_1.visualize)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]))), true)), true), ns => [(0, dom_1.html)('td', attributes(ns.shift()), (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))]), false));
+const head = (0, combinator_1.creation)(1, false, (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(/^#(?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=\s)/), (0, combinator_1.rewrite)((0, combinator_1.inits)([source_1.anyline, (0, combinator_1.some)(source_1.contentline, delimiter)]), (0, combinator_1.union)([(0, combinator_1.block)((0, combinator_1.surround)(/^[^\n]/, inline_1.medialink, /^\s*$/)), (0, combinator_1.block)((0, combinator_1.surround)(/^[^\n]/, inline_1.media, /^\s*$/)), (0, combinator_1.block)((0, combinator_1.surround)(/^[^\n]/, inline_1.shortmedia, /^\s*$/)), (0, combinator_1.open)(/^(?:\s*\n|\s)/, (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)(inline_1.inline))), true)])), true), ns => [(0, dom_1.html)('th', attributes(ns.shift()), (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))]), false));
+const data = (0, combinator_1.creation)(1, false, (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(/^:(?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=\s)/), (0, combinator_1.rewrite)((0, combinator_1.inits)([source_1.anyline, (0, combinator_1.some)(source_1.contentline, delimiter)]), (0, combinator_1.union)([(0, combinator_1.block)((0, combinator_1.surround)(/^[^\n]/, inline_1.medialink, /^\s*$/)), (0, combinator_1.block)((0, combinator_1.surround)(/^[^\n]/, inline_1.media, /^\s*$/)), (0, combinator_1.block)((0, combinator_1.surround)(/^[^\n]/, inline_1.shortmedia, /^\s*$/)), (0, combinator_1.open)(/^(?:\s*\n|\s)/, (0, visibility_1.visualize)((0, combinator_1.some)(inline_1.inline)), true)])), true), ns => [(0, dom_1.html)('td', attributes(ns.shift()), (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))]), false));
 const dataline = (0, combinator_1.creation)(1, false, (0, combinator_1.line)((0, combinator_1.rewrite)(source_1.contentline, (0, combinator_1.union)([(0, combinator_1.validate)(/^!+\s/, (0, combinator_1.convert)(source => `:${source}`, data)), (0, combinator_1.convert)(source => `: ${source}`, data)]))));
 function attributes(source) {
   let [, rowspan = undefined, colspan = undefined, highlight = undefined, extension = undefined] = source.match(/^[#:](?:(\d+)?:(\d+)?)?(?:(!+)([+]?))?$/) ?? [];
@@ -5237,8 +5239,8 @@ const ulist_1 = __webpack_require__(5425);
 const olist_1 = __webpack_require__(7471);
 const inline_1 = __webpack_require__(1160);
 const dom_1 = __webpack_require__(3252);
-exports.ilist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^[-+*](?=[^\S\n]|\n[^\S\n]*\S)/, (0, combinator_1.state)(8 /* State.media */, exports.ilist_))));
-exports.ilist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^[-+*](?:$|\s)/, (0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^[-+*](?:$|\s)/, (0, combinator_1.some)(inline_1.inline), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, olist_1.olist_, exports.ilist_]))]), olist_1.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)((0, ulist_1.fillFirstLine)(ns)))])])))), es => [(0, dom_1.html)('ul', {
+exports.ilist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^[-+*](?=[^\S\n]|\n[^\S\n]*\S)/, exports.ilist_)));
+exports.ilist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^[-+*](?:$|\s)/, (0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^[-+*](?:$|\s)/, (0, combinator_1.some)(inline_1.inline), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, olist_1.olist_, exports.ilist_]))]), ulist_1.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)((0, ulist_1.fillFirstLine)(ns)))])])))), es => [(0, dom_1.html)('ul', {
   class: 'invalid',
   'data-invalid-syntax': 'list',
   'data-invalid-type': 'syntax',
@@ -5281,6 +5283,31 @@ exports.mathblock = (0, combinator_1.block)((0, combinator_1.validate)('$$', (0,
 
 /***/ }),
 
+/***/ 785:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.mediablock = void 0;
+const combinator_1 = __webpack_require__(2087);
+const inline_1 = __webpack_require__(1160);
+const dom_1 = __webpack_require__(3252);
+exports.mediablock = (0, combinator_1.block)((0, combinator_1.validate)(['[!', '!'], (0, combinator_1.fmap)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.union)([inline_1.medialink, inline_1.media, inline_1.shortmedia])), (0, combinator_1.some)((0, combinator_1.line)((0, combinator_1.fallback)((0, combinator_1.union)([inline_1.medialink, inline_1.media, inline_1.shortmedia]), ({
+  source
+}) => [[(0, dom_1.html)('div', [(0, dom_1.html)('span', attrs, source.replace('\n', ''))])], ''])))]), ns => [(0, dom_1.html)('div', ns)])));
+const attrs = {
+  class: 'invalid',
+  'data-invalid-syntax': 'mediablock',
+  'data-invalid-type': 'syntax',
+  'data-invalid-message': 'Not media syntax'
+};
+
+/***/ }),
+
 /***/ 7471:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -5290,13 +5317,12 @@ exports.mathblock = (0, combinator_1.block)((0, combinator_1.validate)('$$', (0,
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.invalid = exports.olist_ = exports.olist = void 0;
+exports.olist_ = exports.olist = void 0;
 const combinator_1 = __webpack_require__(2087);
 const ulist_1 = __webpack_require__(5425);
 const ilist_1 = __webpack_require__(238);
 const inline_1 = __webpack_require__(1160);
 const index_1 = __webpack_require__(4479);
-const source_1 = __webpack_require__(6743);
 const visibility_1 = __webpack_require__(7618);
 const memoize_1 = __webpack_require__(1808);
 const dom_1 = __webpack_require__(3252);
@@ -5304,12 +5330,12 @@ const openers = {
   '.': /^([0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*(?![^\S\n])\.?(?:$|\s)/,
   '(': /^\(([0-9]*|[a-z]*)(?![^)\n])\)?(?:-(?!-)[0-9]*)*(?:$|\s)/
 };
-exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(new RegExp([/^([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\.(?=[^\S\n]|\n[^\S\n]*\S)/.source, /^\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S)/.source].join('|')), (0, combinator_1.state)(8 /* State.media */, exports.olist_))));
+exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(new RegExp([/^([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\.(?=[^\S\n]|\n[^\S\n]*\S)/.source, /^\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S)/.source].join('|')), exports.olist_)));
 exports.olist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.union)([(0, combinator_1.match)(openers['.'], (0, memoize_1.memoize)(ms => list(type(ms[1]), '.'), ms => idx(ms[1]), [])), (0, combinator_1.match)(openers['('], (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => idx(ms[1]), []))])));
 const list = (type, form) => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(heads[form], (0, combinator_1.subsequence)([ulist_1.checkbox, (0, combinator_1.trim)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.close)((0, combinator_1.union)([index_1.index]), /^$/), ([el]) => [(0, dom_1.define)(el, {
   class: void el.classList.add('indexer'),
   'data-index': ''
-})]), (0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))]))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, exports.olist_, ilist_1.ilist_]))]), exports.invalid), ns => [(0, dom_1.html)('li', {
+})]), (0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))]))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, exports.olist_, ilist_1.ilist_]))]), ulist_1.invalid), ns => [(0, dom_1.html)('li', {
   'data-marker': ns.shift() || undefined
 }, (0, dom_1.defrag)((0, ulist_1.fillFirstLine)(ns)))]), true)]))), es => [format((0, dom_1.html)('ol', es), type, form)]);
 const heads = {
@@ -5320,16 +5346,6 @@ const heads = {
     source
   }) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')], ''])
 };
-exports.invalid = (0, combinator_1.rewrite)((0, combinator_1.inits)([source_1.contentline, (0, combinator_1.indent)(({
-  source
-}) => [[source], ''])]), ({
-  source
-}) => [['', (0, dom_1.html)('span', {
-  class: 'invalid',
-  'data-invalid-syntax': 'list',
-  'data-invalid-type': 'syntax',
-  'data-invalid-message': 'Fix the indent or the head of the list item'
-}, source.replace('\n', ''))], '']);
 function idx(value) {
   switch (value) {
     case 'i':
@@ -5638,7 +5654,7 @@ const row = (parser, optional) => (0, combinator_1.creation)(1, false, (0, combi
   'data-invalid-message': 'Missing the start symbol of the table row'
 }, [(0, dom_1.html)('td', source.replace('\n', ''))])], ''])));
 const align = (0, combinator_1.creation)(1, false, (0, combinator_1.fmap)((0, combinator_1.open)('|', (0, combinator_1.union)([(0, combinator_1.focus)(/^:-+:/, () => [['center'], '']), (0, combinator_1.focus)(/^:-+/, () => [['start'], '']), (0, combinator_1.focus)(/^-+:/, () => [['end'], '']), (0, combinator_1.focus)(/^-+/, () => [[''], ''])])), ns => [(0, dom_1.html)('td', (0, dom_1.defrag)(ns))]));
-const cell = (0, combinator_1.surround)(/^\|\s*(?=\S)/, (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), /^\|/, [[/^[|\\]?\s*$/, 9]])), /^[^|]*/, true);
+const cell = (0, combinator_1.surround)(/^\|\s*(?=\S)/, (0, combinator_1.trimStart)((0, combinator_1.union)([(0, combinator_1.close)(inline_1.medialink, /^\s*(?=\||$)/), (0, combinator_1.close)(inline_1.media, /^\s*(?=\||$)/), (0, combinator_1.close)(inline_1.shortmedia, /^\s*(?=\||$)/), (0, visibility_1.trimBlankStart)((0, combinator_1.some)(inline_1.inline, /^\|/, [[/^[|\\]?\s*$/, 9]]))])), /^[^|]*/, true);
 const head = (0, combinator_1.creation)(1, false, (0, combinator_1.fmap)(cell, ns => [(0, dom_1.html)('th', (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))]));
 const data = (0, combinator_1.creation)(1, false, (0, combinator_1.fmap)(cell, ns => [(0, dom_1.html)('td', (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns)))]));
 function format(rows) {
@@ -5666,25 +5682,36 @@ function format(rows) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.fillFirstLine = exports.checkbox = exports.ulist_ = exports.ulist = void 0;
+exports.fillFirstLine = exports.invalid = exports.checkbox = exports.ulist_ = exports.ulist = void 0;
 const combinator_1 = __webpack_require__(2087);
 const olist_1 = __webpack_require__(7471);
 const ilist_1 = __webpack_require__(238);
 const inline_1 = __webpack_require__(1160);
 const index_1 = __webpack_require__(4479);
+const source_1 = __webpack_require__(6743);
 const visibility_1 = __webpack_require__(7618);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
-exports.ulist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^-(?=[^\S\n]|\n[^\S\n]*\S)/, (0, combinator_1.state)(8 /* State.media */, exports.ulist_))));
+exports.ulist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^-(?=[^\S\n]|\n[^\S\n]*\S)/, exports.ulist_)));
 exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^-(?:$|\s)/, (0, combinator_1.subsequence)([exports.checkbox, (0, combinator_1.trim)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.close)((0, combinator_1.union)([index_1.index]), /^$/), ([el]) => [(0, dom_1.define)(el, {
   class: void el.classList.add('indexer'),
   'data-index': ''
-})]), (0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))]))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), olist_1.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]), true)])))), es => [format((0, dom_1.html)('ul', es))])));
+})]), (0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))]))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), exports.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]), true)])))), es => [format((0, dom_1.html)('ul', es))])));
 exports.checkbox = (0, combinator_1.creation)(1, false, (0, combinator_1.focus)(/^\[[xX ]\](?=$|\s)/, ({
   source
 }) => [[(0, dom_1.html)('span', {
   class: 'checkbox'
 }, source[1].trimStart() ? '☑' : '☐')], '']));
+exports.invalid = (0, combinator_1.rewrite)((0, combinator_1.inits)([source_1.contentline, (0, combinator_1.indent)(({
+  source
+}) => [[source], ''])]), ({
+  source
+}) => [['', (0, dom_1.html)('span', {
+  class: 'invalid',
+  'data-invalid-syntax': 'list',
+  'data-invalid-type': 'syntax',
+  'data-invalid-message': 'Fix the indent or the head of the list item'
+}, source.replace('\n', ''))], '']);
 function fillFirstLine(ns) {
   return ns.length === 1 && typeof ns[0] === 'object' && ['UL', 'OL'].includes(ns[0].tagName) ? (0, array_1.unshift)([(0, dom_1.html)('br')], ns) : ns;
 }
@@ -5756,7 +5783,7 @@ const field = (0, combinator_1.line)(({
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.shortmedia = exports.media = exports.indexer = exports.indexee = exports.inline = void 0;
+exports.shortmedia = exports.media = exports.medialink = exports.indexer = exports.indexee = exports.inline = void 0;
 const combinator_1 = __webpack_require__(2087);
 const annotation_1 = __webpack_require__(2736);
 const reference_1 = __webpack_require__(3555);
@@ -5774,13 +5801,11 @@ const emstrong_1 = __webpack_require__(6132);
 const emphasis_1 = __webpack_require__(3867);
 const strong_1 = __webpack_require__(6578);
 const code_1 = __webpack_require__(5771);
-const media_1 = __webpack_require__(1303);
 const htmlentity_1 = __webpack_require__(1562);
-const shortmedia_1 = __webpack_require__(4189);
 const autolink_1 = __webpack_require__(6051);
 const bracket_1 = __webpack_require__(5196);
 const source_1 = __webpack_require__(6743);
-exports.inline = (0, combinator_1.lazy)(() => (0, combinator_1.union)([annotation_1.annotation, reference_1.reference, template_1.template, remark_1.remark, math_1.math, extension_1.extension, ruby_1.ruby, link_1.textlink, link_1.linemedialink, media_1.linemedia, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, emstrong_1.emstrong, strong_1.strong, emphasis_1.emphasis, code_1.code, htmlentity_1.htmlentity, shortmedia_1.lineshortmedia, autolink_1.autolink, bracket_1.bracket, source_1.text]));
+exports.inline = (0, combinator_1.lazy)(() => (0, combinator_1.union)([annotation_1.annotation, reference_1.reference, template_1.template, remark_1.remark, math_1.math, extension_1.extension, ruby_1.ruby, link_1.textlink, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, emstrong_1.emstrong, strong_1.strong, emphasis_1.emphasis, code_1.code, htmlentity_1.htmlentity, autolink_1.autolink, bracket_1.bracket, source_1.text]));
 var indexee_1 = __webpack_require__(1269);
 Object.defineProperty(exports, "indexee", ({
   enumerable: true,
@@ -5795,18 +5820,25 @@ Object.defineProperty(exports, "indexer", ({
     return indexer_1.indexer;
   }
 }));
-var media_2 = __webpack_require__(1303);
+var link_2 = __webpack_require__(9628);
+Object.defineProperty(exports, "medialink", ({
+  enumerable: true,
+  get: function () {
+    return link_2.medialink;
+  }
+}));
+var media_1 = __webpack_require__(1303);
 Object.defineProperty(exports, "media", ({
   enumerable: true,
   get: function () {
-    return media_2.media;
+    return media_1.media;
   }
 }));
-var shortmedia_2 = __webpack_require__(4189);
+var shortmedia_1 = __webpack_require__(4189);
 Object.defineProperty(exports, "shortmedia", ({
   enumerable: true,
   get: function () {
-    return shortmedia_2.shortmedia;
+    return shortmedia_1.shortmedia;
   }
 }));
 
@@ -5856,7 +5888,7 @@ exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^(?:
 // 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.
-(0, source_1.str)(/^@+[0-9a-z]*(?:-[0-9a-z]+)*/i),
+(0, source_1.str)(/^@+[0-9a-z]*(?:[-.][0-9a-z]+)*/i),
 // Escape invalid leading characters.
 (0, source_1.str)(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])(?=#)/u.source.replace('emoji', hashtag_1.emoji), 'u')), hashtag_1.hashtag, hashnum_1.hashnum,
 // Escape unmatched hashtag-like strings.
@@ -5881,7 +5913,7 @@ const link_1 = __webpack_require__(9628);
 const source_1 = __webpack_require__(6743);
 const dom_1 = __webpack_require__(3252);
 // 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]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){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.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, {
   class: 'account'
 })]));
 
@@ -5955,7 +5987,7 @@ const combinator_1 = __webpack_require__(2087);
 const source_1 = __webpack_require__(6743);
 const dom_1 = __webpack_require__(3252);
 // https://html.spec.whatwg.org/multipage/input.html
-exports.email = (0, combinator_1.creation)((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]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*(?![0-9a-z])/i), ([source]) => source.length <= 255), ({
+exports.email = (0, combinator_1.creation)((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), ({
   source
 }) => [[(0, dom_1.html)('a', {
   class: 'email',
@@ -6331,10 +6363,10 @@ exports.indexer = void 0;
 const combinator_1 = __webpack_require__(2087);
 const index_1 = __webpack_require__(4479);
 const dom_1 = __webpack_require__(3252);
-exports.indexer = (0, combinator_1.surround)(/^\s+\[(?=\|\S)/, (0, combinator_1.state)(64 /* State.index */, false, (0, combinator_1.union)([index_1.signature, (0, combinator_1.creation)((0, combinator_1.focus)(/^\|(?=\])/, () => [[(0, dom_1.html)('span', {
+exports.indexer = (0, combinator_1.surround)(/^\s+\[(?=\|\S)/, (0, combinator_1.union)([index_1.signature, (0, combinator_1.creation)((0, combinator_1.focus)(/^\|(?=\])/, () => [[(0, dom_1.html)('span', {
   class: 'indexer',
   'data-index': ''
-})], '']))])), /^\]\s*$/);
+})], '']))]), /^\]\s*$/);
 
 /***/ }),
 
@@ -6631,10 +6663,10 @@ function resolve(uri, host, source) {
 exports.resolve = resolve;
 function decode(uri) {
   if (!uri.includes('%')) return uri;
-  const origin = uri.match(/^[a-z](?:[-.](?=\w)|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
+  const origin = uri.match(/^[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
   try {
     let path = decodeURI(uri.slice(origin.length));
-    if (!origin && /^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/{0,2}\S/i.test(path)) {
+    if (!origin && /^[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:\/{0,2}\S/i.test(path)) {
       path = uri.slice(origin.length);
     }
     uri = origin + path;
@@ -7036,13 +7068,14 @@ function* figure(target, notes, opts = {}) {
   const refs = new queue_1.MultiQueue((0, array_1.push)((0, query_1.querySelectorAll)(target, 'a.label:not(.disabled)[data-label]'), notes && (0, query_1.querySelectorAll)(notes.references, 'a.label:not(.disabled)') || []).map(el => [el.getAttribute('data-label'), el]));
   const labels = new Set();
   const numbers = new Map();
+  const scope = target instanceof Element ? ':scope > ' : '';
   let base = '0';
   let bases = base.split('.');
   let index = bases;
-  for (let defs = target.querySelectorAll('figure[data-label], h1, h2'), len = defs.length, i = 0; i < len; ++i) {
+  for (let defs = target.querySelectorAll(`${scope}:is(figure[data-label], h1, h2)`), len = defs.length, i = 0; i < len; ++i) {
     yield;
     const def = defs[i];
-    if (def.parentNode !== target) continue;
+    if (!scope && def.parentNode !== target) continue;
     const {
       tagName
     } = def;
@@ -7199,7 +7232,8 @@ function build(syntax, marker, splitter = '') {
     const defIndexes = new Map();
     const refSubindexes = new Map();
     const defSubindexes = new Map();
-    const splitters = splitter ? target.querySelectorAll(splitter) : [];
+    const scope = target instanceof Element ? ':scope > ' : '';
+    const splitters = splitter ? target.querySelectorAll(`${scope}:is(${splitter})`) : [];
     let iSplitters = 0;
     let total = 0;
     let format;
@@ -7212,7 +7246,7 @@ function build(syntax, marker, splitter = '') {
       }
       if (splitter) for (let el; el = splitters[iSplitters], el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING; ++iSplitters) {
         if (~iSplitters << 32 - 8 === 0) yield;
-        if (el.parentNode !== target) continue;
+        if (!scope && el.parentNode !== target) continue;
         if (el.tagName === 'OL' && el.nextElementSibling !== splitters[iSplitters + 1]) {
           el.remove();
           continue;
@@ -7284,7 +7318,7 @@ function build(syntax, marker, splitter = '') {
     }
     if (splitter) for (let el; el = splitters[iSplitters]; ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
-      if (el.parentNode !== target) continue;
+      if (!scope && el.parentNode !== target) continue;
       if (el.tagName === 'OL') {
         el.remove();
       }
@@ -7737,21 +7771,21 @@ var blank;
   blank.start = new RegExp(/^(?:\\?[^\S\n]|&IHN;|<wbr[^\S\n]*>)+/.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`));
 })(blank || (exports.blank = blank = {}));
 function visualize(parser) {
-  return (0, combinator_1.union)([(0, combinator_1.convert)(source => source.replace(blank.line, line => line.replace(/[\\&<]/g, '\x1B$&')), (0, combinator_1.verify)(parser, (ns, rest, context) => !rest && hasVisible(ns, context))), (0, combinator_1.some)((0, combinator_1.union)([source_1.linebreak, source_1.unescsource]))]);
+  return (0, combinator_1.union)([(0, combinator_1.convert)(source => source.replace(blank.line, line => line.replace(/[\\&<]/g, '\x1B$&')), (0, combinator_1.verify)(parser, (ns, rest) => !rest && hasVisible(ns))), (0, combinator_1.some)((0, combinator_1.union)([source_1.linebreak, source_1.unescsource]))]);
 }
 exports.visualize = visualize;
-function hasVisible(nodes, {
-  state = 0
-} = {}) {
+function hasVisible(nodes) {
   for (let i = 0; i < nodes.length; ++i) {
     const node = nodes[i];
     if (typeof node === 'string') {
       if (node && node.trimStart()) return true;
     } else {
       if (node.innerText.trimStart()) return true;
-      if (state & 8 /* State.media */ ^ 8 /* State.media */ && (node.classList.contains('media') || node.getElementsByClassName('media')[0])) return true;
+      //if (state & State.media ^ State.media &&
+      //    (node.classList.contains('media') || node.getElementsByClassName('media')[0])) return true;
     }
   }
+
   return false;
 }
 function blankWith(starting, delimiter) {
@@ -8096,7 +8130,7 @@ function image(source, url, cache) {
     src: source.getAttribute('data-src'),
     loading: 'lazy'
   });
-  cache?.set(url.href, (0, dom_1.define)(source.cloneNode(true), Object.fromEntries([...source.attributes].filter(attr => !['class', 'data-type', 'data-src', 'src', 'loading'].includes(attr.name)).map(attr => [attr.name, null]))));
+  cache?.set(url.href, (0, dom_1.define)(source.cloneNode(true), Object.fromEntries([...source.attributes].filter(attr => !['class', 'data-type', 'data-src', 'src', 'loading'].includes(attr.name)).map(attr => [attr.name, attr.name === 'alt' ? '' : null]))));
   return source;
 }
 exports.image = image;
@@ -8155,7 +8189,7 @@ const origins = ['https://twitter.com'];
 function twitter(source, url) {
   if (!origins.includes(url.origin)) return;
   if (url.pathname.split('/').pop().includes('.')) return;
-  if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}(?!\w)/)) return;
+  if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}\/?$/)) return;
   const el = (0, dom_1.html)('div', {
     class: source.className,
     'data-type': 'twitter'
@@ -8526,7 +8560,7 @@ function unlink(h) {
 /***/ 3252:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.335 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.336 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();
@@ -8862,7 +8896,7 @@ exports.defrag = defrag;
 /***/ 6120:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.335 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.336 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();

package/markdown.d.ts

@@ -71,6 +71,7 @@ export namespace MarkdownParser {
       BlockParser.ExtensionParser,
       BlockParser.SidefenceParser,
       BlockParser.BlockquoteParser,
+      BlockParser.MediaBlockParser,
       BlockParser.ReplyParser,
       BlockParser.ParagraphParser,
     ]> {
@@ -270,12 +271,18 @@ export namespace MarkdownParser {
         export interface HeadParser extends
           Block<'table/cell/head'>,
           Parser<HTMLTableCellElement, Context, [
+            InlineParser.LinkParser.MediaLinkParser,
+            InlineParser.MediaParser,
+            InlineParser.ShortMediaParser,
             InlineParser,
           ]> {
         }
         export interface DataParser extends
           Block<'table/cell/data'>,
           Parser<HTMLTableCellElement, Context, [
+            InlineParser.LinkParser.MediaLinkParser,
+            InlineParser.MediaParser,
+            InlineParser.ShortMediaParser,
             InlineParser,
           ]> {
         }
@@ -457,12 +464,18 @@ export namespace MarkdownParser {
           export interface HeadParser extends
             Block<'extension/table/cell/head'>,
             Parser<HTMLTableCellElement, Context, [
+              InlineParser.LinkParser.MediaLinkParser,
+              InlineParser.MediaParser,
+              InlineParser.ShortMediaParser,
               InlineParser,
             ]> {
           }
           export interface DataParser extends
             Block<'extension/table/cell/data'>,
             Parser<HTMLTableCellElement, Context, [
+              InlineParser.LinkParser.MediaLinkParser,
+              InlineParser.MediaParser,
+              InlineParser.ShortMediaParser,
               InlineParser,
             ]> {
           }
@@ -497,6 +510,7 @@ export namespace MarkdownParser {
             BlockParser.MathBlockParser,
             BlockParser.SidefenceParser,
             BlockParser.BlockquoteParser,
+            BlockParser.MediaBlockParser,
             BlockParser.ParagraphParser,
           ]> {
         }
@@ -562,6 +576,22 @@ export namespace MarkdownParser {
         ]> {
       }
     }
+    export interface MediaBlockParser extends
+      // abc
+      Block<'mediablock'>,
+      Parser<HTMLDivElement, Context, [
+        Parser<HTMLElement, Context, [
+          InlineParser.LinkParser.MediaLinkParser,
+          InlineParser.MediaParser,
+          InlineParser.ShortMediaParser,
+        ]>,
+        Parser<HTMLElement, Context, [
+          InlineParser.LinkParser.MediaLinkParser,
+          InlineParser.MediaParser,
+          InlineParser.ShortMediaParser,
+        ]>,
+      ]> {
+    }
     export interface ReplyParser extends
       // >>1
       // > text
@@ -641,8 +671,6 @@ export namespace MarkdownParser {
       InlineParser.ExtensionParser,
       InlineParser.RubyParser,
       InlineParser.LinkParser.TextLinkParser,
-      InlineParser.LinkParser.LineMediaLinkParser,
-      InlineParser.MediaParser.LineMediaParser,
       InlineParser.HTMLParser,
       InlineParser.InsertionParser,
       InlineParser.DeletionParser,
@@ -652,7 +680,6 @@ export namespace MarkdownParser {
       InlineParser.EmphasisParser,
       InlineParser.CodeParser,
       InlineParser.HTMLEntityParser,
-      InlineParser.ShortMediaParser.LineShortMediaParser,
       InlineParser.AutolinkParser,
       InlineParser.BracketParser,
       SourceParser.TextParser,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.277.0",
+  "version": "0.279.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -34,14 +34,14 @@
     "@types/mocha": "10.0.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.59.8",
+    "@typescript-eslint/parser": "^5.59.9",
     "babel-loader": "^9.1.2",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^8.1.0",
     "eslint": "^8.42.0",
     "eslint-plugin-redos": "^4.4.5",
     "eslint-webpack-plugin": "^4.0.1",
-    "glob": "^10.2.6",
+    "glob": "^10.2.7",
     "karma": "^6.4.2",
     "karma-chrome-launcher": "^3.2.0",
     "karma-coverage": "^2.2.0",
@@ -51,11 +51,11 @@
     "mocha": "^10.2.0",
     "npm-check-updates": "^16.10.12",
     "semver": "^7.5.1",
-    "spica": "0.0.731",
+    "spica": "0.0.732",
     "ts-loader": "^9.4.3",
-    "typed-dom": "0.0.335",
+    "typed-dom": "0.0.336",
     "typescript": "5.1.3",
-    "webpack": "^5.85.0",
+    "webpack": "^5.85.1",
     "webpack-cli": "^5.1.3",
     "webpack-merge": "^5.9.0"
   },

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

@@ -132,9 +132,9 @@ describe('Unit: parser/api/parse', () => {
           '<p><a class="url" href="https://source/a" target="_blank">../a</a></p>',
           '<p><a class="url" href="https://source/a" target="_blank">../../a</a></p>',
           '<p><a class="url" href="//domain/a" target="_blank">//domain/a</a></p>',
-          '<p><a href="https://source/x/a" target="_blank"><img class="media" data-src="https://source/x/a" alt=""></a></p>',
-          '<p><a href="/z/a" target="_blank"><img class="media" data-src="/z/a" alt=""></a></p>',
-          '<p><a href="https://source/a" target="_blank"><img class="media" data-src="https://source/a" alt=""></a></p>',
+          '<div><a href="https://source/x/a" target="_blank"><img class="media" data-src="https://source/x/a" alt=""></a></div>',
+          '<div><a href="/z/a" target="_blank"><img class="media" data-src="/z/a" alt=""></a></div>',
+          '<div><a href="https://source/a" target="_blank"><img class="media" data-src="https://source/a" alt=""></a></div>',
           '<ol class="annotations"><li id="annotation::def:a:1" data-marker="*1"><span>a</span><sup><a href="#annotation::ref:a:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(

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

@@ -1,5 +1,5 @@
 import { ExtensionParser } from '../../block';
-import { union, inits, sequence, some, state, block, line, fence, rewrite, close, match, convert, fallback, fmap } from '../../../combinator';
+import { union, inits, sequence, some, block, line, fence, rewrite, close, match, convert, fallback, fmap } from '../../../combinator';
 import { str, contentline, emptyline } from '../../source';
 import { label, segment as seg_label } from '../../inline/extension/label';
 import { ulist } from '../ulist';
@@ -12,7 +12,6 @@ import { table, segment_ as seg_table } from './table';
 import { blockquote, segment as seg_blockquote } from '../blockquote';
 import { placeholder, segment_ as seg_placeholder } from './placeholder';
 import { inline, media, shortmedia } from '../../inline';
-import { State } from '../../context';
 import { visualize, trimBlankStart, trimNodeEnd } from '../../visibility';
 import { memoize } from 'spica/memoize';
 import { html, defrag } from 'typed-dom/dom';
@@ -64,9 +63,7 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
         line(shortmedia),
       ])),
       emptyline,
-      block(
-        state(State.media,
-        visualize(trimBlankStart(some(inline))))),
+      block(visualize(trimBlankStart(some(inline)))),
     ]),
   ])),
   ([label, param, content, ...caption]: [HTMLAnchorElement, string, ...HTMLElement[]]) => [

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

@@ -11,6 +11,7 @@ import { codeblock } from '../codeblock';
 import { mathblock } from '../mathblock';
 import { sidefence } from '../sidefence';
 import { blockquote } from '../blockquote';
+import { mediablock } from '../mediablock';
 import { paragraph } from '../paragraph';
 import { unshift, push } from 'spica/array';
 import { html } from 'typed-dom/dom';
@@ -74,5 +75,6 @@ const content: MessageParser.ContentParser = union([
   mathblock,
   sidefence,
   blockquote,
+  mediablock,
   paragraph,
 ]);

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

@@ -1,8 +1,8 @@
 import { max, min, isArray } from 'spica/alias';
 import { ExtensionParser } from '../../block';
 import { Tree, eval } from '../../../combinator/data/parser';
-import { union, subsequence, inits, some, creation, block, line, validate, fence, rewrite, open, clear, convert, dup, lazy, fmap } from '../../../combinator';
-import { inline } from '../../inline';
+import { union, subsequence, inits, some, creation, block, line, validate, fence, rewrite, surround, open, clear, convert, dup, lazy, fmap } from '../../../combinator';
+import { inline, medialink, media, shortmedia } from '../../inline';
 import { str, anyline, emptyline, contentline } from '../../source';
 import { visualize, trimBlankStart, trimNodeEnd } from '../../visibility';
 import { unshift, splice } from 'spica/array';
@@ -84,7 +84,12 @@ const head: CellParser.HeadParser = creation(1, false, block(fmap(open(
       anyline,
       some(contentline, delimiter),
     ]),
-    open(/^(?:\s*\n|\s)/, visualize(trimBlankStart(some(union([inline])))), true)),
+    union([
+      block(surround(/^[^\n]/, medialink, /^\s*$/)),
+      block(surround(/^[^\n]/, media, /^\s*$/)),
+      block(surround(/^[^\n]/, shortmedia, /^\s*$/)),
+      open(/^(?:\s*\n|\s)/, visualize(trimBlankStart(some(inline))), true),
+    ])),
   true),
   ns => [html('th', attributes(ns.shift()! as string), trimNodeEnd(defrag(ns)))]),
   false));
@@ -96,7 +101,12 @@ const data: CellParser.DataParser = creation(1, false, block(fmap(open(
       anyline,
       some(contentline, delimiter),
     ]),
-    open(/^(?:\s*\n|\s)/, visualize(some(union([inline]))), true)),
+    union([
+      block(surround(/^[^\n]/, medialink, /^\s*$/)),
+      block(surround(/^[^\n]/, media, /^\s*$/)),
+      block(surround(/^[^\n]/, shortmedia, /^\s*$/)),
+      open(/^(?:\s*\n|\s)/, visualize(some(inline)), true),
+    ])),
   true),
   ns => [html('td', attributes(ns.shift()! as string), trimNodeEnd(defrag(ns)))]),
   false));

package/src/parser/block/ilist.ts

@@ -1,15 +1,13 @@
 import { IListParser } from '../block';
-import { union, inits, some, creation, state, block, line, validate, indent, open, fallback, lazy, fmap } from '../../combinator';
-import { ulist_, fillFirstLine } from './ulist';
-import { olist_, invalid } from './olist';
+import { union, inits, some, creation, block, line, validate, indent, open, fallback, lazy, fmap } from '../../combinator';
+import { ulist_, invalid, fillFirstLine } from './ulist';
+import { olist_ } from './olist';
 import { inline } from '../inline';
-import { State } from '../context';
 import { html, defrag } from 'typed-dom/dom';
 
 export const ilist: IListParser = lazy(() => block(validate(
   /^[-+*](?=[^\S\n]|\n[^\S\n]*\S)/,
-  state(State.media,
-  ilist_))));
+  ilist_)));
 
 export const ilist_: IListParser = lazy(() => block(fmap(validate(
   /^[-+*](?:$|\s)/,

package/src/parser/block/mediablock.ts

@@ -0,0 +1,26 @@
+import { MediaBlockParser } from '../block';
+import { union, inits, some, block, line, validate, fallback, fmap } from '../../combinator';
+import { medialink, media, shortmedia } from '../inline';
+import { html } from 'typed-dom/dom';
+
+export const mediablock: MediaBlockParser = block(validate(['[!', '!'], fmap(
+  inits([
+    line(union([
+      medialink,
+      media,
+      shortmedia,
+    ])),
+    some(line(fallback(union([
+      medialink,
+      media,
+      shortmedia,
+    ]), ({ source }) => [[html('div', [html('span', attrs, source.replace('\n', ''))])], '']))),
+  ]),
+  ns => [html('div', ns)])));
+
+const attrs = {
+  class: 'invalid',
+  'data-invalid-syntax': 'mediablock',
+  'data-invalid-type': 'syntax',
+  'data-invalid-message': 'Not media syntax',
+} as const;

package/src/parser/block/olist.ts

@@ -1,12 +1,9 @@
 import { OListParser } from '../block';
-import { Parser } from '../../combinator/data/parser';
-import { union, inits, subsequence, some, creation, state, block, line, validate, indent, focus, rewrite, open, close, match, trim, fallback, lazy, fmap } from '../../combinator';
-import { checkbox, ulist_, fillFirstLine } from './ulist';
+import { union, inits, subsequence, some, creation, block, line, validate, indent, focus, open, close, match, trim, fallback, lazy, fmap } from '../../combinator';
+import { ulist_, checkbox, invalid, fillFirstLine } from './ulist';
 import { ilist_ } from './ilist';
 import { inline, indexee, indexer } from '../inline';
 import { index } from '../inline/extension/index';
-import { contentline } from '../source';
-import { State } from '../context';
 import { visualize, trimBlank } from '../visibility';
 import { memoize } from 'spica/memoize';
 import { html, define, defrag } from 'typed-dom/dom';
@@ -21,8 +18,7 @@ export const olist: OListParser = lazy(() => block(validate(
     /^([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\.(?=[^\S\n]|\n[^\S\n]*\S)/.source,
     /^\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S)/.source,
   ].join('|')),
-  state(State.media,
-  olist_))));
+  olist_)));
 
 export const olist_: OListParser = lazy(() => block(union([
   match(
@@ -59,18 +55,6 @@ const heads = {
     ({ source }) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')], '']),
 } as const;
 
-export const invalid = rewrite(
-  inits([contentline, indent<Parser<string>>(({ source }) => [[source], ''])]),
-  ({ source }) => [[
-    '',
-    html('span', {
-      class: 'invalid',
-      'data-invalid-syntax': 'list',
-      'data-invalid-type': 'syntax',
-      'data-invalid-message': 'Fix the indent or the head of the list item',
-    }, source.replace('\n', ''))
-  ], '']);
-
 function idx(value: string): number {
   switch (value) {
     case 'i':

package/src/parser/block/paragraph.test.ts

@@ -35,9 +35,9 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser('==a\n<wbr>==\nb')), [['<p>==a<br><wbr>==<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('http://host#\\')), [['<p><a class="url" href="http://host#\\" target="_blank">http://host#\\</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\nhttp://host#\\ \nb')), [['<p>a<br><a class="url" href="http://host#\\" target="_blank">http://host#\\</a><br>b</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('!http://host#\\')), [['<p><a href="http://host#\\" target="_blank"><img class="media" data-src="http://host#\\" alt=""></a></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('!http://host#\\ a')), [['<p>!<a class="url" href="http://host#" target="_blank">http://host#</a> a</p>'], '']);
-      assert.deepStrictEqual(inspect(parser(' !http://host#\\')), [['<p> !<a class="url" href="http://host#" target="_blank">http://host#</a></p>'], '']);
+      //assert.deepStrictEqual(inspect(parser('!http://host#\\')), [['<p><a href="http://host#\\" target="_blank"><img class="media" data-src="http://host#\\" alt=""></a></p>'], '']);
+      //assert.deepStrictEqual(inspect(parser('!http://host#\\ a')), [['<p>!<a class="url" href="http://host#" target="_blank">http://host#</a> a</p>'], '']);
+      //assert.deepStrictEqual(inspect(parser(' !http://host#\\')), [['<p> !<a class="url" href="http://host#" target="_blank">http://host#</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('\ta')), [['<p>\ta</p>'], '']);
     });
 

package/src/parser/block/table.ts

@@ -1,6 +1,6 @@
 import { TableParser } from '../block';
-import { union, sequence, some, creation, block, line, validate, focus, rewrite, surround, open, fallback, lazy, fmap } from '../../combinator';
-import { inline } from '../inline';
+import { union, sequence, some, creation, block, line, validate, focus, rewrite, surround, open, close, trimStart, fallback, lazy, fmap } from '../../combinator';
+import { inline, media, medialink, shortmedia } from '../inline';
 import { contentline } from '../source';
 import { trimBlankStart, trimNodeEnd } from '../visibility';
 import { duffReduce } from 'spica/duff';
@@ -49,7 +49,12 @@ const align: AlignParser = creation(1, false, fmap(open(
 
 const cell: CellParser = surround(
   /^\|\s*(?=\S)/,
-  trimBlankStart(some(union([inline]), /^\|/, [[/^[|\\]?\s*$/, 9]])),
+  trimStart(union([
+    close(medialink, /^\s*(?=\||$)/),
+    close(media, /^\s*(?=\||$)/),
+    close(shortmedia, /^\s*(?=\||$)/),
+    trimBlankStart(some(inline, /^\|/, [[/^[|\\]?\s*$/, 9]])),
+  ])),
   /^[^|]*/, true);
 
 const head: CellParser.HeadParser = creation(1, false, fmap(

package/src/parser/block/ulist.ts

@@ -1,18 +1,18 @@
 import { UListParser } from '../block';
-import { union, inits, subsequence, some, creation, state, block, line, validate, indent, focus, open, close, trim, fallback, lazy, fmap } from '../../combinator';
-import { olist_, invalid } from './olist';
+import { Parser } from '../../combinator/data/parser';
+import { union, inits, subsequence, some, creation, block, line, validate, indent, focus, rewrite, open, close, trim, fallback, lazy, fmap } from '../../combinator';
+import { olist_ } from './olist';
 import { ilist_ } from './ilist';
 import { inline, indexer, indexee } from '../inline';
 import { index } from '../inline/extension/index';
-import { State } from '../context';
+import { contentline } from '../source';
 import { visualize, trimBlank } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, define, defrag } from 'typed-dom/dom';
 
 export const ulist: UListParser = lazy(() => block(validate(
   /^-(?=[^\S\n]|\n[^\S\n]*\S)/,
-  state(State.media,
-  ulist_))));
+  ulist_)));
 
 export const ulist_: UListParser = lazy(() => block(fmap(validate(
   /^-(?=$|\s)/,
@@ -38,6 +38,18 @@ export const checkbox = creation(1, false, focus(
     html('span', { class: 'checkbox' }, source[1].trimStart() ? '☑' : '☐'),
   ], '']));
 
+export const invalid = rewrite(
+  inits([contentline, indent<Parser<string>>(({ source }) => [[source], ''])]),
+  ({ source }) => [[
+    '',
+    html('span', {
+      class: 'invalid',
+      'data-invalid-syntax': 'list',
+      'data-invalid-type': 'syntax',
+      'data-invalid-message': 'Fix the indent or the head of the list item',
+    }, source.replace('\n', ''))
+  ], '']);
+
 export function fillFirstLine(ns: (HTMLElement | string)[]): (HTMLElement | string)[] {
   return ns.length === 1
       && typeof ns[0] === 'object'

package/src/parser/block.ts

@@ -13,6 +13,7 @@ import { mathblock } from './block/mathblock';
 import { extension } from './block/extension';
 import { sidefence } from './block/sidefence';
 import { blockquote } from './block/blockquote';
+import { mediablock } from './block/mediablock';
 import { reply } from './block/reply';
 import { paragraph } from './block/paragraph';
 import { rnd0Z } from 'spica/random';
@@ -31,6 +32,7 @@ export import MathBlockParser = BlockParser.MathBlockParser;
 export import ExtensionParser = BlockParser.ExtensionParser;
 export import SidefenceParser = BlockParser.SidefenceParser;
 export import BlockquoteParser = BlockParser.BlockquoteParser;
+export import MediaBlockParser = BlockParser.MediaBlockParser;
 export import ReplyParser = BlockParser.ReplyParser;
 export import ParagraphParser = BlockParser.ParagraphParser;
 
@@ -50,6 +52,7 @@ export const block: BlockParser = creation(1, false, error(
     extension,
     sidefence,
     blockquote,
+    mediablock,
     reply,
     paragraph
   ]))));

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

@@ -33,10 +33,12 @@ describe('Unit: parser/inline/autolink/account', () => {
       assert.deepStrictEqual(inspect(parser('@a-')), [['<a class="account" href="/@a">@a</a>'], '-']);
       assert.deepStrictEqual(inspect(parser('@a-b')), [['<a class="account" href="/@a-b">@a-b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@a--b')), [['<a class="account" href="/@a">@a</a>'], '--b']);
+      assert.deepStrictEqual(inspect(parser('@a.')), [['<a class="account" href="/@a">@a</a>'], '.']);
+      assert.deepStrictEqual(inspect(parser('@a.domain.com')), [['<a class="account" href="/@a.domain.com">@a.domain.com</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@http://host')), [['<a class="account" href="/@http">@http</a>'], '://host']);
       assert.deepStrictEqual(inspect(parser('@ttp://host')), [['<a class="account" href="/@ttp">@ttp</a>'], '://host']);
       assert.deepStrictEqual(inspect(parser('@domain/a')), [['<a class="account" href="https://domain/@a" target="_blank">@domain/a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('@domain.co.jp/a')), [['<a class="account" href="https://domain.co.jp/@a" target="_blank">@domain.co.jp/a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('@domain.com/a')), [['<a class="account" href="https://domain.com/@a" target="_blank">@domain.com/a</a>'], '']);
     });
 
   });

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

@@ -12,8 +12,8 @@ export const account: AutolinkParser.AccountParser = lazy(() => fmap(rewrite(
   open(
     '@',
     tails([
-      str(/^[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*\//i),
-      str(/^[a-z][0-9a-z]*(?:-[0-9a-z]+)*/i),
+      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 =>

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

@@ -6,6 +6,6 @@ import { html } from 'typed-dom/dom';
 // https://html.spec.whatwg.org/multipage/input.html
 
 export const email: AutolinkParser.EmailParser = creation(rewrite(verify(
-  str(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*(?![0-9a-z])/i),
+  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)], '']));

package/src/parser/inline/autolink.ts

@@ -25,7 +25,7 @@ export const autolink: AutolinkParser = lazy(() =>
       channel,
       account,
       // Escape unmatched account-like strings.
-      str(/^@+[0-9a-z]*(?:-[0-9a-z]+)*/i),
+      str(/^@+[0-9a-z]*(?:[-.][0-9a-z]+)*/i),
       // Escape invalid leading characters.
       str(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])(?=#)/u.source.replace('emoji', emoji), 'u')),
       hashtag,

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

@@ -34,7 +34,7 @@ assert(identity(undefined, '0'.repeat(41) + '1'.repeat(38) + '2'.repeat(41) + 3,
 assert(identity(undefined, '0'.repeat(81) + '1'.repeat(38) + '2'.repeat(81) + 3, 'mark')!.slice(6) === '0'.repeat(38) + '...' + '1'.repeat(38) + '...' + '2'.repeat(38 - 1) + 3);
 
 export function index(source: Element, optional = false): string {
-  assert(source instanceof DocumentFragment || !source.matches('.indexer'));
+  assert(!source.matches('.indexer'));
   assert(source.querySelectorAll(':scope > .indexer').length <= 1);
   if (!source.firstChild) return '';
   const indexer = source.querySelector(':scope > .indexer');

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

@@ -1,14 +1,12 @@
 import { ExtensionParser } from '../../inline';
-import { union, creation, state, focus, surround } from '../../../combinator';
+import { union, creation, focus, surround } from '../../../combinator';
 import { signature } from './index';
-import { State } from '../../context';
 import { html } from 'typed-dom/dom';
 
 export const indexer: ExtensionParser.IndexerParser = surround(
   /^\s+\[(?=\|\S)/,
-  state(State.index, false,
   union([
     signature,
     creation(focus(/^\|(?=\])/, () => [[html('span', { class: 'indexer', 'data-index': '' })], ''])),
-  ])),
+  ]),
   /^\]\s*$/);

package/src/parser/inline/link.ts

@@ -203,10 +203,10 @@ export function resolve(uri: string, host: URL | Location, source: URL | Locatio
 
 function decode(uri: string): string {
   if (!uri.includes('%')) return uri;
-  const origin = uri.match(/^[a-z](?:[-.](?=\w)|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
+  const origin = uri.match(/^[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
   try {
     let path = decodeURI(uri.slice(origin.length));
-    if (!origin && /^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/{0,2}\S/i.test(path)) {
+    if (!origin && /^[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:\/{0,2}\S/i.test(path)) {
       path = uri.slice(origin.length);
     }
     uri = origin + path;

package/src/parser/inline.test.ts

@@ -134,7 +134,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('{a}')), [['<a class="url" href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('{{a}}')), [['<span class="template">{{a}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('\r!{}')), [['!', '{', '}'], '']);
-      assert.deepStrictEqual(inspect(parser('\r!{a}')), [['<a href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('\r!{a}')), [['!', '<a class="url" href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('\r!{{a}}')), [['!', '<span class="template">{{a}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('\r!{{{a}}}')), [['!', '<span class="template">{{{a}}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('\r!!{a}')), [['!', '!', '<a class="url" href="a">a</a>'], '']);

package/src/parser/inline.ts

@@ -7,7 +7,7 @@ import { remark } from './inline/remark';
 import { math } from './inline/math';
 import { extension } from './inline/extension';
 import { ruby } from './inline/ruby';
-import { textlink, linemedialink } from './inline/link';
+import { textlink } from './inline/link';
 import { html } from './inline/html';
 import { insertion } from './inline/insertion';
 import { deletion } from './inline/deletion';
@@ -16,9 +16,7 @@ import { emstrong } from './inline/emstrong';
 import { emphasis } from './inline/emphasis';
 import { strong } from './inline/strong';
 import { code } from './inline/code';
-import { linemedia } from './inline/media';
 import { htmlentity } from './inline/htmlentity';
-import { lineshortmedia } from './inline/shortmedia';
 import { autolink } from './inline/autolink';
 import { bracket } from './inline/bracket';
 import { text } from './source';
@@ -56,8 +54,6 @@ export const inline: InlineParser = lazy(() => union([
   extension,
   ruby,
   textlink,
-  linemedialink,
-  linemedia,
   html,
   insertion,
   deletion,
@@ -67,7 +63,6 @@ export const inline: InlineParser = lazy(() => union([
   emphasis,
   code,
   htmlentity,
-  lineshortmedia,
   autolink,
   bracket,
   text
@@ -75,5 +70,6 @@ export const inline: InlineParser = lazy(() => union([
 
 export { indexee } from './inline/extension/indexee';
 export { indexer } from './inline/extension/indexer';
+export { medialink } from './inline/link';
 export { media } from './inline/media';
 export { shortmedia } from './inline/shortmedia';

package/src/parser/processor/figure.ts

@@ -16,15 +16,16 @@ export function* figure(
     .map(el => [el.getAttribute('data-label')!, el]));
   const labels = new Set<string>();
   const numbers = new Map<string, string>();
+  const scope = target instanceof Element ? ':scope > ' : '';
   let base = '0';
   let bases: readonly string[] = base.split('.');
   let index: readonly string[] = bases;
   for (
-    let defs = target.querySelectorAll('figure[data-label], h1, h2'),
+    let defs = target.querySelectorAll(`${scope}:is(figure[data-label], h1, h2)`),
         len = defs.length, i = 0; i < len; ++i) {
     yield;
     const def = defs[i];
-    if (def.parentNode !== target) continue;
+    if (!scope && def.parentNode !== target) continue;
     const { tagName } = def;
     if (bases.length === 1 && tagName[0] === 'H') continue;
     assert(base === '0' || bases.length > 1);

package/src/parser/processor/note.ts

@@ -67,7 +67,8 @@ function build(
     const defIndexes = new Map<HTMLLIElement, number>();
     const refSubindexes = new Map<string, number>();
     const defSubindexes = new Map<string, number>();
-    const splitters = splitter ? target.querySelectorAll(splitter) : [];
+    const scope = target instanceof Element ? ':scope > ' : '';
+    const splitters = splitter ? target.querySelectorAll(`${scope}:is(${splitter})`) : [];
     let iSplitters = 0;
     let total = 0;
     let format: 'number' | 'abbr';
@@ -84,7 +85,7 @@ function build(
         el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING;
         ++iSplitters) {
         if (~iSplitters << 32 - 8 === 0) yield;
-        if (el.parentNode !== target) continue;
+        if (!scope && el.parentNode !== target) continue;
         if (el.tagName === 'OL' && el.nextElementSibling !== splitters[iSplitters + 1]) {
           assert(el.matches(`.${syntax}s`));
           el.remove();
@@ -173,7 +174,7 @@ function build(
       el = splitters[iSplitters];
       ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
-      if (el.parentNode !== target) continue;
+      if (!scope && el.parentNode !== target) continue;
       if (el.tagName === 'OL') {
         assert(el.matches(`.${syntax}s`));
         el.remove();

package/src/parser/visibility.ts

@@ -3,7 +3,6 @@ import { Parser, Input, eval } from '../combinator/data/parser';
 import { union, some, verify, convert, fmap } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
-import { State } from './context';
 import { invisibleHTMLEntityNames } from './api/normalize';
 import { reduce } from 'spica/memoize';
 import { push } from 'spica/array';
@@ -23,13 +22,12 @@ export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Pa
   return union([
     convert(
       source => source.replace(blank.line, line => line.replace(/[\\&<]/g, '\x1B$&')),
-      verify(parser, (ns, rest, context) => !rest && hasVisible(ns, context))),
+      verify(parser, (ns, rest) => !rest && hasVisible(ns))),
     some(union([linebreak, unescsource])),
   ]);
 }
 function hasVisible(
   nodes: readonly (HTMLElement | string)[],
-  { state = 0 }: MarkdownParser.Context = {},
 ): boolean {
   for (let i = 0; i < nodes.length; ++i) {
     const node = nodes[i];
@@ -38,8 +36,8 @@ function hasVisible(
     }
     else {
       if (node.innerText.trimStart()) return true;
-      if (state & State.media ^ State.media &&
-          (node.classList.contains('media') || node.getElementsByClassName('media')[0])) return true;
+      //if (state & State.media ^ State.media &&
+      //    (node.classList.contains('media') || node.getElementsByClassName('media')[0])) return true;
     }
   }
   return false;

package/src/renderer/render/media/image.ts

@@ -15,6 +15,6 @@ export function image(source: HTMLImageElement, url: URL, cache?: Dict<string, H
     source.cloneNode(true),
     Object.fromEntries([...source.attributes]
       .filter(attr => !['class', 'data-type', 'data-src', 'src', 'loading'].includes(attr.name))
-      .map(attr => [attr.name, null]))));
+      .map(attr => [attr.name, attr.name === 'alt' ? '' : null]))));
   return source;
 }

package/src/renderer/render/media/twitter.ts

@@ -19,7 +19,7 @@ const origins = [
 export function twitter(source: HTMLImageElement, url: URL): HTMLElement | undefined {
   if (!origins.includes(url.origin)) return;
   if (url.pathname.split('/').pop()!.includes('.')) return;
-  if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}(?!\w)/)) return;
+  if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}\/?$/)) return;
   const el = h('div', { class: source.className, 'data-type': 'twitter' }, [
     h('em', `Loading ${source.getAttribute('data-src')}...`),
   ]);

package/src/renderer/render.test.ts

@@ -23,18 +23,18 @@ describe('Unit: renderer/render', () => {
 
     it('media', () => {
       // image
-      assert(render(parse('!https://pbs.twimg.com/media/C-RAIleV0AAO81x.jpg').querySelector('p')!).querySelector('img')!.matches('p > a > img'));
-      assert(render(parse('[!{https://pbs.twimg.com/media/C-RAIleV0AAO81x.jpg}]{#}').querySelector('p')!).querySelector('img')!.matches('p > a > img'));
+      assert(render(parse('!https://pbs.twimg.com/media/C-RAIleV0AAO81x.jpg').querySelector('div')!).querySelector('img')!.matches('div > a > img'));
+      assert(render(parse('[!{https://pbs.twimg.com/media/C-RAIleV0AAO81x.jpg}]{#}').querySelector('div')!).querySelector('img')!.matches('div > a > img'));
       // other
-      assert(render(parse('!http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/pdfs/pdf_open_parameters.pdf').querySelector('p')!).querySelector('.media')!.matches('p > .media'));
-      assert(render(parse('[!{http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/pdfs/pdf_open_parameters.pdf}]{#}').querySelector('p')!).querySelector('.media')!.matches('p > .media'));
+      assert(render(parse('!http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/pdfs/pdf_open_parameters.pdf').querySelector('div')!).querySelector('.media')!.matches('div > .media'));
+      assert(render(parse('[!{http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/pdfs/pdf_open_parameters.pdf}]{#}').querySelector('div')!).querySelector('.media')!.matches('div > .media'));
       // all
       assert(render(parse([
         '!https://youtu.be/xRF7WIZV4lA',
         '!http://www.adobe.com/content/dam/Adobe/en/devnet/acrobat/pdfs/pdf_open_parameters.pdf',
         '!https://twitter.com/hourenso_u/status/856828123882676225?hide_thread=true',
         '!https://pbs.twimg.com/media/C-RAIleV0AAO81x.jpg',
-      ].join('\n')).querySelector('p')!).querySelectorAll('.media').length === 4);
+      ].join('\n')).querySelector('div')!).querySelectorAll('.media').length === 4);
     });
 
   });

package/src/util/quote.test.ts

@@ -5,10 +5,10 @@ describe('Unit: util/quote', () => {
   describe('quote', () => {
     it('basic', () => {
       const range = document.createRange();
-      const el = parse('>>1\n>2\n> a\n>>4 `b` ${c}$\n!{d}\n [e](f) ').firstElementChild!;
+      const el = parse('>>1\n>2\n> a\n>>4 `b` ${c}$\n [e](f) ').firstElementChild!;
       range.setStart(el.firstChild!.firstChild!, 0);
       range.setEnd(el.lastChild!.lastChild!.lastChild!, 1);
-      assert(quote('3', range) === `>>>1\n> >2\n>> a\n>>3\n> >>4 \`b\` \${c}$\n> !{d}\n>  e`);
+      assert(quote('3', range) === `>>>1\n> >2\n>> a\n>>3\n> >>4 \`b\` \${c}$\n>  e`);
     });
 
     it('adjustment', () => {