securemark 0.217.0 → 0.218.3

package/markdown.d.ts

@@ -707,21 +707,21 @@ export namespace MarkdownParser {
         // [#index]
         Inline<'extension/index'>,
         Parser<HTMLAnchorElement, Context, [
+          IndexParser.SignatureParser,
           InlineParser,
-          IndexParser.IndexerParser,
         ]> {
       }
       export namespace IndexParser {
-        export interface IndexerParser extends
-          Inline<'extension/index/indexer'>,
+        export interface SignatureParser extends
+          Inline<'extension/index/signature'>,
           Parser<HTMLElement, Context, [
-            IndexerParser.BracketParser,
+            SignatureParser.BracketParser,
             SourceParser.TxtParser,
           ]> {
         }
-        export namespace IndexerParser {
+        export namespace SignatureParser {
           export interface BracketParser extends
-            Inline<'extension/index/indexer/bracket'>,
+            Inline<'extension/index/signature/bracket'>,
             Parser<string, Context, [
               Parser<string, Context, [
                 BracketParser,
@@ -826,6 +826,7 @@ export namespace MarkdownParser {
             SourceParser.StrParser,
             SourceParser.StrParser,
             SourceParser.StrParser,
+            SourceParser.StrParser,
           ]> {
         }
       }

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.217.0",
+  "version": "0.218.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2968,9 +2968,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.861",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.861.tgz",
-      "integrity": "sha512-GZyflmpMnZRdZ1e2yAyvuFwz1MPSVQelwHX4TJZyXypB8NcxdPvPNwy5lOTxnlkrK13EiQzyTPugRSnj6cBgKg==",
+      "version": "1.3.864",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.864.tgz",
+      "integrity": "sha512-v4rbad8GO6/yVI92WOeU9Wgxc4NA0n4f6P1FvZTY+jyY7JHEhw3bduYu60v3Q1h81Cg6eo4ApZrFPuycwd5hGw==",
       "dev": true
     },
     "elliptic": {
@@ -8649,9 +8649,9 @@
       }
     },
     "prompts": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
-      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",

package/package.json

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

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

@@ -46,9 +46,9 @@ describe('Unit: parser/api/bind', () => {
       assert.deepStrictEqual(
         inspect(iter, 3),
         [
-          '<h1 class="error" translate="no">Error: Too large segment over 100,000 in length.</h1>',
+          '<h1 class="error" translate="no">Error: Too large segment over 100,000 bytes.</h1>',
           `<pre class="error" translate="no">${'\n'.repeat(997)}...</pre>`,
-          '<h1 class="error" translate="no">Error: Too large segment over 100,000 in length.</h1>',
+          '<h1 class="error" translate="no">Error: Too large segment over 100,000 bytes.</h1>',
         ]);
     });
 
@@ -212,15 +212,15 @@ describe('Unit: parser/api/bind', () => {
         html('ol', [
           html('li', { id: 'annotation:def:1' }, [
             '1',
-            html('sup', [html('a', { href: '#annotation:ref:1' }, '~1')])
+            html('sup', [html('a', { href: '#annotation:ref:1' }, '^1')])
           ]),
           html('li', { id: 'annotation:def:2' }, [
             '2',
-            html('sup', [html('a', { href: '#annotation:ref:2' }, '~2')])
+            html('sup', [html('a', { href: '#annotation:ref:2' }, '^2')])
           ]),
           html('li', { id: 'annotation:def:3' }, [
             '3',
-            html('sup', [html('a', { href: '#annotation:ref:3' }, '~3')])
+            html('sup', [html('a', { href: '#annotation:ref:3' }, '^3')])
           ]),
         ]).outerHTML);
       assert.throws(() => update('').next());

package/src/parser/api/bind.ts

@@ -5,7 +5,7 @@ import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';
 import { header } from '../header';
 import { block } from '../block';
-import { segment, prepare } from '../segment';
+import { segment, validate, MAX_INPUT_SIZE } from '../segment';
 import { normalize } from './normalize';
 import { headers } from './header';
 import { figure } from '../function/figure';
@@ -43,7 +43,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
   function* parse(source: string): Generator<Progress, undefined, undefined> {
     if (settings.chunk && revision) throw new Error('Chunks cannot be updated.');
     const url = headers(source).find(field => field.toLowerCase().startsWith('url:'))?.slice(4).trim() ?? '';
-    source = normalize(prepare(source));
+    source = normalize(validate(source, MAX_INPUT_SIZE) ? source : source.slice(0, MAX_INPUT_SIZE + 1));
     context = ObjectAssign(context, { url: url ? new ReadonlyURL(url) : undefined });
     const rev = revision = Symbol();
     const sourceSegments: string[] = [];

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

@@ -35,9 +35,27 @@ describe('Unit: parser/api/parse', () => {
       assert.deepStrictEqual(
         [...parse('\\').children].map(el => el.outerHTML),
         ['<p>\\</p>']);
+      assert.deepStrictEqual(
+        [...parse('\\\na').children].map(el => el.outerHTML),
+        ['<p>\\<br>a</p>']);
       assert.deepStrictEqual(
         [...parse('&Tab;').children].map(el => el.outerHTML),
         ['<p>&amp;Tab;</p>']);
+      assert.deepStrictEqual(
+        [...parse('&Tab;\na').children].map(el => el.outerHTML),
+        ['<p>&amp;Tab;<br>a</p>']);
+      assert.deepStrictEqual(
+        [...parse('<wbr>').children].map(el => el.outerHTML),
+        ['<p>&lt;wbr&gt;</p>']);
+      assert.deepStrictEqual(
+        [...parse('<wbr>\na').children].map(el => el.outerHTML),
+        ['<p>&lt;wbr&gt;<br>a</p>']);
+      assert.deepStrictEqual(
+        [...parse('[#\n<wbr>\n#]').children].map(el => el.outerHTML),
+        ['<p>[#<br>&lt;wbr&gt;<br>#]</p>']);
+      assert.deepStrictEqual(
+        [...parse('[#\n<wbr>\n#]a').children].map(el => el.outerHTML),
+        ['<p><sup class="comment" title="<wbr>"></sup>a</p>']);
     });
 
     it('linebreak', () => {

package/src/parser/api/parse.ts

@@ -5,7 +5,7 @@ import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';
 import { header } from '../header';
 import { block } from '../block';
-import { segment, SEGMENT_LENGTH_LIMIT } from '../segment';
+import { segment, validate, MAX_SEGMENT_SIZE } from '../segment';
 import { normalize } from './normalize';
 import { headers } from './header';
 import { figure } from '../function/figure';
@@ -22,7 +22,7 @@ const inherit = memoize<MarkdownParser.Context, MarkdownParser.Context>(context
 const inherit2 = memoize<MarkdownParser.Context, (url: string) => MarkdownParser.Context>(context => memoize((_: string) => ObjectCreate(context)), new WeakMap());
 
 export function parse(source: string, opts: Options = {}, context?: MarkdownParser.Context): DocumentFragment {
-  if (source.length > SEGMENT_LENGTH_LIMIT) throw new Error(`Too large input over ${SEGMENT_LENGTH_LIMIT.toLocaleString('en')} in length.`);
+  if (!validate(source, MAX_SEGMENT_SIZE)) throw new Error(`Too large input over ${MAX_SEGMENT_SIZE.toLocaleString('en')} bytes.`);
   const url = headers(source).find(field => field.toLowerCase().startsWith('url:'))?.slice(4).trim() ?? '';
   source = !context ? normalize(source) : source;
   assert(!context?.delimiters);

package/src/parser/block/blockquote.test.ts

@@ -96,7 +96,7 @@ describe('Unit: parser/block/blockquote', () => {
       assert.deepStrictEqual(inspect(parser('!>> ## a\n> ## a')), [['<blockquote><blockquote><section><h2>a</h2><ol class="annotations"></ol><ol class="references"></ol></section></blockquote><section><h2>a</h2><ol class="annotations"></ol><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('!>> ~ a\n> ~ a')), [['<blockquote><blockquote><section><dl><dt>a</dt><dd></dd></dl><ol class="annotations"></ol><ol class="references"></ol></section></blockquote><section><dl><dt>a</dt><dd></dd></dl><ol class="annotations"></ol><ol class="references"></ol></section></blockquote>'], '']);
       assert.deepStrictEqual(inspect(parser('!>> ~~~figure $fig-a\n>> > \n>>\n~~~\n> ~~~figure $fig-a\n> > \n>\n[#a]\n~~~')), [['<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><a class="index">a</a></figcaption></figure><ol class="annotations"></ol><ol class="references"></ol></section></blockquote>'], '']);
-      assert.deepStrictEqual(inspect(parser('!>> ((a))\n> ((a))')), [['<blockquote><blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li>a<sup><a>~1</a></sup></li></ol><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li>a<sup><a>~1</a></sup></li></ol><ol class="references"></ol></section></blockquote>'], '']);
+      assert.deepStrictEqual(inspect(parser('!>> ((a))\n> ((a))')), [['<blockquote><blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li>a<sup><a>^1</a></sup></li></ol><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li>a<sup><a>^1</a></sup></li></ol><ol class="references"></ol></section></blockquote>'], '']);
     });
 
   });

package/src/parser/block/extension/example.test.ts

@@ -23,7 +23,7 @@ describe('Unit: parser/block/extension/example', () => {
       assert.deepStrictEqual(inspect(parser('~~~example/markdown\n[$fig-a]\n!https://host\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">[$fig-a]\n!https://host</pre><hr><section><figure data-label="fig-a" data-group="fig" data-number="1"><div class="figcontent"><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div><span class="figindex">Fig. 1: </span><figcaption></figcaption></figure><ol class="annotations"></ol><ol class="references"></ol></section></aside>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~example/markdown\n## a\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">## a</pre><hr><section><h2>a</h2><ol class="annotations"></ol><ol class="references"></ol></section></aside>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~example/markdown\n~ a\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">~ a</pre><hr><section><dl><dt>a</dt><dd></dd></dl><ol class="annotations"></ol><ol class="references"></ol></section></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~example/markdown\n((a))[[b]]\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">((a))[[b]]</pre><hr><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup><sup class="reference disabled" title="b"><a>[1]</a></sup></p><ol class="annotations"><li>a<sup><a>~1</a></sup></li></ol><ol class="references"><li>b<sup><a>~1</a></sup></li></ol></section></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~example/markdown\n((a))[[b]]\n~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">((a))[[b]]</pre><hr><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup><sup class="reference disabled" title="b"><a>[1]</a></sup></p><ol class="annotations"><li>a<sup><a>^1</a></sup></li></ol><ol class="references"><li>b<sup><a>^1</a></sup></li></ol></section></aside>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~~example/markdown\na\n~~~~')), [['<aside class="example" data-type="markdown"><pre translate="no">a</pre><hr><section><p>a</p><ol class="annotations"></ol><ol class="references"></ol></section></aside>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~example/math\na\n~~~')), [['<aside class="example" data-type="math"><pre translate="no">a</pre><hr><div class="math" translate="no">$$\na\n$$</div></aside>'], '']);
       assert.deepStrictEqual(inspect(parser(`~~~example/math\n0${'\n'.repeat(100)}~~~`), '>'), [['<aside class="example" data-type="math">'], '']);

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

@@ -26,7 +26,7 @@ export const segment: FigParser.SegmentParser = block(validate(['[$', '$'],
 
 export const fig: FigParser = block(rewrite(segment, convert(
   source => {
-    const fence = (/^[^\n]*\n!?>+\s/.test(source) && source.match(/^~{3,}(?=\s*$)/gm) || [])
+    const fence = (/^[^\n]*\n!?>+\s/.test(source) && source.match(/^~{3,}(?=\s*$)/mg) || [])
       .reduce((max, fence) => fence > max ? fence : max, '~~') + '~';
     return `${fence}figure ${source}\n\n${fence}`;
   },

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

@@ -82,7 +82,7 @@ const head: CellParser.HeadParser = creator(block(fmap(open(
       anyline,
       some(contentline, delimiter),
     ]),
-    visualize(trim(some(union([inline]))), '')),
+    visualize(trim(some(union([inline]))))),
   true),
   ns => [html('th', attributes(ns.shift()! as string), defrag(ns))]),
   false));
@@ -94,7 +94,7 @@ const data: CellParser.DataParser = creator(block(fmap(open(
       anyline,
       some(contentline, delimiter),
     ]),
-    visualize(trim(some(union([inline]))), '')),
+    visualize(trim(some(union([inline]))))),
   true),
   ns => [html('td', attributes(ns.shift()! as string), defrag(ns))]),
   false));

package/src/parser/block/heading.test.ts

@@ -64,24 +64,22 @@ describe('Unit: parser/block/heading', () => {
       assert.deepStrictEqual(inspect(parser('# a [#b]')), [['<h1 id="index:b">a<span class="indexer" data-index="b"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a [#b] ')), [['<h1 id="index:b">a<span class="indexer" data-index="b"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a [#b]\\')), [['<h1 id="index:a_[#b]">a [#b]</h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#B]')), [['<h1 id="index:B">a<span class="indexer" data-index="B"></span></h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#b ]')), [['<h1 id="index:b">a<span class="indexer" data-index="b"></span></h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#b  ]')), [['<h1 id="index:b">a<span class="indexer" data-index="b"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a [#b c]')), [['<h1 id="index:b_c">a<span class="indexer" data-index="b_c"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a [#*b*`c`${d}$]')), [['<h1 id="index:b`c`${d}$">a<span class="indexer" data-index="b`c`${d}$"></span></h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#@a]')), [['<h1 id="index:@a">a<span class="indexer" data-index="@a"></span></h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#http://host]')), [['<h1 id="index:http://host">a<span class="indexer" data-index="http://host"></span></h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#!http://host]')), [['<h1 id="index:!http://host">a<span class="indexer" data-index="!http://host"></span></h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#a((b))]')), [['<h1 id="index:a((b))">a<span class="indexer" data-index="a((b))"></span></h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#a[[b]]]')), [['<h1 id="index:a[[b]]">a<span class="indexer" data-index="a[[b]]"></span></h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#b|#c]')), [['<h1 id="index:c">a<span class="indexer" data-index="c"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a [#b] [#c]')), [['<h1 id="index:c">a [#b]<span class="indexer" data-index="c"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a  [#b] \n')), [['<h1 id="index:b">a<span class="indexer" data-index="b"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a \\[#b]')), [['<h1 id="index:a_[#b]">a [#b]</h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# A')), [['<h1 id="index:A">A</h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# *A*')), [['<h1 id="index:A"><em>A</em></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# `A`')), [['<h1 id="index:`A`"><code data-src="`A`">A</code></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# ${A}$')), [['<h1 id="index:${A}$"><span class="math" translate="no" data-src="${A}$">${A}$</span></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# A [#B]')), [['<h1 id="index:B">A<span class="indexer" data-index="B"></span></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# A [#`B`]')), [['<h1 id="index:`B`">A<span class="indexer" data-index="`B`"></span></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# A [#@a]')), [['<h1 id="index:@a">A<span class="indexer" data-index="@a"></span></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# A [#http://host]')), [['<h1 id="index:http://host">A<span class="indexer" data-index="http://host"></span></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# A [#!http://host]')), [['<h1 id="index:!http://host">A<span class="indexer" data-index="!http://host"></span></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# A [#a((b))]')), [['<h1 id="index:a((b))">A<span class="indexer" data-index="a((b))"></span></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# A [#a[[b]]]')), [['<h1 id="index:a[[b]]">A<span class="indexer" data-index="a[[b]]"></span></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# A [#b|#c]')), [['<h1 id="index:c">A<span class="indexer" data-index="c"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('## a [#b] [#c]')), [['<h2 id="index:c">a [<a href="/hashtags/b" class="hashtag">#b</a>]<span class="indexer" data-index="c"></span></h2>'], '']);
+      assert.deepStrictEqual(inspect(parser('## a [#b  ] [#c  ]')), [['<h2 id="index:c">a [<a href="/hashtags/b" class="hashtag">#b</a>  ]<span class="indexer" data-index="c"></span></h2>'], '']);
     });
 
   });

package/src/parser/block/ilist.ts

@@ -16,7 +16,14 @@ export const ilist: IListParser = lazy(() => block(fmap(validate(
       ]),
       ns => [html('li', defrag(fillFirstLine(ns)))]),
   ]))))),
-  es => [html('ul', { class: 'invalid', 'data-invalid-syntax': 'list', 'data-invalid-type': 'syntax', 'data-invalid-description': 'Use "-" instead of "+" or "*".' }, es)])));
+  es => [
+    html('ul', {
+      class: 'invalid',
+      'data-invalid-syntax': 'list',
+      'data-invalid-type': 'syntax',
+      'data-invalid-description': 'Use "-" instead of "+" or "*".',
+    }, es),
+  ])));
 
 export const ilist_: IListParser = convert(
   source => source.replace(/^[-+*](?=$|\n)/, `$& `),

package/src/parser/block/paragraph.test.ts

@@ -20,6 +20,11 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser('a\\ \n')), [['<p>a</p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\\\n')), [['<p>a</p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\\\nb')), [['<p>a<span class="linebreak"> </span>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('<wbr>')), [['<p>&lt;wbr&gt;</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('<wbr>\n')), [['<p>&lt;wbr&gt;</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('<wbr>\na')), [['<p>&lt;wbr&gt;<br>a</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('a\n<wbr>\n')), [['<p>a<br>&lt;wbr&gt;</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('a\n<wbr>\nb')), [['<p>a<br>&lt;wbr&gt;<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser(' a')), [['<p>a</p>'], '']);
     });
 
@@ -52,6 +57,8 @@ describe('Unit: parser/block/paragraph', () => {
     it('comment', () => {
       assert.deepStrictEqual(inspect(parser('[# a #]')), [['<p>[# a #]</p>'], '']);
       assert.deepStrictEqual(inspect(parser('[# a #]b')), [['<p><sup class="comment" title="a"></sup>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#\n<wbr>\n#]')), [['<p>[#<br>&lt;wbr&gt;<br>#]</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#\n<wbr>\n#]a')), [['<p><sup class="comment" title="<wbr>"></sup>a</p>'], '']);
     });
 
   });

package/src/parser/function/footnote.test.ts

@@ -37,7 +37,7 @@ describe('Unit: parser/footnote', () => {
           html('ol', [
             html('li', { id: 'annotation:def:1' }, [
               'a b',
-              html('sup', [html('a', { href: '#annotation:ref:1' }, '~1')])
+              html('sup', [html('a', { href: '#annotation:ref:1' }, '^1')])
             ]),
           ]).outerHTML);
       }
@@ -65,11 +65,11 @@ describe('Unit: parser/footnote', () => {
           html('ol', [
             html('li', { id: 'annotation:def:1' }, [
               '1',
-              html('sup', [html('a', { href: '#annotation:ref:1' }, '~1')])
+              html('sup', [html('a', { href: '#annotation:ref:1' }, '^1')])
             ]),
             html('li', { id: 'annotation:def:2' }, [
               '12345678901234567890',
-              html('sup', [html('a', { href: '#annotation:ref:2' }, '~2')])
+              html('sup', [html('a', { href: '#annotation:ref:2' }, '^2')])
             ]),
           ]).outerHTML);
       }
@@ -106,22 +106,22 @@ describe('Unit: parser/footnote', () => {
           html('ol', [
             html('li', { id: 'annotation:def:1' }, [
               '1',
-              html('sup', [html('a', { href: '#annotation:ref:1' }, '~1')])
+              html('sup', [html('a', { href: '#annotation:ref:1' }, '^1')])
             ]),
             html('li', { id: 'annotation:def:2' }, [
               '2',
               html('sup', [
-                html('a', { href: '#annotation:ref:2' }, '~2'),
-                html('a', { href: '#annotation:ref:4' }, '~4'),
+                html('a', { href: '#annotation:ref:2' }, '^2'),
+                html('a', { href: '#annotation:ref:4' }, '^4'),
               ]),
             ]),
             html('li', { id: 'annotation:def:3' }, [
               '3',
-              html('sup', [html('a', { href: '#annotation:ref:3' }, '~3')])
+              html('sup', [html('a', { href: '#annotation:ref:3' }, '^3')])
             ]),
             html('li', { id: 'annotation:def:4' }, [
               '4',
-              html('sup', [html('a', { href: '#annotation:ref:5' }, '~5')])
+              html('sup', [html('a', { href: '#annotation:ref:5' }, '^5')])
             ]),
           ]).outerHTML);
       }
@@ -143,13 +143,13 @@ describe('Unit: parser/footnote', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => el.outerHTML),
           [
-            '<blockquote><blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li>a<sup><a>~1</a></sup></li></ol><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup><br>~~~</p><ol class="annotations"><li>a<sup><a>~1</a></sup></li></ol><ol class="references"></ol></section></blockquote>',
-            '<aside class="example" data-type="markdown"><pre translate="no">((a))</pre><hr><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li>a<sup><a>~1</a></sup></li></ol><ol class="references"></ol></section></aside>',
+            '<blockquote><blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li>a<sup><a>^1</a></sup></li></ol><ol class="references"></ol></section></blockquote><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup><br>~~~</p><ol class="annotations"><li>a<sup><a>^1</a></sup></li></ol><ol class="references"></ol></section></blockquote>',
+            '<aside class="example" data-type="markdown"><pre translate="no">((a))</pre><hr><section><p><sup class="annotation disabled" title="a"><a>*1</a></sup></p><ol class="annotations"><li>a<sup><a>^1</a></sup></li></ol><ol class="references"></ol></section></aside>',
             '<p><sup class="annotation" id="annotation:ref:1" title="a"><a href="#annotation:def:1">*1</a></sup></p>',
           ]);
         assert.deepStrictEqual(
           footnote.outerHTML,
-          '<ol><li id="annotation:def:1">a<sup><a href="#annotation:ref:1">~1</a></sup></li></ol>');
+          '<ol><li id="annotation:def:1">a<sup><a href="#annotation:ref:1">^1</a></sup></li></ol>');
       }
     });
 
@@ -172,7 +172,7 @@ describe('Unit: parser/footnote', () => {
           html('ol', [
             html('li', { id: 'annotation:0:def:1' }, [
               'a b',
-              html('sup', [html('a', { href: '#annotation:0:ref:1' }, '~1')])
+              html('sup', [html('a', { href: '#annotation:0:ref:1' }, '^1')])
             ]),
           ]).outerHTML);
       }
@@ -200,7 +200,7 @@ describe('Unit: parser/footnote', () => {
           html('ol', [
             html('li', { id: 'reference:def:1' }, [
               'a b',
-              html('sup', [html('a', { href: '#reference:ref:1' }, '~1')])
+              html('sup', [html('a', { href: '#reference:ref:1' }, '^1')])
             ]),
           ]).outerHTML);
       }
@@ -232,9 +232,9 @@ describe('Unit: parser/footnote', () => {
             html('li', { id: 'reference:def:1' }, [
               'b',
               html('sup', [
-                html('a', { href: '#reference:ref:1' }, '~1'),
-                html('a', { href: '#reference:ref:2', title: 'b' }, '~2'),
-                html('a', { href: '#reference:ref:3' }, '~3'),
+                html('a', { href: '#reference:ref:1' }, '^1'),
+                html('a', { href: '#reference:ref:2', title: 'b' }, '^2'),
+                html('a', { href: '#reference:ref:3' }, '^3'),
               ])
             ]),
           ]).outerHTML);

package/src/parser/function/footnote.ts

@@ -109,7 +109,7 @@ function build(
               ? title
               : undefined,
           },
-          `~${refIndex}`));
+          `^${refIndex}`));
     }
     if (!footnote) return;
     const { children } = footnote;

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

@@ -20,7 +20,6 @@ describe('Unit: parser/inline/annotation', () => {
       assert.deepStrictEqual(inspect(parser('((\na))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\ a))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\\na))')), undefined);
-      assert.deepStrictEqual(inspect(parser('((a  ))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\n))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\\\n))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\nb))')), undefined);
@@ -36,7 +35,11 @@ describe('Unit: parser/inline/annotation', () => {
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('((a))')), [['<sup class="annotation">a</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('((a ))')), [['<sup class="annotation">a </sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('((a ))')), [['<sup class="annotation">a</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('((a  ))')), [['<sup class="annotation">a</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('((a &nbsp;))')), [['<sup class="annotation">a</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('((a <wbr>))')), [['<sup class="annotation">a</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('((a [# b #]))')), [['<sup class="annotation">a <sup class="comment" title="b"></sup></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('((ab))')), [['<sup class="annotation">ab</sup>'], '']);
     });
 

package/src/parser/inline/annotation.ts

@@ -1,11 +1,11 @@
 import { undefined } from 'spica/global';
 import { AnnotationParser } from '../inline';
-import { union, some, validate, verify, guard, context, creator, surround, lazy, fmap } from '../../combinator';
+import { union, some, validate, guard, context, creator, surround, lazy, fmap } from '../../combinator';
 import { inline } from '../inline';
-import { startTight, isEndTight } from '../util';
+import { startTight, trimEnd } from '../util';
 import { html, defrag } from 'typed-dom';
 
-export const annotation: AnnotationParser = lazy(() => creator(validate('((', '))', '\n', fmap(verify(surround(
+export const annotation: AnnotationParser = lazy(() => creator(validate('((', '))', '\n', fmap(surround(
   '((',
   guard(context => context.syntax?.inline?.annotation ?? true,
   startTight(
@@ -21,5 +21,4 @@ export const annotation: AnnotationParser = lazy(() => creator(validate('((', ')
   }}, state: undefined },
   union([some(inline, ')', /^\\?\n/)])))),
   '))'),
-  isEndTight),
-  ns => [html('sup', { class: 'annotation' }, defrag(ns))]))));
+  ns => [html('sup', { class: 'annotation' }, trimEnd(defrag(ns)))]))));

package/src/parser/inline/comment.ts

@@ -6,5 +6,5 @@ export const comment: CommentParser = creator(validate('[#', '#]', match(
   /^\[(#+)\s+((?:\S+\s+)+?)(\1\]|$)/,
   ([, , title, closer]) => (rest, { resources }) =>
     closer
-      ? [[html('sup', { class: 'comment', title: title.trim() })], rest]
+      ? [[html('sup', { class: 'comment', title: title.trim().replace(/\x7F.?/gs, '') })], rest]
       : resources && void (resources.budget -= title.match(/\s+/g)!.length))));

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

@@ -27,6 +27,7 @@ describe('Unit: parser/inline/deletion', () => {
       assert.deepStrictEqual(inspect(parser('~~\\\na~~')), [['<del><span class="linebreak"> </span>a</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~<wbr>a~~')), [['<del><wbr>a</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~[# a #]b~~')), [['<del><sup class="comment" title="a"></sup>b</del>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~a\n~~')), [['<del>a</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~a\nb~~')), [['<del>a<br>b</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~a\\\nb~~')), [['<del>a<span class="linebreak"> </span>b</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~\\~~~')), [['<del>~</del>'], '']);

package/src/parser/inline/deletion.ts

@@ -2,6 +2,7 @@ import { DeletionParser } from '../inline';
 import { union, some, creator, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
+import { trimEndBR } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
 
@@ -9,5 +10,5 @@ export const deletion: DeletionParser = lazy(() => creator(surround(
   str('~~'),
   union([some(inline, '~~')]),
   str('~~'), false,
-  ([, bs], rest) => [[html('del', defrag(bs))], rest],
+  ([, bs], rest) => [[html('del', defrag(trimEndBR(bs)))], rest],
   ([as, bs], rest) => [unshift(as, bs), rest])));

package/src/parser/inline/emphasis.ts

@@ -1,18 +1,18 @@
 import { EmphasisParser } from '../inline';
-import { union, some, creator, surround, lazy } from '../../combinator';
+import { union, some, creator, surround, close, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { strong } from './strong';
 import { str } from '../source';
-import { startTight, isEndTight, trimEndBR } from '../util';
+import { startTight, verifyEndTight, trimEndBR } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
 
-export const emphasis: EmphasisParser = lazy(() => creator(surround(
-  str('*', '*'),
+export const emphasis: EmphasisParser = lazy(() => creator(surround(close(
+  str('*'), /^(?!\*)/),
   startTight(some(union([strong, some(inline, '*')]))),
   str('*'), false,
   ([as, bs, cs], rest) =>
-    isEndTight(bs)
+    verifyEndTight(bs)
       ? [[html('em', defrag(trimEndBR(bs)))], rest]
       : [unshift(as, bs), cs[0] + rest],
   ([as, bs], rest) => [unshift(as, bs), rest])));

package/src/parser/inline/emstrong.ts

@@ -2,7 +2,7 @@ import { EmStrongParser } from '../inline';
 import { union, some, creator, surround, lazy, bind } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { startTight, isEndTight, trimEndBR } from '../util';
+import { startTight, verifyEndTight, trimEndBR } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
 
@@ -11,13 +11,13 @@ export const emstrong: EmStrongParser = lazy(() => creator(surround(
   startTight(union([some(inline, '*')])),
   str(/^\*{1,3}/), false,
   ([as, bs, cs], rest, context) => {
-    if (!isEndTight(bs)) return [unshift(as, bs), cs[0] + rest];
+    if (!verifyEndTight(bs)) return [unshift(as, bs), cs[0] + rest];
     switch (cs[0]) {
       case '*':
         return bind<EmStrongParser>(
           union([some(inline, '**')]),
           (ds, rest) =>
-            rest.slice(0, 2) === '**' && isEndTight(ds)
+            rest.slice(0, 2) === '**' && verifyEndTight(ds)
               ? [[html('strong', unshift([html('em', defrag(trimEndBR(bs)))], defrag(trimEndBR(ds))))], rest.slice(2)]
               : [unshift(['**', html('em', defrag(trimEndBR(bs)))], ds), rest])
           (rest, context) ?? [['**', html('em', defrag(trimEndBR(bs)))], rest];
@@ -25,7 +25,7 @@ export const emstrong: EmStrongParser = lazy(() => creator(surround(
         return bind<EmStrongParser>(
           union([some(inline, '*')]),
           (ds, rest) =>
-            rest.slice(0, 1) === '*' && isEndTight(ds)
+            rest.slice(0, 1) === '*' && verifyEndTight(ds)
               ? [[html('em', unshift([html('strong', defrag(trimEndBR(bs)))], defrag(trimEndBR(ds))))], rest.slice(1)]
               : [unshift(['*', html('strong', defrag(trimEndBR(bs)))], ds), rest])
           (rest, context) ?? [['*', html('strong', defrag(trimEndBR(bs)))], rest];