securemark 0.287.1 → 0.288.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.288.0
+
+- Improve reply parser.
+
 ## 0.287.1
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.287.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.288.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"));
@@ -24,15 +24,15 @@ Object.defineProperty(exports, "__esModule", ({
 exports.trimEnd = exports.trimStart = exports.trim = void 0;
 const convert_1 = __webpack_require__(6572);
 function trim(parser) {
-  return (0, convert_1.convert)(source => source.trim(), parser);
+  return (0, convert_1.convert)(source => source.trim(), parser, false);
 }
 exports.trim = trim;
 function trimStart(parser) {
-  return (0, convert_1.convert)(source => source.trimStart(), parser);
+  return (0, convert_1.convert)(source => source.trimStart(), parser, true);
 }
 exports.trimStart = trimStart;
 function trimEnd(parser) {
-  return (0, convert_1.convert)(source => source.trimEnd(), parser);
+  return (0, convert_1.convert)(source => source.trimEnd(), parser, false);
 }
 exports.trimEnd = trimEnd;
 
@@ -1302,31 +1302,37 @@ class ReadonlyURLSearchParams extends URLSearchParams {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.cite = void 0;
+exports.cite = exports.syntax = void 0;
 const combinator_1 = __webpack_require__(3484);
 const anchor_1 = __webpack_require__(8535);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
-exports.cite = (0, combinator_1.line)((0, combinator_1.fmap)((0, combinator_1.validate)('>>', (0, combinator_1.reverse)((0, combinator_1.tails)([(0, source_1.str)(/^>*(?=>>[^>\s]+\s*$)/), (0, combinator_1.union)([anchor_1.anchor,
+exports.syntax = /^>*(?=>>[^>\s]\S*[^\S\n]*(?:$|\n))/;
+exports.cite = (0, combinator_1.line)((0, combinator_1.fmap)((0, combinator_1.validate)('>>', (0, combinator_1.open)((0, source_1.str)(exports.syntax), (0, combinator_1.union)([anchor_1.anchor,
 // Subject page representation.
 // リンクの実装は後で検討
-(0, combinator_1.focus)(/^>>\.(?=\s*$)/, () => [[(0, dom_1.html)('a', {
-  class: 'anchor'
-}, '>>.')], ''], false), (0, combinator_1.focus)(/^>>#\S*(?=\s*$)/, ({
+(0, combinator_1.focus)(/^>>#\S*(?=\s*$)/, ({
   source
 }) => [[(0, dom_1.html)('a', {
   class: 'anchor'
-}, source)], ''], false), (0, combinator_1.focus)(/^>>https?:\/\/(?:[[]|[^\p{C}\p{S}\p{P}\s])\S*(?=\s*$)/u, ({
+}, source)], ''], false), (0, combinator_1.focus)(/^>>https?:\/\/\S+(?=\s*$)/, ({
   source
 }) => [[(0, dom_1.html)('a', {
   class: 'anchor',
   href: source.slice(2).trimEnd(),
   target: '_blank'
-}, source)], ''], false)])]))), ([el, quotes = '']) => [(0, dom_1.html)('span', {
+}, source)], ''], false), (0, combinator_1.focus)(/^>>.+(?=\s*$)/, ({
+  source
+}) => [[source], ''], false)]))), ([quotes, node]) => [(0, dom_1.html)('span', typeof node === 'object' ? {
   class: 'cite'
-}, (0, dom_1.defrag)([`${quotes}>`, (0, dom_1.define)(el, {
+} : {
+  class: 'cite invalid',
+  'data-invalid-syntax': 'cite',
+  'data-invalid-type': 'syntax',
+  'data-invalid-message': 'Invalid syntax'
+}, (0, dom_1.defrag)([`${quotes}>`, typeof node === 'object' ? (0, dom_1.define)(node, {
   'data-depth': `${quotes.length + 1}`
-}, el.innerText.slice(1))])), (0, dom_1.html)('br')]));
+}, node.innerText.slice(1)) : node.slice(1)])), (0, dom_1.html)('br')]));
 
 /***/ },
 
@@ -1727,7 +1733,7 @@ exports.autolink = void 0;
 const combinator_1 = __webpack_require__(3484);
 const autolink_1 = __webpack_require__(8072);
 const source_1 = __webpack_require__(8745);
-exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.convert)(source => `\r${source}`, (0, combinator_1.some)((0, combinator_1.union)([autolink_1.autolink, source_1.linebreak, source_1.unescsource]))));
+exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.convert)(source => `\r${source}`, (0, combinator_1.some)((0, combinator_1.union)([autolink_1.autolink, source_1.linebreak, source_1.unescsource])), false));
 
 /***/ },
 
@@ -1996,10 +2002,10 @@ 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.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.verify)(bracket, ns => ns.length > 0), (0, combinator_1.some)(source_1.unescsource, closer)]))))), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink))), ({
+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.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.verify)(bracket, ns => ns.length > 0), (0, combinator_1.some)(source_1.unescsource, closer)]))))), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, false, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink, false))), ({
   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.state)(1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink))), ({
+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.state)(1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink, false))), ({
   source
 }) => [[source], '']])]))));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ')')), (0, source_1.str)(')'), true, undefined, () => [[], ''], [3 | 0 /* Backtrack.lineunescbracket */]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ']')), (0, source_1.str)(']'), true, undefined, () => [[], ''], [3 | 0 /* Backtrack.lineunescbracket */]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), '}')), (0, source_1.str)('}'), true, undefined, () => [[], ''], [3 | 0 /* Backtrack.lineunescbracket */]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)(source_1.unescsource, '"'))), (0, source_1.str)('"'), true, undefined, () => [[], ''], [3 | 0 /* Backtrack.lineunescbracket */])]));
@@ -2494,7 +2500,7 @@ exports.header = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^---+[
   class: 'header'
 }, [(0, dom_1.html)('details', {
   open: ''
-}, (0, dom_1.defrag)([(0, dom_1.html)('summary', 'Header'), ...es]))])])), false)), ({
+}, (0, dom_1.defrag)([(0, dom_1.html)('summary', 'Header'), ...es]))])]), false), false)), ({
   source
 }) => [[(0, dom_1.html)('pre', {
   class: 'invalid',
@@ -3424,7 +3430,7 @@ const align = (0, combinator_1.line)((0, combinator_1.fmap)((0, combinator_1.uni
 const delimiter = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|^[#:](?:(?!:\D|0)\d*:(?!0)\d*)?(?:!+[+]?)?(?=\s)/;
 const head = (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.trimBlank)((0, combinator_1.some)(inline_1.inline))), true)])), true), ns => [(0, dom_1.html)('th', attributes(ns.shift()), (0, dom_1.defrag)(ns))]), false);
 const data = (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.trimBlankEnd)((0, util_1.lineable)((0, combinator_1.some)(inline_1.inline)))), true)])), true), ns => [(0, dom_1.html)('td', attributes(ns.shift()), (0, dom_1.defrag)(ns))]), false);
-const dataline = (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)])));
+const dataline = (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, true)), (0, combinator_1.convert)(source => `: ${source}`, data, true)])));
 function attributes(source) {
   let [, rowspan = undefined, colspan = undefined, highlight = undefined, extension = undefined] = source.match(/^[#:](?:(\d+)?:(\d+)?)?(?:(!+)([+]?))?$/) ?? [];
   rowspan === '1' ? rowspan = undefined : undefined;
@@ -4053,15 +4059,9 @@ const inline_1 = __webpack_require__(7973);
 const source_1 = __webpack_require__(8745);
 const util_1 = __webpack_require__(4992);
 const visibility_1 = __webpack_require__(6364);
-const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
-/*
-必ず対象指定から始まる
-対象がページである場合>>.を表現方法とする
-対象をURLで指定すべき(引用ツリーにルートを追加する)場合はない
-対象と引用は1:N(分割)、N:1(統合)のみ可能、N:N(混合)は不可能
-*/
-exports.reply = (0, combinator_1.block)((0, combinator_1.validate)('>', (0, combinator_1.fmap)((0, combinator_1.inits)([(0, combinator_1.some)((0, combinator_1.inits)([cite_1.cite, quote_1.quote])), (0, combinator_1.some)((0, combinator_1.subsequence)([(0, combinator_1.some)(quote_1.quote), (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.some)(source_1.anyline, quote_1.syntax), (0, visibility_1.visualize)((0, util_1.lineable)((0, combinator_1.some)(inline_1.inline)))), ns => (0, array_1.push)(ns, [(0, dom_1.html)('br')]))]))]), ns => [(0, dom_1.html)('p', (0, visibility_1.trimBlankNodeEnd)((0, dom_1.defrag)(ns)))])));
+const delimiter = new RegExp(String.raw`${cite_1.syntax.source}|${quote_1.syntax.source}`);
+exports.reply = (0, combinator_1.block)((0, combinator_1.validate)(cite_1.syntax, (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([cite_1.cite, quote_1.quote, (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.anyline, delimiter), (0, visibility_1.visualize)((0, util_1.lineable)((0, combinator_1.some)(inline_1.inline), true)))])), ns => [(0, dom_1.html)('p', (0, visibility_1.trimBlankNodeEnd)((0, dom_1.defrag)(ns)))])));
 
 /***/ },
 
@@ -4338,7 +4338,8 @@ function str(pattern, not) {
     const m = source.match(pattern);
     count && m && (0, combinator_1.consume)(m[0].length, context);
     if (m && not && source.slice(m[0].length, m[0].length + not.length) === not) return;
-    return m && m[0].length > 0 ? [[m[0]], source.slice(m[0].length)] : undefined;
+    //assert(!m || m[0]);
+    return m ? [[m[0]], source.slice(m[0].length)] : undefined;
   };
 }
 exports.str = str;
@@ -4403,7 +4404,7 @@ 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.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.state)(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, {
+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.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, link_1.unsafelink, false), ([el]) => [(0, dom_1.define)(el, {
   class: 'account'
 })]))), ({
   source
@@ -4709,7 +4710,7 @@ const dom_1 = __webpack_require__(394);
 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, {}), false));
-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.trimBlank)((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.trimBlank)((0, combinator_1.some)(inline_1.inline))))])]), false), ([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'
@@ -5030,7 +5031,7 @@ const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 exports.template = (0, combinator_1.lazy)(() => (0, combinator_1.surround)('{{', (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}', [['\n', 9]])), '}}', true, ([, ns = []], rest) => [[(0, dom_1.html)('span', {
   class: 'template'
-}, `{{${ns.join('')}}}`)], rest], undefined, [3 | 16 /* Backtrack.linedoublebracket */, 1 | 4 /* Backtrack.lineescbracket */], 8 /* Backtrack.bracket */));
+}, `{{${ns.join('')}}}`)], rest], undefined, [3 | 16 /* Backtrack.linedoublebracket */, 1 | 4 /* Backtrack.lineescbracket */]));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ')')), (0, source_1.str)(')'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.lineescbracket */]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ']')), (0, source_1.str)(']'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.lineescbracket */]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}')), (0, source_1.str)('}'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.lineescbracket */]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)(source_1.escsource, '"'))), (0, source_1.str)('"'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.lineescbracket */])]));
 
 /***/ },
@@ -5220,18 +5221,12 @@ const math_1 = __webpack_require__(2962);
 const autolink_1 = __webpack_require__(8072);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
-exports.syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
-exports.quote = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)('>', (0, combinator_1.union)([(0, combinator_1.rewrite)((0, combinator_1.some)((0, combinator_1.validate)(new RegExp(exports.syntax.source.split('|')[0]), source_1.anyline)), qblock), (0, combinator_1.rewrite)((0, combinator_1.validate)(new RegExp(exports.syntax.source.split('|').slice(1).join('|')), source_1.anyline), (0, combinator_1.line)((0, combinator_1.union)([(0, source_1.str)(/^.+/)])))])), ns => [(0, dom_1.html)('span', ns.length > 1 ? {
+exports.syntax = /^>+[^\S\n]/;
+exports.quote = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)('>', (0, combinator_1.rewrite)((0, combinator_1.some)((0, combinator_1.validate)(exports.syntax, source_1.anyline)), (0, combinator_1.convert)(source => source.replace(/\n$/, '').replace(/(?<=^>+[^\S\n])/mg, '\r'), (0, combinator_1.some)((0, combinator_1.union)([math_1.math,
+// quote補助関数が残した数式をパースする。他の構文で数式を残す場合はソーステキストを直接使用する。
+autolink_1.autolink, source_1.linebreak, source_1.unescsource])), false))), ns => [(0, dom_1.html)('span', {
   class: 'quote'
-} : {
-  class: 'quote invalid',
-  'data-invalid-syntax': 'quote',
-  'data-invalid-type': 'syntax',
-  'data-invalid-message': `Missing the whitespace after "${ns[0].split(/[^>]/, 1)[0]}"`
 }, (0, dom_1.defrag)(ns)), (0, dom_1.html)('br')]), false));
-const qblock = (0, combinator_1.convert)(source => source.replace(/\n$/, '').replace(/(?<=^>+[^\S\n])/mg, '\r'), (0, combinator_1.some)((0, combinator_1.union)([math_1.math,
-// quote補助関数が残した数式をパースする。他の構文で数式を残す場合はソーステキストを直接使用する。
-autolink_1.autolink, source_1.linebreak, source_1.unescsource])));
 
 /***/ },
 
@@ -5283,8 +5278,8 @@ const alias_1 = __webpack_require__(5413);
 const parser_1 = __webpack_require__(605);
 const combinator_1 = __webpack_require__(3484);
 const dom_1 = __webpack_require__(394);
-function lineable(parser) {
-  return (0, combinator_1.convert)(source => `\r${source}`, parser);
+function lineable(parser, fillTrailingLinebreak = false) {
+  return (0, combinator_1.convert)(source => `\r${source}${fillTrailingLinebreak && source.at(-1) !== '\n' ? '\n' : ''}`, parser, !fillTrailingLinebreak);
 }
 exports.lineable = lineable;
 function repeat(symbol, parser, cons, termination = (acc, rest, prefix, postfix) => {
@@ -5926,7 +5921,7 @@ 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.rewrite)((0, combinator_1.open)('#', (0, source_1.str)(new RegExp([/^(?!['_])(?=(?:[0-9]{1,9})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji)))/u.source, /(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\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.state)(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, {
+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|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji)))/u.source, /(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\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.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`, link_1.unsafelink, false), ([el]) => [(0, dom_1.define)(el, {
   class: 'hashtag'
 })]))), ({
   source
@@ -6098,8 +6093,8 @@ exports.blockquote = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, co
 const opener = /^(?=>>+(?:$|\s))/;
 const indent = (0, combinator_1.block)((0, combinator_1.open)(opener, (0, combinator_1.some)(source_1.contentline, /^>(?:$|\s)/)), false);
 const unindent = source => source.replace(/(?<=^|\n)>(?:[^\S\n]|(?=>*(?:$|\s)))|\n$/g, '');
-const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.recursion)(2 /* Recursion.blockquote */, (0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, source, true)), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (0, combinator_1.fmap)(autolink_1.autolink, ns => [(0, dom_1.html)('pre', (0, dom_1.defrag)(ns))]), true))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
-const markdown = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.recursion)(2 /* Recursion.blockquote */, (0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, markdown, true)), (0, combinator_1.creation)(10, (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, ({
+const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.recursion)(2 /* Recursion.blockquote */, (0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, source, false, true)), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (0, combinator_1.fmap)(autolink_1.autolink, ns => [(0, dom_1.html)('pre', (0, dom_1.defrag)(ns))]), false, true))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
+const markdown = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.recursion)(2 /* Recursion.blockquote */, (0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, markdown, false, true)), (0, combinator_1.creation)(10, (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, ({
   source,
   context
 }) => {
@@ -6113,7 +6108,7 @@ const markdown = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combina
     }
   }, context);
   return [[(0, dom_1.html)('section', [document, (0, dom_1.html)('h2', 'References'), references])], ''];
-}, true)))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
+}, false, true)))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
 
 /***/ },
 
@@ -6192,8 +6187,8 @@ 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.constraint)(4 /* State.media */, false, (0, combinator_1.rewrite)((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]))));
+exports.shortmedia = (0, combinator_1.constraint)(4 /* State.media */, false, (0, combinator_1.rewrite)((0, combinator_1.open)('!', url_1.url), (0, combinator_1.convert)(source => `!{ ${source.slice(1)} }`, (0, combinator_1.union)([media_1.media]), false)));
+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]), false)));
 
 /***/ },
 
@@ -6352,7 +6347,7 @@ var blank;
   blank.start = new RegExp(/^(?:\\?[^\S\r\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, `${"\u001B" /* Command.Escape */}$&`)), (0, combinator_1.verify)(parser, (ns, rest) => !rest && hasVisible(ns))), (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, `${"\u001B" /* Command.Escape */}$&`)), (0, combinator_1.verify)(parser, (ns, rest) => !rest && hasVisible(ns)), false), (0, combinator_1.some)((0, combinator_1.union)([source_1.linebreak, source_1.unescsource]))]);
 }
 exports.visualize = visualize;
 function hasVisible(nodes) {
@@ -6458,7 +6453,7 @@ function trimBlank(parser) {
 }
 exports.trimBlank = trimBlank;
 function trimBlankStart(parser) {
-  return (0, combinator_1.convert)(source => source.replace(blank.start, ''), parser);
+  return (0, combinator_1.convert)(source => source.replace(blank.start, ''), parser, true);
 }
 exports.trimBlankStart = trimBlankStart;
 function trimBlankEnd(parser) {
@@ -6524,7 +6519,7 @@ exports.sidefence = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, com
 })])));
 const opener = /^(?=\|\|+(?:$|\s))/;
 const unindent = source => source.replace(/(?<=^|\n)\|(?:[^\S\n]|(?=\|*(?:$|\s)))|\n$/g, '');
-const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.recursion)(1 /* Recursion.block */, (0, combinator_1.union)([(0, combinator_1.focus)(/^(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/, (0, combinator_1.convert)(unindent, source, true), false), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (0, combinator_1.fmap)(autolink_1.autolink, ns => [(0, dom_1.html)('pre', (0, dom_1.defrag)(ns))]), true))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
+const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.recursion)(1 /* Recursion.block */, (0, combinator_1.union)([(0, combinator_1.focus)(/^(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/, (0, combinator_1.convert)(unindent, source, false, true), false), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (0, combinator_1.fmap)(autolink_1.autolink, ns => [(0, dom_1.html)('pre', (0, dom_1.defrag)(ns))]), false, true))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
 
 /***/ },
 
@@ -6539,7 +6534,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.convert = void 0;
 const parser_1 = __webpack_require__(605);
-function convert(conv, parser, empty = false) {
+function convert(conv, parser, continuous, empty = false) {
   return ({
     source,
     context
@@ -6547,11 +6542,10 @@ function convert(conv, parser, empty = false) {
     if (source === '') return;
     const src = conv(source, context);
     if (src === '') return empty ? [[], ''] : undefined;
-    const sub = source.endsWith(src);
     const {
       backtracks
     } = context;
-    context.backtracks = sub ? backtracks : {};
+    context.backtracks = continuous ? backtracks : {};
     const result = parser({
       source: src,
       context
@@ -7267,7 +7261,7 @@ exports.fig = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment,
     source,
     context
   }) ? `${fence}figure ${source.replace(/^(.+\n.+\n)([\S\s]+?)\n?$/, '$1\n$2')}\n${fence}` : `${fence}figure ${source}\n\n${fence}`;
-}, (0, combinator_1.union)([figure_1.figure])), ([el]) => el.tagName === 'FIGURE')));
+}, (0, combinator_1.union)([figure_1.figure]), false), ([el]) => el.tagName === 'FIGURE')));
 const parser = (0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.close)(label_1.segment, /^(?=\s).*\n/)), (0, combinator_1.line)((0, combinator_1.union)([inline_1.media, inline_1.shortmedia])), (0, combinator_1.some)(source_1.contentline)]);
 
 /***/ },
@@ -8379,7 +8373,7 @@ 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.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.state)(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, {
+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.state)(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, false), ([el]) => [(0, dom_1.define)(el, {
   class: 'anchor'
 })]))), ({
   source
@@ -8687,7 +8681,7 @@ 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.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.state)(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, {
+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.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.slice(1)} }`, link_1.unsafelink, false), ([el]) => [(0, dom_1.define)(el, {
   class: 'hashnum',
   href: null
 })]))), ({

package/markdown.d.ts

@@ -587,53 +587,30 @@ export namespace MarkdownParser {
       // abc
       Block<'reply'>,
       Parser<HTMLParagraphElement, Context, [
-        Parser<HTMLElement, Context, [
-          ReplyParser.CiteParser,
-          ReplyParser.QuoteParser,
-        ]>,
-        Parser<HTMLElement | string, Context, [
-          ReplyParser.QuoteParser,
-          InlineParser,
-        ]>,
+        ReplyParser.CiteParser,
+        ReplyParser.QuoteParser,
+        InlineParser,
       ]> {
     }
     export namespace ReplyParser {
       export interface CiteParser extends
         Block<'reply/cite'>,
         Parser<HTMLSpanElement | HTMLBRElement, Context, [
-          SourceParser.StrParser,
-          Parser<string | HTMLAnchorElement, Context, [
-            InlineParser.AutolinkParser.AnchorParser,
-            Parser<HTMLAnchorElement, Context, []>,
-            Parser<HTMLAnchorElement, Context, []>,
-            Parser<HTMLAnchorElement, Context, []>,
-          ]>,
+          InlineParser.AutolinkParser.AnchorParser,
+          Parser<HTMLAnchorElement, Context, []>,
+          Parser<HTMLAnchorElement, Context, []>,
+          Parser<string, Context, []>,
         ]> {
       }
       export interface QuoteParser extends
         Block<'reply/quote'>,
         Parser<HTMLSpanElement | HTMLBRElement, Context, [
-          QuoteParser.BlockParser,
-          QuoteParser.PlaceholderParser,
+          InlineParser.MathParser,
+          InlineParser.AutolinkParser,
+          SourceParser.LinebreakParser,
+          SourceParser.UnescapableSourceParser,
         ]> {
       }
-      export namespace QuoteParser {
-        export interface BlockParser extends
-          Block<'reply/quote/block'>,
-          Parser<string | HTMLElement, Context, [
-            InlineParser.MathParser,
-            InlineParser.AutolinkParser,
-            SourceParser.LinebreakParser,
-            SourceParser.UnescapableSourceParser,
-          ]> {
-        }
-        export interface PlaceholderParser extends
-          Block<'reply/quote/placeholder'>,
-          Parser<string | HTMLElement, Context, [
-            SourceParser.StrParser,
-          ]> {
-        }
-      }
     }
     export interface ParagraphParser extends
       // abc

package/package.json

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

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

@@ -1,15 +1,15 @@
 import { Parser, Ctx, Context, check } from '../../data/parser';
 
-export function convert<P extends Parser<unknown>>(conv: (source: string, context: Context<P>) => string, parser: P, empty?: boolean): P;
-export function convert<T>(conv: (source: string, context: Ctx) => string, parser: Parser<T>, empty = false): Parser<T> {
+export function convert<P extends Parser<unknown>>(conv: (source: string, context: Context<P>) => string, parser: P, continuous: boolean, empty?: boolean): P;
+export function convert<T>(conv: (source: string, context: Ctx) => string, parser: Parser<T>, continuous: boolean, empty = false): Parser<T> {
   assert(parser);
   return ({ source, context }) => {
     if (source === '') return;
     const src = conv(source, context);
     if (src === '') return empty ? [[], ''] : undefined;
-    const sub = source.endsWith(src);
     const { backtracks } = context;
-    context.backtracks = sub ? backtracks : {};
+    assert(source.endsWith(src) || src.endsWith(source) || !continuous);
+    context.backtracks = continuous ? backtracks : {};
     const result = parser({ source: src, context });
     assert(check(src, result));
     context.backtracks = backtracks;

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

@@ -3,15 +3,15 @@ import { convert } from './convert';
 
 export function trim<P extends Parser<unknown>>(parser: P): P;
 export function trim<T>(parser: Parser<T>): Parser<T> {
-  return convert(source => source.trim(), parser);
+  return convert(source => source.trim(), parser, false);
 }
 
 export function trimStart<P extends Parser<unknown>>(parser: P): P;
 export function trimStart<T>(parser: Parser<T>): Parser<T> {
-  return convert(source => source.trimStart(), parser);
+  return convert(source => source.trimStart(), parser, true);
 }
 
 export function trimEnd<P extends Parser<unknown>>(parser: P): P;
 export function trimEnd<T>(parser: Parser<T>): Parser<T> {
-  return convert(source => source.trimEnd(), parser);
+  return convert(source => source.trimEnd(), parser, false);
 }

package/src/parser/autolink.test.ts

@@ -6,8 +6,10 @@ describe('Unit: parser/autolink', () => {
     const parser = (source: string) => autolink({ source, context: {} });
 
     it('basic', () => {
-      assert.deepStrictEqual(inspect(parser('http://host#\\')), [['<a class="url" href="http://host#\\" target="_blank">http://host#\\</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('!http://host#\\')), [['!', '<a class="url" href="http://host#\\" target="_blank">http://host#\\</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('http://host)')), [['<a class="url" href="http://host)" target="_blank">http://host)</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('http://host\\')), [['<a class="url" href="http://host\\" target="_blank">http://host\\</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('!http://host)')), [['!', '<a class="url" href="http://host)" target="_blank">http://host)</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('!http://host\\')), [['!', '<a class="url" href="http://host\\" target="_blank">http://host\\</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#a')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@a#b')), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('\\\n')), [['\\', '<br>'], '']);

package/src/parser/autolink.ts

@@ -11,4 +11,5 @@ export const autolink: AutolinkParser = lazy(() =>
     autolink_,
     linebreak,
     unescsource,
-  ]))));
+  ])),
+  false));

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

@@ -41,7 +41,9 @@ describe('Unit: parser/block/blockquote', () => {
       assert.deepStrictEqual(inspect(parser('>\n>')), [['<blockquote><pre><br></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('>\n> a')), [['<blockquote><pre><br>a</pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('> http://host')), [['<blockquote><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser('> http://host)')), [['<blockquote><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('> !http://host')), [['<blockquote><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser('> !http://host)')), [['<blockquote><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('> #a')), [['<blockquote><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('> @a#b')), [['<blockquote><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('> >>1\n> > b')), [['<blockquote><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>&gt; b</pre></blockquote>'], '']);

package/src/parser/block/blockquote.ts

@@ -23,10 +23,10 @@ const source: BlockquoteParser.SourceParser = lazy(() => fmap(
   some(recursion(Recursion.blockquote, union([
     rewrite(
       indent,
-      convert(unindent, source, true)),
+      convert(unindent, source, false, true)),
     rewrite(
       some(contentline, opener),
-      convert(unindent, fmap(autolink, ns => [html('pre', defrag(ns))]), true)),
+      convert(unindent, fmap(autolink, ns => [html('pre', defrag(ns))]), false, true)),
   ]))),
   ns => [html('blockquote', ns)]));
 
@@ -34,7 +34,7 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
   some(recursion(Recursion.blockquote, union([
     rewrite(
       indent,
-      convert(unindent, markdown, true)),
+      convert(unindent, markdown, false, true)),
     creation(10,
     rewrite(
       some(contentline, opener),
@@ -47,6 +47,6 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
           },
         }, context);
         return [[html('section', [document, html('h2', 'References'), references])], ''];
-      }, true))),
+      }, false, true))),
   ]))),
   ns => [html('blockquote', ns)]));

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

@@ -38,7 +38,9 @@ describe('Unit: parser/block/codeblock', () => {
       assert.deepStrictEqual(inspect(parser('````\n```\n\n````')), [['<pre class="text">```<br></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```\n\n```\n')), [['<pre class="text"></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```\nhttp://host\n```')), [['<pre class="text"><a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('```\nhttp://host)\n```')), [['<pre class="text"><a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```\n!http://host\n```')), [['<pre class="text">!<a class="url" href="http://host" target="_blank">http://host</a></pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('```\n!http://host)\n```')), [['<pre class="text">!<a class="url" href="http://host)" target="_blank">http://host)</a></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```\n#a\n```')), [['<pre class="text"><a class="hashtag" href="/hashtags/a">#a</a></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```\n@a#b\n```')), [['<pre class="text"><a class="channel" href="/@a?ch=b">@a#b</a></pre>'], '']);
       assert.deepStrictEqual(inspect(parser(`\`\`\`\n0${'\n'.repeat(300)}\`\`\``), '>'), [['<pre class="text">'], '']);

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

@@ -34,7 +34,8 @@ export const fig: FigParser = block(rewrite(segment, verify(convert(
       ? `${fence}figure ${source.replace(/^(.+\n.+\n)([\S\s]+?)\n?$/, '$1\n$2')}\n${fence}`
       : `${fence}figure ${source}\n\n${fence}`;
   },
-  union([figure])),
+  union([figure]),
+  false),
   ([el]) => el.tagName === 'FIGURE')));
 
 const parser = sequence([

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

@@ -65,7 +65,7 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
       emptyline,
       block(visualize(trimBlank(some(inline)))),
     ]),
-  ])),
+  ]), false),
   ([label, param, content, ...caption]: [HTMLAnchorElement, string, ...HTMLElement[]]) => [
     html('figure',
       attributes(label.getAttribute('data-label')!, param, content, caption),

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

@@ -116,8 +116,8 @@ const dataline: CellParser.DatalineParser = line(
   rewrite(
     contentline,
     union([
-      validate(/^!+\s/, convert(source => `:${source}`, data)),
-      convert(source => `: ${source}`, data),
+      validate(/^!+\s/, convert(source => `:${source}`, data, true)),
+      convert(source => `: ${source}`, data, true),
     ])));
 
 function attributes(source: string): Record<string, string | undefined> {

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

@@ -33,11 +33,10 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser('***a*b\n<wbr>**\nc')), [['<p>**<em>a</em>b<br><wbr>**<br>c</p>'], '']);
       assert.deepStrictEqual(inspect(parser('***a**b\n<wbr>*\nc')), [['<p>*<strong>a</strong>b<br><wbr>*<br>c</p>'], '']);
       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 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 class="url" href="http://host)" target="_blank">http://host)</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('a\n!http://host) \nb')), [['<p>a<br>!<a class="url" href="http://host)" target="_blank">http://host)</a><br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('\ta')), [['<p>\ta</p>'], '']);
     });
 

package/src/parser/block/reply/cite.test.ts

@@ -14,13 +14,12 @@ describe('Unit: parser/block/reply/cite', () => {
       assert.deepStrictEqual(inspect(parser('>>')), undefined);
       assert.deepStrictEqual(inspect(parser('>> ')), undefined);
       assert.deepStrictEqual(inspect(parser('>>0 a')), undefined);
-      assert.deepStrictEqual(inspect(parser('>>/')), undefined);
-      assert.deepStrictEqual(inspect(parser('>>\\')), undefined);
-      assert.deepStrictEqual(inspect(parser('>>01#')), undefined);
-      assert.deepStrictEqual(inspect(parser('>>01@')), undefined);
-      assert.deepStrictEqual(inspect(parser('>>http://')), undefined);
-      assert.deepStrictEqual(inspect(parser('>>tel:1234567890')), undefined);
-      assert.deepStrictEqual(inspect(parser('>>..')), undefined);
+      assert.deepStrictEqual(inspect(parser('>>/')), [['<span class="cite invalid">&gt;&gt;/</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>\\')), [['<span class="cite invalid">&gt;&gt;\\</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>01#')), [['<span class="cite invalid">&gt;&gt;01#</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>01@')), [['<span class="cite invalid">&gt;&gt;01@</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>http://')), [['<span class="cite invalid">&gt;&gt;http://</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>tel:1234567890')), [['<span class="cite invalid">&gt;&gt;tel:1234567890</span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>> 0')), undefined);
       assert.deepStrictEqual(inspect(parser(' >>0')), undefined);
       assert.deepStrictEqual(inspect(parser('\\>>0')), undefined);
@@ -38,15 +37,14 @@ describe('Unit: parser/block/reply/cite', () => {
       assert.deepStrictEqual(inspect(parser('>>0\n>>>1')), [['<span class="cite">&gt;<a class="anchor" href="?at=0" data-depth="1">&gt;0</a></span>', '<br>', '<span class="cite">&gt;&gt;<a class="anchor" href="?at=1" data-depth="2">&gt;1</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>>0\n>>')), [['<span class="cite">&gt;&gt;<a class="anchor" href="?at=0" data-depth="2">&gt;0</a></span>', '<br>'], '>>']);
       assert.deepStrictEqual(inspect(parser('>>>0\n>>1')), [['<span class="cite">&gt;&gt;<a class="anchor" href="?at=0" data-depth="2">&gt;0</a></span>', '<br>', '<span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>.')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;.</a></span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>. ')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;.</a></span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>.\n')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;.</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>#')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>># ')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>#\n')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>#a')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#a</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>#index::a')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#index::a</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>#:~:text=a')), [['<span class="cite">&gt;<a class="anchor" data-depth="1">&gt;#:~:text=a</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>http://host')), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>http://host)')), [['<span class="cite">&gt;<a class="anchor" href="http://host)" target="_blank" data-depth="1">&gt;http://host)</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>http://host ')), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>http://host\n')), [['<span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('>>https://host')), [['<span class="cite">&gt;<a class="anchor" href="https://host" target="_blank" data-depth="1">&gt;https://host</a></span>', '<br>'], '']);

package/src/parser/block/reply/cite.ts

@@ -1,26 +1,39 @@
 import { ReplyParser } from '../../block';
-import { union, tails, line, validate, focus, reverse, fmap } from '../../../combinator';
+import { union, line, validate, focus, open, fmap } from '../../../combinator';
 import { anchor } from '../../inline/autolink/anchor';
 import { str } from '../../source';
 import { html, define, defrag } from 'typed-dom/dom';
 
+export const syntax = /^>*(?=>>[^>\s]\S*[^\S\n]*(?:$|\n))/;
+
 export const cite: ReplyParser.CiteParser = line(fmap(validate(
   '>>',
-  reverse(tails([
-    str(/^>*(?=>>[^>\s]+\s*$)/),
+  open(
+    str(syntax),
     union([
       anchor,
       // Subject page representation.
       // リンクの実装は後で検討
-      focus(/^>>\.(?=\s*$)/, () => [[html('a', { class: 'anchor' }, '>>.')], ''], false),
       focus(/^>>#\S*(?=\s*$)/, ({ source }) => [[html('a', { class: 'anchor' }, source)], ''], false),
-      focus(/^>>https?:\/\/(?:[[]|[^\p{C}\p{S}\p{P}\s])\S*(?=\s*$)/u, ({ source }) => [[html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source)], ''], false),
+      focus(/^>>https?:\/\/\S+(?=\s*$)/, ({ source }) => [[html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source)], ''], false),
+      focus(/^>>.+(?=\s*$)/, ({ source }) => [[source], ''], false),
     ]),
-  ]))),
-  ([el, quotes = '']: [HTMLElement, string?]) => [
-    html('span', { class: 'cite' }, defrag([
-      `${quotes}>`,
-      define(el, { 'data-depth': `${quotes.length + 1}` }, el.innerText.slice(1)),
-    ])),
+  )),
+  ([quotes, node]: [string, HTMLElement | string]) => [
+    html('span',
+      typeof node === 'object'
+        ? { class: 'cite' }
+        : {
+            class: 'cite invalid',
+            'data-invalid-syntax': 'cite',
+            'data-invalid-type': 'syntax',
+            'data-invalid-message': 'Invalid syntax',
+          },
+      defrag([
+        `${quotes}>`,
+        typeof node === 'object'
+          ? define(node, { 'data-depth': `${quotes.length + 1}` }, node.innerText.slice(1))
+          : node.slice(1),
+      ])),
     html('br'),
   ]));

package/src/parser/block/reply/quote.test.ts

@@ -11,22 +11,22 @@ describe('Unit: parser/block/reply/quote', () => {
       assert.deepStrictEqual(inspect(parser('>')), undefined);
       assert.deepStrictEqual(inspect(parser('>\n')), undefined);
       assert.deepStrictEqual(inspect(parser('>>')), undefined);
-      assert.deepStrictEqual(inspect(parser('>0')), [['<span class="quote invalid">&gt;0</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>0')), undefined);
       assert.deepStrictEqual(inspect(parser('>>0')), undefined);
-      assert.deepStrictEqual(inspect(parser('>0A')), [['<span class="quote invalid">&gt;0A</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>0A')), [['<span class="quote invalid">&gt;&gt;0A</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>0 a')), [['<span class="quote invalid">&gt;0 a</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>0A')), undefined);
+      assert.deepStrictEqual(inspect(parser('>>0A')), undefined);
+      assert.deepStrictEqual(inspect(parser('>0 a')), undefined);
       assert.deepStrictEqual(inspect(parser('>>0 a')), undefined);
-      assert.deepStrictEqual(inspect(parser('>A')), [['<span class="quote invalid">&gt;A</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>A 0')), [['<span class="quote invalid">&gt;A 0</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>/')), [['<span class="quote invalid">&gt;/</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>\\')), [['<span class="quote invalid">&gt;\\</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>01#')), [['<span class="quote invalid">&gt;&gt;01#</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>01@')), [['<span class="quote invalid">&gt;&gt;01@</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>https://host')), [['<span class="quote invalid">&gt;&gt;https://host</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>tel:1234567890')), [['<span class="quote invalid">&gt;&gt;tel:1234567890</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>#a')), [['<span class="quote invalid">&gt;#a</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('>A\n> b')), [['<span class="quote invalid">&gt;A</span>', '<br>', '<span class="quote">&gt; b</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('>A')), undefined);
+      assert.deepStrictEqual(inspect(parser('>A 0')), undefined);
+      assert.deepStrictEqual(inspect(parser('>/')), undefined);
+      assert.deepStrictEqual(inspect(parser('>\\')), undefined);
+      assert.deepStrictEqual(inspect(parser('>>01#')), undefined);
+      assert.deepStrictEqual(inspect(parser('>>01@')), undefined);
+      assert.deepStrictEqual(inspect(parser('>>https://host')), undefined);
+      assert.deepStrictEqual(inspect(parser('>>tel:1234567890')), undefined);
+      assert.deepStrictEqual(inspect(parser('>#a')), undefined);
+      assert.deepStrictEqual(inspect(parser('>A\n> b')), undefined);
       assert.deepStrictEqual(inspect(parser(' > 0')), undefined);
       assert.deepStrictEqual(inspect(parser('\\> 0')), undefined);
     });
@@ -55,9 +55,10 @@ describe('Unit: parser/block/reply/quote', () => {
       assert.deepStrictEqual(inspect(parser('> $-a, $-b')), [['<span class="quote">&gt; $-a, $-b</span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> $a=b$')), [['<span class="quote">&gt; <span class="math" translate="no" data-src="$a=b$">$a=b$</span></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> ${a}$')), [['<span class="quote">&gt; <span class="math" translate="no" data-src="${a}$">${a}$</span></span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('> http://host#\\')), [['<span class="quote">&gt; <a class="url" href="http://host#\\" target="_blank">http://host#\\</a></span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('> a\n> http://host#\\ \n> b')), [['<span class="quote">&gt; a<br>&gt; <a class="url" href="http://host#\\" target="_blank">http://host#\\</a> <br>&gt; b</span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('> !http://host#\\')), [['<span class="quote">&gt; !<a class="url" href="http://host#\\" target="_blank">http://host#\\</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> http://host)')), [['<span class="quote">&gt; <a class="url" href="http://host)" target="_blank">http://host)</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> a\n> http://host) \n> b')), [['<span class="quote">&gt; a<br>&gt; <a class="url" href="http://host)" target="_blank">http://host)</a> <br>&gt; b</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> !http://host)')), [['<span class="quote">&gt; !<a class="url" href="http://host)" target="_blank">http://host)</a></span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> a\n> !http://host) \n> b')), [['<span class="quote">&gt; a<br>&gt; !<a class="url" href="http://host)" target="_blank">http://host)</a> <br>&gt; b</span>', '<br>'], '']);
     });
 
   });

package/src/parser/block/reply/quote.ts

@@ -1,42 +1,27 @@
 import { ReplyParser } from '../../block';
-import { union, some, block, line, validate, rewrite, convert, lazy, fmap } from '../../../combinator';
+import { union, some, block, validate, rewrite, convert, lazy, fmap } from '../../../combinator';
 import { math } from '../../inline/math';
 import { autolink } from '../../inline/autolink';
-import { linebreak, unescsource, str, anyline } from '../../source';
+import { linebreak, unescsource, anyline } from '../../source';
 import { html, defrag } from 'typed-dom/dom';
 
-export const syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
+export const syntax = /^>+[^\S\n]/;
 
 export const quote: ReplyParser.QuoteParser = lazy(() => block(fmap(validate(
   '>',
-  union([
-    rewrite(
-      some(validate(new RegExp(syntax.source.split('|')[0]), anyline)),
-      qblock),
-    rewrite(
-      validate(new RegExp(syntax.source.split('|').slice(1).join('|')), anyline),
-      line(union([str(/^.+/)]))),
-  ])),
+  rewrite(
+    some(validate(syntax, anyline)),
+    convert(
+      source => source.replace(/\n$/, '').replace(/(?<=^>+[^\S\n])/mg, '\r'),
+      some(union([
+        math, // quote補助関数が残した数式をパースする。他の構文で数式を残す場合はソーステキストを直接使用する。
+        autolink,
+        linebreak,
+        unescsource,
+      ])),
+      false))),
   (ns: [string, ...(string | HTMLElement)[]]) => [
-    html('span',
-      ns.length > 1
-        ? { class: 'quote' }
-        : {
-            class: 'quote invalid',
-            'data-invalid-syntax': 'quote',
-            'data-invalid-type': 'syntax',
-            'data-invalid-message': `Missing the whitespace after "${ns[0].split(/[^>]/, 1)[0]}"`,
-          },
-      defrag(ns)),
+    html('span', { class: 'quote' }, defrag(ns)),
     html('br'),
   ]),
   false));
-
-const qblock: ReplyParser.QuoteParser.BlockParser = convert(
-  source => source.replace(/\n$/, '').replace(/(?<=^>+[^\S\n])/mg, '\r'),
-  some(union([
-    math, // quote補助関数が残した数式をパースする。他の構文で数式を残す場合はソーステキストを直接使用する。
-    autolink,
-    linebreak,
-    unescsource,
-  ])));

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

@@ -6,15 +6,28 @@ describe('Unit: parser/block/reply', () => {
   describe('reply', () => {
     const parser = (source: string) => some(reply)({ source, context: {} });
 
+    it('invalid', () => {
+      assert.deepStrictEqual(inspect(parser('>')), undefined);
+      assert.deepStrictEqual(inspect(parser('>1')), undefined);
+      assert.deepStrictEqual(inspect(parser('>>')), undefined);
+      assert.deepStrictEqual(inspect(parser('>>1 a')), undefined);
+      assert.deepStrictEqual(inspect(parser('> ')), undefined);
+      assert.deepStrictEqual(inspect(parser('> a')), undefined);
+      assert.deepStrictEqual(inspect(parser('>\n')), undefined);
+    });
+
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('>>1')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span></p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1\na')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('>>1\na\n>>2')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><a class="anchor" href="?at=2">&gt;&gt;2</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\na\n>>2')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><span class="cite">&gt;<a class="anchor" href="?at=2" data-depth="1">&gt;2</a></span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\na\n>>2 b')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><a class="anchor" href="?at=2">&gt;&gt;2</a> b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>1\na\n> b')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br>a<br><span class="quote">&gt; b</span></p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1\n>>2')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="cite">&gt;<a class="anchor" href="?at=2" data-depth="1">&gt;2</a></span></p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1\n> a')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span></p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1\n> a\nb')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1\n> a\n>>2')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a</span><br><span class="cite">&gt;<a class="anchor" href="?at=2" data-depth="1">&gt;2</a></span></p>'], '']);
       assert.deepStrictEqual(inspect(parser('>>1\n> a\n>> b')), [['<p><span class="cite">&gt;<a class="anchor" href="?at=1" data-depth="1">&gt;1</a></span><br><span class="quote">&gt; a<br>&gt;&gt; b</span></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('>>http://host\n>>http://host')), [['<p><span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span><br><span class="cite">&gt;<a class="anchor" href="http://host" target="_blank" data-depth="1">&gt;http://host</a></span></p>'], '']);
     });
 
   });

package/src/parser/block/reply.ts

@@ -1,33 +1,21 @@
 import { ReplyParser } from '../block';
-import { inits, subsequence, some, block, validate, rewrite, fmap } from '../../combinator';
-import { cite } from './reply/cite';
-import { quote, syntax as delimiter } from './reply/quote';
+import { union, some, block, validate, rewrite, fmap } from '../../combinator';
+import { cite, syntax as csyntax } from './reply/cite';
+import { quote, syntax as qsyntax } from './reply/quote';
 import { inline } from '../inline';
 import { anyline } from '../source';
 import { lineable } from '../util';
 import { visualize, trimBlankNodeEnd } from '../visibility';
-import { push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-/*
-必ず対象指定から始まる
-対象がページである場合>>.を表現方法とする
-対象をURLで指定すべき(引用ツリーにルートを追加する)場合はない
-対象と引用は1:N(分割)、N:1(統合)のみ可能、N:N(混合)は不可能
-*/
+const delimiter = new RegExp(String.raw`${csyntax.source}|${qsyntax.source}`);
 
-export const reply: ReplyParser = block(validate('>', fmap(
-  inits([
-    some(inits([
-      cite,
-      quote,
-    ])),
-    some(subsequence([
-      some(quote),
-      fmap(rewrite(
-        some(anyline, delimiter),
-        visualize(lineable(some(inline)))),
-        ns => push(ns, [html('br')])),
-    ])),
-  ]),
+export const reply: ReplyParser = block(validate(csyntax, fmap(
+  some(union([
+    cite,
+    quote,
+    rewrite(
+      some(anyline, delimiter),
+      visualize(lineable(some(inline), true))),
+  ])),
   ns => [html('p', trimBlankNodeEnd(defrag(ns)))])));

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

@@ -41,7 +41,9 @@ describe('Unit: parser/block/sidefence', () => {
       assert.deepStrictEqual(inspect(parser('|\n|')), [['<blockquote class="invalid"><pre><br></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('|\n| a')), [['<blockquote class="invalid"><pre><br>a</pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('| http://host')), [['<blockquote class="invalid"><pre><a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser('| http://host)')), [['<blockquote class="invalid"><pre><a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('| !http://host')), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host" target="_blank">http://host</a></pre></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser('| !http://host)')), [['<blockquote class="invalid"><pre>!<a class="url" href="http://host)" target="_blank">http://host)</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('| #a')), [['<blockquote class="invalid"><pre><a class="hashtag" href="/hashtags/a">#a</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('| @a#b')), [['<blockquote class="invalid"><pre><a class="channel" href="/@a?ch=b">@a#b</a></pre></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('| >>1\n| | b')), [['<blockquote class="invalid"><pre><a class="anchor" href="?at=1">&gt;&gt;1</a><br>| b</pre></blockquote>'], '']);

package/src/parser/block/sidefence.ts

@@ -24,9 +24,9 @@ const source: SidefenceParser.SourceParser = lazy(() => fmap(
   some(recursion(Recursion.block, union([
     focus(
       /^(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/,
-      convert(unindent, source, true), false),
+      convert(unindent, source, false, true), false),
     rewrite(
       some(contentline, opener),
-      convert(unindent, fmap(autolink, ns => [html('pre', defrag(ns))]), true)),
+      convert(unindent, fmap(autolink, ns => [html('pre', defrag(ns))]), false, true)),
   ]))),
   ns => [html('blockquote', ns)]));

package/src/parser/header.ts

@@ -26,7 +26,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
                     ...es,
                   ])),
                 ]),
-              ])), false)),
+              ]), false), false)),
           ({ source }) => [[
             html('pre', {
               class: 'invalid',

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

@@ -21,7 +21,8 @@ export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
           ? `https://${source.slice(1).replace('/', '/@')}`
           : `/${source}`
         } }`,
-      unsafelink),
+      unsafelink,
+      false),
       ([el]) => [define(el, { class: 'account' })]))),
     ({ source }) => [[source], ''],
   ])));

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

@@ -24,7 +24,8 @@ export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>',
             ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
             : `?at=${source.slice(2)}`
           } }`,
-        unsafelink),
+        unsafelink,
+        false),
         ([el]) => [define(el, { class: 'anchor' })]))),
       ({ source }) => [[source], ''],
     ]))));

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

@@ -11,7 +11,8 @@ export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
   union([
     constraint(State.autolink, false, state(State.autolink, fmap(convert(
       source => `[${source}]{ ${source.slice(1)} }`,
-      unsafelink),
+      unsafelink,
+      false),
       ([el]) => [define(el, { class: 'hashnum', href: null })]))),
     ({ source }) => [[source], ''],
   ])));

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

@@ -20,7 +20,8 @@ export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
   union([
     constraint(State.autolink, false, state(State.autolink, fmap(convert(
       source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
-      unsafelink),
+      unsafelink,
+      false),
       ([el]) => [define(el, { class: 'hashtag' })]))),
     ({ source }) => [[source], ''],
   ])));

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

@@ -16,7 +16,8 @@ export const url: AutolinkParser.UrlParser = lazy(() => validate(['http://', 'ht
   union([
     constraint(State.autolink, false, state(State.autolink, convert(
       url => `{ ${url} }`,
-      unsafelink))),
+      unsafelink,
+      false))),
     ({ source }) => [[source], ''],
   ]))));
 
@@ -29,7 +30,8 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => open(
       union([
         constraint(State.autolink, false, state(State.autolink, convert(
           url => `{ ${url} }`,
-          unsafelink))),
+          unsafelink,
+          false))),
         ({ source }) => [[source], ''],
       ]),
     ]))));

package/src/parser/inline/shortmedia.ts

@@ -9,7 +9,8 @@ export const shortmedia: ShortMediaParser = constraint(State.media, false, rewri
   open('!', url),
   convert(
     source => `!{ ${source.slice(1)} }`,
-    union([media]))));
+    union([media]),
+    false)));
 
 export const lineshortmedia: ShortMediaParser.LineShortMediaParser = open(
   linebreak,
@@ -17,4 +18,5 @@ export const lineshortmedia: ShortMediaParser.LineShortMediaParser = open(
     /^!https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
     convert(
       source => `!{ ${source.slice(1)} }`,
-      union([media]))));
+      union([media]),
+      false)));

package/src/parser/inline/template.ts

@@ -11,7 +11,7 @@ export const template: TemplateParser = lazy(() => surround(
   '}}',
   true,
   ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('')}}}`)], rest],
-  undefined, [3 | Backtrack.linedoublebracket, 1 | Backtrack.lineescbracket], Backtrack.bracket));
+  undefined, [3 | Backtrack.linedoublebracket, 1 | Backtrack.lineescbracket]));
 
 const bracket: TemplateParser.BracketParser = lazy(() => union([
   surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'), true,

package/src/parser/inline.test.ts

@@ -169,6 +169,8 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('_http://host_')), [['_', '<a class="url" href="http://host" target="_blank">http://host</a>', '_'], '']);
       assert.deepStrictEqual(inspect(parser('*http://host*')), [['<em><a class="url" href="http://host" target="_blank">http://host</a></em>'], '']);
       assert.deepStrictEqual(inspect(parser('(http://host)')), [['<span class="paren">(<a class="url" href="http://host" target="_blank">http://host</a>)</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('"http://host"')), [['"', '<a class="url" href="http://host" target="_blank">http://host</a>', '"'], '']);
+      assert.deepStrictEqual(inspect(parser('"http://host""')), [['"', '<a class="url" href="http://host" target="_blank">http://host</a>', '"', '"'], '']);
       assert.deepStrictEqual(inspect(parser(' http://host')), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('あhttp://hostい')), [['あ', '<a class="url" href="http://host" target="_blank">http://host</a>', 'い'], '']);
     });

package/src/parser/source/str.ts

@@ -21,7 +21,8 @@ export function str(pattern: string | RegExp, not?: string): Parser<string, Cont
         const m = source.match(pattern);
         count && m && consume(m[0].length, context);
         if (m && not && source.slice(m[0].length, m[0].length + not.length) === not) return;
-        return m && m[0].length > 0
+        //assert(!m || m[0]);
+        return m
           ? [[m[0]], source.slice(m[0].length)]
           : undefined;
       };

package/src/parser/util.ts

@@ -4,9 +4,12 @@ import { Parser, Result, Ctx, Tree, Context, eval, exec } from '../combinator/da
 import { convert } from '../combinator';
 import { define } from 'typed-dom/dom';
 
-export function lineable<P extends Parser<HTMLElement | string>>(parser: P): P;
-export function lineable<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
-  return convert(source => `\r${source}`, parser);
+export function lineable<P extends Parser<HTMLElement | string>>(parser: P, fillTrailingLinebreak?: boolean): P;
+export function lineable<T extends HTMLElement | string>(parser: Parser<T>, fillTrailingLinebreak = false): Parser<T> {
+  return convert(
+    source => `\r${source}${fillTrailingLinebreak && source.at(-1) !== '\n' ? '\n' : ''}`,
+    parser,
+    !fillTrailingLinebreak);
 }
 
 export function repeat<P extends Parser<HTMLElement | string>>(symbol: string, parser: P, cons: (nodes: Tree<P>[], context: Context<P>) => Tree<P>[], termination?: (acc: Tree<P>[][], rest: string, prefix: number, postfix: number, state: boolean) => Result<string | Tree<P>>): P;

package/src/parser/visibility.ts

@@ -23,7 +23,8 @@ export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Pa
   return union([
     convert(
       source => source.replace(blank.line, line => line.replace(/[\\&<]/g, `${Command.Escape}$&`)),
-      verify(parser, (ns, rest) => !rest && hasVisible(ns))),
+      verify(parser, (ns, rest) => !rest && hasVisible(ns)),
+      false),
     some(union([linebreak, unescsource])),
   ]);
 }
@@ -162,7 +163,8 @@ export function trimBlankStart<P extends Parser<unknown>>(parser: P): P;
 export function trimBlankStart<T>(parser: Parser<T>): Parser<T> {
   return convert(
     source => source.replace(blank.start, ''),
-    parser);
+    parser,
+    true);
 }
 export function trimBlankEnd<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function trimBlankEnd<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {

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 [e](f) ').firstElementChild!;
+      const el = parse('>>1\n> a\n>>?\n> 2\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>  e`);
+      assert.deepStrictEqual(quote('3', range), `>>>1\n>> a\n>>>?\n>> 2\n>>3\n> >>4 \`b\` \${c}$\n>  e`);
     });
 
     it('adjustment', () => {