securemark 0.286.1 → 0.286.3

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

@@ -66,7 +66,6 @@ export function surround<T>(
         if (source[i] !== source[0]) break;
         const pos = source.length + offset - i - 1;
         if (!(pos in backtracks)) continue;
-        assert(backtrack >>> 2);
         // bracket only
         const shift = backtrack >>> 2 === state >>> 2 ? state & 3 : 0;
         if (backtracks[pos] & 1 << (backtrack >>> 2) + shift) return;

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

@@ -332,14 +332,14 @@ describe('Unit: parser/api/parse', () => {
     if (!navigator.userAgent.includes('Chrome')) return;
 
     it('creation', function () {
-      this.timeout(5000);
+      this.timeout(10000);
       assert.deepStrictEqual(
         [...parse('.'.repeat(100000)).children].map(el => el.outerHTML),
         [`<p>${'.'.repeat(100000)}</p>`]);
     });
 
     it.skip('creation error', function () {
-      this.timeout(5000);
+      this.timeout(10000);
       assert.deepStrictEqual(
         [...parse('.'.repeat(100001)).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
         [
@@ -350,18 +350,20 @@ describe('Unit: parser/api/parse', () => {
 
     it('backtrack', function () {
       this.timeout(5000);
+      const str = `${'.'.repeat(9)}((${'['.repeat(13)}{{http://[[[${'.'.repeat(7134)}`;
       assert.deepStrictEqual(
-        [...parse(`${'.'.repeat(8)}((${'['.repeat(16)}http://{{${'.'.repeat(7684)}`).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
-        [`<p>${'.'.repeat(8)}((${'['.repeat(16)}http://{{${'.'.repeat(7684)}</p>`]);
+        [...parse(str).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
+        [`<p>${str}</p>`]);
     });
 
     it('backtrack error', function () {
       this.timeout(5000);
+      const str = `${'.'.repeat(9)}((${'['.repeat(13)}{{http://[[[${'.'.repeat(7134 + 1)}`;
       assert.deepStrictEqual(
-        [...parse(`${'.'.repeat(8)}((${'['.repeat(16)}http://{{${'.'.repeat(7685)}`).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
+        [...parse(str).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
         [
           '<h1 id="error:rnd" class="error">Error: Too many creations</h1>',
-          `<pre class="error" translate="no">${'.'.repeat(8)}((${'['.repeat(16)}http://{{${'.'.repeat(1000 - 8 - 2 - 16 - 9 - 3)}...</pre>`,
+          `<pre class="error" translate="no">${str.slice(0, 1000 - 3)}...</pre>`,
         ]);
     });
 

package/src/parser/context.ts

@@ -29,15 +29,17 @@ export const enum Recursion {
 }
 
 export const enum Backtrack {
-  template = 8 << 2,
-  index = 7 << 2,
-  link = 6 << 2,
-  ruby = 5 << 2,
-  media = 4 << 2,
-  linebracket = 3 << 2,
-  bracket = 2 << 2,
-  url = 1 << 2,
+  template = 7 << 2,
+  index = 6 << 2,
+  link = 5 << 2,
+  ruby = 4 << 2,
+  media = 3 << 2,
+  linebracket = 2 << 2,
+  bracket = 1 << 2,
+  url = 0 << 2,
 }
+// バックトラックを削減するため括弧派生構文を改行禁止し
+// 括弧派生構文内のバックトラック状態を統一する。
 export const enum BacktrackState {
   nobreak = 1,
 }

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

@@ -10,7 +10,6 @@ describe('Unit: parser/inline/autolink/hashnum', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);
       assert.deepStrictEqual(inspect(parser('#')), [['#'], '']);
       assert.deepStrictEqual(inspect(parser('# ')), [['#'], ' ']);
-      assert.deepStrictEqual(inspect(parser('#1_')), [['#1_'], '']);
       assert.deepStrictEqual(inspect(parser('#1#')), [['#1#'], '']);
       assert.deepStrictEqual(inspect(parser('#1#2')), [['#1#2'], '']);
       assert.deepStrictEqual(inspect(parser('#1#2#3')), [['#1#2#3'], '']);
@@ -44,6 +43,8 @@ describe('Unit: parser/inline/autolink/hashnum', () => {
       assert.deepStrictEqual(inspect(parser('#1\\')), [['<a class="hashnum">#1</a>'], '\\']);
       assert.deepStrictEqual(inspect(parser('#1\\ ')), [['<a class="hashnum">#1</a>'], '\\ ']);
       assert.deepStrictEqual(inspect(parser('#1\\\n')), [['<a class="hashnum">#1</a>'], '\\\n']);
+      assert.deepStrictEqual(inspect(parser(`#1'`)), [[`<a class="hashnum">#1</a>`], `'`]);
+      assert.deepStrictEqual(inspect(parser(`#1''`)), [[`<a class="hashnum">#1</a>`], `''`]);
       assert.deepStrictEqual(inspect(parser('#123456789')), [['<a class="hashnum">#123456789</a>'], '']);
     });
 

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

@@ -7,7 +7,7 @@ import { str } from '../../source';
 import { define } from 'typed-dom/dom';
 
 export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
-  open('#', str(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji|['_])/u.source.replace(/emoji/, emoji), 'u'))),
+  open('#', str(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji)/u.source.replace(/emoji/, emoji), 'u'))),
   union([
     constraint(State.autolink, false, state(State.autolink, fmap(convert(
       source => `[${source}]{ ${source.slice(1)} }`,

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

@@ -20,11 +20,11 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
       assert.deepStrictEqual(inspect(parser('##')), [['##'], '']);
       assert.deepStrictEqual(inspect(parser('##a')), [['##a'], '']);
       assert.deepStrictEqual(inspect(parser('###a')), [['###a'], '']);
-      assert.deepStrictEqual(inspect(parser(`#'`)), [[`#'`], '']);
-      assert.deepStrictEqual(inspect(parser(`#'0`)), [[`#'0`], '']);
-      assert.deepStrictEqual(inspect(parser(`#'00`)), [[`#'00`], '']);
-      assert.deepStrictEqual(inspect(parser('#_')), [['#_'], '']);
-      assert.deepStrictEqual(inspect(parser('#_a')), [['#_a'], '']);
+      assert.deepStrictEqual(inspect(parser(`#'`)), [['#'], `'`]);
+      assert.deepStrictEqual(inspect(parser(`#'0`)), [[`#`], `'0`]);
+      assert.deepStrictEqual(inspect(parser(`#'00`)), [[`#`], `'00`]);
+      assert.deepStrictEqual(inspect(parser('#_')), [['#'], '_']);
+      assert.deepStrictEqual(inspect(parser('#_a')), [['#'], '_a']);
       assert.deepStrictEqual(inspect(parser('#(a)')), [['#'], '(a)']);
       assert.deepStrictEqual(inspect(parser('#{}')), [['#'], '{}']);
       assert.deepStrictEqual(inspect(parser('#{{}')), [['#'], '{{}']);
@@ -58,13 +58,12 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
       assert.deepStrictEqual(inspect(parser('#1a')), [['<a class="hashtag" href="/hashtags/1a">#1a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#1あ')), [['<a class="hashtag" href="/hashtags/1あ">#1あ</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#1👩')), [['<a class="hashtag" href="/hashtags/1👩">#1👩</a>'], '']);
-      assert.deepStrictEqual(inspect(parser(`#1'`)), [[`<a class="hashtag" href="/hashtags/1'">#1'</a>`], '']);
-      assert.deepStrictEqual(inspect(parser(`#1''`)), [[`<a class="hashtag" href="/hashtags/1''">#1''</a>`], '']);
-      assert.deepStrictEqual(inspect(parser(`#a'`)), [[`<a class="hashtag" href="/hashtags/a'">#a'</a>`], '']);
-      assert.deepStrictEqual(inspect(parser(`#a''`)), [[`<a class="hashtag" href="/hashtags/a''">#a''</a>`], '']);
+      assert.deepStrictEqual(inspect(parser(`#a'`)), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `'`]);
+      assert.deepStrictEqual(inspect(parser(`#a''`)), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `''`]);
       assert.deepStrictEqual(inspect(parser(`#a'b`)), [[`<a class="hashtag" href="/hashtags/a'b">#a'b</a>`], '']);
-      assert.deepStrictEqual(inspect(parser(`#a'_b`)), [[`<a class="hashtag" href="/hashtags/a'_b">#a'_b</a>`], '']);
-      assert.deepStrictEqual(inspect(parser(`#a_'b`)), [[`<a class="hashtag" href="/hashtags/a_'b">#a_'b</a>`], '']);
+      assert.deepStrictEqual(inspect(parser(`#a'0`)), [[`<a class="hashtag" href="/hashtags/a'0">#a'0</a>`], '']);
+      assert.deepStrictEqual(inspect(parser(`#a'_b`)), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `'_b`]);
+      assert.deepStrictEqual(inspect(parser(`#a_'b`)), [[`<a class="hashtag" href="/hashtags/a">#a</a>`], `_'b`]);
       assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(9)}a`)), [[`<a class="hashtag" href="/hashtags/${'1'.repeat(9)}a">#${'1'.repeat(9)}a</a>`], '']);
     });
 

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

@@ -14,8 +14,8 @@ export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
   open(
     '#',
     str(new RegExp([
-      /^(?!['_])(?=(?:[0-9]{1,9})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|')))/u.source,
-      /(?:[^\p{C}\p{S}\p{P}\s]|emoji|'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|'))+/u.source,
+      /^(?!['_])(?=(?:[0-9]{1,9})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji)))/u.source,
+      /(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji))+/u.source,
     ].join('').replace(/emoji/g, emoji), 'u'))),
   union([
     constraint(State.autolink, false, state(State.autolink, fmap(convert(

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

@@ -34,13 +34,13 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => open(
       ]),
     ]))));
 
-const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => recursion(Recursion.terminal, union([
-  surround(str('('), some(union([bracket, unescsource]), ')'), str(')'), true,
+const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => union([
+  surround(str('('), recursion(Recursion.terminal, some(union([bracket, unescsource]), ')')), str(')'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.url),
-  surround(str('['), some(union([bracket, unescsource]), ']'), str(']'), true,
+  surround(str('['), recursion(Recursion.terminal, some(union([bracket, unescsource]), ']')), str(']'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.url),
-  surround(str('{'), some(union([bracket, unescsource]), '}'), str('}'), true,
+  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, unescsource]), '}')), str('}'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.url),
-  surround(str('"'), precedence(2, some(unescsource, '"')), str('"'), true,
+  surround(str('"'), precedence(2, recursion(Recursion.terminal, some(unescsource, '"'))), str('"'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.url),
-])));
+]));

package/src/parser/inline/autolink.ts

@@ -12,7 +12,7 @@ import { str } from '../source';
 import { stringify } from '../util';
 
 export const autolink: AutolinkParser = lazy(() =>
-  validate(/^(?:[@#>0-9a-z]|\S[#>]|[\r\n]!?https?:\/\/)/iu,
+  validate(/^(?:[@#>0-9a-z]|\S#|[0-9a-z]>|[\r\n]!?https?:\/\/)/iu,
   state(~State.autolink,
   union([
     some(union([lineurl])),
@@ -20,17 +20,17 @@ export const autolink: AutolinkParser = lazy(() =>
       url,
       email,
       // Escape unmatched email-like strings.
-      str(/^[0-9a-z]+(?:[_.+-][0-9a-z]+)*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i),
+      str(/^[0-9a-z]+(?:[_.+-][0-9a-z]+|@(?=@))*/i),
       channel,
       account,
       // Escape unmatched account-like strings.
-      str(/^@+[0-9a-z]*(?:[-.][0-9a-z]+)*/i),
+      str(/^@+(?:[0-9a-z]+(?:[_.+-][0-9a-z]+)*)?/i),
       // Escape invalid leading characters.
-      str(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])(?=#)/u.source.replace('emoji', emoji), 'u')),
+      str(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji)(?=#)/u.source.replace('emoji', emoji), 'u')),
       hashtag,
       hashnum,
       // Escape unmatched hashtag-like strings.
-      str(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])*/u.source.replace('emoji', emoji), 'u')),
+      str(new RegExp(/^#+(?:(?:[^\p{C}\p{S}\p{P}\s]|emoji)+(?:['_.+-](?:[^\p{C}\p{S}\p{P}\s]|emoji)+)*)?/u.source.replace(/emoji/g, emoji), 'u')),
       // Escape invalid leading characters.
       str(/^[0-9a-z](?=>)/iu),
       anchor,

package/src/parser/inline/deletion.ts

@@ -7,14 +7,15 @@ import { repeat } from '../util';
 import { push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const deletion: DeletionParser = lazy(() => recursion(Recursion.inline, validate('~~',
+export const deletion: DeletionParser = lazy(() => validate('~~',
   precedence(0, repeat('~~', surround(
     '',
+    recursion(Recursion.inline,
     some(union([
       some(inline, blankWith('\n', '~~')),
       open('\n', some(deletion, '~'), true),
-    ])),
+    ]))),
     '~~', false,
     ([, bs], rest) => [bs, rest],
     ([, bs], rest) => [push(bs, [Command.Escape]), rest]),
-    nodes => [html('del', defrag(nodes))])))));
+    nodes => [html('del', defrag(nodes))]))));

package/src/parser/inline/emphasis.ts

@@ -9,9 +9,9 @@ import { tightStart, blankWith } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const emphasis: EmphasisParser = lazy(() => recursion(Recursion.inline, surround(
+export const emphasis: EmphasisParser = lazy(() => surround(
   str('*', '*'),
-  precedence(0,
+  precedence(0, recursion(Recursion.inline,
   tightStart(some(union([
     strong,
     some(inline, blankWith('*')),
@@ -20,7 +20,7 @@ export const emphasis: EmphasisParser = lazy(() => recursion(Recursion.inline, s
       strong,
       emphasis,
     ])),
-  ])))),
+  ]))))),
   str('*'), false,
   ([, bs], rest) => [[html('em', defrag(bs))], rest],
-  ([as, bs], rest) => [unshift(as, bs), rest])));
+  ([as, bs], rest) => [unshift(as, bs), rest]));

package/src/parser/inline/emstrong.ts

@@ -30,13 +30,14 @@ const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
 
 // 開閉が明示的でない構文は開閉の不明確な記号による再帰的適用を行わず早く閉じるよう解析しなければならない。
 // このため終端記号の後ろを見て終端を中止し同じ構文を再帰的に適用してはならない。
-export const emstrong: EmStrongParser = lazy(() => recursion(Recursion.inline, validate('***',
+export const emstrong: EmStrongParser = lazy(() => validate('***',
   precedence(0, repeat('***', surround(
     '',
+    recursion(Recursion.inline,
     tightStart(some(union([
       some(inline, blankWith('*')),
       open(some(inline, '*'), inline),
-    ]))),
+    ])))),
     str(/^\*{1,3}/), false,
     ([, bs, cs], rest, context): Result<HTMLElement | string, typeof context> => {
       assert(cs.length === 1);
@@ -93,4 +94,4 @@ export const emstrong: EmStrongParser = lazy(() => recursion(Recursion.inline, v
         rest = rest.slice(postfix);
       }
       return [nodes, rest];
-    })))));
+    }))));

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

@@ -40,16 +40,16 @@ export const signature: IndexParser.SignatureParser = lazy(() => validate('|', f
     html('span', { class: 'indexer', 'data-index': identity('index', undefined, ns.join(''))!.slice(7) }),
   ])));
 
-const bracket: IndexParser.SignatureParser.BracketParser = lazy(() => recursion(Recursion.terminal, union([
-  surround(str('('), some(union([bracket, txt]), ')'), str(')'), true,
+const bracket: IndexParser.SignatureParser.BracketParser = lazy(() => union([
+  surround(str('('), recursion(Recursion.terminal, some(union([bracket, txt]), ')')), str(')'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.index),
-  surround(str('['), some(union([bracket, txt]), ']'), str(']'), true,
+  surround(str('['), recursion(Recursion.terminal, some(union([bracket, txt]), ']')), str(']'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.index),
-  surround(str('{'), some(union([bracket, txt]), '}'), str('}'), true,
+  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, txt]), '}')), str('}'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.index),
-  surround(str('"'), precedence(2, some(txt, '"')), str('"'), true,
+  surround(str('"'), precedence(2, recursion(Recursion.terminal, some(txt, '"'))), str('"'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.index),
-])));
+]));
 
 export function dataindex(ns: readonly (string | HTMLElement)[]): string | undefined {
   if (ns.length === 0) return;

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

@@ -11,10 +11,10 @@ import { html, defrag } from 'typed-dom/dom';
 
 // All syntax surrounded by square brackets shouldn't contain line breaks.
 
-export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => recursion(Recursion.inline, surround(
+export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surround(
   str(/^\[[:^|]/),
-  precedence(1,
-  tightStart(some(union([inline]), ']', [[']', 1]]))),
+  precedence(1, recursion(Recursion.inline,
+  tightStart(some(union([inline]), ']', [[']', 1]])))),
   str(']'), false,
   ([, bs], rest) => [[
     html('span', {
@@ -24,4 +24,4 @@ export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => recursi
       'data-invalid-message': `Invalid start symbol or linebreak`,
     }, defrag(bs)),
   ], rest],
-  ([as, bs], rest) => [unshift(as, bs), rest], 3 | Backtrack.bracket)));
+  ([as, bs], rest) => [unshift(as, bs), rest], 3 | Backtrack.bracket));

package/src/parser/inline/html.ts

@@ -18,7 +18,7 @@ const attrspecs = {
 Object.setPrototypeOf(attrspecs, null);
 Object.values(attrspecs).forEach(o => Object.setPrototypeOf(o, null));
 
-export const html: HTMLParser = lazy(() => validate(/^<[a-z]+(?=[^\S\n]|>)/i, recursion(Recursion.inline,
+export const html: HTMLParser = lazy(() => validate(/^<[a-z]+(?=[^\S\n]|>)/i,
   union([
     focus(
       /^<wbr[^\S\n]*>/i,
@@ -36,11 +36,11 @@ export const html: HTMLParser = lazy(() => validate(/^<[a-z]+(?=[^\S\n]|>)/i, re
       ([, tag]) =>
         surround<HTMLParser.TagParser, string>(
           surround(str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
-          precedence(3,
+          precedence(3, recursion(Recursion.inline,
           subsequence([
             focus(/^[^\S\n]*\n/, some(inline)),
             some(open(/^\n?/, some(inline, blankWith('\n', `</${tag}>`), [[blankWith('\n', `</${tag}>`), 3]]), true)),
-          ])),
+          ]))),
           str(`</${tag}>`), true,
           ([as, bs = [], cs], rest) =>
             [[elem(tag, as, bs, cs)], rest],
@@ -54,11 +54,11 @@ export const html: HTMLParser = lazy(() => validate(/^<[a-z]+(?=[^\S\n]|>)/i, re
       ([, tag]) =>
         surround<HTMLParser.TagParser, string>(surround(
           str(`<${tag}`), some(attribute), str(/^[^\S\n]*>/), true),
-          precedence(3,
+          precedence(3, recursion(Recursion.inline,
           subsequence([
             focus(/^[^\S\n]*\n/, some(inline)),
             some(inline, `</${tag}>`, [[`</${tag}>`, 3]]),
-          ])),
+          ]))),
           str(`</${tag}>`), true,
           ([as, bs = [], cs], rest) =>
             [[elem(tag, as, bs, cs)], rest],
@@ -66,7 +66,7 @@ export const html: HTMLParser = lazy(() => validate(/^<[a-z]+(?=[^\S\n]|>)/i, re
             [[elem(tag, as, bs, [])], rest]),
       ([, tag]) => tag,
       new Clock(10000))),
-  ]))));
+  ])));
 
 export const attribute: HTMLParser.AttributeParser = union([
   str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="[^"\n]*")?(?=[^\S\n]|>)/i),

package/src/parser/inline/insertion.ts

@@ -7,14 +7,15 @@ import { repeat } from '../util';
 import { push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const insertion: InsertionParser = lazy(() => recursion(Recursion.inline, validate('++',
+export const insertion: InsertionParser = lazy(() => validate('++',
   precedence(0, repeat('++', surround(
     '',
+    recursion(Recursion.inline,
     some(union([
       some(inline, blankWith('\n', '++')),
       open('\n', some(insertion, '+'), true),
-    ])),
+    ]))),
     '++', false,
     ([, bs], rest) => [bs, rest],
     ([, bs], rest) => [push(bs, [Command.Escape]), rest]),
-    nodes => [html('ins', defrag(nodes))])))));
+    nodes => [html('ins', defrag(nodes))]))));

package/src/parser/inline/italic.ts

@@ -7,16 +7,18 @@ import { repeat } from '../util';
 import { push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
+// 可読性のため実際にはオブリーク体を指定する。
 // 斜体は単語に使うとかえって見づらく読み飛ばしやすくなるため使わないべきであり
 // ある程度の長さのある文に使うのが望ましい。
-export const italic: ItalicParser = lazy(() => recursion(Recursion.inline, validate('///',
+export const italic: ItalicParser = lazy(() => validate('///',
   precedence(0, repeat('///', surround(
     '',
+    recursion(Recursion.inline,
     tightStart(some(union([
       some(inline, blankWith('///')),
       open(some(inline, '/'), italic),
-    ]))),
+    ])))),
     '///', false,
     ([, bs], rest) => [bs, rest],
     ([, bs], rest) => [push(bs, [Command.Escape]), rest]),
-    nodes => [html('i', defrag(nodes))])))));
+    nodes => [html('i', defrag(nodes))]))));

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

@@ -180,6 +180,7 @@ describe('Unit: parser/inline/link', () => {
       assert.deepStrictEqual(inspect(parser('[@a]{b}')), [['<a class="link" href="b">@a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[@a@b]{c}')), [['<a class="link" href="c">@a@b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[a@b]{c}')), [['<a class="link" href="c">a@b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[==a==]{b}')), [['<a class="link" href="b">==a==</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[*a*]{b}')), [['<a class="link" href="b"><em>a</em></a>'], '']);
     });
 

package/src/parser/inline/mark.ts

@@ -1,6 +1,6 @@
 import { MarkParser } from '../inline';
 import { State, Recursion, Command } from '../context';
-import { union, some, recursion, precedence, constraint, validate, surround, open, lazy } from '../../combinator';
+import { union, some, recursion, precedence, state, constraint, validate, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { identity, signature } from './extension/indexee';
 import { tightStart, blankWith } from '../visibility';
@@ -8,13 +8,14 @@ import { repeat } from '../util';
 import { push } from 'spica/array';
 import { html, define, defrag } from 'typed-dom/dom';
 
-export const mark: MarkParser = lazy(() => constraint(State.mark, false, recursion(Recursion.inline, validate('==',
-  precedence(0, repeat('==', surround(
+export const mark: MarkParser = lazy(() => constraint(State.linkers & ~State.mark, false, validate('==',
+  precedence(0, state(State.mark, repeat('==', surround(
     '',
+    recursion(Recursion.inline,
     tightStart(some(union([
       some(inline, blankWith('==')),
       open(some(inline, '='), mark),
-    ]))),
+    ])))),
     '==', false,
     ([, bs], rest) => [bs, rest],
     ([, bs], rest) => [push(bs, [Command.Escape]), rest]),

package/src/parser/inline/math.ts

@@ -32,11 +32,12 @@ export const math: MathParser = lazy(() => validate('$', rewrite(
       source)
   ], ''])));
 
-const bracket: MathParser.BracketParser = lazy(() => recursion(Recursion.terminal, surround(
+const bracket: MathParser.BracketParser = lazy(() => surround(
   str('{'),
+  recursion(Recursion.terminal,
   some(union([
     bracket,
     some(escsource, /^[{}$\n]/),
-  ])),
+  ]))),
   str('}'),
-  true)));
+  true));

package/src/parser/inline/reference.ts

@@ -5,6 +5,7 @@ import { inline } from '../inline';
 import { str } from '../source';
 import { blank, trimBlankStart, trimBlankNodeEnd } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
+import { unshift } from 'spica/array';
 
 export const reference: ReferenceParser = lazy(() => constraint(State.reference, false, surround(
   '[[',
@@ -19,7 +20,11 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
     trimBlankNodeEnd(ns).length > 0
       ? [[html('sup', attributes(ns), [html('span', defrag(ns))])], rest]
       : undefined,
-  undefined, 1 | Backtrack.linebracket, Backtrack.bracket | BacktrackState.nobreak)));
+  ([as, bs], rest, { state = 0 }) =>
+    state & State.annotation
+      ? [unshift(as, bs), rest]
+      : undefined,
+  1 | Backtrack.linebracket, Backtrack.bracket | BacktrackState.nobreak)));
 
 // Chicago-Style
 const abbr: ReferenceParser.AbbrParser = surround(

package/src/parser/inline/remark.ts

@@ -7,13 +7,14 @@ import { memoize } from 'spica/memoize';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const remark: RemarkParser = lazy(() => recursion(Recursion.inline, match(
+export const remark: RemarkParser = lazy(() => match(
   /^\[(%+)\s/,
   memoize(
   ([, fence]) =>
     surround(
       str(`[${fence}`),
-      precedence(4, some(union([inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 4]])),
+      precedence(4, recursion(Recursion.inline,
+      some(union([inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 4]]))),
       close(some(text, '%'), str(`${fence}]`)), true,
       ([as, bs = [], cs], rest) => [[
         html('span', { class: 'remark' }, [
@@ -22,4 +23,4 @@ export const remark: RemarkParser = lazy(() => recursion(Recursion.inline, match
         ]),
       ], rest],
       ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  ([, fence]) => fence.length, {}))));
+  ([, fence]) => fence.length, {})));

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

@@ -17,6 +17,8 @@ describe('Unit: parser/inline/ruby', () => {
       assert.deepStrictEqual(inspect(parser('[	 a](b)')), undefined);
       assert.deepStrictEqual(inspect(parser('[&a;](b)')), [['<ruby class="invalid">&amp;a;<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
       assert.deepStrictEqual(inspect(parser('[a](&a;)')), [['<ruby class="invalid">a<rp>(</rp><rt>&amp;a;</rt><rp>)</rp></ruby>'], '']);
+      assert.deepStrictEqual(inspect(parser('[<wbr>](a)')), undefined);
+      assert.deepStrictEqual(inspect(parser('[a](<wbr>)')), undefined);
       assert.deepStrictEqual(inspect(parser('[a]()')), undefined);
       assert.deepStrictEqual(inspect(parser('[a]( )')), undefined);
       assert.deepStrictEqual(inspect(parser('[a\nb](c)')), undefined);
@@ -51,7 +53,6 @@ describe('Unit: parser/inline/ruby', () => {
       assert.deepStrictEqual(inspect(parser('[&copy;](&copy;)')), [['<ruby>©<rp>(</rp><rt>©</rt><rp>)</rp></ruby>'], '']);
       assert.deepStrictEqual(inspect(parser('[&amp;copy;](&amp;copy;)')), [['<ruby>&amp;copy;<rp>(</rp><rt>&amp;copy;</rt><rp>)</rp></ruby>'], '']);
       assert.deepStrictEqual(inspect(parser('[*A*](*a*)')), [['<ruby>*A*<rp>(</rp><rt>*a*</rt><rp>)</rp></ruby>'], '']);
-      assert.deepStrictEqual(inspect(parser('[<wbr>](<wbr>)')), [['<ruby>&lt;wbr&gt;<rp>(</rp><rt>&lt;wbr&gt;</rt><rp>)</rp></ruby>'], '']);
     });
 
   });

package/src/parser/inline/ruby.ts

@@ -1,7 +1,7 @@
 import { RubyParser } from '../inline';
 import { Backtrack, Command, CmdRegExp } from '../context';
 import { eval, exec } from '../../combinator/data/parser';
-import { sequence, surround, lazy, fmap, bind } from '../../combinator';
+import { sequence, surround, dup, lazy, fmap } from '../../combinator';
 import { unsafehtmlentity } from './htmlentity';
 import { text as txt, str } from '../source';
 import { isTightNodeStart } from '../visibility';
@@ -10,15 +10,23 @@ import { html, defrag } from 'typed-dom/dom';
 
 export const ruby: RubyParser = lazy(() => fmap(
   sequence([
-    bind(surround('[', str(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']', false, undefined, undefined, 3 | Backtrack.ruby), ([source], rest, context) => {
-      const ns = eval(text({ source, context }), [undefined])[0];
-      ns && ns.at(-1) === '' && ns.pop();
-      return ns && isTightNodeStart(ns) ? [[ns], rest] : undefined;
-    }),
-    bind(surround('(', str(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ')', false, undefined, undefined, 3 | Backtrack.ruby), ([source], rest, context) => {
-      const ns = eval(text({ source, context }), [undefined])[0];
-      return ns && [[ns], rest];
-    }),
+    dup(surround(
+      '[', str(/^(?:\\[^\n]|[^\\[\](){}<>"\n])+/u), ']',
+      false,
+      ([, [source]], rest, context) => {
+        const ns = eval(text({ source, context }), [undefined])[0];
+        ns && ns.at(-1) === '' && ns.pop();
+        return ns && isTightNodeStart(ns) ? [ns, rest] : undefined;
+      },
+      undefined, 3 | Backtrack.ruby)),
+    dup(surround(
+      '(', str(/^(?:\\[^\n]|[^\\[\](){}<>"\n])+/u), ')',
+      false,
+      ([, [source]], rest, context) => {
+        const ns = eval(text({ source, context }), [undefined])[0];
+        return ns && [ns, rest];
+      },
+      undefined, 3 | Backtrack.ruby)),
   ]),
   ([texts, rubies]) => {
     switch (true) {

package/src/parser/inline/strong.ts

@@ -8,16 +8,16 @@ import { tightStart, blankWith } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const strong: StrongParser = lazy(() => recursion(Recursion.inline, surround(
+export const strong: StrongParser = lazy(() => surround(
   str('**', '*'),
-  precedence(0,
+  precedence(0, recursion(Recursion.inline,
   tightStart(some(union([
     some(inline, blankWith('**')),
     open(some(inline, '*'), union([
       emstrong,
       strong,
     ])),
-  ])))),
+  ]))))),
   str('**'), false,
   ([, bs], rest) => [[html('strong', defrag(bs))], rest],
-  ([as, bs], rest) => [unshift(as, bs), rest])));
+  ([as, bs], rest) => [unshift(as, bs), rest]));

package/src/parser/inline/template.ts

@@ -12,13 +12,13 @@ export const template: TemplateParser = lazy(() => surround(
   ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('')}}}`)], rest],
   undefined, 3 | Backtrack.template));
 
-const bracket: TemplateParser.BracketParser = lazy(() => recursion(Recursion.terminal, union([
-  surround(str('('), some(union([bracket, escsource]), ')'), str(')'), true,
+const bracket: TemplateParser.BracketParser = lazy(() => union([
+  surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.template),
-  surround(str('['), some(union([bracket, escsource]), ']'), str(']'), true,
+  surround(str('['), recursion(Recursion.terminal, some(union([bracket, escsource]), ']')), str(']'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.template),
-  surround(str('{'), some(union([bracket, escsource]), '}'), str('}'), true,
+  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, escsource]), '}')), str('}'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.template),
-  surround(str('"'), precedence(2, some(escsource, /^["\n]/)), str('"'), true,
+  surround(str('"'), precedence(2, recursion(Recursion.terminal, some(escsource, /^["\n]/))), str('"'), true,
     undefined, () => [[Command.Escape], ''], 3 | Backtrack.template),
-])));
+]));