securemark 0.293.0 → 0.293.2

package/markdown.d.ts

@@ -355,7 +355,7 @@ export namespace MarkdownParser {
               BlockquoteParser,
               PlaceholderParser,
               InlineParser.MediaParser,
-              InlineParser.ShortMediaParser,
+              InlineParser.ShortMediaParser.LineShortMediaParser,
             ]>,
             SourceParser.EmptyLineParser,
             InlineParser,
@@ -456,18 +456,22 @@ export namespace MarkdownParser {
           export interface HeadParser extends
             Block<'extension/table/cell/head'>,
             Parser<HTMLTableCellElement, Context, [
-              InlineParser.LinkParser.MediaLinkParser,
-              InlineParser.MediaParser,
-              InlineParser.ShortMediaParser,
+              Parser<HTMLElement, Context, [
+                InlineParser.LinkParser.MediaLinkParser,
+                InlineParser.MediaParser,
+                InlineParser.ShortMediaParser.LineShortMediaParser,
+              ]>,
               InlineParser,
             ]> {
           }
           export interface DataParser extends
             Block<'extension/table/cell/data'>,
             Parser<HTMLTableCellElement, Context, [
-              InlineParser.LinkParser.MediaLinkParser,
-              InlineParser.MediaParser,
-              InlineParser.ShortMediaParser,
+              Parser<HTMLElement, Context, [
+                InlineParser.LinkParser.MediaLinkParser,
+                InlineParser.MediaParser,
+                InlineParser.ShortMediaParser.LineShortMediaParser,
+              ]>,
               InlineParser,
             ]> {
           }
@@ -575,12 +579,12 @@ export namespace MarkdownParser {
         Parser<HTMLElement, Context, [
           InlineParser.LinkParser.MediaLinkParser,
           InlineParser.MediaParser,
-          InlineParser.ShortMediaParser,
+          InlineParser.ShortMediaParser.LineShortMediaParser,
         ]>,
         Parser<HTMLElement, Context, [
           InlineParser.LinkParser.MediaLinkParser,
           InlineParser.MediaParser,
-          InlineParser.ShortMediaParser,
+          InlineParser.ShortMediaParser.LineShortMediaParser,
         ]>,
       ]> {
     }
@@ -785,12 +789,6 @@ export namespace MarkdownParser {
       ]> {
     }
     export namespace LinkParser {
-      export interface LineMediaLinkParser extends
-        Inline<'link/linemedialink'>,
-        Parser<HTMLElement, Context, [
-          LinkParser.MediaLinkParser,
-        ]> {
-      }
       export interface TextLinkParser extends
         Inline<'link/textlink'>,
         Parser<HTMLAnchorElement | HTMLSpanElement, Context, [
@@ -866,12 +864,6 @@ export namespace MarkdownParser {
       ]> {
     }
     export namespace MediaParser {
-      export interface LineMediaParser extends
-        Inline<'media/linemedia'>,
-        Parser<HTMLElement, Context, [
-          MediaParser,
-        ]> {
-      }
       export interface TextParser extends
         Inline<'media/text'>,
         Parser<string[], Context, [

package/package.json

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

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

@@ -1,8 +1,8 @@
 import { Parser, Context, input, eval, failsafe } from '../../data/parser';
-import { consume, matcher } from '../../../combinator';
+import { matcher } from '../../../combinator';
 
-export function focus<P extends Parser<unknown>>(scope: string | RegExp, parser: P, cost?: boolean): P;
-export function focus<N>(scope: string | RegExp, parser: Parser<N>, cost = true): Parser<N> {
+export function focus<P extends Parser<unknown>>(scope: string | RegExp, parser: P): P;
+export function focus<N>(scope: string | RegExp, parser: Parser<N>): Parser<N> {
   assert(parser);
   const match = matcher(scope, false);
   return failsafe(({ context }) => {
@@ -11,7 +11,6 @@ export function focus<N>(scope: string | RegExp, parser: Parser<N>, cost = true)
     const src = eval(match({ context }))?.[0] ?? '';
     assert(source.startsWith(src, position));
     if (src === '') return;
-    cost && consume(src.length, context);
     context.range = src.length;
     context.offset ??= 0;
     context.offset += position;

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

@@ -179,13 +179,13 @@ export function matcher(pattern: string | RegExp, advance: boolean): Parser<stri
       return ({ context }) => {
         const { source, position } = context;
         pattern.lastIndex = position;
-        const m = pattern.exec(source);
-        if (m === null) return;
-        count && consume(m[0].length, context);
+        if (!pattern.test(source)) return;
+        const src = source.slice(position, pattern.lastIndex);
+        count && consume(src.length, context);
         if (advance) {
-          context.position += m[0].length;
+          context.position += src.length;
         }
-        return [[m[0]]];
+        return [[src]];
       };
   }
 }

package/src/combinator.ts

@@ -15,7 +15,6 @@ export * from './combinator/control/manipulation/clear';
 export * from './combinator/control/manipulation/surround';
 export * from './combinator/control/manipulation/match';
 export * from './combinator/control/manipulation/convert';
-export * from './combinator/control/manipulation/trim';
 export * from './combinator/control/manipulation/duplicate';
 export * from './combinator/control/manipulation/reverse';
 export * from './combinator/control/manipulation/fallback';

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

@@ -363,7 +363,7 @@ describe('Unit: parser/api/parse', () => {
       this.timeout(5000);
       // 最悪計算量での実行速度はCommonMarkの公式JS実装の32nに対して3倍遅い程度。
       // 5n = annotation/reference + link + url/math + ruby + text
-      const source = `${'.'.repeat(0 + 0)}((([[[[#$[${'.'.repeat(19998)}`;
+      const source = `${'.'.repeat(0 + 0)}((([[[[#$[${'&'.repeat(19998)}`;
       assert.deepStrictEqual(
         [...parse(source, {}, { resources: { clock: 100000, recursions: [100] } }).children]
           .map(el => el.tagName),
@@ -372,7 +372,7 @@ describe('Unit: parser/api/parse', () => {
 
     it('backtrack error', function () {
       this.timeout(5000);
-      const source = `${'.'.repeat(0 + 1)}((([[[[#$[${'.'.repeat(19998)}`;
+      const source = `${'.'.repeat(0 + 1)}((([[[[#$[${'&'.repeat(19998)}`;
       assert.deepStrictEqual(
         [...parse(source, {}, { resources: { clock: 100000, recursions: [100] } }).children]
           .map(el => el.tagName),

package/src/parser/autolink.test.ts

@@ -15,15 +15,15 @@ describe('Unit: parser/autolink', () => {
       assert.deepStrictEqual(inspect(parser('#a'), ctx), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@a#b'), ctx), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('\\\n'), ctx), [['\\', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('a#b'), ctx), [['a', '#', 'b'], '']);
-      assert.deepStrictEqual(inspect(parser('0a#b'), ctx), [['0a', '#', 'b'], '']);
-      assert.deepStrictEqual(inspect(parser('あ#b'), ctx), [['あ', '#', 'b'], '']);
-      assert.deepStrictEqual(inspect(parser('あい#b'), ctx), [['あい', '#', 'b'], '']);
-      assert.deepStrictEqual(inspect(parser('0aあ#b'), ctx), [['0a', 'あ', '#', 'b'], '']);
-      assert.deepStrictEqual(inspect(parser('0aあい#b'), ctx), [['0a', 'あい', '#', 'b'], '']);
+      assert.deepStrictEqual(inspect(parser('a#b'), ctx), [['a', '#b'], '']);
+      assert.deepStrictEqual(inspect(parser('0a#b'), ctx), [['0a', '#b'], '']);
+      assert.deepStrictEqual(inspect(parser('あ#b'), ctx), [['あ', '#b'], '']);
+      assert.deepStrictEqual(inspect(parser('あい#b'), ctx), [['あい', '#b'], '']);
+      assert.deepStrictEqual(inspect(parser('0aあ#b'), ctx), [['0a', 'あ', '#b'], '']);
+      assert.deepStrictEqual(inspect(parser('0aあい#b'), ctx), [['0a', 'あい', '#b'], '']);
       assert.deepStrictEqual(inspect(parser('a\n#b'), ctx), [['a', '<br>', '<a class="hashtag" href="/hashtags/b">#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('a\\\n#b'), ctx), [['a', '\\', '<br>', '<a class="hashtag" href="/hashtags/b">#b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('0a>>b'), ctx), [['0a', '>', '>', 'b'], '']);
+      assert.deepStrictEqual(inspect(parser('0a>>b'), ctx), [['0a', '>', '>b'], '']);
     });
 
   });

package/src/parser/block/blockquote.ts

@@ -6,9 +6,9 @@ import { contentline } from '../source';
 import { parse } from '../api/parse';
 import { html, defrag } from 'typed-dom/dom';
 
-export const segment: BlockquoteParser.SegmentParser = block(validate(/!?>/y, union([
+export const segment: BlockquoteParser.SegmentParser = block(union([
   validate(/!?>+(?=[^\S\n]|\n[^\S\n]*\S)/y, some(contentline)),
-])));
+]));
 
 export const blockquote: BlockquoteParser = lazy(() => block(rewrite(segment, union([
   open(/(?=>)/y, source),

package/src/parser/block/codeblock.ts

@@ -1,6 +1,6 @@
 import { CodeBlockParser } from '../block';
 import { input, eval } from '../../combinator/data/parser';
-import { block, validate, fence, clear, fmap } from '../../combinator';
+import { block, fence, clear, fmap } from '../../combinator';
 import { autolink } from '../autolink';
 import { invalid } from '../util';
 import { html, defrag } from 'typed-dom/dom';
@@ -8,13 +8,13 @@ import { html, defrag } from 'typed-dom/dom';
 const opener = /(`{3,})(?!`)([^\n]*)(?:$|\n)/y;
 const language = /^[0-9a-z]+(?:-[a-z][0-9a-z]*)*$/i;
 
-export const segment: CodeBlockParser.SegmentParser = block(validate('```',
-  clear(fence(opener, 300))));
+export const segment: CodeBlockParser.SegmentParser = block(
+  clear(fence(opener, 300)));
 
-export const segment_: CodeBlockParser.SegmentParser = block(validate('```',
-  clear(fence(opener, 300, false))), false);
+export const segment_: CodeBlockParser.SegmentParser = block(
+  clear(fence(opener, 300, false)), false);
 
-export const codeblock: CodeBlockParser = block(validate('```', fmap(
+export const codeblock: CodeBlockParser = block(fmap(
   fence(opener, 300),
   // Bug: Type mismatch between outer and inner.
   ([body, overflow, closer, opener, delim, param]: string[], context) => {
@@ -74,4 +74,4 @@ export const codeblock: CodeBlockParser = block(validate('```', fmap(
           body.slice(0, -1) || undefined
         : defrag(eval(autolink(input(body.slice(0, -1), { ...context })), [])));
     return [el];
-  })));
+  }));

package/src/parser/block/dlist.ts

@@ -3,7 +3,6 @@ import { State } from '../context';
 import { union, inits, some, state, block, line, validate, rewrite, open, lazy, fmap } from '../../combinator';
 import { inline, indexee, indexer, dataindex } from '../inline';
 import { anyline } from '../source';
-import { linearize } from '../util';
 import { visualize, trimBlank, trimBlankEnd } from '../visibility';
 import { push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
@@ -27,7 +26,7 @@ const desc: DListParser.DescriptionParser = block(fmap(open(
   /:[^\S\n]+(?=\S)|/y,
   rewrite(
     some(anyline, /[~:][^\S\n]+\S/y),
-    visualize(trimBlankEnd(linearize(some(union([inline])), -1)))),
+    visualize(trimBlankEnd(some(union([inline]))))),
   true),
   ns => [html('dd', defrag(ns))]),
   false);

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

@@ -1,12 +1,12 @@
 import { ExtensionParser } from '../../block';
 import { Recursion } from '../../context';
-import { recursion, block, validate, fence, fmap } from '../../../combinator';
+import { recursion, block, fence, fmap } from '../../../combinator';
 import { identity } from '../../inline/extension/indexee';
 import { invalid } from '../../util';
 import { parse } from '../../api/parse';
 import { html } from 'typed-dom/dom';
 
-export const aside: ExtensionParser.AsideParser = recursion(Recursion.block, block(validate('~~~', fmap(
+export const aside: ExtensionParser.AsideParser = recursion(Recursion.block, block(fmap(
   fence(/(~{3,})aside(?!\S)([^\n]*)(?:$|\n)/y, 300),
   // Bug: Type mismatch between outer and inner.
   ([body, overflow, closer, opener, delim, param]: string[], context) => {
@@ -42,4 +42,4 @@ export const aside: ExtensionParser.AsideParser = recursion(Recursion.block, blo
         references,
       ]),
     ];
-  }))));
+  })));

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

@@ -1,7 +1,7 @@
 import { ExtensionParser } from '../../block';
 import { Recursion } from '../../context';
 import { input, eval } from '../../../combinator/data/parser';
-import { recursion, block, validate, fence, fmap } from '../../../combinator';
+import { recursion, block, fence, fmap } from '../../../combinator';
 import { mathblock } from '../mathblock';
 import { invalid } from '../../util';
 import { parse } from '../../api/parse';
@@ -9,7 +9,7 @@ import { html } from 'typed-dom/dom';
 
 const opener = /(~{3,})(?:example\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/y;
 
-export const example: ExtensionParser.ExampleParser = recursion(Recursion.block, block(validate('~~~', fmap(
+export const example: ExtensionParser.ExampleParser = recursion(Recursion.block, block(fmap(
   fence(opener, 300),
   // Bug: Type mismatch between outer and inner.
   ([body, overflow, closer, opener, delim, type = 'markdown', param]: string[], context) => {
@@ -58,4 +58,4 @@ export const example: ExtensionParser.ExampleParser = recursion(Recursion.block,
           }, `${opener}${body}${closer}`),
         ];
     }
-  }))));
+  })));

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

@@ -8,7 +8,7 @@ import { segment as seg_math } from '../mathblock';
 import { segment as seg_table } from './table';
 import { segment as seg_blockquote } from '../blockquote';
 import { segment as seg_placeholder } from './placeholder';
-import { media, shortmedia } from '../../inline';
+import { media, lineshortmedia } from '../../inline';
 
 import FigParser = ExtensionParser.FigParser;
 
@@ -42,7 +42,7 @@ const parser = sequence([
   line(close(seg_label, /(?=\s).*\n/y)),
   line(union([
     media,
-    shortmedia,
+    lineshortmedia,
   ])),
   some(contentline),
 ]);

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

@@ -13,7 +13,6 @@ describe('Unit: parser/block/extension/figure', () => {
       assert.deepStrictEqual(inspect(parser('~~~figure $group-name]\n!https://host\n~~~'), ctx), [['<pre class="invalid" translate="no">~~~figure $group-name]\n!https://host\n~~~</pre>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name\n!https://host\n~~~'), ctx), [['<pre class="invalid" translate="no">~~~figure [$group-name\n!https://host\n~~~</pre>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\nhttps://host\n~~~'), ctx), [['<pre class="invalid" translate="no">~~~figure [$group-name]\nhttps://host\n~~~</pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\n!https://host\\\n~~~'), ctx), [['<pre class="invalid" translate="no">~~~figure [$group-name]\n!https://host\\\n~~~</pre>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\n!https://host\n\\\n~~~'), ctx), [['<pre class="invalid" translate="no">~~~figure [$group-name]\n!https://host\n\\\n~~~</pre>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\n!https://host\na\n~~~'), ctx), [['<pre class="invalid" translate="no">~~~figure [$group-name]\n!https://host\na\n~~~</pre>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\n!https://host\n\n\n\n~~~'), ctx), [['<pre class="invalid" translate="no">~~~figure [$group-name]\n!https://host\n\n\n\n~~~</pre>'], '']);
@@ -60,6 +59,7 @@ describe('Unit: parser/block/extension/figure', () => {
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\n~~~table\n~~~\n\ncaption\n~~~'), ctx), [['<figure data-type="table" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext">caption</span></figcaption><div><table></table></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\n> \n~~~\n\n~~~'), ctx), [['<figure data-type="quote" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><blockquote><pre><br>~~~</pre></blockquote></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\n> \n~~~\n\ncaption\n~~~'), ctx), [['<figure data-type="quote" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext">caption</span></figcaption><div><blockquote><pre><br>~~~</pre></blockquote></div></figure>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\n!https://host\\\n~~~'), ctx), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host\\" target="_blank"><img class="media" data-src="https://host\\" alt="https://host\\"></a></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]\n![]{https://host}\n~~~'), ctx), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~~figure [$group-name]\n!https://host\n~~~~'), ctx), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure $group-name\n!https://host\n~~~'), ctx), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt="https://host"></a></div></figure>'], '']);

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

@@ -12,7 +12,7 @@ import { example } from './example';
 import { table, segment_ as seg_table } from './table';
 import { blockquote, segment as seg_blockquote } from '../blockquote';
 import { placeholder, segment_ as seg_placeholder } from './placeholder';
-import { inline, media, shortmedia } from '../../inline';
+import { inline, media, lineshortmedia } from '../../inline';
 import { visualize, trimBlank } from '../../visibility';
 import { invalid } from '../../util';
 import { memoize } from 'spica/memoize';
@@ -62,7 +62,7 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
         blockquote,
         placeholder,
         line(media),
-        line(shortmedia),
+        line(lineshortmedia),
       ])),
       emptyline,
       block(visualize(trimBlank(some(inline)))),

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

@@ -1,6 +1,6 @@
 import { ExtensionParser } from '../../block';
 import { input, eval } from '../../../combinator/data/parser';
-import { union, block, validate, fence, fmap } from '../../../combinator';
+import { union, block, fence, fmap } from '../../../combinator';
 import { segment } from '../../segment';
 import { emptyline } from '../../source';
 import { ulist } from '../ulist';
@@ -19,7 +19,7 @@ import { html } from 'typed-dom/dom';
 
 import MessageParser = ExtensionParser.MessageParser;
 
-export const message: MessageParser = block(validate('~~~', fmap(
+export const message: MessageParser = block(fmap(
   fence(/(~{3,})message\/(\S+)([^\n]*)(?:$|\n)/y, 300),
   // Bug: Type mismatch between outer and inner.
   ([body, overflow, closer, opener, delim, type, param]: string[], context) => {
@@ -50,7 +50,7 @@ export const message: MessageParser = block(validate('~~~', fmap(
         [html('h1', title(type))],
         [...segment(body)].reduce((acc, seg) => push(acc, eval(content(input(seg, { ...context })), [])), []))),
     ];
-  })));
+  }));
 
 function title(type: string): string {
   switch (type) {

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

@@ -1,17 +1,17 @@
 import { ExtensionParser } from '../../block';
-import { block, validate, fence, clear, fmap } from '../../../combinator';
+import { block, fence, clear, fmap } from '../../../combinator';
 import { invalid } from '../../util';
 import { html } from 'typed-dom/dom';
 
 const opener = /(~{3,})(?!~)[^\n]*(?:$|\n)/y;
 
-export const segment: ExtensionParser.PlaceholderParser.SegmentParser = block(validate('~~~',
-  clear(fence(opener, 300))));
+export const segment: ExtensionParser.PlaceholderParser.SegmentParser = block(
+  clear(fence(opener, 300)));
 
-export const segment_: ExtensionParser.PlaceholderParser.SegmentParser = block(validate('~~~',
-  clear(fence(opener, 300, false))), false);
+export const segment_: ExtensionParser.PlaceholderParser.SegmentParser = block(
+  clear(fence(opener, 300, false)), false);
 
-export const placeholder: ExtensionParser.PlaceholderParser = block(validate('~~~', fmap(
+export const placeholder: ExtensionParser.PlaceholderParser = block(fmap(
   fence(opener, Infinity),
   ([body, overflow, closer, opener, delim]) => [
     html('pre', {
@@ -24,4 +24,4 @@ export const placeholder: ExtensionParser.PlaceholderParser = block(validate('~~
           overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
             'Invalid argument'),
     }, `${opener}${body}${overflow || closer}`),
-  ])));
+  ]));

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

@@ -2,9 +2,9 @@ import { max, min, isArray } from 'spica/alias';
 import { ExtensionParser } from '../../block';
 import { Node, eval, input } from '../../../combinator/data/parser';
 import { union, subsequence, inits, some, block, line, validate, fence, rewrite, clear, surround, open, convert, dup, lazy, fmap } from '../../../combinator';
-import { inline, medialink, media, shortmedia } from '../../inline';
+import { inline, medialink, media, lineshortmedia } from '../../inline';
 import { str, anyline, emptyline, contentline } from '../../source';
-import { linearize, invalid } from '../../util';
+import { invalid } from '../../util';
 import { visualize, trimBlank, trimBlankEnd } from '../../visibility';
 import { unshift, splice } from 'spica/array';
 import { html, define, defrag } from 'typed-dom/dom';
@@ -16,13 +16,13 @@ import CellParser = TableParser.CellParser;
 
 const opener = /(~{3,})table(?:\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/y;
 
-export const segment: TableParser.SegmentParser = block(validate('~~~',
-  clear(fence(opener, 10000))));
+export const segment: TableParser.SegmentParser = block(
+  clear(fence(opener, 10000)));
 
-export const segment_: TableParser.SegmentParser = block(validate('~~~',
-  clear(fence(opener, 10000, false))), false);
+export const segment_: TableParser.SegmentParser = block(
+  clear(fence(opener, 10000, false)), false);
 
-export const table: TableParser = block(validate('~~~', fmap(
+export const table: TableParser = block(fmap(
   fence(opener, 10000),
   // Bug: Type mismatch between outer and inner.
   ([body, overflow, closer, opener, delim, type, param]: string[], context) => {
@@ -48,7 +48,7 @@ export const table: TableParser = block(validate('~~~', fmap(
           ...invalid('table', 'argument', 'Invalid table type'),
         }, `${opener}${body}${closer}`)];
     }
-  })));
+  }));
 
 const parser: TableParser = lazy(() => block(fmap(
   some(union([row])),
@@ -84,10 +84,15 @@ const head: CellParser.HeadParser = block(fmap(open(
       some(contentline, delimiter),
     ]),
     union([
-      block(surround(/[^\n]/y, medialink, /\s*$/y)),
-      block(surround(/[^\n]/y, media, /\s*$/y)),
-      block(surround(/[^\n]/y, shortmedia, /\s*$/y)),
-      open(/(?:\s*\n|\s)/y, visualize(trimBlank(some(inline))), true),
+      block(surround(
+        /\s/y,
+        union([
+          medialink,
+          media,
+          lineshortmedia,
+        ]),
+        /\s*$/y)),
+      open(/(?:[^\S\n]*\n|\s)/y, visualize(trimBlank(some(inline))), true),
     ])),
   true),
   ns => [html('th', attributes(ns.shift()! as string), defrag(ns))]),
@@ -101,10 +106,15 @@ const data: CellParser.DataParser = block(fmap(open(
       some(contentline, delimiter),
     ]),
     union([
-      block(surround(/[^\n]/y, medialink, /\s*$/y)),
-      block(surround(/[^\n]/y, media, /\s*$/y)),
-      block(surround(/[^\n]/y, shortmedia, /\s*$/y)),
-      open(/(?:\s*\n|\s)/y, visualize(trimBlankEnd(linearize(some(inline), -1))), true),
+      block(surround(
+        /\s/y,
+        union([
+          medialink,
+          media,
+          lineshortmedia,
+        ]),
+        /\s*$/y)),
+      open(/(?:[^\S\n]*\n|\s)/y, visualize(trimBlankEnd(some(inline))), true),
     ])),
   true),
   ns => [html('td', attributes(ns.shift()! as string), defrag(ns))]),

package/src/parser/block/extension.ts

@@ -1,5 +1,5 @@
 import { ExtensionParser } from '../block';
-import { union, validate } from '../../combinator';
+import { union } from '../../combinator';
 import { figbase } from './extension/figbase';
 import { fig, segment as seg_fig } from './extension/fig';
 import { figure, segment as seg_figure } from './extension/figure';
@@ -9,12 +9,12 @@ import { aside } from './extension/aside';
 import { example } from './extension/example';
 import { placeholder, segment as seg_placeholder } from './extension/placeholder';
 
-export const segment: ExtensionParser.SegmentParser = validate(/~~~|\[?\$|~{3,}|\[?\$[A-Za-z-]\S+[^\S\n]*(?:$|\n)/y, union([
+export const segment: ExtensionParser.SegmentParser = union([
   seg_fig,
   seg_figure,
   seg_table,
   seg_placeholder,
-]));
+]);
 
 export const extension: ExtensionParser = union([
   figbase,

package/src/parser/block/ilist.ts

@@ -1,13 +1,13 @@
 import { IListParser } from '../block';
 import { Parser } from '../../combinator/data/parser';
 import { Recursion } from '../context';
-import { union, inits, some, recursion, block, line, validate, indent, rewrite, open, trim, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, some, recursion, block, line, validate, indent, rewrite, open, fallback, lazy, fmap } from '../../combinator';
 import { ulist_, fillFirstLine } from './ulist';
 import { olist_ } from './olist';
 import { inline } from '../inline';
 import { contentline } from '../source';
 import { visualize, trimBlank } from '../visibility';
-import { linearize, invalid } from '../util';
+import { invalid } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const ilist: IListParser = lazy(() => block(validate(
@@ -19,7 +19,7 @@ export const ilist_: IListParser = lazy(() => block(fmap(validate(
   some(recursion(Recursion.listitem, union([
     fmap(fallback(
       inits([
-        line(open(/[-+*](?:$|[ \n])/y, trim(visualize(trimBlank(linearize(some(inline), -1)))), true)),
+        line(open(/[-+*](?:$|[ \n])/y, visualize(trimBlank(some(inline))), true)),
         indent(union([ulist_, olist_, ilist_])),
       ]),
       ilistitem),

package/src/parser/block/mathblock.ts

@@ -1,17 +1,17 @@
 import { MathBlockParser } from '../block';
-import { block, validate, fence, clear, fmap } from '../../combinator';
+import { block, fence, clear, fmap } from '../../combinator';
 import { invalid } from '../util';
 import { html } from 'typed-dom/dom';
 
 const opener = /(\${2,})(?!\$)([^\n]*)(?:$|\n)/y;
 
-export const segment: MathBlockParser.SegmentParser = block(validate('$$',
-  clear(fence(opener, 300))));
+export const segment: MathBlockParser.SegmentParser = block(
+  clear(fence(opener, 300)));
 
-export const segment_: MathBlockParser.SegmentParser = block(validate('$$',
-  clear(fence(opener, 300, false))), false);
+export const segment_: MathBlockParser.SegmentParser = block(
+  clear(fence(opener, 300, false)), false);
 
-export const mathblock: MathBlockParser = block(validate('$$', fmap(
+export const mathblock: MathBlockParser = block(fmap(
   fence(opener, 300),
   // Bug: Type mismatch between outer and inner.
   ([body, overflow, closer, opener, delim, param]: string[], { caches: { math: cache = undefined } = {} }) => [
@@ -29,4 +29,4 @@ export const mathblock: MathBlockParser = block(validate('$$', fmap(
                 overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
                   'Invalid argument'),
         }, `${opener}${body}${overflow || closer}`),
-  ])));
+  ]));

package/src/parser/block/mediablock.ts

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

package/src/parser/block/olist.ts

@@ -1,10 +1,10 @@
 import { OListParser } from '../block';
 import { Recursion } from '../context';
-import { union, inits, subsequence, some, recursion, block, line, validate, indent, focus, open, match, trim, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, subsequence, some, recursion, block, line, validate, indent, focus, open, match, fallback, lazy, fmap } from '../../combinator';
 import { ulist_, checkbox, fillFirstLine } from './ulist';
 import { ilist_, ilistitem } from './ilist';
 import { inline, indexee, indexer, dataindex } from '../inline';
-import { invalid, linearize } from '../util';
+import { invalid } from '../util';
 import { visualize, trimBlank } from '../visibility';
 import { memoize } from 'spica/memoize';
 import { html, define, defrag } from 'typed-dom/dom';
@@ -36,7 +36,7 @@ const list = (type: string, form: string): OListParser.ListParser => fmap(
       inits([
         line(open(heads[form], subsequence([
           checkbox,
-          trim(visualize(linearize(trimBlank(some(union([indexer, inline]))), -1)))]), true)),
+          visualize(trimBlank(some(union([indexer, inline]))))]), true)),
         indent(union([ulist_, olist_, ilist_])),
       ]),
       ilistitem),