securemark 0.274.1 → 0.274.3

package/.eslintrc.json

@@ -20,8 +20,6 @@
         "maxSimpleRepeatCount": 256,
         "attackTimeout": null,
         "incubationTimeout": null,
-        "recallTimeout": null,
-        "seedingTimeout": null,
         "timeout": 1e6
       }
     ]

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.274.3
+
+- Fix abbr parser.
+
+## 0.274.2
+
+- Fix identifiers of notes.
+
 ## 0.274.1
 
 - Fix identifiers of notes.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.274.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.274.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("Prism"), require("DOMPurify"));
@@ -6581,14 +6581,14 @@ const visibility_1 = __webpack_require__(7618);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
 exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('==', '='), (0, combinator_1.constraint)(4 /* State.mark */, false, (0, combinator_1.syntax)(0 /* Syntax.none */, 1, 1, 0 /* State.none */, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('=='), [[/^\\?\n/, 9]]), (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '=', [[/^\\?\n/, 9]]), exports.mark)]))))), (0, source_1.str)('=='), false, ([, bs], rest, {
-  id
+  id,
+  state
 }) => {
   const el = (0, dom_1.html)('mark', (0, dom_1.defrag)(bs));
-  (0, dom_1.define)(el, {
-    id: (0, indexee_1.identity)(id, (0, indexee_1.text)(el), 'mark')
-  });
-  return [[el, (0, dom_1.html)('a', {
-    href: el.id ? `#${el.id}` : undefined
+  return [[(0, dom_1.define)(el, {
+    id: state & (256 /* State.annotation */ | 128 /* State.reference */) ? undefined : (0, indexee_1.identity)(id, (0, indexee_1.text)(el), 'mark')
+  }), el.id && (0, dom_1.html)('a', {
+    href: `#${el.id}`
   })], rest];
 }, ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest]));
 
@@ -6645,6 +6645,7 @@ const link_1 = __webpack_require__(9628);
 const html_1 = __webpack_require__(5994);
 const htmlentity_1 = __webpack_require__(1562);
 const source_1 = __webpack_require__(6743);
+const util_1 = __webpack_require__(9437);
 const url_1 = __webpack_require__(2261);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
@@ -6692,32 +6693,19 @@ function sanitize(target, uri, alt) {
     case 'http:':
     case 'https:':
       if (/\/\.\.?(?:\/|$)/.test('/' + uri.source.slice(0, uri.source.search(/[?#]|$/)))) {
-        (0, dom_1.define)(target, {
-          class: void target.classList.add('invalid'),
-          'data-invalid-syntax': 'media',
-          'data-invalid-type': 'argument',
-          'data-invalid-message': 'Dot-segments cannot be used in media paths; use subresource paths instead'
-        });
+        (0, util_1.markInvalid)(target, 'media', 'argument', 'Dot-segments cannot be used in media paths; use subresource paths instead');
         return false;
       }
       break;
     default:
-      (0, dom_1.define)(target, {
-        class: void target.classList.add('invalid'),
-        'data-invalid-syntax': 'media',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': 'Invalid protocol'
-      });
+      (0, util_1.markInvalid)(target, 'media', 'argument', 'Invalid protocol');
       return false;
   }
   if (alt.includes('\x1B')) {
     (0, dom_1.define)(target, {
-      class: void target.classList.add('invalid'),
-      'data-invalid-syntax': 'media',
-      'data-invalid-type': 'content',
-      'data-invalid-message': `Cannot use invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)[0]}"`,
       alt: target.getAttribute('alt')?.replace(/\x1B/g, '')
     });
+    (0, util_1.markInvalid)(target, 'media', 'content', `Cannot use invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)[0]}"`);
     return false;
   }
   return true;
@@ -6739,22 +6727,31 @@ const combinator_1 = __webpack_require__(2087);
 const inline_1 = __webpack_require__(1160);
 const source_1 = __webpack_require__(6743);
 const visibility_1 = __webpack_require__(7618);
-const util_1 = __webpack_require__(9437);
 const dom_1 = __webpack_require__(3252);
 exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.surround)('[[', (0, combinator_1.constraint)(128 /* State.reference */, false, (0, combinator_1.syntax)(256 /* Syntax.reference */, 6, 1, 256 /* State.annotation */ | 128 /* State.reference */ | 8 /* State.media */, (0, visibility_1.startLoose)((0, combinator_1.subsequence)([abbr, (0, combinator_1.fmap)((0, source_1.str)('^'), ns => ['', ...ns]), (0, combinator_1.some)(inline_1.inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]])]), ']'))), ']]', false, ([, ns], rest) => [[(0, dom_1.html)('sup', attributes(ns), [(0, dom_1.html)('span', (0, visibility_1.trimNode)((0, dom_1.defrag)(ns)))])], rest]));
-const abbr = (0, combinator_1.creation)((0, combinator_1.bind)((0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?![0-9]+\s?[|\]])[0-9A-Za-z]+(?:(?:-|(?=\W)(?!'\d)'?(?!\.\d)\.?(?!,\S),? ?)[0-9A-Za-z]+)*(?:-|'?\.?,? ?)?/)]), /^\|?(?=]])|^\|[^\S\n]*/), ([source], rest) => [[(0, dom_1.html)('abbr', source)], rest.replace(visibility_1.regBlankStart, '')]));
+// Chicago-Style
+const abbr = (0, combinator_1.creation)((0, combinator_1.bind)((0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?=[A-Z])(?:[0-9A-Za-z]'?|(?:[-.:]|\.?\??,? ?)(?!['\-.:?, ]))+/)]), /^\|?(?=]])|^\|[^\S\n]*/), ([source], rest) => [['\n', source.trimEnd()], rest.replace(visibility_1.regBlankStart, '')]));
 function attributes(ns) {
-  return typeof ns[0] === 'object' && ns[0].tagName === 'ABBR' ? {
-    class: 'reference',
-    'data-abbr': (0, util_1.stringify)([ns.shift()]).trimEnd()
-  } : ns[0] === '' ? {
-    class: 'invalid',
-    'data-invalid-syntax': 'reference',
-    'data-invalid-type': 'syntax',
-    'data-invalid-message': 'Invalid abbr'
-  } : {
-    class: 'reference'
-  };
+  switch (ns[0]) {
+    case '':
+      return {
+        class: 'invalid',
+        'data-invalid-syntax': 'reference',
+        'data-invalid-type': 'syntax',
+        'data-invalid-message': 'Invalid abbreviation'
+      };
+    case '\n':
+      const abbr = ns[1];
+      ns[0] = ns[1] = '';
+      return {
+        class: 'reference',
+        'data-abbr': abbr
+      };
+    default:
+      return {
+        class: 'reference'
+      };
+  }
 }
 
 /***/ }),
@@ -6924,6 +6921,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.figure = void 0;
 const label_1 = __webpack_require__(466);
+const util_1 = __webpack_require__(9437);
 const queue_1 = __webpack_require__(4934);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
@@ -6946,11 +6944,8 @@ function* figure(target, notes, opts = {}) {
     const label = tagName === 'FIGURE' ? def.getAttribute('data-label') : `$-${increment(index, def)}`;
     if (label.endsWith('-')) continue;
     if (label.endsWith('-0')) {
+      (0, util_1.markInvalid)(def, 'figure', 'argument', 'Invalid base index');
       (0, dom_1.define)(def, {
-        class: void def.classList.add('invalid'),
-        'data-invalid-syntax': 'figure',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': 'Invalid base index',
         hidden: null
       });
       continue;
@@ -6958,32 +6953,23 @@ function* figure(target, notes, opts = {}) {
     if (tagName === 'FIGURE' && label.endsWith('.0')) {
       // $-x.x.0 is disabled.
       if (label.lastIndexOf('.', label.length - 3) !== -1) {
+        (0, util_1.markInvalid)(def, 'figure', 'argument', 'Base index must be $-x.0 format');
         (0, dom_1.define)(def, {
-          class: void def.classList.add('invalid'),
-          'data-invalid-syntax': 'figure',
-          'data-invalid-type': 'argument',
-          'data-invalid-message': 'Base index must be $-x.0 format',
           hidden: null
         });
         continue;
       }
       // $-x.0 after h1-h6.
       if (!/^H[1-6]$/.test(def.previousElementSibling?.tagName ?? '')) {
+        (0, util_1.markInvalid)(def, 'figure', 'position', messages.declaration);
         (0, dom_1.define)(def, {
-          class: void def.classList.add('invalid'),
-          'data-invalid-syntax': 'figure',
-          'data-invalid-type': 'position',
-          'data-invalid-message': messages.declaration,
           hidden: null
         });
         continue;
       } else if (def.getAttribute('data-invalid-message') === messages.declaration) {
+        (0, util_1.unmarkInvalid)(def);
         (0, dom_1.define)(def, {
-          class: void def.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null,
-          hidden: ''
+          hidden: null
         });
       }
     }
@@ -7008,31 +6994,18 @@ function* figure(target, notes, opts = {}) {
     if (labels.has(label)) {
       if (def.classList.contains('invalid')) continue;
       (0, dom_1.define)(def, {
-        id: null,
-        class: void def.classList.add('invalid'),
-        'data-invalid-syntax': 'figure',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': messages.duplicate
+        id: null
       });
+      (0, util_1.markInvalid)(def, 'figure', 'argument', messages.duplicate);
       continue;
     } else if (def.getAttribute('data-invalid-message') === messages.duplicate) {
-      (0, dom_1.define)(def, {
-        class: void def.classList.remove('invalid'),
-        'data-invalid-syntax': null,
-        'data-invalid-type': null,
-        'data-invalid-message': null
-      });
+      (0, util_1.unmarkInvalid)(def);
     }
     labels.add(label);
     opts.id !== '' && def.setAttribute('id', `label:${opts.id ? `${opts.id}:` : ''}${label}`);
     for (const ref of refs.take(label, Infinity)) {
       if (ref.getAttribute('data-invalid-message') === messages.reference) {
-        (0, dom_1.define)(ref, {
-          class: void ref.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null
-        });
+        (0, util_1.unmarkInvalid)(ref);
       }
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;
       yield (0, dom_1.define)(ref, opts.id !== '' ? {
@@ -7044,12 +7017,7 @@ function* figure(target, notes, opts = {}) {
   }
   for (const [, ref] of refs) {
     if (opts.id !== '' && !ref.classList.contains('invalid')) {
-      (0, dom_1.define)(ref, {
-        class: void ref.classList.add('invalid'),
-        'data-invalid-syntax': 'label',
-        'data-invalid-type': 'reference',
-        'data-invalid-message': messages.reference
-      });
+      (0, util_1.markInvalid)(ref, 'label', 'reference', messages.reference);
     }
     yield ref;
   }
@@ -7091,6 +7059,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.reference = exports.annotation = exports.note = void 0;
 const indexee_1 = __webpack_require__(1269);
+const util_1 = __webpack_require__(9437);
 const dom_1 = __webpack_require__(3252);
 function* note(target, notes, opts = {}, bottom = null) {
   for (let es = target.querySelectorAll(`.annotations`), len = es.length, i = 0; i < len; ++i) {
@@ -7109,101 +7078,85 @@ function build(syntax, marker, splitter = '') {
   // 構文ごとに各1回の処理では不可能
   return function* (target, note, opts = {}, bottom = null) {
     const defs = new Map();
-    const splitters = [];
-    for (let es = target.querySelectorAll(splitter || '_'), len = es.length, i = 0; i < len; ++i) {
-      if (i % 100 === 0) yield;
-      const el = es[i];
-      el.parentNode === target && splitters.push(el);
-    }
     const refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`);
     const titles = new Map();
     const defIndexes = new Map();
     const refSubindexes = new Map();
-    const defSubindexes = new Map();
-    let refIndex = 0;
+    const defSubindexes = splitter && refs.length > 0 ? new Map() : undefined;
+    const splitters = splitter && refs.length > 0 ? target.querySelectorAll(splitter) : [];
+    let iSplitters = 0;
     let total = 0;
-    let style;
+    let format;
+    let refIndex = 0;
     for (let len = refs.length, i = 0; i < len; ++i) {
       const ref = refs[i];
-      if (ref.closest('[hidden]')) {
+      if (ref.closest('sup > [hidden]')) {
         yield;
         continue;
       }
-      while (splitters.length > 0 && splitters[0].compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING) {
+      if (splitter) for (let el; (el = splitters[iSplitters])?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING; ++iSplitters) {
+        if (el.parentNode !== target) continue;
         if (defs.size > 0) {
           total += defs.size;
           yield* proc(defs, target.insertBefore((0, dom_1.html)('ol', {
             class: `${syntax}s`
-          }), splitters[0]));
-        } else if (splitters.length % 100 === 0) {
+          }), el));
+        } else if (~iSplitters % 128 === 0) {
           yield;
         }
-        splitters.shift();
       }
       const abbr = ref.getAttribute('data-abbr') || undefined;
-      const identifier = abbr || (0, indexee_1.identity)(undefined, (0, indexee_1.text)(ref.firstElementChild), 'mark')?.slice(6) || '';
+      const identifier = (0, indexee_1.identity)(undefined, abbr ? abbr.match(/^(?:\S+ )+?(?:(?:January|February|March|April|May|June|August|September|October|November|December) \d{1,2}(?:-\d{0,2})?, \d{1,4}(?:-\d{0,4})?[a-z]?|n\.d\.)(?=,|$)/)?.[0] ?? abbr.match(/^[^,\s]+(?:,? [^,\s]+)*?(?: \d{1,4}(?:-\d{0,4})?[a-z]?(?=,|$)|(?=,(?: [a-z]+\.?)? [0-9]))/)?.[0] ?? abbr : (0, indexee_1.text)(ref.firstElementChild), 'mark')?.slice(6) || '';
       const refSubindex = refSubindexes.get(identifier) + 1 || 1;
       refSubindexes.set(identifier, refSubindex);
       const refId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:ref:${identifier}:${refSubindex}` : undefined;
       const initial = splitter ? !defs.has(identifier) : refSubindex === 1;
-      const defSubindex = defSubindexes.get(identifier) + 1 || 1;
-      defSubindexes.set(identifier, defSubindex);
+      const defSubindex = defSubindexes?.get(identifier) + +initial || 1;
+      initial && defSubindexes?.set(identifier, defSubindex);
+      const defId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}${splitter && `:${defSubindex}`}` : undefined;
       const def = initial ? (0, dom_1.html)('li', {
-        id: opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}:${defSubindex}` : undefined,
-        'data-marker': !note ? marker(total + defs.size + 1, abbr) : undefined
+        id: defId,
+        'data-marker': note ? undefined : marker(total + defs.size + 1, abbr)
       }, [(0, dom_1.define)(ref.firstElementChild.cloneNode(true), {
         hidden: null
       }), (0, dom_1.html)('sup')]) : defs.get(identifier);
       initial && defs.set(identifier, def);
       const defIndex = initial ? total + defs.size : defIndexes.get(def);
       initial && defIndexes.set(def, defIndex);
-      const defId = def.id || undefined;
       const title = initial ? (0, indexee_1.text)(ref.firstElementChild) : titles.get(identifier);
       initial && titles.set(identifier, title);
-      style ??= abbr ? 'abbr' : 'count';
-      if (style === 'count' ? abbr : !abbr) {
-        (0, dom_1.define)(ref, {
-          class: void ref.classList.add('invalid'),
-          'data-invalid-syntax': syntax,
-          'data-invalid-type': 'style',
-          'data-invalid-message': `${syntax[0].toUpperCase() + syntax.slice(1)} style must be consistent`
-        });
-      } else if (ref.getAttribute('data-invalid-type') === 'style') {
-        (0, dom_1.define)(ref, {
-          class: void ref.classList.remove('invalid'),
-          'data-invalid-syntax': null,
-          'data-invalid-type': null,
-          'data-invalid-message': null
-        });
-      }
-      if (!ref.firstElementChild.hasAttribute('hidden')) {
-        ref.firstElementChild.setAttribute('hidden', '');
-      } else {
-        ref.lastChild?.remove();
-      }
+      ref.firstElementChild.hasAttribute('hidden') ? ref.lastElementChild.remove() : ref.firstElementChild.setAttribute('hidden', '');
       (0, dom_1.define)(ref, {
         id: refId,
         class: opts.id !== '' ? undefined : void ref.classList.add('disabled'),
-        title,
-        ...(!title && {
-          class: void ref.classList.add('invalid'),
-          'data-invalid-syntax': syntax,
-          'data-invalid-type': 'content',
-          'data-invalid-message': 'Missing the content'
-        })
+        title
       });
+      switch (ref.getAttribute('data-invalid-syntax')) {
+        case 'format':
+        case 'content':
+          (0, util_1.unmarkInvalid)(ref);
+      }
+      format ??= abbr ? 'abbr' : 'number';
+      if (!ref.classList.contains('invalid')) switch (true) {
+        case format === 'number' ? !!abbr : !abbr:
+          (0, util_1.markInvalid)(ref, syntax, 'format', 'Notation format must be consistent with numbers or abbreviations');
+          break;
+        case !title:
+          (0, util_1.markInvalid)(ref, syntax, 'content', 'Missing the content');
+          break;
+      }
       yield ref.appendChild((0, dom_1.html)('a', {
         href: refId && defId && `#${defId}`
       }, marker(defIndex, abbr)));
-      def.lastChild.appendChild((0, dom_1.html)('a', {
+      def.lastElementChild.appendChild((0, dom_1.html)('a', {
         href: refId && `#${refId}`,
         title: abbr && (0, indexee_1.text)((0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes)).trim() || undefined
       }, `^${++refIndex}`));
     }
-    if (defs.size > 0 || note) {
+    if (note || defs.size > 0) {
       yield* proc(defs, note ?? target.insertBefore((0, dom_1.html)('ol', {
         class: `${syntax}s`
-      }), splitters[0] ?? bottom));
+      }), splitters[iSplitters] ?? bottom));
     }
     return;
   };
@@ -7586,7 +7539,7 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 /***/ }),
 
 /***/ 9437:
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
@@ -7594,7 +7547,26 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.stringify = void 0;
+exports.stringify = exports.unmarkInvalid = exports.markInvalid = void 0;
+const dom_1 = __webpack_require__(3252);
+function markInvalid(el, syntax, type, message) {
+  return (0, dom_1.define)(el, {
+    class: void el.classList.add('invalid'),
+    'data-invalid-syntax': syntax,
+    'data-invalid-type': type,
+    'data-invalid-message': message
+  });
+}
+exports.markInvalid = markInvalid;
+function unmarkInvalid(el) {
+  return (0, dom_1.define)(el, {
+    class: void el.classList.remove('invalid'),
+    'data-invalid-syntax': null,
+    'data-invalid-type': null,
+    'data-invalid-message': null
+  });
+}
+exports.unmarkInvalid = unmarkInvalid;
 function stringify(nodes) {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {

package/markdown.d.ts

@@ -658,8 +658,8 @@ export namespace MarkdownParser {
     }
     export interface ReferenceParser extends
       // [[abc]]
-      // [[^abbr]]
-      // [[^abbr| abc]]
+      // [[^Abbr]]
+      // [[^Abbr| abc]]
       Inline<'reference'>,
       Parser<HTMLElement, Context, [
         ReferenceParser.AbbrParser,
@@ -669,11 +669,10 @@ export namespace MarkdownParser {
     }
     export namespace ReferenceParser {
       export interface AbbrParser extends
-        // ^Xyz2020
-        // ^X, 2020, p1-2
-        // ^X. Y., Z et al., 2020, p1-2
+        // ^X 2020, 1-2
+        // ^X. Y., and Z et al. 2020, 1-2
         Inline<'reference/abbr'>,
-        Parser<HTMLElement, Context, [
+        Parser<string, Context, [
           SourceParser.StrParser,
         ]> {
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.274.1",
+  "version": "0.274.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

@@ -194,34 +194,34 @@ describe('Unit: parser/api/bind', () => {
           html('p', [
             html('sup', { class: "reference", id: "reference::ref:1:1", title: "1" }, [
               html('span', { hidden: '' }, '1'),
-              html('a', { href: "#reference::def:1:1" }, '[1]'),
+              html('a', { href: "#reference::def:1" }, '[1]'),
             ]),
           ]).outerHTML,
           html('p', [
             html('sup', { class: "reference", id: "reference::ref:2:1", title: "2" }, [
               html('span', { hidden: '' }, '2'),
-              html('a', { href: "#reference::def:2:1" }, '[2]'),
+              html('a', { href: "#reference::def:2" }, '[2]'),
             ]),
           ]).outerHTML,
           html('p', [
             html('sup', { class: "reference", id: "reference::ref:3:1", title: "3" }, [
               html('span', { hidden: '' }, '3'),
-              html('a', { href: "#reference::def:3:1" }, '[3]'),
+              html('a', { href: "#reference::def:3" }, '[3]'),
             ]),
           ]).outerHTML,
         ]);
       assert.deepStrictEqual(
         cfgs.notes.references?.outerHTML,
         html('ol', [
-          html('li', { id: 'reference::def:1:1' }, [
+          html('li', { id: 'reference::def:1' }, [
             html('span', '1'),
             html('sup', [html('a', { href: '#reference::ref:1:1' }, '^1')]),
           ]),
-          html('li', { id: 'reference::def:2:1' }, [
+          html('li', { id: 'reference::def:2' }, [
             html('span', '2'),
             html('sup', [html('a', { href: '#reference::ref:2:1' }, '^2')]),
           ]),
-          html('li', { id: 'reference::def:3:1' }, [
+          html('li', { id: 'reference::def:3' }, [
             html('span', '3'),
             html('sup', [html('a', { href: '#reference::ref:3:1' }, '^3')]),
           ]),

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

@@ -204,15 +204,80 @@ describe('Unit: parser/api/parse', () => {
     it('note', () => {
       const notes = { references: html('ol') };
       assert.deepStrictEqual(
-        [...parse('$-a\n$$\n$$\n\n(($-a[[^b]]))[[^b|$-a]]', { notes }).children].map(el => el.outerHTML),
+        [...parse('$-a\n$$\n$$\n\n(($-a[[^B]]))[[^B|$-a]]', { notes }).children].map(el => el.outerHTML),
         [
           '<figure data-type="math" data-label="$-a" data-group="$" data-number="1" id="label:$-a"><figcaption><span class="figindex">(1)</span><span class="figtext"></span></figcaption><div><div class="math" translate="no">$$\n$$</div></div></figure>',
-          '<p><sup class="annotation" id="annotation::ref:(1):1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="b"><span></span></sup></span><a href="#annotation::def:(1):1">*1</a></sup><sup class="reference" data-abbr="b" id="reference::ref:b:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><a href="#reference::def:b:1">[b]</a></sup></p>',
-          '<ol class="annotations"><li id="annotation::def:(1):1" data-marker="*1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="b" id="reference::ref:b:2" title="(1)"><span hidden=""></span><a href="#reference::def:b:1">[b]</a></sup></span><sup><a href="#annotation::ref:(1):1">^1</a></sup></li></ol>',
+          '<p><sup class="annotation" id="annotation::ref:(1):1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="B"><span></span></sup></span><a href="#annotation::def:(1):1">*1</a></sup><sup class="reference" data-abbr="B" id="reference::ref:B:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><a href="#reference::def:B">[B]</a></sup></p>',
+          '<ol class="annotations"><li id="annotation::def:(1):1" data-marker="*1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" data-abbr="B" id="reference::ref:B:2" title="(1)"><span hidden=""></span><a href="#reference::def:B">[B]</a></sup></span><sup><a href="#annotation::ref:(1):1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
         notes.references.outerHTML,
-        '<ol><li id="reference::def:b:1"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><sup><a href="#reference::ref:b:1" title="(1)">^1</a><a href="#reference::ref:b:2">^2</a></sup></li></ol>');
+        '<ol><li id="reference::def:B"><span><a class="label" data-label="$-a" href="#label:$-a">(1)</a></span><sup><a href="#reference::ref:B:1" title="(1)">^1</a><a href="#reference::ref:B:2">^2</a></sup></li></ol>');
+      assert.deepStrictEqual(
+        [...parse([
+          '[[^A 1|b]]',
+          '[[^A 1,|b]]',
+          '[[^A 1, |b]]',
+          '[[^Xyz 2020|b]]',
+          '[[^Xyz 2020, 1|b]]',
+          '[[^Xyz 2020, 1, 2|b]]',
+          '[[^Xyz 2020, 1, fig. 1.1|b]]',
+          '[[^Xyz 2020, 1, fig. 1.1-2.1b|b]]',
+          '[[^Xyz 2020, 1, fig. 1.1a-b|b]]',
+          '[[^Xyz 2020, 1-2|b]]',
+          '[[^Xyz 2020, 1:1-2|b]]',
+          '[[^Xyz 2020, 1n|b]]',
+          '[[^Xyz 2020, 1n1|b]]',
+          '[[^Xyz 2020, 1nn1-2|b]]',
+          '[[^Xyz 2020, i|b]]',
+          '[[^Xyz 2020, capter 1|b]]',
+          '[[^Xyz 2020, cap. 1|b]]',
+          '[[^Xyz 2020a|b]]',
+          '[[^Xyz 2020a, 1|b]]',
+          '[[^Xyz 2020-2021a|b]]',
+          '[[^Xyz 2020-2021a, 1|b]]',
+          '[[^Xyz, April 1, 2020|b]]',
+          '[[^Xyz, April 1, 2020, 1|b]]',
+          '[[^Xyz n.d.|b]]',
+          '[[^Xyz n.d., 1|b]]',
+          '[[^X. Y., and Z et al. 2020, 1-2|b]]',
+          '[[^A title 2020|b]]',
+          '[[^A title 2020, 1|b]]',
+          '[[^Constitution, art. 2|b]]',
+          '[[^Constitution, art. 2, sec. 1|b]]',
+        ].join('\n\n'), { notes }).children].map(el => el.outerHTML),
+        [
+          '<p><sup class="reference" data-abbr="A 1" id="reference::ref:A_1:1" title="b"><span hidden="">b</span><a href="#reference::def:A_1">[A 1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="A 1," id="reference::ref:A_1:2" title="b"><span hidden="">b</span><a href="#reference::def:A_1">[A 1,]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="A 1," id="reference::ref:A_1:3" title="b"><span hidden="">b</span><a href="#reference::def:A_1">[A 1,]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020" id="reference::ref:Xyz_2020:1" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1" id="reference::ref:Xyz_2020:2" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1, 2" id="reference::ref:Xyz_2020:3" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1, 2]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1, fig. 1.1" id="reference::ref:Xyz_2020:4" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1, fig. 1.1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1, fig. 1.1-2.1b" id="reference::ref:Xyz_2020:5" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1, fig. 1.1-2.1b]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1, fig. 1.1a-b" id="reference::ref:Xyz_2020:6" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1, fig. 1.1a-b]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1-2" id="reference::ref:Xyz_2020:7" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1-2]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1:1-2" id="reference::ref:Xyz_2020:8" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1:1-2]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1n" id="reference::ref:Xyz_2020:9" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1n]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1n1" id="reference::ref:Xyz_2020:10" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1n1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, 1nn1-2" id="reference::ref:Xyz_2020:11" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, 1nn1-2]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, i" id="reference::ref:Xyz_2020:12" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, i]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, capter 1" id="reference::ref:Xyz_2020:13" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, capter 1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020, cap. 1" id="reference::ref:Xyz_2020:14" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020">[Xyz 2020, cap. 1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020a" id="reference::ref:Xyz_2020a:1" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020a">[Xyz 2020a]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020a, 1" id="reference::ref:Xyz_2020a:2" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020a">[Xyz 2020a, 1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020-2021a" id="reference::ref:Xyz_2020-2021a:1" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020-2021a">[Xyz 2020-2021a]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz 2020-2021a, 1" id="reference::ref:Xyz_2020-2021a:2" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_2020-2021a">[Xyz 2020-2021a, 1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz, April 1, 2020" id="reference::ref:Xyz,_April_1,_2020:1" title="b"><span hidden="">b</span><a href="#reference::def:Xyz,_April_1,_2020">[Xyz, April 1, 2020]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz, April 1, 2020, 1" id="reference::ref:Xyz,_April_1,_2020:2" title="b"><span hidden="">b</span><a href="#reference::def:Xyz,_April_1,_2020">[Xyz, April 1, 2020, 1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz n.d." id="reference::ref:Xyz_n.d.:1" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_n.d.">[Xyz n.d.]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Xyz n.d., 1" id="reference::ref:Xyz_n.d.:2" title="b"><span hidden="">b</span><a href="#reference::def:Xyz_n.d.">[Xyz n.d., 1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="X. Y., and Z et al. 2020, 1-2" id="reference::ref:X._Y.,_and_Z_et_al._2020:1" title="b"><span hidden="">b</span><a href="#reference::def:X._Y.,_and_Z_et_al._2020">[X. Y., and Z et al. 2020, 1-2]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="A title 2020" id="reference::ref:A_title_2020:1" title="b"><span hidden="">b</span><a href="#reference::def:A_title_2020">[A title 2020]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="A title 2020, 1" id="reference::ref:A_title_2020:2" title="b"><span hidden="">b</span><a href="#reference::def:A_title_2020">[A title 2020, 1]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Constitution, art. 2" id="reference::ref:Constitution:1" title="b"><span hidden="">b</span><a href="#reference::def:Constitution">[Constitution, art. 2]</a></sup></p>',
+          '<p><sup class="reference" data-abbr="Constitution, art. 2, sec. 1" id="reference::ref:Constitution:2" title="b"><span hidden="">b</span><a href="#reference::def:Constitution">[Constitution, art. 2, sec. 1]</a></sup></p>',
+        ]);
     });
 
     it('normalize', () => {

package/src/parser/inline/mark.ts

@@ -17,9 +17,15 @@ export const mark: MarkParser = lazy(() => surround(
     open(some(inline, '=', [[/^\\?\n/, 9]]), mark),
   ]))))),
   str('=='), false,
-  ([, bs], rest, { id }) => {
+  ([, bs], rest, { id, state }) => {
     const el = html('mark', defrag(bs));
-    define(el, { id: identity(id, text(el), 'mark') });
-    return [[el, html('a', { href: el.id ? `#${el.id}` : undefined })], rest];
+    return [[
+      define(el, {
+        id: state! & (State.annotation | State.reference)
+          ? undefined
+          : identity(id, text(el), 'mark'),
+      }),
+      el.id && html('a', { href: `#${el.id}` }),
+    ], rest];
   },
   ([as, bs], rest) => [unshift(as, bs), rest]));