securemark 0.234.2 → 0.235.1

package/src/parser/inline/html.ts

@@ -26,11 +26,9 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
     memoize(
     ([, tag]) =>
       surround(
-        str(`<${tag}`), some(union([attribute])), str('>'), true,
-        ([, as = []], rest) => [
-          [h(tag as 'span', attributes('html', [], attrspec[tag], as))],
-          rest
-        ]),
+        `<${tag}`, some(union([attribute])), '>', true,
+        ([, bs = []], rest) =>
+          [[h(tag as 'span', attributes('html', [], attrspec[tag], bs))], rest]),
     ([, tag]) => tag)),
   match(
     /^(?=<(sup|sub|small|bdo|bdi)(?=[^\S\n]|>))/,
@@ -80,9 +78,7 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
         ([as, bs, cs], rest) =>
           [[elem(tag, as, trimNodeEndBR(defrag(bs)), cs, {})], rest],
         ([as, bs], rest) =>
-          as.length === 1
-            ? [unshift(as, bs), rest]
-            : undefined)),
+          as.length === 1 ? [unshift(as, bs), rest] : undefined)),
     ([, tag]) => tag,
     new Cache(1000))),
 ])))));
@@ -91,8 +87,10 @@ export const attribute: HTMLParser.TagParser.AttributeParser = union([
   str(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|>)/),
 ]);
 
-function elem(tag: string, as: (HTMLElement | string)[], bs: (HTMLElement | string)[], cs: (HTMLElement | string)[], context: MarkdownParser.Context): HTMLElement {
+function elem(tag: string, as: string[], bs: (HTMLElement | string)[], cs: string[], context: MarkdownParser.Context): HTMLElement {
+  assert(as.length > 0);
   assert(bs.length === defrag(bs).length);
+  assert(cs.length === 1);
   if (!tags.includes(tag)) return invalid('tag', `Invalid HTML tag <${tag}>.`, as, bs, cs);
   switch (tag) {
     case 'sup':
@@ -115,8 +113,6 @@ function elem(tag: string, as: (HTMLElement | string)[], bs: (HTMLElement | stri
     case as[as.length - 1] !== '>'
       || 'data-invalid-syntax' in (attrs = attributes('html', [], attrspec[tag], as.slice(1, -1) as string[])):
       return invalid('attribute', 'Invalid HTML attribute.', as, bs, cs);
-    case cs.length === 0:
-      return invalid('closer', `Missing the closing HTML tag <${tag}>.`, as, bs, cs);
     default:
       assert(attrs);
       return h(tag as 'span', attrs, bs);

package/src/parser/inline/htmlentity.ts

@@ -2,18 +2,15 @@ import { HTMLEntityParser, UnsafeHTMLEntityParser } from '../inline';
 import { union, validate, focus, creator, fmap } from '../../combinator';
 import { html } from 'typed-dom';
 
-const parser = html('textarea');
-
-export const unsafehtmlentity: UnsafeHTMLEntityParser = creator(validate('&', fmap(focus(
+export const unsafehtmlentity: UnsafeHTMLEntityParser = creator(validate('&', focus(
   /^&(?!NewLine;)[0-9A-Za-z]+;/,
-  entity => [[(parser.innerHTML = entity, parser.value)], '']),
-  ([str]) => [
-    str[0] !== '&' || str.length < 3
-      ? str
-      : `\0${str}`,
-  ])));
+  (parser => entity => (
+    parser.innerHTML = entity,
+    entity = parser.textContent!,
+    [[`${entity[0] !== '&' || entity.length === 1 ? '' : '\0'}${entity}`], '']
+  ))(html('b')))));
 
-export const htmlentity: HTMLEntityParser = creator(validate('&', fmap(
+export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),
   ([str]) => [
     str[0] === '\0'
@@ -24,4 +21,4 @@ export const htmlentity: HTMLEntityParser = creator(validate('&', fmap(
           'data-invalid-description': 'Invalid HTML entity.',
         }, str.slice(1))
       : str,
-  ])));
+  ]);

package/src/parser/inline/link.ts

@@ -16,8 +16,7 @@ const optspec = {
 } as const;
 ObjectSetPrototypeOf(optspec, null);
 
-export const link: LinkParser = lazy(() => creator(10, bind(
-  validate(['[', '{'], '}', '\n',
+export const link: LinkParser = lazy(() => creator(10, validate(['[', '{'], '}', '\n', bind(
   guard(context => context.syntax?.inline?.link ?? true,
   reverse(tails([
     context({ syntax: { inline: {
@@ -44,7 +43,7 @@ export const link: LinkParser = lazy(() => creator(10, bind(
         true),
     ]))),
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]?}/)),
-  ])))),
+  ]))),
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) => {
     assert(params.every(p => typeof p === 'string'));
     if (eval(some(autolink)(stringify(content), context))?.some(node => typeof node === 'object')) return;
@@ -62,7 +61,7 @@ export const link: LinkParser = lazy(() => creator(10, bind(
     if (el.classList.contains('invalid')) return [[el], rest];
     assert(el.classList.length === 0);
     return [[define(el, attributes('link', [], optspec, params))], rest];
-  })));
+  }))));
 
 export const uri: LinkParser.ParameterParser.UriParser = union([
   open(/^[^\S\n]/, str(/^\S+/)),

package/src/parser/inline/mark.ts

@@ -2,19 +2,16 @@ import { MarkParser } from '../inline';
 import { union, some, creator, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { startTight, isEndTightNodes, delimiter } from '../util';
+import { startTight, delimiter } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
 
 export const mark: MarkParser = lazy(() => creator(surround(
   str('=='),
   startTight(some(union([
-    some(inline, delimiter('==')),
+    some(inline, delimiter(/==/)),
     open(some(inline, '='), inline),
   ]))),
   str('=='), false,
-  ([as, bs, cs], rest) =>
-    isEndTightNodes(bs)
-      ? [[html('mark', defrag(bs))], rest]
-      : [unshift(as, bs), cs[0] + rest],
+  ([, bs], rest) => [[html('mark', defrag(bs))], rest],
   ([as, bs], rest) => [unshift(as, bs), rest])));

package/src/parser/inline/media.ts

@@ -18,14 +18,17 @@ const optspec = {
 } as const;
 ObjectSetPrototypeOf(optspec, null);
 
-export const media: MediaParser = lazy(() => creator(10, bind(verify(fmap(open(
+export const media: MediaParser = lazy(() => creator(10, validate(['![', '!{'], '}', '\n', bind(verify(fmap(open(
   '!',
-  validate(['[', '{'], '}', '\n',
   guard(context => context.syntax?.inline?.media ?? true,
   tails([
-    dup(surround(/^\[(?!\s*\\\s)/, some(union([unsafehtmlentity, bracket, txt]), ']', /^\\?\n/), ']', true)),
+    dup(surround(
+      /^\[(?!\s*\\\s)/,
+      some(union([unsafehtmlentity, bracket, txt]), ']', /^\\?\n/),
+      ']',
+      true)),
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]?}/)),
-  ])))),
+  ]))),
   ([as, bs]) => bs ? [[join(as).trim() || join(as)], bs] : [[''], as]),
   ([[text]]) => text === '' || text.trim() !== ''),
   ([[text], params], rest, context) => {
@@ -51,7 +54,7 @@ export const media: MediaParser = lazy(() => creator(10, bind(verify(fmap(open(
       link as MediaParser,
       ([link]) => [define(link, { target: '_blank' }, [el])])
       (`{ ${INSECURE_URI}${join(params)} }${rest}`, context);
-  })));
+  }))));
 
 const bracket: MediaParser.TextParser.BracketParser = lazy(() => union([
   surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),

package/src/parser/inline/ruby.ts

@@ -8,12 +8,11 @@ import { isStartTightNodes } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift, push, join } from 'spica/array';
 
-export const ruby: RubyParser = lazy(() => creator(bind(verify(
-  validate('[', ')', '\n',
+export const ruby: RubyParser = lazy(() => creator(validate('[', ')', '\n', bind(verify(
   sequence([
     surround('[', focus(/^(?:\\[^\n]|[^\\\[\]\n])+(?=]\()/, text), ']'),
     surround('(', focus(/^(?:\\[^\n]|[^\\\(\)\n])+(?=\))/, text), ')'),
-  ])),
+  ]),
   ([texts]) => isStartTightNodes(texts)),
   ([texts, rubies], rest) => {
     const tail = typeof texts[texts.length - 1] === 'object'
@@ -44,7 +43,7 @@ export const ruby: RubyParser = lazy(() => creator(bind(verify(
           [html('rp', '('), html('rt', join(rubies, ' ').trim()), html('rp', ')')]), tail)))
         ], rest];
     }
-  })));
+  }))));
 
 const text: RubyParser.TextParser = creator((source, context) => {
   const acc = [''];

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

@@ -9,11 +9,11 @@ describe('Unit: parser/inline/strong', () => {
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('**')), undefined);
       assert.deepStrictEqual(inspect(parser('**a')), [['**', 'a'], '']);
-      assert.deepStrictEqual(inspect(parser('**a*')), [['**', 'a', '*'], '']);
       assert.deepStrictEqual(inspect(parser('**a **')), [['**', 'a', ' ', '**'], '']);
       assert.deepStrictEqual(inspect(parser('**a\n**')), [['**', 'a', '<br>', '**'], '']);
       assert.deepStrictEqual(inspect(parser('**a\\ **')), [['**', 'a', ' ', '**'], '']);
       assert.deepStrictEqual(inspect(parser('**a\\\n**')), [['**', 'a', '<span class="linebreak"> </span>', '**'], '']);
+      assert.deepStrictEqual(inspect(parser('**a*')), [['**', 'a', '*'], '']);
       assert.deepStrictEqual(inspect(parser('**a*b**')), [['**', 'a', '<em>b</em>', '*'], '']);
       assert.deepStrictEqual(inspect(parser('** **')), undefined);
       assert.deepStrictEqual(inspect(parser('** a**')), undefined);

package/src/parser/inline/strong.ts

@@ -1,20 +1,17 @@
 import { StrongParser } from '../inline';
-import { union, some, creator, surround, open, close, lazy } from '../../combinator';
+import { union, some, creator, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { startTight, isEndTightNodes, delimiter } from '../util';
+import { startTight, delimiter } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
 
-export const strong: StrongParser = lazy(() => creator(surround(close(
-  str('**'), /^(?!\*)/),
+export const strong: StrongParser = lazy(() => creator(surround(
+  str('**'),
   startTight(some(union([
-    some(inline, delimiter(String.raw`\*\*`)),
+    some(inline, delimiter(/\*\*/)),
     open(some(inline, '*'), inline),
-  ]))),
+  ])), '*'),
   str('**'), false,
-  ([as, bs, cs], rest) =>
-    isEndTightNodes(bs)
-      ? [[html('strong', defrag(bs))], rest]
-      : [unshift(as, bs), cs[0] + rest],
+  ([, bs], rest) => [[html('strong', defrag(bs))], rest],
   ([as, bs], rest) => [unshift(as, bs), rest])));

package/src/parser/inline.test.ts

@@ -92,7 +92,6 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('***a***')), [['<em><strong>a</strong></em>'], '']);
       assert.deepStrictEqual(inspect(parser('***a***b')), [['<em><strong>a</strong></em>', 'b'], '']);
       assert.deepStrictEqual(inspect(parser('***a****')), [['<em><strong>a</strong></em>', '*'], '']);
-      assert.deepStrictEqual(inspect(parser('***a *b****')), [['<em><strong>a <em>b</em></strong></em>'], '']);
       assert.deepStrictEqual(inspect(parser('****a***')), [['****', 'a', '***'], '']);
       assert.deepStrictEqual(inspect(parser('****a****')), [['****', 'a', '****'], '']);
       assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);

package/src/parser/processor/figure.test.ts

@@ -28,7 +28,7 @@ describe('Unit: parser/processor/figure', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
-            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure>',
             '<p><a class="label" data-label="fig-a" href="#label:fig-a">Fig. 1</a></p>',
             '<p><a class="label" data-label="fig-a" href="#label:fig-a">Fig. 1</a></p>',
           ]);
@@ -47,10 +47,10 @@ describe('Unit: parser/processor/figure', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
-            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure>',
             '<h2 id="index:0">0</h2>',
-            '<figure data-label="fig-b" data-group="fig" data-number="2" id="label:fig-b"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 2. </span><figcaption></figcaption></figure>',
-            '<figure data-label="table-a" data-group="table" data-number="1" id="label:table-a"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Table 1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-b" data-group="fig" data-number="2" id="label:fig-b"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 2. </span></figcaption></figure>',
+            '<figure data-label="table-a" data-group="table" data-number="1" id="label:table-a"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Table 1. </span></figcaption></figure>',
           ]);
       }
     });
@@ -65,7 +65,7 @@ describe('Unit: parser/processor/figure', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
-            '<figure data-label="$-a" data-group="$" data-number="1" id="label:$-a"><div class="figcontent"><div class="math" translate="no">$$\n$$</div></div><span class="figindex">(1)</span><figcaption></figcaption></figure>',
+            '<figure data-label="$-a" data-group="$" data-number="1" id="label:$-a"><div class="figcontent"><div class="math" translate="no">$$\n$$</div></div><figcaption><span class="figindex">(1)</span></figcaption></figure>',
             '<p><a class="label" data-label="$-a" href="#label:$-a">(1)</a></p>',
           ]);
       }
@@ -87,11 +87,11 @@ describe('Unit: parser/processor/figure', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
-            '<figure data-label="fig-2" data-group="fig" data-number="2" id="label:fig-2"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 2. </span><figcaption></figcaption></figure>',
-            '<figure data-label="fig-3.1" data-group="fig" data-number="3.1" id="label:fig-3.1"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 3.1. </span><figcaption></figcaption></figure>',
-            '<figure data-label="$-4.1.1" data-group="$" data-number="4.1.1" id="label:$-4.1.1"><div class="figcontent"><div class="math" translate="no">$$\n$$</div></div><span class="figindex">(4.1.1)</span><figcaption></figcaption></figure>',
-            '<figure data-label="$-a" data-group="$" data-number="1" id="label:$-a"><div class="figcontent"><div class="math" translate="no">$$\n$$</div></div><span class="figindex">(1)</span><figcaption></figcaption></figure>',
-            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-2" data-group="fig" data-number="2" id="label:fig-2"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 2. </span></figcaption></figure>',
+            '<figure data-label="fig-3.1" data-group="fig" data-number="3.1" id="label:fig-3.1"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 3.1. </span></figcaption></figure>',
+            '<figure data-label="$-4.1.1" data-group="$" data-number="4.1.1" id="label:$-4.1.1"><div class="figcontent"><div class="math" translate="no">$$\n$$</div></div><figcaption><span class="figindex">(4.1.1)</span></figcaption></figure>',
+            '<figure data-label="$-a" data-group="$" data-number="1" id="label:$-a"><div class="figcontent"><div class="math" translate="no">$$\n$$</div></div><figcaption><span class="figindex">(1)</span></figcaption></figure>',
+            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure>',
             '<p><a class="label" data-label="fig-2" href="#label:fig-2">Fig. 2</a></p>',
             '<p><a class="label" data-label="$-4.1.1" href="#label:$-4.1.1">(4.1.1)</a></p>',
             '<p><a class="label disabled invalid" data-label="fig-1" data-invalid-syntax="label" data-invalid-type="reference" data-invalid-description="Missing the reference.">$fig-1</a></p>',
@@ -111,10 +111,10 @@ describe('Unit: parser/processor/figure', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
-            '<blockquote><blockquote><section><figure data-label="fig-a" data-group="fig" data-number="1"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure><ol class="annotations"></ol><ol class="references"></ol></section></blockquote><section><figure data-label="fig-a" data-group="fig" data-number="1"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure><ol class="annotations"></ol><ol class="references"></ol></section></blockquote>',
-            '<aside class="example" data-type="markdown"><pre translate="no">~~~figure $fig-a\n&gt; \n\n~~~\n\n$fig-a</pre><hr><section><figure data-label="fig-a" data-group="fig" data-number="1"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure><p><a class="label disabled" data-label="fig-a">Fig. 1</a></p><ol class="annotations"></ol><ol class="references"></ol></section></aside>',
-            '<figure data-label="fig-b" data-group="fig" data-number="1" id="label:fig-b"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure>',
-            '<figure data-label="fig-a" data-group="fig" data-number="2" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 2. </span><figcaption></figcaption></figure>',
+            '<blockquote><blockquote><section><figure data-label="fig-a" data-group="fig" data-number="1"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure><ol class="annotations"></ol><ol class="references"></ol></section></blockquote><section><figure data-label="fig-a" data-group="fig" data-number="1"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure><ol class="annotations"></ol><ol class="references"></ol></section></blockquote>',
+            '<aside class="example" data-type="markdown"><pre translate="no">~~~figure $fig-a\n&gt; \n\n~~~\n\n$fig-a</pre><hr><section><figure data-label="fig-a" data-group="fig" data-number="1"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure><p><a class="label disabled" data-label="fig-a">Fig. 1</a></p><ol class="annotations"></ol><ol class="references"></ol></section></aside>',
+            '<figure data-label="fig-b" data-group="fig" data-number="1" id="label:fig-b"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure>',
+            '<figure data-label="fig-a" data-group="fig" data-number="2" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 2. </span></figcaption></figure>',
           ]);
       }
     });
@@ -163,16 +163,16 @@ describe('Unit: parser/processor/figure', () => {
             '<h1 id="index:0">0</h1>',
             '<figure data-label="$-0.0" data-group="$" hidden="" data-number="0.0"></figure>',
             '<h2 id="index:0">0</h2>',
-            '<figure data-label="fig-1" data-group="fig" data-number="1" id="label:fig-1"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-1" data-group="fig" data-number="1" id="label:fig-1"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure>',
             '<h2 id="index:0">0</h2>',
             '<blockquote><section><h2>0</h2><ol class="annotations"></ol><ol class="references"></ol></section></blockquote>',
-            '<figure data-label="fig-b" data-group="fig" data-number="2.1" id="label:fig-b"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 2.1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-b" data-group="fig" data-number="2.1" id="label:fig-b"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 2.1. </span></figcaption></figure>',
             '<h2 id="index:0">0</h2>',
             '<figure data-label="$-0.0.0" data-group="$" hidden=""></figure>',
-            '<figure data-label="fig-c" data-group="fig" data-number="3.1" id="label:fig-c"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 3.1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-c" data-group="fig" data-number="3.1" id="label:fig-c"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 3.1. </span></figcaption></figure>',
             '<h2 id="index:0">0</h2>',
             '<figure data-label="$-0.1.0" data-group="$" hidden=""></figure>',
-            '<figure data-label="fig-d" data-group="fig" data-number="4.1" id="label:fig-d"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 4.1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-d" data-group="fig" data-number="4.1" id="label:fig-d"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 4.1. </span></figcaption></figure>',
             '<figure data-label="$-0.0" data-group="$" hidden=""></figure>',
             '<figure data-label="$-0.1.0" data-group="$" hidden=""></figure>',
             '<figure data-label="$-0.4.0" data-group="$" hidden=""></figure>',
@@ -180,19 +180,19 @@ describe('Unit: parser/processor/figure', () => {
             '<h2 id="index:0">0</h2>',
             '<h2 id="index:0">0</h2>',
             '<figure data-label="$-0.0" data-group="$" hidden="" data-number="6.0"></figure>',
-            '<figure data-label="fig-e" data-group="fig" data-number="6.1" id="label:fig-e"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 6.1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-e" data-group="fig" data-number="6.1" id="label:fig-e"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 6.1. </span></figcaption></figure>',
             '<h2 id="index:0">0</h2>',
             '<figure data-label="$-5.0" data-group="$" hidden="" data-number="5.0"></figure>',
-            '<figure data-label="fig-f" data-group="fig" data-number="5.1" id="label:fig-f"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 5.1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-f" data-group="fig" data-number="5.1" id="label:fig-f"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 5.1. </span></figcaption></figure>',
             '<figure data-label="$-0" data-group="$" hidden=""></figure>',
-            '<figure data-label="fig-g" data-group="fig" data-number="5.2" id="label:fig-g"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 5.2. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-g" data-group="fig" data-number="5.2" id="label:fig-g"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 5.2. </span></figcaption></figure>',
             '<h3 id="index:0">0</h3>',
             '<figure data-label="$-0.0.0" data-group="$" hidden=""></figure>',
-            '<figure data-label="fig-h" data-group="fig" data-number="5.3" id="label:fig-h"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 5.3. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-h" data-group="fig" data-number="5.3" id="label:fig-h"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 5.3. </span></figcaption></figure>',
             '<h3 id="index:0">0</h3>',
-            '<figure data-label="fig-i" data-group="fig" data-number="5.4" id="label:fig-i"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 5.4. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-i" data-group="fig" data-number="5.4" id="label:fig-i"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 5.4. </span></figcaption></figure>',
             '<h1 id="index:0">0</h1>',
-            '<figure data-label="fig-j" data-group="fig" data-number="6.1" id="label:fig-j"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 6.1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-j" data-group="fig" data-number="6.1" id="label:fig-j"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 6.1. </span></figcaption></figure>',
           ]);
       }
     });
@@ -219,10 +219,10 @@ describe('Unit: parser/processor/figure', () => {
             '<h2 id="index:0">0</h2>',
             '<h2 id="index:0">0</h2>',
             '<figure data-label="$-1.0" data-group="$" hidden="" data-number="1.0"></figure>',
-            '<figure data-label="fig-a" data-group="fig" data-number="1.1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1.1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-a" data-group="fig" data-number="1.1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1.1. </span></figcaption></figure>',
             '<h2 id="index:0">0</h2>',
             '<figure data-label="$-0.0" data-group="$" hidden="" data-number="2.0"></figure>',
-            '<figure data-label="fig-b" data-group="fig" data-number="2.1" id="label:fig-b"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 2.1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-b" data-group="fig" data-number="2.1" id="label:fig-b"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 2.1. </span></figcaption></figure>',
           ]);
       }
     });
@@ -238,7 +238,7 @@ describe('Unit: parser/processor/figure', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
-            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure>',
             '<p><a class="label" data-label="fig-a" href="#label:fig-a">Fig. 1</a></p>',
             '<p><a class="label" data-label="fig-a" href="#label:fig-a">Fig. 1</a></p>',
           ]);
@@ -255,7 +255,7 @@ describe('Unit: parser/processor/figure', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
-            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:0:fig-a"><div class="figcontent"><blockquote></blockquote></div><span class="figindex">Fig. 1. </span><figcaption></figcaption></figure>',
+            '<figure data-label="fig-a" data-group="fig" data-number="1" id="label:0:fig-a"><div class="figcontent"><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure>',
             '<p><a class="label" data-label="fig-a" href="#label:0:fig-a">Fig. 1</a></p>',
           ]);
       }

package/src/parser/processor/figure.ts

@@ -85,7 +85,7 @@ export function* figure(
       ? `(${number})`
       : `${capitalize(group)}${group === 'fig' ? '.' : ''} ${number}`;
     define(
-      def.querySelector(':scope > .figindex')!,
+      def.querySelector(':scope > figcaption > .figindex')!,
       group === '$' ? figindex : `${figindex}. `);
     for (const ref of refs.take(label, Infinity)) {
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;

package/src/parser/util.ts

@@ -4,51 +4,16 @@ import { Parser, eval } from '../combinator/data/parser';
 import { union, some, verify, convert } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
+import { invisibleHTMLEntityNames } from './api/normalize';
 import { push, pop } from 'spica/array';
 
-// https://dev.w3.org/html5/html-author/charref
-const invisibleHTMLEntityNames = [
-  'Tab',
-  'NewLine',
-  'NonBreakingSpace',
-  'nbsp',
-  'shy',
-  'ensp',
-  'emsp',
-  'emsp13',
-  'emsp14',
-  'numsp',
-  'puncsp',
-  'ThinSpace',
-  'thinsp',
-  'VeryThinSpace',
-  'hairsp',
-  'ZeroWidthSpace',
-  'NegativeVeryThinSpace',
-  'NegativeThinSpace',
-  'NegativeMediumSpace',
-  'NegativeThickSpace',
-  'zwj',
-  'zwnj',
-  'lrm',
-  'rlm',
-  'MediumSpace',
-  'NoBreak',
-  'ApplyFunction',
-  'af',
-  'InvisibleTimes',
-  'it',
-  'InvisibleComma',
-  'ic',
-] as const;
-const blankline = new RegExp(String.raw`^(?:\\$|\\?[^\S\n]|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)+$`, 'gm');
-
-export function delimiter(opener: string): RegExp {
-  return new RegExp(String.raw`^(?:\s+|\\\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)?${opener}`);
+export function delimiter(opener: RegExp): RegExp {
+  return new RegExp(String.raw`^(?:\s+|\\\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)?${opener.source}`);
 }
 
 export function visualize<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+  const blankline = new RegExp(String.raw`^(?:\\$|\\?[^\S\n]|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)+$`, 'gm');
   return union([
     convert(
       source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')),
@@ -81,20 +46,18 @@ export function startLoose<T extends HTMLElement | string>(parser: Parser<T>, ex
       : undefined;
 }
 export function isStartLoose(source: string, context: MarkdownParser.Context, except?: string): boolean {
-  source &&= source.replace(/^[^\S\n]+/, '');
-  if (source === '') return true;
-  return source.slice(0, except?.length ?? 0) !== except
-      && isStartTight(source, context);
+  return isStartTight(source.replace(/^[^\S\n]+/, ''), context, except);
 }
-export function startTight<P extends Parser<unknown>>(parser: P): P;
-export function startTight<T>(parser: Parser<T>): Parser<T> {
+export function startTight<P extends Parser<unknown>>(parser: P, except?: string): P;
+export function startTight<T>(parser: Parser<T>, except?: string): Parser<T> {
   return (source, context) =>
-    isStartTight(source, context)
+    isStartTight(source, context, except)
       ? parser(source, context)
       : undefined;
 }
-function isStartTight(source: string, context: MarkdownParser.Context): boolean {
+function isStartTight(source: string, context: MarkdownParser.Context, except?: string): boolean {
   if (source === '') return true;
+  if (except && source.slice(0, except.length) === except) return false;
   switch (source[0]) {
     case ' ':
     case '　':
@@ -127,10 +90,10 @@ export function isStartTightNodes(nodes: readonly (HTMLElement | string)[]): boo
   if (nodes.length === 0) return true;
   return isVisible(nodes[0], 0);
 }
-export function isEndTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
-  if (nodes.length === 0) return true;
-  return isVisible(nodes[nodes.length - 1], -1);
-}
+//export function isEndTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
+//  if (nodes.length === 0) return true;
+//  return isVisible(nodes[nodes.length - 1], -1);
+//}
 function isVisible(node: HTMLElement | string, strpos?: number): boolean {
   switch (typeof node) {
     case 'string':