securemark 0.296.3 → 0.296.5

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.296.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.296.5 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"));
@@ -2573,7 +2573,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.block = void 0;
 const parser_1 = __webpack_require__(605);
 const line_1 = __webpack_require__(8287);
-function block(parser, separation = true) {
+function block(parser, separation = true, segment = 0) {
   return (0, parser_1.failsafe)(input => {
     const {
       context
@@ -2583,10 +2583,18 @@ function block(parser, separation = true) {
       position
     } = context;
     if (position === source.length) return;
+    if (segment !== 0 && context.segment & 1 /* Segment.write */) {
+      if (context.segment !== (segment | 1 /* Segment.write */)) return;
+      context.position = source.length;
+      return new parser_1.List();
+    }
     const result = parser(input);
     if (result === undefined) return;
     if (separation && !(0, line_1.isEmptyline)(source, context.position)) return;
-    return context.position === source.length || source[context.position - 1] === '\n' ? result : undefined;
+    if (segment !== 0 && context.segment & 1 /* Segment.write */ ^ 1 /* Segment.write */) {
+      context.segment = segment;
+    }
+    return result;
   });
 }
 exports.block = block;
@@ -2938,7 +2946,7 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.recover = void 0;
-function recover(parser, fallback) {
+function recover(parser, catcher) {
   return input => {
     const {
       context
@@ -2952,7 +2960,7 @@ function recover(parser, fallback) {
     } catch (reason) {
       context.source = source;
       context.position = position;
-      return fallback(input, reason);
+      return catcher(input, reason);
     }
   };
 }
@@ -3655,6 +3663,7 @@ class Context {
   constructor({
     source,
     position,
+    segment,
     resources,
     delimiters,
     precedence,
@@ -3666,6 +3675,7 @@ class Context {
   } = {}) {
     this.source = source ?? '';
     this.position = position ?? 0;
+    this.segment = segment ?? 0;
     this.resources = resources;
     this.precedence = precedence ?? 0;
     this.delimiters = delimiters ?? new delimiter_1.Delimiters();
@@ -4212,8 +4222,10 @@ function bind(target, settings) {
     context.url = url ? new url_1.ReadonlyURL(url) : undefined;
     const rev = revision = Symbol();
     const sourceSegments = [];
-    for (const seg of (0, segment_1.segment)(source)) {
+    const sourceSegmentAttrs = [];
+    for (const [seg, attr] of (0, segment_1.segment)(source)) {
       sourceSegments.push(seg);
+      sourceSegmentAttrs.push(attr);
       yield {
         type: 'segment',
         value: seg
@@ -4236,13 +4248,14 @@ function bind(target, settings) {
     // @ts-expect-error
     context.header = true;
     for (; index < sourceSegments.length - last; ++index) {
-      const seg = sourceSegments[index];
-      const es = (0, block_1.block)((0, parser_1.input)(seg, new context_1.Context(context)))?.foldl((acc, {
+      const src = sourceSegments[index];
+      context.segment = sourceSegmentAttrs[index] | 1 /* Segment.write */;
+      const es = (0, block_1.block)((0, parser_1.input)(src, new context_1.Context(context)))?.foldl((acc, {
         value
       }) => void acc.push(value) || acc, []) ?? [];
       // @ts-expect-error
       context.header = false;
-      blocks.splice(index, 0, [seg, es, url]);
+      blocks.length === index ? blocks.push([src, es, url]) : blocks.splice(index, 0, [src, es, url]);
       if (es.length === 0) continue;
       // All deletion processes always run after all addition processes have done.
       // Therefore any `base` node will never be unavailable by deletions until all the dependent `el` nodes are added.
@@ -4547,7 +4560,8 @@ function parse(source, options = {}, context) {
   const node = (0, dom_1.frag)();
   // @ts-expect-error
   context.header = true;
-  for (const seg of (0, segment_1.segment)(source)) {
+  for (const [seg, attr] of (0, segment_1.segment)(source)) {
+    context.segment = attr | 1 /* Segment.write */;
     node.append(...((0, block_1.block)((0, parser_1.input)(seg, new context_1.Context(context)))?.foldl((acc, {
       value
     }) => void acc.push(value) || acc, []) ?? []));
@@ -4605,6 +4619,9 @@ const table_1 = __webpack_require__(2752);
 const codeblock_1 = __webpack_require__(9194);
 const mathblock_1 = __webpack_require__(4903);
 const extension_1 = __webpack_require__(6193);
+const figbase_1 = __webpack_require__(8289);
+const fig_1 = __webpack_require__(7396);
+const figure_1 = __webpack_require__(4248);
 const sidefence_1 = __webpack_require__(6500);
 const blockquote_1 = __webpack_require__(5885);
 const mediablock_1 = __webpack_require__(2583);
@@ -4619,16 +4636,27 @@ exports.block = (0, combinator_1.reset)({
     recursions: [10 || 0 /* Recursion.block */, 20 || 0 /* Recursion.blockquote */, 40 || 0 /* Recursion.listitem */, 20 || 0 /* Recursion.inline */, 20 || 0 /* Recursion.bracket */, 20 || 0 /* Recursion.terminal */]
   },
   backtracks: {}
-}, error((0, combinator_1.union)([source_1.emptyline, input => {
+}, error((0, combinator_1.union)([source_1.emptysegment, input => {
   const {
     context: {
       source,
-      position
+      position,
+      segment
     }
   } = input;
   if (position === source.length) return;
+  switch (segment ^ 1 /* Segment.write */) {
+    case 6 /* Segment.heading */:
+      return (0, heading_1.heading)(input);
+    case 8 /* Segment.fig */:
+      return (0, fig_1.fig)(input);
+    case 10 /* Segment.figure */:
+      return (0, figure_1.figure)(input);
+  }
   const fst = source[position];
   switch (fst) {
+    case "\u0007" /* Command.Error */:
+      throw new Error((0, combinator_1.firstline)(source, position + 1).trimEnd());
     case '=':
       if (source.startsWith('===', position)) return (0, pagebreak_1.pagebreak)(input);
       break;
@@ -4650,7 +4678,7 @@ exports.block = (0, combinator_1.reset)({
     case '[':
       switch (source[position + 1]) {
         case '$':
-          return (0, extension_1.extension)(input);
+          return (0, figbase_1.figbase)(input);
         case '!':
           return (0, mediablock_1.mediablock)(input);
       }
@@ -4661,11 +4689,9 @@ exports.block = (0, combinator_1.reset)({
     case '>':
       if (source[position + 1] === '>') return (0, blockquote_1.blockquote)(input) || (0, reply_1.reply)(input);
       return (0, blockquote_1.blockquote)(input);
-    case '#':
-      return (0, heading_1.heading)(input);
     case '$':
       if (source[position + 1] === '$') return (0, mathblock_1.mathblock)(input);
-      return (0, extension_1.extension)(input);
+      return (0, figbase_1.figbase)(input);
     case '|':
       return (0, table_1.table)(input) || (0, sidefence_1.sidefence)(input);
     case '(':
@@ -4676,14 +4702,7 @@ exports.block = (0, combinator_1.reset)({
 }, paragraph_1.paragraph])));
 function error(parser) {
   const reg = new RegExp(String.raw`^${"\u0007" /* Command.Error */}[^\n]*\n`);
-  return (0, combinator_1.recover)((0, combinator_1.fallback)((0, combinator_1.open)("\u0007" /* Command.Error */, ({
-    context: {
-      source,
-      position
-    }
-  }) => {
-    throw new Error(source.slice(position).split('\n', 1)[0]);
-  }), parser), ({
+  return (0, combinator_1.recover)(parser, ({
     context: {
       source,
       position,
@@ -4844,7 +4863,6 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.extension = exports.segment = void 0;
 const combinator_1 = __webpack_require__(3484);
-const figbase_1 = __webpack_require__(8289);
 const fig_1 = __webpack_require__(7396);
 const figure_1 = __webpack_require__(4248);
 const table_1 = __webpack_require__(3646);
@@ -4853,7 +4871,10 @@ const aside_1 = __webpack_require__(6150);
 const example_1 = __webpack_require__(6624);
 const placeholder_1 = __webpack_require__(4091);
 exports.segment = (0, combinator_1.union)([fig_1.segment, figure_1.segment, table_1.segment, placeholder_1.segment]);
-exports.extension = (0, combinator_1.union)([figbase_1.figbase, fig_1.fig, figure_1.figure, table_1.table, message_1.message, aside_1.aside, example_1.example, placeholder_1.placeholder]);
+exports.extension = (0, combinator_1.union)([
+//figbase,
+//fig,
+figure_1.figure, table_1.table, message_1.message, aside_1.aside, example_1.example, placeholder_1.placeholder]);
 
 /***/ },
 
@@ -4987,7 +5008,7 @@ const table_1 = __webpack_require__(3646);
 const blockquote_1 = __webpack_require__(5885);
 const placeholder_1 = __webpack_require__(4091);
 const inline_1 = __webpack_require__(7973);
-exports.segment = (0, combinator_1.block)((0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.close)(label_1.segment, /(?!\S).*\n/y)), (0, combinator_1.union)([codeblock_1.segment, mathblock_1.segment, table_1.segment, blockquote_1.segment, placeholder_1.segment, (0, combinator_1.some)(source_1.contentline)])]));
+exports.segment = (0, combinator_1.block)((0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.close)(label_1.segment, /(?!\S).*\n/y)), (0, combinator_1.union)([codeblock_1.segment, mathblock_1.segment, table_1.segment, blockquote_1.segment, placeholder_1.segment, (0, combinator_1.some)(source_1.contentline)])]), true, 8 /* Segment.fig */);
 exports.fig = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.verify)((0, combinator_1.convert)((source, context) => {
   // Bug: TypeScript
   const fence = (/^[^\n]*\n!?>+ /.test(source) && source.match(/^~{3,}(?=[^\S\n]*$)/gm) || []).reduce((max, fence) => fence > max ? fence : max, '~~') + '~';
@@ -4998,6 +5019,7 @@ exports.fig = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment,
     context
   });
   context.position = position;
+  context.segment = 10 /* Segment.figure */ | 1 /* Segment.write */;
   return result ? `${fence}figure ${source.replace(/^(.+\n.+\n)([\S\s]+?)\n?$/, '$1\n$2')}\n${fence}` : `${fence}figure ${source}\n\n${fence}`;
 }, (0, combinator_1.union)([figure_1.figure])), ([{
   value: el
@@ -5064,7 +5086,7 @@ const memoize_1 = __webpack_require__(6925);
 const dom_1 = __webpack_require__(394);
 exports.segment = (0, combinator_1.block)((0, combinator_1.match)(/(~{3,})(?:figure )?(?=\[?\$)/y, (0, memoize_1.memoize)(([, fence], closer = new RegExp(String.raw`${fence}[^\S\n]*(?:$|\n)`, 'y')) => (0, combinator_1.close)((0, combinator_1.sequence)([source_1.contentline, (0, combinator_1.inits)([
 // All parsers which can include closing terms.
-(0, combinator_1.union)([codeblock_1.segment_, mathblock_1.segment_, table_2.segment_, blockquote_1.segment, placeholder_1.segment_, (0, combinator_1.some)(source_1.contentline, closer)]), source_1.emptyline, (0, combinator_1.union)([source_1.emptyline, (0, combinator_1.some)(source_1.contentline, closer)])])]), closer), ([, fence]) => fence.length - 1, [], 2 ** 4 - 1)));
+(0, combinator_1.union)([codeblock_1.segment_, mathblock_1.segment_, table_2.segment_, blockquote_1.segment, placeholder_1.segment_, (0, combinator_1.some)(source_1.contentline, closer)]), source_1.emptyline, (0, combinator_1.union)([source_1.emptyline, (0, combinator_1.some)(source_1.contentline, closer)])])]), closer), ([, fence]) => fence.length - 1, [], 2 ** 4 - 1)), true, 10 /* Segment.figure */);
 exports.figure = (0, combinator_1.block)((0, combinator_1.fallback)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.fmap)((0, combinator_1.convert)(source => source.slice(source.match(/^~+(?:\w+\s+)?/)[0].length, source.trimEnd().lastIndexOf('\n')), (0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.sequence)([label_1.label, (0, source_1.str)(/(?!\S).*\n/y)])), (0, combinator_1.inits)([(0, combinator_1.block)((0, combinator_1.union)([ulist_1.ulist, olist_1.olist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, example_1.example, table_2.table, blockquote_1.blockquote, placeholder_1.placeholder, (0, combinator_1.line)(inline_1.media), (0, combinator_1.line)(inline_1.lineshortmedia)])), source_1.emptyline, (0, combinator_1.block)((0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)(inline_1.inline))))])])), nodes => {
   const [label, param, content, ...caption] = (0, util_1.unwrap)(nodes);
   return new parser_1.List([new parser_1.Node((0, dom_1.html)('figure', attributes(label.getAttribute('data-label'), param, content, caption), [(0, dom_1.html)('figcaption', [(0, dom_1.html)('span', {
@@ -5172,7 +5194,7 @@ exports.message = (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_
   return new parser_1.List([new parser_1.Node((0, dom_1.html)('section', {
     class: `message`,
     'data-type': type
-  }, [...(0, segment_1.segment)(body)].reduce((acc, seg) => (0, array_1.push)(acc, (0, util_1.unwrap)(content((0, parser_1.subinput)(seg, context)))), [(0, dom_1.html)('h1', title(type))])))]);
+  }, [...(0, segment_1.segment)(body)].reduce((acc, [seg]) => (0, array_1.push)(acc, (0, util_1.unwrap)(content((0, parser_1.subinput)(seg, context)))), [(0, dom_1.html)('h1', title(type))])))]);
 }));
 function title(type) {
   switch (type) {
@@ -5508,10 +5530,10 @@ exports.segment = (0, combinator_1.block)((0, combinator_1.focus)(/#+ +\S[^\n]*(
     context.position += line.length;
   }
   return acc;
-}, false));
+}, false), true, 6 /* Segment.heading */);
 exports.heading = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment,
 // その他の表示制御は各所のCSSで行う。
-(0, combinator_1.state)(128 /* State.annotation */ | 64 /* State.reference */ | 32 /* State.index */ | 16 /* State.label */ | 8 /* State.link */, (0, combinator_1.line)((0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.union)([(0, combinator_1.open)((0, source_1.str)(/##+/y), (0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))), true), (0, combinator_1.open)((0, source_1.str)('#'), (0, combinator_1.state)(251 /* State.linkers */, (0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))), true)]), (nodes, context) => {
+(0, combinator_1.state)(128 /* State.annotation */ | 64 /* State.reference */ | 32 /* State.index */ | 16 /* State.label */ | 8 /* State.link */, (0, combinator_1.line)((0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.union)([(0, combinator_1.open)((0, source_1.strs)('#', 2), (0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))), true), (0, combinator_1.open)((0, source_1.str)('#'), (0, combinator_1.state)(251 /* State.linkers */, (0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))), true)]), (nodes, context) => {
   const [h, ...ns] = (0, util_1.unwrap)(nodes);
   return new parser_1.List([h.length <= 6 ? new parser_1.Node((0, dom_1.html)(`h${h.length}`, {
     'data-index': (0, inline_1.dataindex)(nodes)
@@ -6057,6 +6079,7 @@ class Context extends parser_1.Context {
   constructor(options = {}) {
     super(options);
     const {
+      segment,
       buffer,
       sequential,
       header,
@@ -6065,6 +6088,7 @@ class Context extends parser_1.Context {
       id,
       caches
     } = options;
+    this.segment = segment ?? 0 /* Segment.unknown */;
     this.buffer = buffer ?? new parser_1.List();
     this.sequential = sequential ?? false;
     this.header = header ?? true;
@@ -6394,7 +6418,7 @@ const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 // https://example/@user must be a user page or a redirect page going there.
 // https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
-exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.surround)((0, combinator_1.surround)(/(?<![0-9a-z])@/yi, (0, source_1.str)(/[0-9a-z](?:[.-](?=[0-9a-z])|[0-9a-z]){0,254}\/|/yi), (0, source_1.str)(/[a-z][0-9a-z]*(?:[.-][0-9a-z]+)*(?![_.-]?[0-9a-z@]|>>|:\S)/yi), false, [3 | 8 /* Backtrack.unescapable */]), (0, combinator_1.some)((0, combinator_1.surround)('#', (0, combinator_1.verify)((0, source_1.str)(new RegExp([/(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source].join('|').replace(/emoji/g, hashtag_1.emoji.source), 'yu')), ([{
+exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.surround)((0, combinator_1.surround)(/(?<![0-9a-z@#])@/yi, (0, source_1.str)(/[0-9a-z](?:[.-](?=[0-9a-z])|[0-9a-z]){0,254}\/|/yi), (0, source_1.str)(/[a-z][0-9a-z]*(?:[.-][0-9a-z]+)*(?![_.-]?[0-9a-z@]|>>|:\S)/yi), false, [3 | 8 /* Backtrack.unescapable */]), (0, combinator_1.some)((0, combinator_1.surround)('#', (0, combinator_1.verify)((0, source_1.str)(new RegExp([/(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source].join('|').replace(/emoji/g, hashtag_1.emoji.source), 'yu')), ([{
   value
 }]) => /^[0-9]{0,4}[^0-9]/.test(value)), new RegExp([/(?![_.-]?[0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source].join('|').replace(/emoji/g, hashtag_1.emoji.source), 'yu'), false, [3 | 8 /* Backtrack.unescapable */])), '', false, [], ([[{
   value: host
@@ -6447,7 +6471,7 @@ const dom_1 = __webpack_require__(394);
 // cid: YYYY-MMDD-HHMM-SSmmm
 // 内部表現はUnixTimeに統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
-exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.surround)(/(?<![0-9a-z])>>/yi, (0, source_1.str)(/[0-9a-z]+(?:-[0-9a-z]+)*(?![_.-]?[0-9a-z@#]|>>|:\S)/yi), '', false, [3 | 8 /* Backtrack.unescapable */], ([, [{
+exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.surround)(/(?<![0-9a-z@#])>>/yi, (0, source_1.str)(/[0-9a-z]+(?:-[0-9a-z]+)*(?![_.-]?[0-9a-z@#]|>>|:\S)/yi), '', false, [3 | 8 /* Backtrack.unescapable */], ([, [{
   value
 }]], context) => new parser_1.List([new parser_1.Node((0, dom_1.define)((0, link_1.parse)(new parser_1.List([new parser_1.Node(`>>${value}`)]), new parser_1.List([new parser_1.Node(`?at=${value}`)]), context), {
   class: 'anchor'
@@ -6497,7 +6521,7 @@ const link_1 = __webpack_require__(3628);
 const hashtag_1 = __webpack_require__(5764);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
-exports.hashnum = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.surround)(new RegExp([/(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yu.source].join('|').replace(/emoji/g, hashtag_1.emoji.source), 'yu'), (0, source_1.str)(new RegExp([/[0-9]{1,9}(?![_.-]?[0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source].join('|').replace(/emoji/g, hashtag_1.emoji.source), 'yu')), '', false,
+exports.hashnum = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.surround)(new RegExp([/(?<![^\p{C}\p{S}\p{P}\s]|emoji|[@#])#/yu.source].join('|').replace(/emoji/g, hashtag_1.emoji.source), 'yu'), (0, source_1.str)(new RegExp([/[0-9]{1,9}(?![_.-]?[0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source].join('|').replace(/emoji/g, hashtag_1.emoji.source), 'yu')), '', false,
 // unescapableを使用するべきだがhashtagとの重複を回避するためescapableを使用する。
 [3 | 16 /* Backtrack.escapable */], ([, [{
   value
@@ -6526,7 +6550,7 @@ const dom_1 = __webpack_require__(394);
 // https://example/hashtags/a must be a hashtag page or a redirect page going there.
 // https://github.com/tc39/proposal-regexp-unicode-property-escapes#matching-emoji
 exports.emoji = /\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F|\u200D/u;
-exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.surround)(new RegExp([/(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yu.source].join('|').replace(/emoji/g, exports.emoji.source), 'yu'), (0, combinator_1.verify)((0, source_1.str)(new RegExp([/(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source].join('|').replace(/emoji/g, exports.emoji.source), 'yu')), ([{
+exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.surround)(new RegExp([/(?<![^\p{C}\p{S}\p{P}\s]|emoji|[@#])#/yu.source].join('|').replace(/emoji/g, exports.emoji.source), 'yu'), (0, combinator_1.verify)((0, source_1.str)(new RegExp([/(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source].join('|').replace(/emoji/g, exports.emoji.source), 'yu')), ([{
   value
 }]) => /^[0-9]{0,4}[^0-9]/.test(value)), new RegExp([/(?![_.-]?[0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source].join('|').replace(/emoji/g, exports.emoji.source), 'yu'), false, [3 | 8 /* Backtrack.unescapable */], ([, [{
   value
@@ -6792,7 +6816,7 @@ const subemphasis = (0, combinator_1.lazy)(() => (0, combinator_1.some)((0, comb
 // 開閉が明示的でない構文は開閉の不明確な記号による再帰的適用を行わず
 // 可能な限り早く閉じるよう解析しなければならない。
 // このため終端記号の後ろを見て終端を中止し同じ構文を再帰的に適用してはならない。
-exports.emstrong = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('***', visibility_1.beforeNonblank, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank)])), (0, source_1.strs)('*', 3), false, [], ([, bs, cs], context) => {
+exports.emstrong = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, util_1.repeat)('***', visibility_1.beforeNonblank, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank)])), (0, source_1.strs)('*', 1, 3), false, [], ([, bs, cs], context) => {
   const {
     buffer
   } = context;
@@ -7015,7 +7039,7 @@ function identity(type, id, text) {
   if (typeof text !== 'string') {
     const index = text.getAttribute('data-index') ?? undefined;
     if (index === '' && text.tagName === 'LI') return undefined;
-    return index ? `${type}:${id ?? ''}:${index}` : identity(type, id, signature(text));
+    return index ? `${type}:${id ?? ''}:${index}` : identity(type, id, signature(text.cloneNode(true)));
   }
   text = text.trim();
   if (text === '') return undefined;
@@ -7051,9 +7075,8 @@ function baseR(n, r) {
   } while (n > 0);
   return acc;
 }
-function signature(source) {
-  const target = source.cloneNode(true);
-  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .label[data-label], .remark, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'), len = es.length, i = 0; i < len; ++i) {
+function signature(target) {
+  for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, .checkbox, ul, ol, .label[data-label]'), len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
     switch (el.tagName) {
       case 'CODE':
@@ -7087,8 +7110,7 @@ function signature(source) {
   return target.textContent.trim();
 }
 exports.signature = signature;
-function text(source) {
-  const target = source.cloneNode(true);
+function text(target) {
   for (let es = target.querySelectorAll('code[data-src], .math[data-src], .remark, rt, rp, br, .annotation, .reference, .checkbox, ul, ol'), len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
     switch (el.tagName) {
@@ -7576,7 +7598,7 @@ exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.precedence)(0, (0,
   const el = (0, dom_1.html)('mark', (0, dom_1.defrag)((0, util_1.unwrap)(nodes)));
   if (state & 251 /* State.linkers */ || nest) return new parser_1.List([new parser_1.Node(el)]);
   (0, dom_1.define)(el, {
-    id: (0, indexee_1.identity)('mark', id, (0, indexee_1.signature)(el))
+    id: (0, indexee_1.identity)('mark', id, (0, indexee_1.signature)(el.cloneNode(true)))
   });
   return el.id ? new parser_1.List([new parser_1.Node(el), new parser_1.Node((0, dom_1.html)('a', {
     href: `#${el.id}`
@@ -8210,25 +8232,30 @@ function build(syntax, marker, splitter = '') {
   splitter &&= `${splitter}, .${syntax}s`;
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
-  const memory = (0, memoize_1.memoize)(ref => {
+  const refInfo = (0, memoize_1.memoize)(ref => {
     const content = ref.firstElementChild;
     content.replaceWith(content.cloneNode());
     const abbr = ref.getAttribute('data-abbr') ?? '';
-    const identifier = abbr ? (0, indexee_1.identity)('', undefined, 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)?.slice(2) || '' : (0, indexee_1.identity)('mark', undefined, (0, indexee_1.signature)(content))?.slice(6) || '';
+    const clone = content.cloneNode(true);
+    const txt = (0, indexee_1.text)(clone).trim();
+    const identifier = abbr ? (0, indexee_1.identity)('', undefined, 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)?.slice(2) || '' : (0, indexee_1.identity)('mark', undefined, (0, indexee_1.signature)(clone))?.slice(6) || '';
     return {
       content,
       identifier,
       abbr,
-      text: (0, indexee_1.text)(content).trim()
+      text: txt
     };
   }, new WeakMap());
   return function* (target, note, opts = {}, bottom = null) {
     const defs = new Map();
     const refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`);
-    const titles = new Map();
-    const defIndexes = new Map();
-    const refSubindexes = new Map();
-    const defSubindexes = new Map();
+    const identifierInfo = (0, memoize_1.memoize)(identifier => ({
+      defIndex: 0,
+      defSubindex: 0,
+      refSubindex: 0,
+      title: '' && 0,
+      queue: []
+    }));
     const scope = target instanceof Element ? ':scope > ' : '';
     const splitters = splitter ? target.querySelectorAll(`${scope}:is(${splitter})`) : [];
     let iSplitters = 0;
@@ -8261,29 +8288,36 @@ function build(syntax, marker, splitter = '') {
         identifier,
         abbr,
         text
-      } = memory(ref);
-      const refSubindex = refSubindexes.get(identifier) + 1 || 1;
-      refSubindexes.set(identifier, refSubindex);
+      } = refInfo(ref);
+      const info = identifierInfo(identifier);
+      const refSubindex = ++info.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) + +initial || 1;
-      initial && defSubindexes?.set(identifier, defSubindex);
+      const defSubindex = initial ? ++info.defSubindex : info.defSubindex;
       const defId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}${splitter && `:${defSubindex}`}` : undefined;
       const def = initial ? (0, dom_1.html)('li', {
         id: defId,
         'data-marker': note ? undefined : marker(total + defs.size + 1, abbr)
       }, [content.cloneNode(true), (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 title = initial ? text : titles.get(identifier);
-      initial && titles.set(identifier, title);
+      const defIndex = initial ? info.defIndex = total + defs.size : info.defIndex;
+      const title = info.title ||= text;
       ref.childElementCount > 1 && ref.lastElementChild.remove();
       (0, dom_1.define)(ref, {
         id: refId,
         class: opts.id !== '' ? undefined : void ref.classList.add('disabled'),
         title
       });
+      if (title && info.queue.length > 0) {
+        for (const ref of info.queue) {
+          (0, dom_1.define)(ref, {
+            title
+          });
+          (0, util_1.unmarkInvalid)(ref);
+        }
+        info.queue = [];
+        def.firstElementChild.replaceWith(content.cloneNode(true));
+      }
       switch (ref.getAttribute('data-invalid-syntax')) {
         case 'format':
         case 'content':
@@ -8291,11 +8325,12 @@ function build(syntax, marker, splitter = '') {
       }
       format ??= abbr ? 'abbr' : 'number';
       if (!ref.classList.contains('invalid')) switch (true) {
-        case format === 'number' ? !!abbr : !abbr:
+        case format === 'number' ? abbr !== '' : abbr === '':
           (0, util_1.markInvalid)(ref, syntax, 'format', 'Notation format must be consistent with numbers or abbreviations');
           break;
-        case !title:
+        case title === '':
           (0, util_1.markInvalid)(ref, syntax, 'content', 'Missing the content');
+          info.queue.push(ref);
           break;
       }
       yield ref.appendChild((0, dom_1.html)('a', {
@@ -8373,7 +8408,7 @@ const extension_1 = __webpack_require__(6193);
 const source_1 = __webpack_require__(8745);
 exports.MAX_SEGMENT_SIZE = 100_000; // 100,000 bytes (Max value size of FDB)
 exports.MAX_INPUT_SIZE = exports.MAX_SEGMENT_SIZE * 10;
-const parser = (0, combinator_1.union)([(0, combinator_1.some)(source_1.emptyline, exports.MAX_SEGMENT_SIZE + 1), input => {
+const parser = (0, combinator_1.union)([(0, combinator_1.some)(source_1.emptysegment, exports.MAX_SEGMENT_SIZE + 1), input => {
   const {
     context: {
       source,
@@ -8390,18 +8425,16 @@ const parser = (0, combinator_1.union)([(0, combinator_1.some)(source_1.emptylin
       break;
     case '$':
       if (source[position + 1] === '$') return (0, mathblock_1.segment)(input);
-      break;
+      return (0, extension_1.segment)(input);
     case '[':
       if (source[position + 1] === '$') return (0, extension_1.segment)(input);
       break;
     case '#':
       return (0, heading_1.segment)(input);
-    case '$':
-      return (0, extension_1.segment)(input);
   }
 }, (0, combinator_1.some)(source_1.contentline, exports.MAX_SEGMENT_SIZE + 1)]);
 function* segment(source) {
-  if (!validate(source, exports.MAX_INPUT_SIZE)) return yield `${"\u0007" /* Command.Error */}Too large input over ${exports.MAX_INPUT_SIZE.toLocaleString('en')} bytes.\n${source.slice(0, 1001)}`;
+  if (!validate(source, exports.MAX_INPUT_SIZE)) return yield [`${"\u0007" /* Command.Error */}Too large input over ${exports.MAX_INPUT_SIZE.toLocaleString('en')} bytes.\n${source.slice(0, 1001)}`, 0 /* Segment.unknown */];
   for (let position = 0; position < source.length;) {
     const context = new context_1.Context({
       source,
@@ -8413,11 +8446,11 @@ function* segment(source) {
     const segs = result.length > 0 ? result.foldl((acc, {
       value
     }) => void acc.push(value) || acc, []) : [source.slice(position, context.position)];
+    position = context.position;
     for (let i = 0; i < segs.length; ++i) {
       const seg = segs[i];
-      validate(seg, exports.MAX_SEGMENT_SIZE) ? yield seg : yield `${"\u0007" /* Command.Error */}Too large segment over ${exports.MAX_SEGMENT_SIZE.toLocaleString('en')} bytes.\n${seg}`;
+      validate(seg, exports.MAX_SEGMENT_SIZE) ? yield [seg, context.segment] : yield [`${"\u0007" /* Command.Error */}Too large segment over ${exports.MAX_SEGMENT_SIZE.toLocaleString('en')} bytes.\n${seg}`, 0 /* Segment.unknown */];
     }
-    position = context.position;
   }
 }
 exports.segment = segment;
@@ -8437,7 +8470,7 @@ exports.validate = validate;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.anyline = exports.emptyline = exports.contentline = exports.strs = exports.str = exports.unescsource = exports.escsource = exports.txt = exports.text = void 0;
+exports.anyline = exports.emptysegment = exports.emptyline = exports.contentline = exports.strs = exports.str = exports.unescsource = exports.escsource = exports.txt = exports.text = void 0;
 var text_1 = __webpack_require__(5655);
 Object.defineProperty(exports, "text", ({
   enumerable: true,
@@ -8491,6 +8524,12 @@ Object.defineProperty(exports, "emptyline", ({
     return line_1.emptyline;
   }
 }));
+Object.defineProperty(exports, "emptysegment", ({
+  enumerable: true,
+  get: function () {
+    return line_1.emptysegment;
+  }
+}));
 Object.defineProperty(exports, "anyline", ({
   enumerable: true,
   get: function () {
@@ -8571,7 +8610,7 @@ exports.escsource = escsource;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.contentline = exports.emptyline = exports.anyline = void 0;
+exports.contentline = exports.emptysegment = exports.emptyline = exports.anyline = void 0;
 const parser_1 = __webpack_require__(605);
 const anyline = input => {
   const {
@@ -8596,15 +8635,40 @@ const emptyline = input => {
     position
   } = context;
   if (position === source.length) return;
-  if (source[position] === '\n') return ++context.position, new parser_1.List();
-  regEmptyline.lastIndex = position;
-  regEmptyline.test(source);
-  const i = regEmptyline.lastIndex;
-  if (i === 0) return;
+  const i = eoel(source, position);
+  if (i === position) return;
   context.position = i;
   return new parser_1.List();
 };
 exports.emptyline = emptyline;
+const emptysegment = input => {
+  const {
+    context
+  } = input;
+  const {
+    source,
+    position,
+    segment
+  } = context;
+  if (position === source.length) return;
+  if (segment & 1 /* Segment.write */) {
+    if (segment !== (2 /* Segment.empty */ | 1 /* Segment.write */)) return;
+    context.position = source.length;
+    return new parser_1.List();
+  }
+  const i = eoel(source, position);
+  if (i === position) return;
+  context.position = i;
+  context.segment = 2 /* Segment.empty */;
+  return new parser_1.List();
+};
+exports.emptysegment = emptysegment;
+function eoel(source, position) {
+  if (source[position] === '\n') return position + 1;
+  regEmptyline.lastIndex = position;
+  regEmptyline.test(source);
+  return regEmptyline.lastIndex || position;
+}
 const regContentline = /[^\S\n]*\S[^\n]*(?:$|\n)/y;
 const contentline = input => {
   const {
@@ -8643,19 +8707,19 @@ function str(pattern, after) {
   return (0, delimiter_1.matcher)(pattern, true, after ? (0, delimiter_1.tester)(after, false) : undefined);
 }
 exports.str = str;
-function strs(pattern, limit = -1) {
+function strs(char, min = 1, max = -1) {
   return ({
     context
   }) => {
     const {
-      source
+      source,
+      position
     } = context;
-    let acc = '';
-    for (let i = 0; i !== limit && context.position < source.length && source.startsWith(pattern, context.position); ++i) {
-      acc += pattern;
-      context.position += pattern.length;
+    let cnt = 0;
+    for (; cnt !== max && context.position < source.length && source[context.position] === char; ++cnt) {
+      context.position += char.length;
     }
-    return acc ? new parser_1.List([new parser_1.Node(acc)]) : undefined;
+    return cnt >= min ? new parser_1.List([new parser_1.Node(source.slice(position, context.position))]) : undefined;
   };
 }
 exports.strs = strs;

package/markdown.d.ts

@@ -15,12 +15,12 @@ export namespace MarkdownParser {
   export interface SegmentParser extends
     Markdown<'segment'>,
     Parser<string, Context, [
+      SourceParser.EmptySegmentParser,
       BlockParser.HeadingParser.SegmentParser,
       BlockParser.CodeBlockParser.SegmentParser,
       BlockParser.MathBlockParser.SegmentParser,
       BlockParser.ExtensionParser.SegmentParser,
       SourceParser.ContentLineParser,
-      SourceParser.EmptyLineParser,
     ]> {
   }
   export interface HeaderParser extends
@@ -47,7 +47,7 @@ export namespace MarkdownParser {
   export interface BlockParser extends
     Markdown<'block'>,
     Parser<HTMLElement, Context, [
-      SourceParser.EmptyLineParser,
+      SourceParser.EmptySegmentParser,
       BlockParser.PagebreakParser,
       BlockParser.HeadingParser,
       BlockParser.UListParser,
@@ -296,8 +296,8 @@ export namespace MarkdownParser {
       // ~~~
       Block<'extension'>,
       Parser<HTMLElement, Context, [
-        ExtensionParser.FigbaseParser,
-        ExtensionParser.FigParser,
+        //ExtensionParser.FigbaseParser,
+        //ExtensionParser.FigParser,
         ExtensionParser.FigureParser,
         ExtensionParser.TableParser,
         ExtensionParser.MessageParser,
@@ -1196,6 +1196,10 @@ export namespace MarkdownParser {
       Source<'emptyline'>,
       Parser<never, Context, []> {
     }
+    export interface EmptySegmentParser extends
+      Source<'emptysegment'>,
+      Parser<never, Context, []> {
+    }
     export interface AnyLineParser extends
       Source<'anyline'>,
       Parser<never, Context, []> {

package/package.json

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