securemark 0.294.6 → 0.294.8

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

@@ -22,12 +22,12 @@ export const index: IndexParser = lazy(() => constraint(State.index, fmap(indexe
   ]), ']', [[']', 1]])))),
   str(']'),
   false,
+  [3 | Backtrack.bracket],
   ([, bs], context) =>
     context.linebreak === 0 && trimBlankNodeEnd(bs).length > 0
       ? new List([new Data(html('a', { 'data-index': dataindex(bs) }, defrag(unwrap(bs))))])
       : undefined,
-  undefined,
-  [3 | Backtrack.bracket])),
+  undefined)),
   ns => {
     if (ns.length === 1) {
       const el = ns.head!.value as HTMLElement;
@@ -54,14 +54,14 @@ export const signature: IndexParser.SignatureParser = lazy(() => validate('|', s
   ]), ']'),
   /(?=])/y,
   false,
+  [3 | Backtrack.bracket],
   ([, ns], context) => {
     const index = identity('index', undefined, ns.foldl((acc, { value }) => acc + value, ''))?.slice(7);
     return index && context.linebreak === 0
       ? new List([new Data(html('span', { class: 'indexer', 'data-index': index }))])
       : undefined;
   },
-  ([as, bs]) => bs && as.import(bs),
-  [3 | Backtrack.bracket])));
+  ([as, bs]) => bs && as.import(bs))));
 
 export function dataindex(nodes: List<Data<string | HTMLElement>>): string | undefined {
   let node = nodes.last;

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

@@ -16,4 +16,4 @@ export const indexer: ExtensionParser.IndexerParser = surround(
     signature,
     focus(/\|(?=\])/y, () => new List([new Data(html('span', { class: 'indexer', 'data-index': '' }))])),
   ]),
-  /\]\s*$/y);
+  /\][^\S\n]*(?:$|\n)/y);

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

@@ -14,7 +14,7 @@ export const segment: ExtensionParser.LabelParser.SegmentParser = clear(union([
 
 export const label: ExtensionParser.LabelParser = constraint(State.label, fmap(
   union([
-    surround('[', body, ']', false, undefined, undefined, [1 | Backtrack.bracket, 1]),
+    surround('[', body, ']', false, [1 | Backtrack.bracket, 1]),
     body,
   ]),
   ([{ value }]) => new List([

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

@@ -17,7 +17,9 @@ export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surroun
   str(/\[[:^|]/y),
   precedence(1, recursion(Recursion.inline,
   tightStart(some(union([inline]), ']', [[']', 1]])))),
-  str(']'), false,
+  str(']'),
+  false,
+  [3 | Backtrack.bracket],
   (_, context) => new List([
     new Data(html('span',
       {
@@ -26,5 +28,4 @@ export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surroun
       },
       context.source.slice(context.position - context.range!, context.position)))
   ]),
-  ([as, bs]) => bs && as.import(bs as List<Data<string>>),
-  [3 | Backtrack.bracket]));
+  ([as, bs]) => bs && as.import(bs as List<Data<string>>)));

package/src/parser/inline/html.ts

@@ -23,10 +23,10 @@ export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[ >])/yi,
   union([
     surround(
       // https://html.spec.whatwg.org/multipage/syntax.html#void-elements
-      str(/<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[ >])/yi),
+      str(/<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[ >])/y),
       some(union([attribute])),
       open(str(/ ?/y), str('>'), true),
-      true,
+      true, [],
       ([as, bs = new List(), cs], context) =>
         new List([new Data(elem(as.head!.value.slice(1), false, [...unwrap(as.import(bs).import(cs))], new List(), new List(), context))]),
       ([as, bs = new List()], context) =>
@@ -38,7 +38,7 @@ export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[ >])/yi,
         surround<HTMLParser.TagParser, string>(
           surround(
             str(`<${tag}`), some(attribute), open(str(/ ?/y), str('>'), true),
-            true,
+            true, [],
             ([as, bs = new List(), cs]) => as.import(bs).import(cs),
             ([as, bs = new List()]) => as.import(bs)),
           // 不可視のHTML構造が可視構造を変化させるべきでない。
@@ -51,7 +51,7 @@ export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[ >])/yi,
             open('\n', some(inline, `</${tag}>`), true),
           ])))),
           str(`</${tag}>`),
-          true,
+          true, [],
           ([as, bs = new List(), cs], context) =>
             new List([new Data(elem(tag, true, [...unwrap(as)], bs, cs, context))]),
           ([as, bs = new List()], context) =>
@@ -63,7 +63,7 @@ export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[ >])/yi,
       str(/<[a-z]+(?=[ >])/yi),
       some(union([attribute])),
       open(str(/ ?/y), str('>'), true),
-      true,
+      true, [],
       ([as, bs = new List(), cs], context) =>
         new List([new Data(elem(as.head!.value.slice(1), false, [...unwrap(as.import(bs).import(cs))], new List(), new List(), context))]),
       ([as, bs = new List()], context) =>

package/src/parser/inline/htmlentity.ts

@@ -9,11 +9,11 @@ import { html } from 'typed-dom/dom';
 export const unsafehtmlentity: UnsafeHTMLEntityParser = surround(
   str('&'), str(/[0-9A-Za-z]+/y), str(';'),
   false,
+  [3 | Backtrack.bracket],
   ([as, bs, cs]) =>
     new List([new Data(parser(as.head!.value + bs.head!.value + cs.head!.value))]),
   ([as, bs]) =>
-    new List([new Data(as.head!.value + (bs?.head?.value ?? ''))]),
-  [3 | Backtrack.bracket]);
+    new List([new Data(as.head!.value + (bs?.head?.value ?? ''))]));
 
 export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),
@@ -23,7 +23,7 @@ export const htmlentity: HTMLEntityParser = fmap(
       : new Data(html('span', {
           class: 'invalid',
           ...invalid('htmlentity', 'syntax', 'Invalid HTML entity'),
-      }, value))
+        }, value))
   ]));
 
 const parser = (el => (entity: string): string => {

package/src/parser/inline/insertion.ts

@@ -15,7 +15,8 @@ export const insertion: InsertionParser = lazy(() =>
       some(inline, blankWith('\n', '++')),
       open('\n', some(inline, '+'), true),
     ]))),
-    '++', false,
+    '++',
+    false, [],
     ([, bs], { buffer }) => buffer!.import(bs),
     ([, bs], { buffer }) => bs && buffer!.import(bs).push(new Data(Command.Cancel)) && buffer!),
     nodes => new List([new Data(html('ins', defrag(unwrap(nodes))))]))));

package/src/parser/inline/italic.ts

@@ -18,7 +18,8 @@ export const italic: ItalicParser = lazy(() =>
       some(inline, blankWith('///')),
       open(some(inline, '/'), inline),
     ])))),
-    '///', false,
+    '///',
+    false, [],
     ([, bs], { buffer }) => buffer!.import(bs),
     ([, bs], { buffer }) => bs && buffer!.import(bs).push(new Data(Command.Cancel)) && buffer!),
     nodes => new List([new Data(html('i', defrag(unwrap(nodes))))]))));

package/src/parser/inline/link.ts

@@ -2,10 +2,10 @@ import { MarkdownParser } from '../../../markdown';
 import { LinkParser } from '../inline';
 import { State, Backtrack, Command } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, inits, tails, sequence, subsequence, some, creation, precedence, state, constraint, surround, open, setBacktrack, dup, reverse, lazy, fmap, bind } from '../../combinator';
+import { union, inits, sequence, subsequence, some, creation, precedence, state, constraint, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
 import { inline, media, shortmedia } from '../inline';
 import { attributes } from './html';
-import { unescsource, str } from '../source';
+import { str } from '../source';
 import { trimBlankStart, trimBlankNodeEnd } from '../visibility';
 import { unwrap, invalid, stringify } from '../util';
 import { ReadonlyURL } from 'spica/url';
@@ -24,12 +24,11 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => constraint(State.l
       trimBlankStart(some(union([inline]), ']', [[']', 1]])),
       ']',
       true,
+      [3 | Backtrack.bracket, 3 | Backtrack.link, 2 | Backtrack.ruby],
       ([, ns = new List()], context) =>
         context.linebreak === 0
           ? ns.push(new Data(Command.Separator)) && ns
-          : undefined,
-      undefined,
-      [3 | Backtrack.bracket, 3 | Backtrack.link, 2 | Backtrack.ruby])),
+          : undefined)),
     // `{ `と`{`で個別にバックトラックが発生し+1nされる。
     // 自己再帰的にパースしてもオプションの不要なパースによる計算量の増加により相殺される。
     dup(surround(
@@ -37,14 +36,14 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => constraint(State.l
       inits([uri, some(option)]),
       / ?}/y,
       false,
+      [3 | Backtrack.link],
       undefined,
       ([as, bs], context) => {
         if (!bs) return;
         const head = context.position - context.range!;
         setBacktrack(context, [2 | Backtrack.link], head);
         return as.import(bs).push(new Data(Command.Cancel)) && as;
-      },
-      [3 | Backtrack.link])),
+      })),
   ]),
   ([{ value: content }, { value: params = undefined } = {}], context) => {
     if (content.last!.value === Command.Separator) {
@@ -87,18 +86,6 @@ export const medialink: LinkParser.MediaLinkParser = lazy(() => constraint(State
   ([{ value: content }, { value: params }], context) =>
     new List([new Data(parse(content, params as List<Data<string>>, context))]))))));
 
-export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
-  creation(10,
-  bind(reverse(tails([
-    dup(surround(
-      '[',
-      some(union([unescsource]), ']'),
-      ']')),
-    dup(surround(/{(?![{}])/y, inits([uri, some(option)]), / ?}/y)),
-  ])),
-  ([{ value: params }, { value: content } = new Data(new List<Data<string>>())], context) =>
-    new List([new Data(parse(content, params, context))]))));
-
 export const uri: LinkParser.ParameterParser.UriParser = union([
   open(/ /y, str(/\S+/y)),
   str(/[^\s{}]+/y),
@@ -110,7 +97,7 @@ export const option: LinkParser.ParameterParser.OptionParser = union([
   str(/ [^\s{}]+/y),
 ]);
 
-function parse(
+export function parse(
   content: List<Data<string | HTMLElement>>,
   params: List<Data<string>>,
   context: MarkdownParser.Context,

package/src/parser/inline/mark.ts

@@ -16,7 +16,8 @@ export const mark: MarkParser = lazy(() => constraint(State.linkers & ~State.mar
       some(inline, blankWith('==')),
       open(some(inline, '='), inline),
     ])))),
-    '==', false,
+    '==',
+    false, [],
     ([, bs], { buffer }) => buffer!.import(bs),
     ([, bs], { buffer }) => bs && buffer!.import(bs).push(new Data(Command.Cancel)) && buffer!),
     (nodes, { id }) => {

package/src/parser/inline/math.ts

@@ -14,7 +14,8 @@ export const math: MathParser = lazy(() => rewrite(
       /\$(?={)/y,
       precedence(4, bracket),
       '$',
-      false, undefined, undefined, [3 | Backtrack.bracket]),
+      false,
+      [3 | Backtrack.bracket]),
     surround(
       /\$(?![\s{}])/y,
       precedence(2, some(union([
@@ -22,7 +23,8 @@ export const math: MathParser = lazy(() => rewrite(
         precedence(4, bracket),
       ]))),
       /\$(?![-0-9A-Za-z])/y,
-      false, undefined, undefined, [3 | Backtrack.bracket]),
+      false,
+      [3 | Backtrack.bracket]),
   ]),
   ({ context: { source, caches: { math: cache } = {} } }) => new List([
     new Data(cache?.get(source)?.cloneNode(true) ||

package/src/parser/inline/media.ts

@@ -1,8 +1,8 @@
 import { MediaParser } from '../inline';
 import { State, Recursion, Backtrack, Command } from '../context';
-import { List, Data, subinput } from '../../combinator/data/parser';
+import { List, Data } from '../../combinator/data/parser';
 import { union, inits, tails, some, creation, recursion, precedence, constraint, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
-import { unsafelink, uri, option as linkoption, resolve, decode } from './link';
+import { uri, option as linkoption, resolve, decode, parse } from './link';
 import { attributes } from './html';
 import { unsafehtmlentity } from './htmlentity';
 import { txt, str } from '../source';
@@ -30,25 +30,24 @@ export const media: MediaParser = lazy(() => constraint(State.media, creation(10
       ]), ']')),
       ']',
       true,
+      [3 | Backtrack.escbracket],
       ([, ns = new List()], context) =>
         context.linebreak === 0
           ? ns
-          : undefined,
-      undefined,
-      [3 | Backtrack.escbracket])),
+          : undefined)),
     dup(surround(
       /{(?![{}])/y,
       inits([uri, some(option)]),
       / ?}/y,
       false,
+      [3 | Backtrack.link],
       undefined,
       ([as, bs], context) => {
         if (!bs) return;
         const head = context.position - context.range!;
         setBacktrack(context, [2 | Backtrack.link], head);
         return as.import(bs).push(new Data(Command.Cancel)) && as;
-      },
-      [3 | Backtrack.link])),
+      })),
   ]),
   nodes =>
     nodes.length === 1
@@ -98,26 +97,26 @@ export const media: MediaParser = lazy(() => constraint(State.media, creation(10
     }
     if (context.state! & State.link) return new List([new Data(el)]);
     if (cache && cache.tagName !== 'IMG') return new List([new Data(el)]);
-    const { source, position } = context;
-    return fmap(
-      unsafelink as MediaParser,
-      ([{ value }]) => {
-        context.source = source;
-        context.position = position;
-        return new List([new Data(define(value, { class: null, target: '_blank' }, [el]))]);
-      })
-      (subinput(`{ ${INSECURE_URI}${linkparams.join('')} }`, context));
+    return new List([new Data(define(
+      parse(
+        new List(),
+        linkparams.reduce(
+          (acc, p) => acc.push(new Data(p)) && acc,
+          new List([new Data(INSECURE_URI)])),
+        context),
+      { class: null, target: '_blank' }, [el]))
+    ]);
   })))));
 
 const bracket: MediaParser.TextParser.BracketParser = lazy(() => recursion(Recursion.terminal, union([
-  surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('"'), precedence(2, some(union([unsafehtmlentity, txt]), '"')), str('"'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
+  surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('"'), precedence(2, some(union([unsafehtmlentity, txt]), '"')), str('"'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
 ])));
 
 const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
@@ -125,7 +124,7 @@ const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
     open(/ /y, str(/[1-9][0-9]*/y)),
     str(/[x:]/y),
     str(/[1-9][0-9]*(?=[ }])/y),
-    false,
+    false, [],
     ([[{ value: a }], [{ value: b }], [{ value: c }]]) =>
       b === 'x'
         ? new List([new Data(`width="${a}"`), new Data(`height="${c}"`)])

package/src/parser/inline/reference.ts

@@ -18,6 +18,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
   ]))),
   ']]',
   false,
+  [1 | Backtrack.bracket, 3 | Backtrack.doublebracket],
   ([, ns], context) => {
     const { position, range = 0, linebreak = 0 } = context;
     if (linebreak === 0) {
@@ -69,7 +70,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
           '',
           some(inline, ']', [[']', 1]]),
           str(']'),
-          true,
+          true, [],
           ([, cs = new List(), ds]) =>
             cs.import(ds),
           ([, cs = new List()]) => {
@@ -86,15 +87,14 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
     return state & State.annotation
       ? as.import(bs as List<Data<string>>)
       : undefined;
-  },
-  [1 | Backtrack.bracket, 3 | Backtrack.doublebracket])));
+  })));
 
 // Chicago-Style
 const abbr: ReferenceParser.AbbrParser = surround(
   str('^'),
   union([str(/(?=[A-Z])(?:[0-9A-Za-z]'?|(?:[-.:]|\.?\??,? ?)(?!['\-.:?, ]))+/y)]),
   /\|?(?=]])|\|/y,
-  true,
+  true, [],
   ([, ns], context) => {
     const { source, position, range = 0 } = context;
     if (!ns) return new List([new Data(''), new Data(source.slice(position - range, source[position - 1] === '|' ? position - 1 : position))]);

package/src/parser/inline/remark.ts

@@ -11,7 +11,8 @@ export const remark: RemarkParser = lazy(() => fallback(surround(
   str(/\[%(?=[ \n])/y),
   precedence(3, recursion(Recursion.inline,
   some(union([inline]), /[ \n]%\]/y, [[/[ \n]%\]/y, 3]]))),
-  close(text, str(`%]`)), true,
+  close(text, str(`%]`)),
+  true, [],
   ([as, bs = new List(), cs]) => new List([
     new Data(html('span', { class: 'remark' }, [
       html('input', { type: 'checkbox' }),

package/src/parser/inline/ruby.ts

@@ -13,15 +13,14 @@ export const ruby: RubyParser = lazy(() => bind(
     dup(surround(
       '[', text, ']',
       false,
+      [1 | Backtrack.bracket, 3 | Backtrack.ruby],
       ([, ns]) => {
         ns && ns.last?.value === '' && ns.pop();
         return isTightNodeStart(ns) ? ns : undefined;
-      },
-      undefined,
-      [1 | Backtrack.bracket, 3 | Backtrack.ruby])),
+      })),
     dup(surround(
       '(', text, ')',
-      false, undefined, undefined,
+      false,
       [1 | Backtrack.bracket, 3 | Backtrack.ruby])),
   ]),
   ([{ value: texts }, { value: rubies = undefined } = {}], context) => {

package/src/parser/inline/strong.ts

@@ -17,6 +17,7 @@ export const strong: StrongParser = lazy(() => surround(
     some(inline, blankWith('*')),
     open(some(inline, '*'), inline),
   ]))))),
-  str('**'), false,
+  str('**'),
+  false, [],
   ([, bs]) => new List([new Data(html('strong', defrag(unwrap(bs))))]),
   ([as, bs]) => bs && as.import(bs as List<Data<string>>)));

package/src/parser/inline/template.ts

@@ -12,6 +12,7 @@ export const template: TemplateParser = lazy(() => surround(
   some(union([bracket, escsource]), '}')),
   str('}}'),
   true,
+  [3 | Backtrack.doublebracket, 3 | Backtrack.escbracket],
   ([as, bs = new List(), cs]) => new List([
     new Data(html('span', { class: 'template' }, defrag(unwrap(as.import(bs as List<Data<string>>).import(cs)))))
   ]),
@@ -23,25 +24,24 @@ export const template: TemplateParser = lazy(() => surround(
           ...invalid('template', 'syntax', `Missing the closing symbol "}}"`),
         },
         context.source.slice(context.position - context.range!, context.position)))
-    ]),
-  [3 | Backtrack.doublebracket, 3 | Backtrack.escbracket]));
+    ])));
 
 const bracket: TemplateParser.BracketParser = lazy(() => union([
-  surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('['), recursion(Recursion.terminal, some(union([bracket, escsource]), ']')), str(']'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, escsource]), '}')), str('}'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
+  surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('['), recursion(Recursion.terminal, some(union([bracket, escsource]), ']')), str(']'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, escsource]), '}')), str('}'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
   surround(
     str('"'),
     precedence(2, recursion(Recursion.terminal, some(escsource, /["\n]/y, [['"', 2], ['\n', 3]]))),
     str('"'),
     true,
+    [3 | Backtrack.escbracket],
     ([as, bs = new List(), cs], context) =>
       context.linebreak === 0
         ? as.import(bs as List<Data<string>>).import(cs)
         : (context.position -= 1, as.import(bs as List<Data<string>>)),
-    ([as, bs]) => bs && as.import(bs as List<Data<string>>),
-    [3 | Backtrack.escbracket]),
+    ([as, bs]) => bs && as.import(bs as List<Data<string>>)),
 ]));

package/src/parser/inline.ts

@@ -5,6 +5,7 @@ import { reference } from './inline/reference';
 import { template } from './inline/template';
 import { remark } from './inline/remark';
 import { extension } from './inline/extension';
+import { label } from './inline/extension/label';
 import { textlink } from './inline/link';
 import { ruby } from './inline/ruby';
 import { html } from './inline/html';
@@ -94,7 +95,7 @@ export const inline: InlineParser = lazy(() => union([
         return html(input);
       case '$':
         if (source[position + 1] === '{') return math(input);
-        return extension(input)
+        return label(input)
             || math(input);
       case '+':
         if (source[position + 1] === '+') return insertion(input);

package/src/parser/segment.ts

@@ -13,6 +13,7 @@ export const MAX_SEGMENT_SIZE = 100_000; // 100,000 bytes (Max value size of FDB
 export const MAX_INPUT_SIZE = MAX_SEGMENT_SIZE * 10;
 
 const parser: SegmentParser = union([
+  some(emptyline),
   input => {
     const { context: { source, position } } = input;
     if (position === source.length) return;
@@ -35,8 +36,7 @@ const parser: SegmentParser = union([
         return extension(input);
     }
   },
-  some(contentline, MAX_SEGMENT_SIZE + 1),
-  some(emptyline, MAX_SEGMENT_SIZE + 1),
+  some(contentline),
 ]) as any;
 
 export function* segment(source: string): Generator<string, undefined, undefined> {

package/src/parser/source/escapable.ts

@@ -14,10 +14,6 @@ export const escsource: EscapableSourceParser = ({ context }) => {
   consume(1, context);
   context.position += 1;
   switch (char) {
-    case '\r':
-      assert(!source.includes('\r', position + 1));
-      consume(-1, context);
-      return new List();
     case Command.Escape:
       consume(1, context);
       context.position += 1;
@@ -33,6 +29,9 @@ export const escsource: EscapableSourceParser = ({ context }) => {
           context.position += 1;
           return new List([new Data(source.slice(position, position + 2))]);
       }
+    case '\r':
+      consume(-1, context);
+      return new List();
     case '\n':
       context.linebreak ||= source.length - position;
       return new List([new Data(html('br'))]);

package/src/parser/source/line.ts

@@ -8,6 +8,7 @@ export const anyline: AnyLineParser = input => {
   context.position = source.indexOf('\n', position) + 1 || source.length;
   return new List();
 };
+
 const regEmptyline = /[^\S\n]*(?:$|\n)/y;
 export const emptyline: EmptyLineParser = input => {
   const { context } = input;
@@ -21,6 +22,7 @@ export const emptyline: EmptyLineParser = input => {
   context.position = i;
   return new List();
 };
+
 const regContentline = /[^\S\n]*\S[^\n]*(?:$|\n)/y;
 export const contentline: ContentLineParser = input => {
   const { context } = input;
@@ -33,4 +35,4 @@ export const contentline: ContentLineParser = input => {
   if (i === 0) return;
   context.position = i;
   return new List();
-}
+};

package/src/parser/source/text.ts

@@ -1,7 +1,7 @@
-import { TextParser, TxtParser, LinebreakParser } from '../source';
+import { TextParser, TxtParser } from '../source';
 import { Command } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, consume, focus } from '../../combinator';
+import { union, consume } from '../../combinator';
 import { html } from 'typed-dom/dom';
 
 //const delimiter = /(?=[\\!@#$&"`\[\](){}<>（）［］｛｝*%|\r\n]|([+~=])\1|\/{3}|\s(?:\\?(?:$|\s)|[$%])|:\/\/)/g;
@@ -15,10 +15,6 @@ export const text: TextParser = input => {
   consume(1, context);
   context.position += 1;
   switch (char) {
-    case '\r':
-      assert(!source.includes('\r', position + 1));
-      consume(-1, context);
-      return new List();
     case Command.Escape:
     case '\\':
       switch (source[position + 1]) {
@@ -32,6 +28,9 @@ export const text: TextParser = input => {
           context.position += 1;
           return new List([new Data(source.slice(position + 1, context.position))]);
       }
+    case '\r':
+      consume(-1, context);
+      return new List();
     case '\n':
       context.linebreak ||= source.length - position;
       return new List([new Data(html('br'))]);
@@ -64,10 +63,6 @@ export const txt: TxtParser = union([
   text,
 ]) as TxtParser;
 
-export const linebreak: LinebreakParser = focus(/[\r\n]/y, union([
-  text,
-])) as LinebreakParser;
-
 export function canSkip(source: string, position: number): boolean {
   assert(position < source.length);
   if (!isWhitespace(source[position], false)) return false;
@@ -185,12 +180,12 @@ export function backToEmailHead(source: string, position: number, index: number)
     ? delim
     : index;
 }
-function isAlphanumeric(char: string): boolean {
+export function isAlphanumeric(char: string): boolean {
   assert(char.length === 1);
   if (char < '0' || '\x7F' < char) return false;
   return '0' <= char && char <= '9'
-      || 'a' <= char && char <= 'z'
-      || 'A' <= char && char <= 'Z';
+      || 'A' <= char && char <= 'Z'
+      || 'a' <= char && char <= 'z';
 }
 
 //const dict = new class {

package/src/parser/source/unescapable.ts

@@ -14,14 +14,12 @@ export const unescsource: UnescapableSourceParser = ({ context }) => {
   consume(1, context);
   context.position += 1;
   switch (char) {
-    case '\r':
-      assert(!source.includes('\r', position + 1));
-      consume(-1, context);
-      return new List();
     case Command.Escape:
       consume(1, context);
       context.position += 1;
       return new List([new Data(source.slice(position + 1, position + 2))]);
+    case '\r':
+      return new List();
     case '\n':
       context.linebreak ||= source.length - position;
       return new List([new Data(html('br'))]);

package/src/parser/source.ts

@@ -3,7 +3,6 @@ import { MarkdownParser } from '../../markdown';
 import SourceParser = MarkdownParser.SourceParser;
 export import TextParser = SourceParser.TextParser;
 export import TxtParser = SourceParser.TxtParser;
-export import LinebreakParser = SourceParser.LinebreakParser;
 export import EscapableSourceParser = SourceParser.EscapableSourceParser;
 export import UnescapableSourceParser = SourceParser.UnescapableSourceParser;
 export import StrParser = SourceParser.StrParser;
@@ -11,7 +10,7 @@ export import ContentLineParser = SourceParser.ContentLineParser;
 export import EmptyLineParser = SourceParser.EmptyLineParser;
 export import AnyLineParser = SourceParser.AnyLineParser;
 
-export { text, txt, linebreak } from './source/text';
+export { text, txt } from './source/text';
 export { escsource } from './source/escapable';
 export { unescsource } from './source/unescapable';
 export { str, strs } from './source/str';