securemark 0.294.7 → 0.294.9

package/markdown.d.ts

@@ -614,7 +614,6 @@ export namespace MarkdownParser {
         Parser<HTMLSpanElement | HTMLBRElement, Context, [
           InlineParser.MathParser,
           InlineParser.AutolinkParser,
-          SourceParser.LinebreakParser,
           SourceParser.UnescapableSourceParser,
         ]> {
       }
@@ -808,13 +807,6 @@ export namespace MarkdownParser {
           LinkParser.ParameterParser,
         ]> {
       }
-      export interface UnsafeLinkParser extends
-        Inline<'link/unsafelink'>,
-        Parser<HTMLAnchorElement, Context, [
-          LinkParser.TextParser,
-          LinkParser.ParameterParser,
-        ]> {
-      }
       export interface ContentParser extends
         Inline<'link/content'>,
         Parser<List<Data<string | HTMLElement>>, Context, [
@@ -1098,7 +1090,6 @@ export namespace MarkdownParser {
         AutolinkParser.UrlParser.LineUrlParser,
         AutolinkParser.UrlParser,
         AutolinkParser.EmailParser,
-        AutolinkParser.ChannelParser,
         AutolinkParser.AccountParser,
         AutolinkParser.HashtagParser,
         AutolinkParser.HashnumParser,
@@ -1110,7 +1101,7 @@ export namespace MarkdownParser {
         // https://host
         Inline<'url'>,
         Parser<string | HTMLElement, Context, [
-          LinkParser.UnsafeLinkParser,
+          Parser<HTMLAnchorElement, Context, []>,
           InlineParser,
         ]> {
       }
@@ -1120,7 +1111,7 @@ export namespace MarkdownParser {
           Parser<string | HTMLElement, Context, [
             SourceParser.StrParser,
             Parser<string | HTMLElement, Context, [
-              InlineParser.LinkParser.UnsafeLinkParser,
+              Parser<HTMLAnchorElement, Context, []>,
               InlineParser,
             ]>,
           ]> {
@@ -1147,43 +1138,37 @@ export namespace MarkdownParser {
       export interface EmailParser extends
         // user@host
         Inline<'email'>,
-        Parser<string | HTMLAnchorElement, Context, [
-          Parser<HTMLAnchorElement, Context, []>,
-        ]> {
-      }
-      export interface ChannelParser extends
-        // @user#tag
-        Inline<'channel'>,
-        Parser<string | HTMLAnchorElement, Context, [
-          LinkParser.UnsafeLinkParser,
+        Parser<HTMLAnchorElement, Context, [
+          SourceParser.StrParser,
         ]> {
       }
       export interface AccountParser extends
         // @user
+        // @user#tag
         Inline<'account'>,
-        Parser<string | HTMLAnchorElement, Context, [
-          LinkParser.UnsafeLinkParser,
+        Parser<HTMLAnchorElement, Context, [
+          SourceParser.StrParser,
         ]> {
       }
       export interface HashtagParser extends
         // #tag
         Inline<'hashtag'>,
-        Parser<string | HTMLAnchorElement, Context, [
-          LinkParser.UnsafeLinkParser,
+        Parser<HTMLAnchorElement, Context, [
+          SourceParser.StrParser,
         ]> {
       }
       export interface HashnumParser extends
         // #1
         Inline<'hashnum'>,
-        Parser<string | HTMLAnchorElement, Context, [
-          LinkParser.UnsafeLinkParser,
+        Parser<HTMLAnchorElement, Context, [
+          SourceParser.StrParser,
         ]> {
       }
       export interface AnchorParser extends
         // >>1
         Inline<'anchor'>,
-        Parser<string | HTMLAnchorElement, Context, [
-          LinkParser.UnsafeLinkParser,
+        Parser<HTMLAnchorElement, Context, [
+          SourceParser.StrParser,
         ]> {
       }
     }
@@ -1192,7 +1177,6 @@ export namespace MarkdownParser {
     Markdown<'autolink'>,
     Parser<string | HTMLElement, Context, [
       InlineParser.AutolinkParser,
-      SourceParser.LinebreakParser,
       SourceParser.UnescapableSourceParser,
     ]> {
   }
@@ -1210,13 +1194,6 @@ export namespace MarkdownParser {
         TextParser,
       ]> {
     }
-    export interface LinebreakParser extends
-      // \n
-      Source<'linebreak'>,
-      Parser<HTMLBRElement, Context, [
-        TextParser,
-      ]> {
-    }
     export interface EscapableSourceParser extends
       // abc
       Source<'escsource'>,

package/package.json

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

package/src/combinator/control/constraint/block.ts

@@ -1,5 +1,5 @@
 import { Parser, failsafe } from '../../data/parser';
-import { firstline, isBlank } from './line';
+import { isBlankline } from './line';
 
 export function block<P extends Parser<unknown>>(parser: P, separation?: boolean): P;
 export function block<N>(parser: Parser<N>, separation = true): Parser<N> {
@@ -10,7 +10,7 @@ export function block<N>(parser: Parser<N>, separation = true): Parser<N> {
     if (position === source.length) return;
     const result = parser(input);
     if (result === undefined) return;
-    if (separation && !isBlank(firstline(source, context.position))) return;
+    if (separation && !isBlankline(source, context.position)) return;
     assert(context.position === source.length || source[context.position - 1] === '\n');
     return context.position === source.length || source[context.position - 1] === '\n'
       ? result

package/src/combinator/control/constraint/line.ts

@@ -16,7 +16,7 @@ export function line<N>(parser: Parser<N>): Parser<N> {
     context.source = source;
     context.offset -= position;
     if (result === undefined) return;
-    if (!isBlank(source.slice(context.position, position + line.length))) return;
+    if (context.position < position + line.length && !isBlankline(source, context.position)) return;
     context.position = position + line.length;
     return result;
   });
@@ -29,8 +29,10 @@ export function firstline(source: string, position: number): string {
     : source.slice(position, i + 1);
 }
 
-export function isBlank(line: string): boolean {
-  return line === ''
-      || line === '\n'
-      || line.trimStart() === '';
+const blankline = /[^\S\n]*(?:$|\n)/y;
+export function isBlankline(source: string, position: number): boolean {
+  blankline.lastIndex = position;
+  return source.length === position
+      || source[position] === '\n'
+      || blankline.test(source);
 }

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

@@ -8,6 +8,7 @@ export function convert<N>(conv: (source: string, context: Ctx) => string, parse
     const { source, position } = context;
     if (position === source.length) return;
     const src = conv(source.slice(position), context);
+    assert(context.position === position);
     if (src === '') {
       if (!empty) return;
       context.position = source.length;
@@ -22,7 +23,7 @@ export function convert<N>(conv: (source: string, context: Ctx) => string, parse
       return result;
     }
     else {
-    const { offset, backtracks } = context;
+      const { offset, backtracks } = context;
       const result = parser(subinput(src, context));
       context.position = context.source.length
       assert(context.offset === offset);

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

@@ -1,6 +1,6 @@
 import { Parser, List, Data, Ctx, failsafe } from '../../data/parser';
 import { consume } from '../../../combinator';
-import { firstline, isBlank } from '../constraint/line';
+import { firstline, isBlankline } from '../constraint/line';
 import { push } from 'spica/array';
 
 export function fence<C extends Ctx, D extends Parser<unknown, C>[]>(opener: RegExp, limit: number, separation = true): Parser<string, C, D> {
@@ -20,20 +20,20 @@ export function fence<C extends Ctx, D extends Parser<unknown, C>[]>(opener: Reg
     context.position += matches[0].length;
     // Prevent annoying parsing in editing.
     const secondline = firstline(source, context.position);
-    if (isBlank(secondline) && firstline(source, context.position + secondline.length).trimEnd() !== delim) return;
+    if (isBlankline(secondline, 0) && firstline(source, context.position + secondline.length).trimEnd() !== delim) return;
     let block = '';
     let closer = '';
     let overflow = '';
     for (let count = 1; ; ++count) {
       if (context.position === source.length) break;
       const line = firstline(source, context.position);
-      if ((closer || count > limit + 1) && isBlank(line)) break;
+      if ((closer || count > limit + 1) && isBlankline(line, 0)) break;
       if(closer) {
         overflow += line;
       }
       if (!closer && count <= limit + 1 && line.slice(0, delim.length) === delim && line.trimEnd() === delim) {
         closer = line;
-        if (isBlank(firstline(source, context.position + line.length))) {
+        if (isBlankline(source, context.position + line.length)) {
           context.position += line.length;
           break;
         }

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

@@ -4,51 +4,51 @@ import { matcher, clear } from '../../../combinator';
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: IntermediateParser<P>, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: false,
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<SubNode<P>>>, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<SubNode<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  backtracks?: readonly number[],
 ): P;
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: IntermediateParser<P>, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: boolean,
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<SubNode<P>>> | undefined, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<SubNode<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  backtracks?: readonly number[],
 ): P;
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: false,
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<Node<P>>>, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  backtracks?: readonly number[],
 ): P;
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: boolean,
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  backtracks?: readonly number[],
 ): P;
 export function surround<P extends Parser<string>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: string | RegExp | P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: false,
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<Node<P>>>, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  backtracks?: readonly number[],
 ): P;
 export function surround<P extends Parser<string>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: string | RegExp | P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: boolean,
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  backtracks?: readonly number[],
 ): P;
 export function surround<N>(
   opener: string | RegExp | Parser<N>, parser: string | RegExp | Parser<N>, closer: string | RegExp | Parser<N>,
   optional: boolean = false,
+  backtracks: readonly number[] = [],
   f?: (rss: [List<Data<N>>, List<Data<N>>, List<Data<N>>], context: Ctx) => Result<N>,
   g?: (rss: [List<Data<N>>, List<Data<N>> | undefined], context: Ctx) => Result<N>,
-  backtracks: readonly number[] = [],
 ): Parser<N> {
   switch (typeof opener) {
     case 'string':
@@ -129,7 +129,7 @@ export function open<N>(
   optional?: boolean,
   backtracks?: readonly number[],
 ): Parser<N> {
-  return surround(opener, parser as Parser<N>, '', optional, undefined, undefined, backtracks);
+  return surround(opener, parser as Parser<N>, '', optional, backtracks);
 }
 export function close<P extends Parser<unknown>>(
   parser: P,
@@ -149,7 +149,7 @@ export function close<N>(
   optional?: boolean,
   backtracks?: readonly number[],
 ): Parser<N> {
-  return surround('', parser as Parser<N>, closer, optional, undefined, undefined, backtracks);
+  return surround('', parser as Parser<N>, closer, optional, backtracks);
 }
 
 const statesize = 2;

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

@@ -24,7 +24,7 @@ export function some<N>(parser: Parser<N>, end?: string | RegExp | number, delim
       context.delimiters.push(delims);
     }
     // whileは数倍遅い
-    for (; context.position < source.length;) {
+    for (const len = source.length; context.position < len;) {
       if (match(input)) break;
       if (context.delimiters?.match(input)) break;
       const result = parser(input);

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

@@ -10,8 +10,12 @@ export function union<N, D extends Parser<N>[]>(parsers: D): Parser<N, Ctx, D> {
       return parsers[0];
     default:
       return eval([
+        '((',
+        parsers.map((_, i) => `parser${i},`).join(''),
+        ') =>',
         'input =>',
-        parsers.map((_, i) => `|| parsers[${i}](input)`).join('').slice(2),
-      ].join(''));
+        parsers.map((_, i) => `|| parser${i}(input)`).join('').slice(2),
+        ')',
+      ].join(''))(...parsers);
   }
 }

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

@@ -48,7 +48,6 @@ describe('Unit: parser/api/bind', () => {
         [
           '<h1 class="error">Error: Too large segment over 100,000 bytes.</h1>',
           `<pre class="error" translate="no">${'\n'.repeat(997)}...</pre>`,
-          '<h1 class="error">Error: Too large segment over 100,000 bytes.</h1>',
         ]);
     });
 

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

@@ -2,10 +2,6 @@ import { normalize, escape } from './normalize';
 
 describe('Unit: parser/normalize', () => {
   describe('normalize', () => {
-    it('invalid surrogate pairs', () => {
-      assert(normalize('\uDC00\uD800') === '\uFFFD\uFFFD');
-    });
-
     it('controls', () => {
       assert(normalize('\r') === '\n');
       assert(normalize('\r\n') === '\n');
@@ -50,10 +46,11 @@ describe('Unit: parser/normalize', () => {
       assert(normalize('\u202A') === '\uFFFD');
       assert(normalize('\u202F') === '\uFFFD');
       assert(normalize('\uFEFF') === '\uFFFD');
-      assert(normalize('\u180E') === '\uFFFD');
-      assert(normalize('\u1820\u180E') === '\u1820\u180E');
-      assert(normalize('\u1821\u180E') === '\u1821\u180E');
-      assert(normalize('\u1822\u180E') === '\u1822\uFFFD');
+      //assert(normalize('\u180E') === '\uFFFD');
+      //assert(normalize('\u1820\u180E') === '\u1820\u180E');
+      //assert(normalize('\u1821\u180E') === '\u1821\u180E');
+      //assert(normalize('\u1822\u180E') === '\u1822\uFFFD');
+      //assert(normalize('\uDC00\uD800') === '\uFFFD\uFFFD');
     });
 
     it('header', () => {

package/src/parser/api/normalize.ts

@@ -14,8 +14,10 @@ function format(source: string): string {
 
 const invalid = new RegExp([
   /(?![\t\r\n])[\x00-\x1F\x7F]/g.source,
-  /(?!\u200D)[\u2006\u200B-\u200F\u202A-\u202F\u2060\uFEFF]|(?<![\u1820\u1821])\u180E/g.source,
-  /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g.source,
+  /(?!\u200D)[\u2006\u200B-\u200F\u202A-\u202F\u2060\uFEFF]/g.source,
+  // 後読みが重い
+  ///(?<![\u1820\u1821])\u180E/g.source,
+  ///[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g.source,
 ].join('|'), 'g');
 function sanitize(source: string): string {
   return source.replace(invalid, UNICODE_REPLACEMENT_CHARACTER);

package/src/parser/autolink.ts

@@ -1,13 +1,12 @@
 import { MarkdownParser } from '../../markdown';
 import { union, some, lazy } from '../combinator';
 import { autolink as autolink_ } from './inline/autolink';
-import { linebreak, unescsource } from './source';
+import { unescsource } from './source';
 
 export import AutolinkParser = MarkdownParser.AutolinkParser;
 
 export const autolink: AutolinkParser = lazy(() =>
   some(union([
     autolink_,
-    linebreak,
     unescsource,
   ])));

package/src/parser/block/blockquote.ts

@@ -1,7 +1,7 @@
 import { BlockquoteParser } from '../block';
 import { Recursion } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, some, creation, recursion, block, validate, rewrite, open, convert, lazy, fmap } from '../../combinator';
+import { union, some, consume, recursion, block, validate, rewrite, open, convert, lazy, fmap } from '../../combinator';
 import { autolink } from '../autolink';
 import { contentline } from '../source';
 import { unwrap } from '../util';
@@ -37,10 +37,10 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
     rewrite(
       indent,
       convert(unindent, markdown, false, true)),
-    creation(10,
     rewrite(
       some(contentline, opener),
       convert(unindent, ({ context }) => {
+        consume(10, context);
         const { source } = context;
         const references = html('ol', { class: 'references' });
         const document = parse(source, {
@@ -51,6 +51,6 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
         }, context);
         context.position = source.length;
         return new List([new Data(html('section', [document, html('h2', 'References'), references]))]);
-      }, false, true))),
+      }, false, true)),
   ]))),
   ns => new List([new Data(html('blockquote', unwrap(ns)))])));

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

@@ -30,7 +30,10 @@ export const fig: FigParser = block(rewrite(segment, verify(convert(
     // Bug: TypeScript
     const fence = (/^[^\n]*\n!?>+ /.test(source) && source.match(/^~{3,}(?=[^\S\n]*$)/mg) as string[] || [])
       .reduce((max, fence) => fence > max ? fence : max, '~~') + '~';
-    return parser({ context })
+    const { position } = context;
+    const result = parser({ context });
+    context.position = position;
+    return result
       ? `${fence}figure ${source.replace(/^(.+\n.+\n)([\S\s]+?)\n?$/, '$1\n$2')}\n${fence}`
       : `${fence}figure ${source}\n\n${fence}`;
   },

package/src/parser/block/heading.ts

@@ -1,7 +1,7 @@
 import { HeadingParser } from '../block';
 import { State } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, some, state, block, line, focus, rewrite, open, fmap } from '../../combinator';
+import { union, some, state, block, line, focus, rewrite, open, fmap, firstline } from '../../combinator';
 import { inline, indexee, indexer, dataindex } from '../inline';
 import { str } from '../source';
 import { visualize, trimBlank } from '../visibility';
@@ -10,7 +10,17 @@ import { html, defrag } from 'typed-dom/dom';
 
 export const segment: HeadingParser.SegmentParser = block(focus(
   /#+ +\S[^\n]*(?:\n#+(?=$|[ \n])[^\n]*)*(?:$|\n)/y,
-  some(line(({ context: { source } }) => new List([new Data(source)])))));
+  input => {
+    const { context } = input;
+    const { source } = context;
+    const acc = new List<Data<string>>();
+    for (; context.position < source.length;) {
+      const line = firstline(source, context.position);
+      acc.push(new Data(line));
+      context.position += line.length;
+    }
+    return acc;
+  }));
 
 export const heading: HeadingParser = block(rewrite(segment,
   // その他の表示制御は各所のCSSで行う。

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

@@ -3,7 +3,7 @@ import { List, Data } from '../../../combinator/data/parser';
 import { union, some, block, validate, rewrite, convert, lazy, fmap } from '../../../combinator';
 import { math } from '../../inline/math';
 import { autolink } from '../../inline/autolink';
-import { linebreak, unescsource, anyline } from '../../source';
+import { unescsource, anyline } from '../../source';
 import { unwrap } from '../../util';
 import { html, defrag } from 'typed-dom/dom';
 
@@ -19,7 +19,6 @@ export const quote: ReplyParser.QuoteParser = lazy(() => block(fmap(
         // quote補助関数が残した数式をパースする。
         math,
         autolink,
-        linebreak,
         unescsource,
       ])),
       false)),

package/src/parser/block/ulist.ts

@@ -10,7 +10,7 @@ import { unwrap } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const ulist: UListParser = lazy(() => block(validate(
-  /- /y,
+  '- ',
   ulist_)));
 
 export const ulist_: UListParser = lazy(() => block(fmap(validate(

package/src/parser/block.ts

@@ -62,10 +62,6 @@ export const block: BlockParser = reset(
       if (position === source.length) return;
       const fst = source[position];
       switch (fst) {
-        case '\n':
-          assert(source.trim() === '');
-          input.context.position = source.length;
-          return new List();
         case '=':
           if (source.startsWith('===', position)) return pagebreak(input);
           break;

package/src/parser/header.ts

@@ -1,7 +1,6 @@
 import { MarkdownParser } from '../../markdown';
 import { List, Data } from '../combinator/data/parser';
-import { union, inits, some, block, line, validate, focus, rewrite, clear, convert, lazy, fmap } from '../combinator';
-import { segment } from './segment';
+import { union, inits, some, block, line, validate, focus, clear, convert, lazy, fmap } from '../combinator';
 import { str } from './source';
 import { unwrap, invalid } from './util';
 import { normalize } from './api/normalize';
@@ -10,44 +9,33 @@ import { html, defrag } from 'typed-dom/dom';
 export const header: MarkdownParser.HeaderParser = lazy(() => validate(
   /---+ *\r?\n(?=\S)/y,
   inits([
-    rewrite(
-      ({ context }) => {
-        const { source } = context;
-        if (context.header ?? true) {
-          context.position += segment(source).next().value!.length;
-        }
-        else {
-          context.position = source.length;
-        }
-        return new List();
-      },
-      block(
-        union([
-          validate(({ context }) => context.header ?? true,
-          focus(/(---+) *\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[0-9A-Za-z]+)*:[ \t]+\S[^\r\n]*\r?\n){1,100}\1 *(?:$|\r?\n)/y,
-          convert(source =>
-            normalize(source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n'))).replace(/(\S)\s+$/mg, '$1'),
-            fmap(
-              some(union([field])),
-              ns => new List([
-                new Data(html('aside', { class: 'header' }, [
-                  html('details',
-                    { open: '' },
-                    defrag(unwrap(ns.unshift(new Data(html('summary', 'Header'))) && ns))),
-                ])),
-              ])), false))),
-          ({ context }) => {
-            const { source, position } = context;
-            context.position += source.length;
-            return new List([
-              new Data(html('pre', {
-                class: 'invalid',
-                translate: 'no',
-                ...invalid('header', 'syntax', 'Invalid syntax'),
-              }, normalize(source.slice(position)))),
-            ]);
-          },
-        ]))),
+    block(
+      union([
+        validate(({ context }) => context.header ?? true,
+        focus(/(---+) *\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[0-9A-Za-z]+)*:[ \t]+\S[^\r\n]*\r?\n){1,100}\1 *(?:$|\r?\n)/y,
+        convert(source =>
+          normalize(source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n'))).replace(/(\S)\s+$/mg, '$1'),
+          fmap(
+            some(union([field])),
+            ns => new List([
+              new Data(html('aside', { class: 'header' }, [
+                html('details',
+                  { open: '' },
+                  defrag(unwrap(ns.unshift(new Data(html('summary', 'Header'))) && ns))),
+              ])),
+            ])), false))),
+        ({ context }) => {
+          const { source, position } = context;
+          context.position += source.length;
+          return new List([
+            new Data(html('pre', {
+              class: 'invalid',
+              translate: 'no',
+              ...invalid('header', 'syntax', 'Invalid syntax'),
+            }, normalize(source.slice(position)))),
+          ]);
+        },
+      ])),
     clear(str(/ *\r?\n/y)),
   ])));
 

package/src/parser/inline/annotation.ts

@@ -13,9 +13,8 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
   trimBlankStart(some(union([inline]), ')', [[')', 1]])))),
   '))',
   false,
+  [1 | Backtrack.bracket, 3 | Backtrack.doublebracket],
   ([, ns], context) =>
     context.linebreak === 0
       ? new List([new Data(html('sup', { class: 'annotation' }, [html('span', defrag(unwrap(trimBlankNodeEnd(ns))))]))])
-      : undefined,
-  undefined,
-  [1 | Backtrack.bracket, 3 | Backtrack.doublebracket])));
+      : undefined)));