securemark 0.294.4 → 0.294.6

package/src/parser/header.ts

@@ -8,7 +8,7 @@ import { normalize } from './api/normalize';
 import { html, defrag } from 'typed-dom/dom';
 
 export const header: MarkdownParser.HeaderParser = lazy(() => validate(
-  /---+[^\S\v\f\r\n]*\r?\n(?=\S)/y,
+  /---+ *\r?\n(?=\S)/y,
   inits([
     rewrite(
       ({ context }) => {
@@ -24,7 +24,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
       block(
         union([
           validate(({ context }) => context.header ?? true,
-          focus(/(---+)[^\S\v\f\r\n]*\r?\n(?:[A-Za-z][0-9A-Za-z]*(?:-[A-Za-z][0-9A-Za-z]*)*:[ \t]+\S[^\v\f\r\n]*\r?\n){1,100}\1[^\S\v\f\r\n]*(?:$|\r?\n)/y,
+          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(
@@ -48,7 +48,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
             ]);
           },
         ]))),
-    clear(str(/[^\S\v\f\r\n]*\r?\n/y)),
+    clear(str(/ *\r?\n/y)),
   ])));
 
 const field: MarkdownParser.HeaderParser.FieldParser = line(({ context: { source, position } }) => {

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, tails, state, constraint, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, state, constraint, rewrite, surround, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { define } from 'typed-dom/dom';
@@ -9,13 +9,11 @@ import { define } from 'typed-dom/dom';
 // https://example/@user must be a user page or a redirect page going there.
 
 export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
-  open(
+  surround(
     /(?<![0-9a-z])@/yi,
-    tails([
-      str(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi),
-      str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@#]|>>|:\S)/yi),
-    ]),
-    false,
+    str(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi),
+    str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@#]|>>|:\S)/yi),
+    true, undefined, undefined,
     [3 | Backtrack.autolink]),
   constraint(State.autolink, state(State.autolink, fmap(convert(
     source =>

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, tails, sequence, some, state, constraint, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, sequence, some, state, constraint, verify, rewrite, surround, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { emoji } from './hashtag';
 import { str } from '../../source';
@@ -11,23 +11,23 @@ import { define } from 'typed-dom/dom';
 
 export const channel: AutolinkParser.ChannelParser = lazy(() => rewrite(
   sequence([
-    open(
+    surround(
       /(?<![0-9a-z])@/yi,
-      tails([
-        str(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi),
-        str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@]|>>|:\S)/yi),
-      ]),
-      false,
+      str(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi),
+      str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@]|>>|:\S)/yi),
+      true, undefined, undefined,
       [3 | Backtrack.autolink]),
-    some(open(
+    some(verify(surround(
       '#',
-      verify(
-        str(new RegExp([
-          /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji))+(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
-        ].join('').replace(/emoji/g, emoji), 'yu')),
-        ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)),
-      false,
-      [3 | Backtrack.autolink])),
+      str(new RegExp([
+        /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source,
+      ].join('').replace(/emoji/g, emoji.source), 'yu')),
+      str(new RegExp([
+        /(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
+      ].join('').replace(/emoji/g, emoji.source), 'yu')),
+      false, undefined, undefined,
+      [3 | Backtrack.autolink]),
+      ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value as string))),
   ]),
   constraint(State.autolink, state(State.autolink, fmap(convert(
     source =>

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

@@ -11,10 +11,10 @@ export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
   open(
     new RegExp([
       /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
-    ].join('').replace(/emoji/g, emoji), 'yu'),
+    ].join('').replace(/emoji/g, emoji.source), 'yu'),
     str(new RegExp([
       /[0-9]{1,9}(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
-    ].join('').replace(/emoji/g, emoji), 'yu')),
+    ].join('').replace(/emoji/g, emoji.source), 'yu')),
     false,
     [1 | Backtrack.autolink]),
   constraint(State.autolink, state(State.autolink, fmap(convert(

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

@@ -54,10 +54,14 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
       assert.deepStrictEqual(inspect(parser('#a_b'), ctx), [['<a class="hashtag" href="/hashtags/a_b">#a_b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#a__b'), ctx), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '__b']);
       assert.deepStrictEqual(inspect(parser('#あ'), ctx), [['<a class="hashtag" href="/hashtags/あ">#あ</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('#👩'), ctx), [['<a class="hashtag" href="/hashtags/👩">#👩</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('#😀'), ctx), [['<a class="hashtag" href="/hashtags/😀">#😀</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('#🤚🏽'), ctx), [['<a class="hashtag" href="/hashtags/🤚🏽">#🤚🏽</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('#👨‍👩‍👧'), ctx), [['<a class="hashtag" href="/hashtags/👨‍👩‍👧">#👨‍👩‍👧</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('#🇺🇳'), ctx), [['<a class="hashtag" href="/hashtags/🇺🇳">#🇺🇳</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('##️⃣*️⃣0️⃣1️⃣2️⃣3️⃣4️⃣5️⃣6️⃣7️⃣8️⃣9️⃣'), ctx), [['<a class="hashtag" href="/hashtags/#️⃣*️⃣0️⃣1️⃣2️⃣3️⃣4️⃣5️⃣6️⃣7️⃣8️⃣9️⃣">##️⃣*️⃣0️⃣1️⃣2️⃣3️⃣4️⃣5️⃣6️⃣7️⃣8️⃣9️⃣</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#1a'), ctx), [['<a class="hashtag" href="/hashtags/1a">#1a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#1あ'), ctx), [['<a class="hashtag" href="/hashtags/1あ">#1あ</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('#1👩'), ctx), [['<a class="hashtag" href="/hashtags/1👩">#1👩</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('#1😀'), ctx), [['<a class="hashtag" href="/hashtags/1😀">#1😀</a>'], '']);
       assert.deepStrictEqual(inspect(parser(`#a'`), ctx), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `'`]);
       assert.deepStrictEqual(inspect(parser(`#a''`), ctx), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `''`]);
       assert.deepStrictEqual(inspect(parser(`#a'b`), ctx), [[`<a class="hashtag" href="/hashtags/a'b">#a'b</a>`], '']);

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

@@ -1,7 +1,7 @@
 import { AutolinkParser } from '../../inline';
 import { State, Backtrack } from '../../context';
 import { List, Data } from '../../../combinator/data/parser';
-import { union, state, constraint, verify, rewrite, open, convert, fmap, lazy } from '../../../combinator';
+import { union, state, constraint, verify, rewrite, surround, convert, fmap, lazy } from '../../../combinator';
 import { unsafelink } from '../link';
 import { str } from '../../source';
 import { define } from 'typed-dom/dom';
@@ -9,20 +9,22 @@ import { define } from 'typed-dom/dom';
 // https://example/hashtags/a must be a hashtag page or a redirect page going there.
 
 // https://github.com/tc39/proposal-regexp-unicode-property-escapes#matching-emoji
-export const emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F`;
+export const emoji = /\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F|\u200D/u;
 
 export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
-  open(
+  verify(surround(
     new RegExp([
       /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
-    ].join('').replace(/emoji/g, emoji), 'yu'),
-    verify(
-      str(new RegExp([
-        /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji))+(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
-      ].join('').replace(/emoji/g, emoji), 'yu')),
-      ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)),
-    false,
+    ].join('').replace(/emoji/g, emoji.source), 'yu'),
+    str(new RegExp([
+      /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source,
+    ].join('').replace(/emoji/g, emoji.source), 'yu')),
+    str(new RegExp([
+      /(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
+    ].join('').replace(/emoji/g, emoji.source), 'yu')),
+    false, undefined, undefined,
     [3 | Backtrack.autolink]),
+    ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)),
   constraint(State.autolink, state(State.autolink, fmap(convert(
     source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
     union([unsafelink]),

package/src/parser/inline/autolink.ts

@@ -15,7 +15,7 @@ export const autolink: AutolinkParser = lazy(() =>
     /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
     /(?<![0-9a-z])>>/yi.source,
     /(?<![0-9a-z][.+-]?|[@#])!?[0-9a-z]/yi.source,
-  ].join('|').replace(/emoji/g, emoji), 'yiu'),
+  ].join('|').replace(/emoji/g, emoji.source), 'yiu'),
   state(~State.autolink,
   union([
     lineurl,

package/src/parser/inline/code.ts

@@ -1,26 +1,20 @@
 import { CodeParser } from '../inline';
 import { List, Data } from '../../combinator/data/parser';
-import { open, match } from '../../combinator';
-import { Backtrack } from '../context';
+import { match } from '../../combinator';
 import { invalid } from '../util';
 import { html } from 'typed-dom/dom';
 
-export const code: CodeParser = open(
-  /(?=`)/y,
-  match(
-    /(`+)(?!`)([^\n]*?)(?:((?<!`)\1(?!`))|(?=$|\n))/y,
-    ([whole, opener, body, closer]) => () =>
-      closer
-        ? new List([new Data(html('code', { 'data-src': whole }, format(body)))])
-        : body
-          ? new List([new Data(html('code', {
-              class: 'invalid',
-              ...invalid('code', 'syntax', `Missing the closing symbol "${opener}"`)
-            }, whole))])
-          : new List([new Data(opener)]),
-    true),
-  false,
-  [3 | Backtrack.bracket]);
+export const code: CodeParser = match(
+  /(`+)(?!`)([^\n]*?)(?:((?<!`)\1(?!`))|(?=$|\n))/y,
+  ([whole, opener, body, closer]) => () =>
+    closer
+      ? new List([new Data(html('code', { 'data-src': whole }, format(body)))])
+      : body
+        ? new List([new Data(html('code', {
+            class: 'invalid',
+            ...invalid('code', 'syntax', `Missing the closing symbol "${opener}"`)
+          }, whole))])
+        : new List([new Data(opener)]));
 
 function format(text: string): string {
   return text.length > 2

package/src/parser/inline/deletion.ts

@@ -1,13 +1,13 @@
 import { DeletionParser } from '../inline';
 import { Recursion, Command } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, some, recursion, precedence, validate, surround, open, lazy } from '../../combinator';
+import { union, some, recursion, precedence, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { blankWith } from '../visibility';
 import { unwrap, repeat } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
-export const deletion: DeletionParser = lazy(() => validate('~~',
+export const deletion: DeletionParser = lazy(() =>
   precedence(0, repeat('~~', surround(
     '',
     recursion(Recursion.inline,
@@ -18,4 +18,4 @@ export const deletion: DeletionParser = lazy(() => validate('~~',
     '~~', false,
     ([, bs], { buffer }) => buffer!.import(bs),
     ([, bs], { buffer }) => bs && buffer!.import(bs).push(new Data(Command.Cancel)) && buffer!),
-    nodes => new List([new Data(html('del', defrag(unwrap(nodes))))])))));
+    nodes => new List([new Data(html('del', defrag(unwrap(nodes))))]))));

package/src/parser/inline/emstrong.ts

@@ -1,7 +1,7 @@
 import { EmStrongParser, EmphasisParser, StrongParser } from '../inline';
 import { Recursion, Command } from '../context';
 import { Result, List, Data, Node, Context, IntermediateParser } from '../../combinator/data/parser';
-import { union, some, recursion, precedence, validate, surround, open, lazy, bind } from '../../combinator';
+import { union, some, recursion, precedence, surround, open, lazy, bind } from '../../combinator';
 import { inline } from '../inline';
 import { strong } from './strong';
 import { emphasis } from './emphasis';
@@ -24,7 +24,7 @@ const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
 // 開閉が明示的でない構文は開閉の不明確な記号による再帰的適用を行わず
 // 可能な限り早く閉じるよう解析しなければならない。
 // このため終端記号の後ろを見て終端を中止し同じ構文を再帰的に適用してはならない。
-export const emstrong: EmStrongParser = lazy(() => validate('***',
+export const emstrong: EmStrongParser = lazy(() =>
   precedence(0, repeat('***', surround(
     '',
     recursion(Recursion.inline,
@@ -142,7 +142,7 @@ export const emstrong: EmStrongParser = lazy(() => validate('***',
         nodes = prepend('*'.repeat(prefix - postfix), nodes);
       }
       return nodes;
-    }))));
+    })));
 
 function prepend<N>(prefix: string, nodes: List<Data<N>>): List<Data<N>> {
   if (typeof nodes.head?.value === 'string') {

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

@@ -11,7 +11,7 @@ import { html } from 'typed-dom/dom';
 // 継続的編集において最も簡便となる。
 
 export const indexer: ExtensionParser.IndexerParser = surround(
-  /\s\[(?=\|\S)/y,
+  / \[(?=\|\S)/y,
   union([
     signature,
     focus(/\|(?=\])/y, () => new List([new Data(html('span', { class: 'indexer', 'data-index': '' }))])),

package/src/parser/inline/html.ts

@@ -32,7 +32,7 @@ export const html: HTMLParser = lazy(() => validate(/<[a-z]+(?=[ >])/yi,
       ([as, bs = new List()], context) =>
         new List([new Data(elem(as.head!.value.slice(1), false, [...unwrap(as.import(bs))], new List(), new List(), context))])),
     match(
-      new RegExp(String.raw`<(${TAGS.join('|')})(?=[^\S\n]|>)`, 'y'),
+      new RegExp(String.raw`<(${TAGS.join('|')})(?=[ >])`, 'y'),
       memoize(
       ([, tag]) =>
         surround<HTMLParser.TagParser, string>(

package/src/parser/inline/htmlentity.ts

@@ -1,19 +1,19 @@
 import { HTMLEntityParser, UnsafeHTMLEntityParser } from '../inline';
+import { Backtrack } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, focus, fmap } from '../../combinator';
+import { union, surround, fmap } from '../../combinator';
+import { str } from '../source';
 import { invalid } from '../util';
 import { html } from 'typed-dom/dom';
 
-export const unsafehtmlentity: UnsafeHTMLEntityParser = focus(
-  /&(?:[0-9A-Za-z]+;?)?/y,
-  //({ source }) => [[parser(source) ?? `${Command.Error}${source}`], '']));
-  ({ context }) => {
-    const { source } = context;
-    context.position += source.length;
-    return source.length > 1 && source.at(-1) === ';'
-      ? new List([new Data(parser(source) ?? source)])
-      : new List([new Data(source)]);
-  });
+export const unsafehtmlentity: UnsafeHTMLEntityParser = surround(
+  str('&'), str(/[0-9A-Za-z]+/y), str(';'),
+  false,
+  ([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]);
 
 export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),
@@ -26,11 +26,8 @@ export const htmlentity: HTMLEntityParser = fmap(
       }, value))
   ]));
 
-const parser = (el => (entity: string): string | undefined => {
+const parser = (el => (entity: string): string => {
   if (entity === '
') return ' ';
   el.innerHTML = entity;
-  const text = el.textContent!;
-  return entity === text
-    ? undefined
-    : text;
+  return el.textContent!;
 })(html('span'));

package/src/parser/inline/insertion.ts

@@ -1,13 +1,13 @@
 import { InsertionParser } from '../inline';
 import { Recursion, Command } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, some, recursion, precedence, validate, surround, open, lazy } from '../../combinator';
+import { union, some, recursion, precedence, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { blankWith } from '../visibility';
 import { unwrap, repeat } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
-export const insertion: InsertionParser = lazy(() => validate('++',
+export const insertion: InsertionParser = lazy(() =>
   precedence(0, repeat('++', surround(
     '',
     recursion(Recursion.inline,
@@ -18,4 +18,4 @@ export const insertion: InsertionParser = lazy(() => validate('++',
     '++', 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))))])))));
+    nodes => new List([new Data(html('ins', defrag(unwrap(nodes))))]))));

package/src/parser/inline/italic.ts

@@ -1,7 +1,7 @@
 import { ItalicParser } from '../inline';
 import { Recursion, Command } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, some, recursion, precedence, validate, surround, open, lazy } from '../../combinator';
+import { union, some, recursion, precedence, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { tightStart, blankWith } from '../visibility';
 import { unwrap, repeat } from '../util';
@@ -10,7 +10,7 @@ import { html, defrag } from 'typed-dom/dom';
 // 可読性のため実際にはオブリーク体を指定する。
 // 斜体は単語に使うとかえって見づらく読み飛ばしやすくなるため使わないべきであり
 // ある程度の長さのある文に使うのが望ましい。
-export const italic: ItalicParser = lazy(() => validate('///',
+export const italic: ItalicParser = lazy(() =>
   precedence(0, repeat('///', surround(
     '',
     recursion(Recursion.inline,
@@ -21,4 +21,4 @@ export const italic: ItalicParser = lazy(() => validate('///',
     '///', 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))))])))));
+    nodes => new List([new Data(html('i', defrag(unwrap(nodes))))]))));

package/src/parser/inline/link.ts

@@ -2,7 +2,7 @@ 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, validate, surround, open, setBacktrack, dup, reverse, lazy, fmap, bind } from '../../combinator';
+import { union, inits, tails, sequence, subsequence, some, creation, precedence, state, constraint, surround, open, setBacktrack, dup, reverse, lazy, fmap, bind } from '../../combinator';
 import { inline, media, shortmedia } from '../inline';
 import { attributes } from './html';
 import { unescsource, str } from '../source';
@@ -75,7 +75,7 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => constraint(State.l
     return new List([new Data(parse(content, params as List<Data<string>>, context))]);
   }))))));
 
-export const medialink: LinkParser.MediaLinkParser = lazy(() => constraint(State.link | State.media, validate(/[[{]/y, creation(10,
+export const medialink: LinkParser.MediaLinkParser = lazy(() => constraint(State.link | State.media, creation(10,
   state(State.linkers,
   bind(sequence([
     dup(surround(
@@ -85,7 +85,7 @@ export const medialink: LinkParser.MediaLinkParser = lazy(() => constraint(State
     dup(surround(/{(?![{}])/y, inits([uri, some(option)]), / ?}/y)),
   ]),
   ([{ value: content }, { value: params }], context) =>
-    new List([new Data(parse(content, params as List<Data<string>>, context))])))))));
+    new List([new Data(parse(content, params as List<Data<string>>, context))]))))));
 
 export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
   creation(10,

package/src/parser/inline/mark.ts

@@ -1,14 +1,14 @@
 import { MarkParser } from '../inline';
 import { State, Recursion, Command } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, some, recursion, precedence, state, constraint, validate, surround, open, lazy } from '../../combinator';
+import { union, some, recursion, precedence, state, constraint, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { identity, signature } from './extension/indexee';
 import { tightStart, blankWith } from '../visibility';
 import { unwrap, repeat } from '../util';
 import { html, define, defrag } from 'typed-dom/dom';
 
-export const mark: MarkParser = lazy(() => constraint(State.linkers & ~State.mark, validate('==',
+export const mark: MarkParser = lazy(() => constraint(State.linkers & ~State.mark,
   precedence(0, state(State.mark, repeat('==', surround(
     '',
     recursion(Recursion.inline,
@@ -25,4 +25,4 @@ export const mark: MarkParser = lazy(() => constraint(State.linkers & ~State.mar
       return el.id
         ? new List([new Data(el), new Data(html('a', { href: `#${el.id}` }))])
         : new List([new Data(el)]);
-    }))))));
+    })))));

package/src/parser/inline/remark.ts

@@ -8,9 +8,9 @@ import { unwrap, invalid } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const remark: RemarkParser = lazy(() => fallback(surround(
-  str(/\[%(?=\s)/y),
+  str(/\[%(?=[ \n])/y),
   precedence(3, recursion(Recursion.inline,
-  some(union([inline]), /\s%\]/y, [[/\s%\]/y, 3]]))),
+  some(union([inline]), /[ \n]%\]/y, [[/[ \n]%\]/y, 3]]))),
   close(text, str(`%]`)), true,
   ([as, bs = new List(), cs]) => new List([
     new Data(html('span', { class: 'remark' }, [
@@ -19,6 +19,6 @@ export const remark: RemarkParser = lazy(() => fallback(surround(
     ])),
   ]),
   ([as, bs]) => bs && as.import(bs as List<Data<string>>)),
-  focus(/\[%+(?=\s)/y, ({ context: { source } }) => new List([
+  focus(/\[%+(?=[ \n])/y, ({ context: { source } }) => new List([
     new Data(html('span', { class: 'invalid', ...invalid('remark', 'syntax', 'Invalid start symbol') }, source))
   ]))));

package/src/parser/inline/ruby.ts

@@ -63,6 +63,8 @@ export const ruby: RubyParser = lazy(() => bind(
     }
   }));
 
+const delimiter = /[$"`\[\](){}<>（）［］｛｝]|\\?\n/y;
+
 const text: RubyParser.TextParser = input => {
   const { context } = input;
   const { source } = context;
@@ -70,11 +72,14 @@ const text: RubyParser.TextParser = input => {
   let state = false;
   context.sequential = true;
   for (let { position } = context; position < source.length; position = context.position) {
-    if (/[$"`\[\](){}<>（）［］｛｝]|\\?\n/yi.test(source.slice(position, position + 2))) break;
+    delimiter.lastIndex = position;
+    if (delimiter.test(source)) break;
     assert(source[position] !== '\n');
     switch (source[position]) {
       case '&': {
-        const result = unsafehtmlentity(input) ?? txt(input)!;
+        const result = source[position + 1] !== ' '
+          ? unsafehtmlentity(input) ?? txt(input)!
+          : txt(input)!;
         assert(result);
         acc.last!.value += result.head!.value;
         continue;

package/src/parser/inline.ts

@@ -66,6 +66,7 @@ export const inline: InlineParser = lazy(() => union([
           case '%':
             return remark(input)
                 || textlink(input)
+                || ruby(input)
                 || bracket(input);
           case '#':
           case '$':
@@ -74,6 +75,7 @@ export const inline: InlineParser = lazy(() => union([
           case '|':
             return extension(input)
                 || textlink(input)
+                || ruby(input)
                 || bracket(input);
         }
         return textlink(input)

package/src/parser/source/text.ts

@@ -103,7 +103,6 @@ export function next(source: string, position: number, delimiter?: RegExp): numb
   const char = source[index];
   switch (char) {
     case '$':
-    case '%':
     case '*':
     case '+':
     case '~':
@@ -111,10 +110,15 @@ export function next(source: string, position: number, delimiter?: RegExp): numb
     case '/':
       index = backToWhitespace(source, position, index);
       break;
+    case '%':
+      index += index - 1 > position && source.startsWith(' %]', index - 1)
+        ? -1
+        : 0;
+      break;
     case '[':
-      index = source[index + 1] === '|'
-        ? backToWhitespace(source, position, index)
-        : index;
+      index += index - 1 > position && source.startsWith(' [|', index - 1)
+        ? -1
+        : 0;
       break;
     case ':':
       index = source.startsWith('//', index + 1)
@@ -234,7 +238,6 @@ function seek(source: string, position: number): number {
       case '@':
       case '#':
       case '$':
-      case '&':
       case '"':
       case '`':
       case '[':
@@ -270,6 +273,9 @@ function seek(source: string, position: number): number {
       case ':':
         if (source[i + 1] === '/' && source[i + 2] === '/') return i;
         continue;
+      case '&':
+        if (source[i + 1] !== ' ') return i;
+        continue;
       case ' ':
       case '\t':
       case '　':

package/src/parser/util.ts

@@ -28,7 +28,7 @@ export function repeat<N extends HTMLElement | string>(symbol: string, parser: P
   return failsafe(input => {
     const { context } = input;
     const { source, position } = context;
-    assert(source.startsWith(symbol, context.position));
+    if (!source.startsWith(symbol, context.position)) return;
     let nodes = new List<Data<N>>();
     let i = symbol.length;
     for (; source[context.position + i] === source[context.position];) ++i;

package/src/parser/visibility.ts

@@ -8,7 +8,7 @@ import { invisibleHTMLEntityNames } from './api/normalize';
 export namespace blank {
   export const line = new RegExp(
     // TODO: 行全体をエスケープ
-    /^(?:[^\S\r\n])*(?!\s)(\\?[^\S\r\n]|&IHN;|<wbr ?>|\\$)+$/mg.source
+    /^(\\?[^\S\r\n]|&IHN;|<wbr ?>|\\$)+$/mg.source
       .replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`),
     'gm');
   export const start = new RegExp(