securemark 0.251.0 → 0.252.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.252.0
+
+- Remove indentblock syntax.
+
 ## 0.251.0
 
 - Change indentblock parser to require 4 spaces or 1 tab to support text indent.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.251.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.252.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("DOMPurify"), require("Prism"));
@@ -2339,16 +2339,16 @@ const memoize_1 = __webpack_require__(1808);
 
 function indent(opener, parser, separation = false) {
   if (typeof opener === 'function') return indent(/^([ \t])\1*/, opener, parser);
-  return (0, bind_1.bind)((0, block_1.block)((0, match_1.match)(opener, (0, memoize_1.memoize)(([indent]) => (0, some_1.some)((0, line_1.line)((0, surround_1.open)(indent, source => [[unline(source)], '']))), ([indent]) => indent.length * 2 + +(indent[0] === ' '), [])), separation), (nodes, rest, context) => {
-    const result = parser(nodes.join('\n'), context);
+  return (0, bind_1.bind)((0, block_1.block)((0, match_1.match)(opener, (0, memoize_1.memoize)(([indent]) => (0, some_1.some)((0, line_1.line)((0, surround_1.open)(indent, source => [[source], '']))), ([indent]) => indent.length * 2 + +(indent[0] === ' '), [])), separation), (lines, rest, context) => {
+    const result = parser(trimBlockEnd(lines.join('')), context);
     return result && (0, parser_1.exec)(result) === '' ? [(0, parser_1.eval)(result), rest] : global_1.undefined;
   });
 }
 
 exports.indent = indent;
 
-function unline(line) {
-  return line === '' || line[line.length - 1] !== '\n' ? line : line.slice(0, -1);
+function trimBlockEnd(block) {
+  return block === '' || block[block.length - 1] !== '\n' ? block : block.slice(0, -1);
 }
 
 /***/ }),
@@ -3632,8 +3632,6 @@ const dlist_1 = __webpack_require__(9373);
 
 const table_1 = __webpack_require__(8717);
 
-const indentblock_1 = __webpack_require__(3565);
-
 const codeblock_1 = __webpack_require__(1849);
 
 const mathblock_1 = __webpack_require__(3754);
@@ -3657,7 +3655,7 @@ exports.block = (0, combinator_1.creator)(error((0, combinator_1.reset)({
     budget: 100 * 1000,
     recursion: 200
   }
-}, (0, combinator_1.union)([source_1.emptyline, horizontalrule_1.horizontalrule, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, indentblock_1.indentblock, 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, horizontalrule_1.horizontalrule, 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]))));
 
 function error(parser) {
   return (0, combinator_1.recover)((0, combinator_1.fallback)((0, combinator_1.open)('\x07', source => {
@@ -4102,8 +4100,6 @@ const olist_1 = __webpack_require__(7471);
 
 const table_1 = __webpack_require__(8717);
 
-const indentblock_1 = __webpack_require__(3565);
-
 const codeblock_1 = __webpack_require__(1849);
 
 const mathblock_1 = __webpack_require__(3754);
@@ -4130,7 +4126,7 @@ const array_1 = __webpack_require__(8112);
 
 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, indentblock_1.indentblock, 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, locale_1.localize)((0, combinator_1.context)({
+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, locale_1.localize)((0, combinator_1.context)({
   syntax: {
     inline: {
       media: false
@@ -4265,8 +4261,6 @@ const ilist_1 = __webpack_require__(238);
 
 const table_1 = __webpack_require__(8717);
 
-const indentblock_1 = __webpack_require__(3565);
-
 const codeblock_1 = __webpack_require__(1849);
 
 const mathblock_1 = __webpack_require__(3754);
@@ -4327,7 +4321,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, indentblock_1.indentblock, 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, paragraph_1.paragraph]);
 
 /***/ }),
 
@@ -4743,29 +4737,6 @@ exports.ilist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combin
 
 /***/ }),
 
-/***/ 3565:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports.indentblock = void 0;
-
-const combinator_1 = __webpack_require__(2087);
-
-const codeblock_1 = __webpack_require__(1849); // 空行を含むインデントブロックはインデントの違いによるセグメント分割の境界が視認不能となるため採用しない
-
-
-exports.indentblock = (0, combinator_1.block)((0, combinator_1.indent)(/^( {4}|\t)\1*/, (0, combinator_1.convert)(source => {
-  const fence = (source.match(/^`{3,}(?=[^\S\n]*$)/mg) ?? []).reduce((max, fence) => fence > max ? fence : max, '``') + '`';
-  return `${fence}\n${source}\n${fence}`;
-}, (0, combinator_1.union)([codeblock_1.codeblock])), true));
-
-/***/ }),
-
 /***/ 3754:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -6015,7 +5986,7 @@ exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combi
       autolink: false
     }
   }
-}, (0, combinator_1.open)((0, source_1.stropt)('|'), (0, combinator_1.some)((0, combinator_1.union)([signature, inline_1.inline]), ']', /^\\?\n/), true)))), ']'), ns => [(0, dom_1.html)('a', (0, util_1.trimNodeEnd)((0, dom_1.defrag)(ns)))])), ([el]) => [(0, dom_1.define)(el, {
+}, (0, combinator_1.open)((0, source_1.stropt)(/^\|?/), (0, util_1.trimBlankEnd)((0, combinator_1.some)((0, combinator_1.union)([signature, inline_1.inline]), ']', /^\\?\n/)), true)))), ']'), ns => [(0, dom_1.html)('a', (0, dom_1.defrag)(ns))])), ([el]) => [(0, dom_1.define)(el, {
   id: el.id ? null : global_1.undefined,
   class: 'index',
   href: el.id ? `#${el.id}` : global_1.undefined
@@ -6719,7 +6690,7 @@ exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, c
     }
   },
   delimiters: global_1.undefined
-}, (0, combinator_1.subsequence)([abbr, (0, combinator_1.focus)(/^\^[^\S\n]*/, source => [['', source], '']), (0, util_1.trimBlank)((0, combinator_1.some)(inline_1.inline, ']', /^\\?\n/))]))), ']]'), ns => [(0, dom_1.html)('sup', attributes(ns), (0, dom_1.defrag)(ns))]))));
+}, (0, combinator_1.subsequence)([abbr, (0, combinator_1.open)((0, source_1.stropt)(/^(?=\^)/), (0, combinator_1.some)(inline_1.inline, ']', /^\\?\n/)), (0, util_1.trimBlank)((0, combinator_1.some)(inline_1.inline, ']', /^\\?\n/))]))), ']]'), ns => [(0, dom_1.html)('sup', attributes(ns), (0, dom_1.defrag)(ns))]))));
 const abbr = (0, combinator_1.creator)((0, combinator_1.bind)((0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?![0-9]+\s?[|\]])[0-9A-Za-z]+(?:(?:-|(?=\W)(?!'\d)'?(?!\.\d)\.?(?!,\S),? ?)[0-9A-Za-z]+)*(?:-|'?\.?,? ?)?/)]), /^\|?(?=]])|^\|[^\S\n]*/), ([source], rest) => [[(0, dom_1.html)('abbr', source)], rest.replace(util_1.regBlankStart, '')]));
 
 function attributes(ns) {
@@ -7618,11 +7589,11 @@ exports.str = str;
 function stropt(pattern) {
   return typeof pattern === 'string' ? (0, combinator_1.creator)(source => {
     if (source === '') return;
-    return source.slice(0, pattern.length) === pattern ? [[pattern], source.slice(pattern.length)] : [[], source];
+    return source.slice(0, pattern.length) === pattern ? [[pattern], source.slice(pattern.length)] : global_1.undefined;
   }) : (0, combinator_1.creator)(source => {
     if (source === '') return;
     const m = source.match(pattern);
-    return m ? [[m[0]], source.slice(m[0].length)] : [[], source];
+    return m ? [[m[0]], source.slice(m[0].length)] : global_1.undefined;
   });
 }
 
@@ -7779,7 +7750,7 @@ exports.unescsource = (0, combinator_1.creator)(source => {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.stringify = exports.trimNodeEnd = exports.trimBlank = exports.isStartTightNodes = exports.startTight = exports.startLoose = exports.visualize = exports.blankWith = exports.regBlankStart = void 0;
+exports.stringify = exports.trimBlankEnd = exports.trimBlankStart = exports.trimBlank = exports.isStartTightNodes = exports.startTight = exports.startLoose = exports.visualize = exports.blankWith = exports.regBlankStart = void 0;
 
 const global_1 = __webpack_require__(4128);
 
@@ -7926,14 +7897,22 @@ function isVisible(node, strpos) {
 }
 
 function trimBlank(parser) {
-  return (0, combinator_1.fmap)(trimBlankStart(parser), trimNodeEnd);
+  return trimBlankStart(trimBlankEnd(parser));
 }
 
 exports.trimBlank = trimBlank;
 
 function trimBlankStart(parser) {
   return (0, combinator_1.convert)((0, memoize_1.reduce)(source => source.replace(exports.regBlankStart, '')), parser);
-} //export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
+}
+
+exports.trimBlankStart = trimBlankStart;
+
+function trimBlankEnd(parser) {
+  return (0, combinator_1.fmap)(parser, trimNodeEnd);
+}
+
+exports.trimBlankEnd = trimBlankEnd; //export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
 //  return trimNodeStart(trimNodeEnd(nodes));
 //}
 //function trimNodeStart(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
@@ -7951,7 +7930,6 @@ function trimBlankStart(parser) {
 //  return nodes;
 //}
 
-
 function trimNodeEnd(nodes) {
   const skip = nodes.length > 0 && typeof nodes[nodes.length - 1] === 'object' && nodes[nodes.length - 1]['className'] === 'indexer' ? [nodes.pop()] : [];
 
@@ -7971,8 +7949,6 @@ function trimNodeEnd(nodes) {
   return (0, array_1.push)(nodes, skip);
 }
 
-exports.trimNodeEnd = trimNodeEnd;
-
 function stringify(nodes) {
   let acc = '';
 

package/markdown.d.ts

@@ -77,7 +77,6 @@ export namespace MarkdownParser {
       BlockParser.IListParser,
       BlockParser.DListParser,
       BlockParser.TableParser,
-      BlockParser.IndentBlockParser,
       BlockParser.CodeBlockParser,
       BlockParser.MathBlockParser,
       BlockParser.ExtensionParser,
@@ -283,13 +282,6 @@ export namespace MarkdownParser {
         }
       }
     }
-    export interface IndentBlockParser extends
-      //   abc
-      Block<'indentblock'>,
-      Parser<HTMLPreElement, Context, [
-        CodeBlockParser,
-      ]> {
-    }
     export interface CodeBlockParser extends
       // ```js index.js
       // abc
@@ -358,7 +350,6 @@ export namespace MarkdownParser {
               UListParser,
               OListParser,
               BlockParser.TableParser,
-              IndentBlockParser,
               CodeBlockParser,
               MathBlockParser,
               ExampleParser,
@@ -503,7 +494,6 @@ export namespace MarkdownParser {
             BlockParser.OListParser,
             BlockParser.IListParser,
             BlockParser.TableParser,
-            BlockParser.IndentBlockParser,
             BlockParser.CodeBlockParser,
             BlockParser.MathBlockParser,
             BlockParser.SidefenceParser,
@@ -668,13 +658,6 @@ export namespace MarkdownParser {
   }
   export namespace InlineParser {
     interface Inline<T extends string> extends Markdown<`inline/${T}`> { }
-    export interface AnnotationParser extends
-      // ((abc))
-      Inline<'annotation'>,
-      Parser<HTMLElement, Context, [
-        InlineParser,
-      ]> {
-    }
     export interface EscapeParser extends
       // ****
       // +++
@@ -685,6 +668,13 @@ export namespace MarkdownParser {
         SourceParser.StrParser,
       ]> {
     }
+    export interface AnnotationParser extends
+      // ((abc))
+      Inline<'annotation'>,
+      Parser<HTMLElement, Context, [
+        InlineParser,
+      ]> {
+    }
     export interface ReferenceParser extends
       // [[abc]]
       // [[^abbr]]
@@ -692,7 +682,7 @@ export namespace MarkdownParser {
       Inline<'reference'>,
       Parser<HTMLElement, Context, [
         ReferenceParser.AbbrParser,
-        SourceParser.StrParser,
+        InlineParser,
         InlineParser,
       ]> {
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.251.0",
+  "version": "0.252.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/indent.ts

@@ -17,20 +17,20 @@ export function indent<T>(opener: RegExp | Parser<T>, parser?: Parser<T> | boole
     opener,
     memoize(
     ([indent]) =>
-      some(line(open(indent, source => [[unline(source)], '']))),
+      some(line(open(indent, source => [[source], '']))),
     ([indent]) => indent.length * 2 + +(indent[0] === ' '), [])), separation),
-    (nodes, rest, context) => {
+    (lines, rest, context) => {
       assert(parser = parser as Parser<T>);
-      const result = parser(nodes.join('\n'), context);
+      const result = parser(trimBlockEnd(lines.join('')), context);
       return result && exec(result) === ''
         ? [eval(result), rest]
         : undefined;
     });
 }
 
-function unline(line: string): string {
-  return line === ''
-      || line[line.length - 1] !== '\n'
-    ? line
-    : line.slice(0, -1);
+function trimBlockEnd(block: string): string {
+  return block === ''
+      || block[block.length - 1] !== '\n'
+    ? block
+    : block.slice(0, -1);
 }

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

@@ -82,8 +82,8 @@ describe('Unit: parser/api/parse', () => {
 
     it('indent', () => {
       assert.deepStrictEqual(
-        [...parse('   a').children].map(el => el.outerHTML),
-        ['<p>   a</p>']);
+        [...parse('\ta').children].map(el => el.outerHTML),
+        ['<p>\ta</p>']);
     });
 
     it('url', () => {

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

@@ -6,7 +6,6 @@ import { label, segment as seg_label } from '../../inline/extension/label';
 import { ulist } from '../ulist';
 import { olist } from '../olist';
 import { table as styled_table } from '../table';
-import { indentblock } from '../indentblock';
 import { codeblock, segment_ as seg_code } from '../codeblock';
 import { mathblock, segment_ as seg_math } from '../mathblock';
 import { example } from './example';
@@ -57,7 +56,6 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
         ulist,
         olist,
         styled_table,
-        indentblock,
         codeblock,
         mathblock,
         example,

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

@@ -7,7 +7,6 @@ import { ulist } from '../ulist';
 import { olist } from '../olist';
 import { ilist } from '../ilist';
 import { table } from '../table';
-import { indentblock } from '../indentblock';
 import { codeblock } from '../codeblock';
 import { mathblock } from '../mathblock';
 import { sidefence } from '../sidefence';
@@ -71,7 +70,6 @@ const content: MessageParser.ContentParser = union([
   olist,
   ilist,
   table,
-  indentblock,
   codeblock,
   mathblock,
   sidefence,

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

@@ -33,7 +33,7 @@ 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('   a')), [['<p>   a</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('\ta')), [['<p>\ta</p>'], '']);
     });
 
     it('anchor', () => {
@@ -50,8 +50,8 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser('a\n>>1')), [['<p>a<br><a href="?at=1" class="anchor">&gt;&gt;1</a></p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\n>>1\nb')), [['<p>a<br><a href="?at=1" class="anchor">&gt;&gt;1</a><br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\n>> b\nc')), [['<p>a<br>&gt;&gt; b<br>c</p>'], '']);
-      assert.deepStrictEqual(inspect(parser('   >>1')), [['<p>   <a href="?at=1" class="anchor">&gt;&gt;1</a></p>'], '']);
-      assert.deepStrictEqual(inspect(parser('   >>>1')), [['<p>   &gt;<a href="?at=1" class="anchor">&gt;&gt;1</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('\t>>1')), [['<p>\t<a href="?at=1" class="anchor">&gt;&gt;1</a></p>'], '']);
+      assert.deepStrictEqual(inspect(parser('\t>>>1')), [['<p>\t&gt;<a href="?at=1" class="anchor">&gt;&gt;1</a></p>'], '']);
     });
 
     it('comment', () => {

package/src/parser/block.ts

@@ -9,7 +9,6 @@ import { olist } from './block/olist';
 import { ilist } from './block/ilist';
 import { dlist } from './block/dlist';
 import { table } from './block/table';
-import { indentblock } from './block/indentblock';
 import { codeblock } from './block/codeblock';
 import { mathblock } from './block/mathblock';
 import { extension } from './block/extension';
@@ -28,7 +27,6 @@ export import OListParser = BlockParser.OListParser;
 export import IListParser = BlockParser.IListParser;
 export import DListParser = BlockParser.DListParser;
 export import TableParser = BlockParser.TableParser;
-export import IndentBlockParser = BlockParser.IndentBlockParser;
 export import CodeBlockParser = BlockParser.CodeBlockParser;
 export import MathBlockParser = BlockParser.MathBlockParser;
 export import ExtensionParser = BlockParser.ExtensionParser;
@@ -48,7 +46,6 @@ export const block: BlockParser = creator(error(
     ilist,
     dlist,
     table,
-    indentblock,
     codeblock,
     mathblock,
     extension,

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

@@ -4,7 +4,7 @@ import { union, some, validate, guard, context, creator, surround, open, lazy, f
 import { inline } from '../../inline';
 import { indexee, identity } from './indexee';
 import { txt, str, stropt } from '../../source';
-import { startTight, trimNodeEnd } from '../../util';
+import { startTight, trimBlankEnd } from '../../util';
 import { html, define, defrag } from 'typed-dom/dom';
 
 import IndexParser = ExtensionParser.IndexParser;
@@ -22,13 +22,12 @@ export const index: IndexParser = lazy(() => creator(validate('[#', ']', '\n', f
     media: false,
     autolink: false,
   }}},
-  open(stropt('|'),
-  some(union([
+  open(stropt(/^\|?/), trimBlankEnd(some(union([
     signature,
     inline,
-  ]), ']', /^\\?\n/), true)))),
+  ]), ']', /^\\?\n/)), true)))),
   ']'),
-  ns => [html('a', trimNodeEnd(defrag(ns)))])),
+  ns => [html('a', defrag(ns))])),
   ([el]: [HTMLAnchorElement]) => [
     define(el,
       {

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

@@ -58,7 +58,7 @@ describe('Unit: parser/inline/reference', () => {
       assert.deepStrictEqual(inspect(parser('[[^a,]]')), [['<sup class="reference" data-abbr="a,"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a, ]]')), [['<sup class="reference" data-abbr="a,"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a ]]')), [['<sup class="reference" data-abbr="a"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^a  ]]')), [['<sup class="invalid">^a</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^a  ]]')), [['<sup class="invalid">^a  </sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a b]]')), [['<sup class="reference" data-abbr="a b"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a  b]]')), [['<sup class="invalid">^a  b</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a|]]')), [['<sup class="reference" data-abbr="a"></sup>'], '']);
@@ -76,7 +76,7 @@ describe('Unit: parser/inline/reference', () => {
       assert.deepStrictEqual(inspect(parser('[[^a|  ]]')), [['<sup class="reference" data-abbr="a"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^1]]')), [['<sup class="invalid">^1</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^1a]]')), [['<sup class="reference" data-abbr="1a"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^1 ]]')), [['<sup class="invalid">^1</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^1 ]]')), [['<sup class="invalid">^1 </sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^1 a]]')), [['<sup class="reference" data-abbr="1 a"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^1|]]')), [['<sup class="invalid">^1|</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^1 |]]')), [['<sup class="invalid">^1 |</sup>'], '']);
@@ -91,7 +91,7 @@ describe('Unit: parser/inline/reference', () => {
       assert.deepStrictEqual(inspect(parser('[[^ a]]')), [['<sup class="invalid">^ a</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^ |]]')), [['<sup class="invalid">^ |</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^ |b]]')), [['<sup class="invalid">^ |b</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^ | ]]')), [['<sup class="invalid">^ |</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^ | ]]')), [['<sup class="invalid">^ | </sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^ | b]]')), [['<sup class="invalid">^ | b</sup>'], '']);
     });
 

package/src/parser/inline/reference.ts

@@ -1,8 +1,8 @@
 import { undefined } from 'spica/global';
 import { ReferenceParser } from '../inline';
-import { union, subsequence, some, validate, focus, guard, context, creator, surround, lazy, fmap, bind } from '../../combinator';
+import { union, subsequence, some, validate, guard, context, creator, surround, open, lazy, fmap, bind } from '../../combinator';
 import { inline } from '../inline';
-import { str } from '../source';
+import { str, stropt } from '../source';
 import { regBlankStart, trimBlank, stringify } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
@@ -21,7 +21,7 @@ export const reference: ReferenceParser = lazy(() => creator(validate('[[', ']]'
   }}, delimiters: undefined },
   subsequence([
     abbr,
-    focus(/^\^[^\S\n]*/, source => [['', source], '']),
+    open(stropt(/^(?=\^)/), some(inline, ']', /^\\?\n/)),
     trimBlank(some(inline, ']', /^\\?\n/)),
   ]))),
   ']]'),

package/src/parser/source/str.ts

@@ -30,13 +30,13 @@ export function stropt(pattern: string | RegExp): Parser<string, Context<StrPars
         if (source === '') return;
         return source.slice(0, pattern.length) === pattern
           ? [[pattern], source.slice(pattern.length)]
-          : [[], source];
+          : undefined;
       })
     : creator(source => {
         if (source === '') return;
         const m = source.match(pattern);
         return m
           ? [[m[0]], source.slice(m[0].length)]
-          : [[], source];
+          : undefined;
       });
 }

package/src/parser/util.ts

@@ -139,16 +139,20 @@ function isVisible(node: HTMLElement | string, strpos?: number): boolean {
 
 export function trimBlank<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function trimBlank<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
-  return fmap(
-    trimBlankStart(parser),
-    trimNodeEnd);
+  return trimBlankStart(trimBlankEnd(parser));
 }
-function trimBlankStart<P extends Parser<unknown>>(parser: P): P;
-function trimBlankStart<T>(parser: Parser<T>): Parser<T> {
+export function trimBlankStart<P extends Parser<unknown>>(parser: P): P;
+export function trimBlankStart<T>(parser: Parser<T>): Parser<T> {
   return convert(
     reduce(source => source.replace(regBlankStart, '')),
     parser);
 }
+export function trimBlankEnd<P extends Parser<HTMLElement | string>>(parser: P): P;
+export function trimBlankEnd<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+  return fmap(
+    parser,
+    trimNodeEnd);
+}
 //export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
 //  return trimNodeStart(trimNodeEnd(nodes));
 //}
@@ -166,7 +170,7 @@ function trimBlankStart<T>(parser: Parser<T>): Parser<T> {
 //  }
 //  return nodes;
 //}
-export function trimNodeEnd<T extends HTMLElement | string>(nodes: T[]): T[] {
+function trimNodeEnd<T extends HTMLElement | string>(nodes: T[]): T[] {
   const skip = nodes.length > 0 &&
     typeof nodes[nodes.length - 1] === 'object' &&
     nodes[nodes.length - 1]['className'] === 'indexer'

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

@@ -1,37 +0,0 @@
-import { indentblock } from './indentblock';
-import { some } from '../../combinator';
-import { inspect } from '../../debug.test';
-
-describe('Unit: parser/block/indentblock', () => {
-  describe('indentblock', () => {
-    const parser = (source: string) => some(indentblock)(source, {});
-
-    it('invalid', () => {
-      assert.deepStrictEqual(inspect(parser('')), undefined);
-      assert.deepStrictEqual(inspect(parser('\na')), undefined);
-      assert.deepStrictEqual(inspect(parser('a')), undefined);
-      assert.deepStrictEqual(inspect(parser('  a')), undefined);
-      assert.deepStrictEqual(inspect(parser('   a')), undefined);
-      assert.deepStrictEqual(inspect(parser('   \ta')), undefined);
-      assert.deepStrictEqual(inspect(parser('    a\nb')), undefined);
-      assert.deepStrictEqual(inspect(parser('    a\n b')), undefined);
-      assert.deepStrictEqual(inspect(parser('    a\n\tb')), undefined);
-    });
-
-    it('valid', () => {
-      assert.deepStrictEqual(inspect(parser('    a')), [['<pre class="text">a</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('    a ')), [['<pre class="text">a </pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('    a \n')), [['<pre class="text">a </pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('    a \n       b')), [['<pre class="text">a <br>   b</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('    a \\\n       b')), [['<pre class="text">a \\<br>   b</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('       a')), [['<pre class="text">   a</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('        a')), [['<pre class="text">a</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('    \ta')), [['<pre class="text">\ta</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('\ta')), [['<pre class="text">a</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('\t\ta')), [['<pre class="text">a</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('\t    a')), [['<pre class="text">    a</pre>'], '']);
-    });
-
-  });
-
-});

package/src/parser/block/indentblock.ts

@@ -1,13 +0,0 @@
-import { IndentBlockParser } from '../block';
-import { union, block, indent, convert } from '../../combinator';
-import { codeblock } from './codeblock';
-
-// 空行を含むインデントブロックはインデントの違いによるセグメント分割の境界が視認不能となるため採用しない
-
-export const indentblock: IndentBlockParser = block(indent(/^( {4}|\t)\1*/, convert(
-  source => {
-    const fence = (source.match(/^`{3,}(?=[^\S\n]*$)/mg) ?? [])
-      .reduce((max, fence) => fence > max ? fence : max, '``') + '`';
-    return `${fence}\n${source}\n${fence}`;
-  },
-  union([codeblock])), true));