@peaceroad/markdown-it-figure-with-p-caption 0.16.1 → 0.17.0

package/README.md

@@ -15,10 +15,10 @@ Optionally, you can auto-number image and table caption paragraphs starting from
 - Pure image paragraphs (`![...](...)`) become `<figure class="f-img">` blocks as soon as a caption paragraph (previous or next) or an auto-detected caption exists.
 - Auto detection runs per image paragraph when `autoCaptionDetection` is `true` (default). The priority is:
     1. Caption paragraphs immediately before or after the image (standard syntax).
-    2. Image `alt` text that already matches p7d-markdown-it-p-captions label formats (`Figure. `, `Figure 1. `, `図　`,`図1　`, etc.).
+    2. Image `alt` text that `p7d-markdown-it-p-captions` recognizes as an image caption start (`Figure. `, `Figure 1. `, `図　`, `図1　`, etc.).
     3. Image `title` attribute that matches the same labels.
     4. Optional fallbacks (`autoAltCaption`, `autoTitleCaption`) that inject the label when the alt/title lacks one.
-        - `autoAltCaption`: `false` (default), `true`, or a string label. `true` inspects the first sentence of the caption text and picks `Figure` / `図` based on detected language; a string uses that label verbatim.
+        - `autoAltCaption`: `false` (default), `true`, or a string label. `true` uses locale-aware generated-label defaults from `p7d-markdown-it-p-captions`, so the label text and punctuation stay aligned with the upstream caption language data. A string uses that label verbatim. Empty alt text does not generate a fallback caption.
         - `autoTitleCaption`: same behavior but sourced from the image `title`. It stays off by default so other plugins can keep using the `title` attribute for metadata.
 - Set `autoCaptionDetection: false` to disable the auto-caption workflow entirely.
 - Multi-image paragraphs are still wrapped as one figure when `multipleImages: true` (default). Layout-specific classes help with styling:
@@ -50,9 +50,9 @@ Optionally, you can auto-number image and table caption paragraphs starting from
 
 ### Embedded content by iframe
 
-- Inline HTML `<iframe>` elements become `<figure class="f-video">` when they point to known video hosts (YouTube `youtube.com` / `youtube-nocookie.com`, Vimeo `player.vimeo.com`).
+- Inline HTML `<iframe>` elements become `<figure class="f-video">` when they point to known video hosts (YouTube `youtube-nocookie.com`, Vimeo `player.vimeo.com`).
 - `<div>` wrappers are treated as iframe-type embeds only when the same HTML block contains an `<iframe ...>` tag (for example common video wrapper markup).
-- Blockquote-based social embeds (Twitter/X `twitter-tweet`, Mastodon `mastodon-embed`, Bluesky `bluesky-embed`, Instagram `instagram-media`, Tumblr `text-post-media`) are treated like iframe-type embeds when their `class` matches those providers. By default they become `<figure class="f-img">` so the caption label behaves like an image label (Labels can also use quote labels). You can override that figure class with `figureClassThatWrapsIframeTypeBlockquote` or the global `allIframeTypeFigureClassName`.
+- Blockquote-based social embeds (Twitter/X `twitter-tweet`, Mastodon `mastodon-embed`, Bluesky `bluesky-embed`, Instagram `instagram-media`, Tumblr `text-post-media`) are treated like iframe-type embeds when their class list contains one of those provider classes. Extra classes on the same blockquote do not block detection. By default they become `<figure class="f-img">` so the caption label behaves like an image label (Labels can also use quote labels). You can override that figure class with `figureClassThatWrapsIframeTypeBlockquote` or the global `allIframeTypeFigureClassName`.
 - `p7d-markdown-it-p-captions` ships with a `Slide.` label. When you use it (for example with Speaker Deck or SlideShare iframes), the `<figure>` wrapper automatically switches to `f-slide` (or whatever you set via `figureClassThatWrapsSlides`) so slides can get their own layout. If `allIframeTypeFigureClassName` is also configured, that class takes precedence even for slides, so you get a uniform embed wrapper without touching the slide option.
 - All other iframes fall back to `<figure class="f-iframe">` unless you override the class via `allIframeTypeFigureClassName`.
 
@@ -85,13 +85,15 @@ Every option below is forwarded verbatim to `p7d-markdown-it-p-captions`, which
 - `strongFilename` / `dquoteFilename`: pull out filenames from captions using `**filename**` or `"filename"` syntax and wrap them in `<strong class="f-*-filename">`.
 - `jointSpaceUseHalfWidth`: replace full-width space between Japanese labels and caption body with half-width space.
 - `bLabel` / `strongLabel`: emphasize the label span itself.
-- `removeUnnumberedLabel`: drop the leading “Figure. Etext entirely when no label number is present. Use `removeUnnumberedLabelExceptMarks` to keep specific labels (e.g., `['blockquote']` keeps `Quote. `).
+- `removeUnnumberedLabel`: drop the leading label entirely when no label number is present. Use `removeUnnumberedLabelExceptMarks` to keep specific labels (e.g., `['blockquote']` keeps `Quote. `).
 - `removeMarkNameInCaptionClass`: replace `.f-img-label` / `.f-table-label` with the generic `.f-label`.
 - `wrapCaptionBody`: wrap the non-label caption text in a span element.
 - `hasNumClass`: add a class attribute to label span element if it has a label number.
 - `labelClassFollowsFigure`: mirror the resolved `<figure>` class onto the `figcaption` spans (`f-embed-label`, `f-embed-label-joint`, `f-embed-body`, etc.) when you want captions styled alongside the wrapper.
 - `figureToLabelClassMap`: extend `labelClassFollowsFigure` by mapping specific figure classes (e.g., `f-embed`) to custom caption label classes such as `caption-embed caption-social` for fine-grained control. When this map is provided and `labelClassFollowsFigure` is not set explicitly, figure-following mode is enabled automatically.
 - `labelPrefixMarker`: allow a leading marker before labels (string or array, e.g., `*Figure. ...`). Arrays are limited to two markers; extras are ignored.
+- Automatic image-label fallback text and punctuation (`Figure. `, `図　`, etc.) are generated from `p7d-markdown-it-p-captions` locale metadata, not from a local hardcoded map in this plugin.
+- `preferredLanguages`: optional tie-break order for generated fallback labels. When omitted, this plugin derives the order once per render from `env.preferredLanguages`, `env.lang` / `env.locale`, then a cheap document-script heuristic that skips a leading hyphen-fenced frontmatter block (`---` or longer, spaces allowed before newline), and finally the raw `languages` order.
 
 ### Automatic numbering
 
@@ -454,7 +456,7 @@ Figure. Highlighted cat.
 
 ### Automatic detection fallbacks
 
-`autoCaptionDetection` combined with `autoAltCaption` / `autoTitleCaption` can still generate caption text even when the original alt/title lacks labels. The corresponding attributes are cleared after conversion so the figcaption becomes the canonical source.
+`autoCaptionDetection` combined with `autoAltCaption` / `autoTitleCaption` can still generate caption text even when the original alt/title lacks labels, as long as the alt/title body is non-empty. The corresponding attributes are cleared after conversion so the figcaption becomes the canonical source. When these fallbacks are `true`, the generated label text and punctuation come from `p7d-markdown-it-p-captions` locale metadata rather than a local hardcoded map.
 
 ```
 [Markdown]

package/embeds/detect.js

@@ -0,0 +1,178 @@
+import {
+  BLOCKQUOTE_EMBED_CLASS_NAMES,
+  HTML_EMBED_CANDIDATES,
+  VIDEO_IFRAME_HOSTS,
+} from './providers.js'
+
+const htmlRegCache = new Map()
+const openingClassAttrReg = /^<[^>]*?\bclass=(?:"([^"]*)"|'([^']*)')/i
+const openingSrcAttrReg = /^<[^>]*?\bsrc=(?:"([^"]*)"|'([^']*)')/i
+const endBlockquoteScriptReg = /<\/blockquote> *<script[^>]*?><\/script>$/
+const iframeTagReg = /<iframe(?=[\s>])/i
+
+const getHtmlReg = (tag) => {
+  const cached = htmlRegCache.get(tag)
+  if (cached) return cached
+  const regexStr = `^<${tag} ?[^>]*?>[\\s\\S]*?<\\/${tag}>(\\n| *?)(<script [^>]*?>(?:<\\/script>)?)? *(\\n|$)`
+  const reg = new RegExp(regexStr)
+  htmlRegCache.set(tag, reg)
+  return reg
+}
+
+const getHtmlDetectionHints = (content) => {
+  const hasBlueskyHint = content.indexOf('bluesky-embed') !== -1
+  const hasVideoHint = content.indexOf('<video') !== -1
+  const hasAudioHint = content.indexOf('<audio') !== -1
+  const hasIframeHint = content.indexOf('<iframe') !== -1
+  const hasBlockquoteHint = content.indexOf('<blockquote') !== -1
+  const hasDivHint = content.indexOf('<div') !== -1
+  return {
+    hasBlueskyHint,
+    hasVideoHint,
+    hasAudioHint,
+    hasIframeHint,
+    hasBlockquoteHint,
+    hasDivHint,
+    hasIframeTag: hasIframeHint || (hasDivHint && iframeTagReg.test(content)),
+  }
+}
+
+const hasAnyHtmlDetectionHint = (hints) => {
+  return !!(
+    hints.hasBlueskyHint ||
+    hints.hasVideoHint ||
+    hints.hasAudioHint ||
+    hints.hasIframeHint ||
+    hints.hasBlockquoteHint ||
+    hints.hasDivHint
+  )
+}
+
+const appendHtmlBlockNewlineIfNeeded = (token, hasTag) => {
+  if ((hasTag[2] && hasTag[3] !== '\n') || (hasTag[1] !== '\n' && hasTag[2] === undefined)) {
+    token.content += '\n'
+  }
+}
+
+const consumeBlockquoteEmbedScript = (tokens, token, startIndex) => {
+  let addedContent = ''
+  let i = startIndex + 1
+  while (i < tokens.length) {
+    const nextToken = tokens[i]
+    if (nextToken.type === 'inline' && endBlockquoteScriptReg.test(nextToken.content)) {
+      addedContent += nextToken.content + '\n'
+      if (tokens[i + 1] && tokens[i + 1].type === 'paragraph_close') {
+        tokens.splice(i + 1, 1)
+      }
+      nextToken.content = ''
+      if (nextToken.children) {
+        for (let j = 0; j < nextToken.children.length; j++) {
+          nextToken.children[j].content = ''
+        }
+      }
+      break
+    }
+    if (nextToken.type === 'paragraph_open') {
+      addedContent += '\n'
+      tokens.splice(i, 1)
+      continue
+    }
+    i++
+  }
+  token.content += addedContent
+}
+
+const getOpeningAttrValue = (content, reg) => {
+  if (typeof content !== 'string' || content.charCodeAt(0) !== 0x3c) return ''
+  const match = content.match(reg)
+  if (!match) return ''
+  return match[1] || match[2] || ''
+}
+
+const hasKnownBlockquoteEmbedClass = (content) => {
+  const classAttr = getOpeningAttrValue(content, openingClassAttrReg)
+  if (!classAttr) return false
+  let start = 0
+  while (start < classAttr.length) {
+    while (start < classAttr.length && classAttr.charCodeAt(start) <= 0x20) start++
+    if (start >= classAttr.length) break
+    let end = start + 1
+    while (end < classAttr.length && classAttr.charCodeAt(end) > 0x20) end++
+    if (BLOCKQUOTE_EMBED_CLASS_NAMES.has(classAttr.slice(start, end))) return true
+    start = end + 1
+  }
+  return false
+}
+
+const isKnownVideoIframe = (content) => {
+  const src = getOpeningAttrValue(content, openingSrcAttrReg)
+  if (!src || src.slice(0, 8).toLowerCase() !== 'https://') return false
+  const slashIndex = src.indexOf('/', 8)
+  const host = (slashIndex === -1 ? src.slice(8) : src.slice(8, slashIndex)).toLowerCase()
+  return VIDEO_IFRAME_HOSTS.has(host)
+}
+
+const detectHtmlTagCandidate = (tokens, token, startIndex, detector, hints, result) => {
+  if (detector.requiresIframeTag && !hints.hasIframeTag) return ''
+  const hasTagHint = !!(detector.hintKey && hints[detector.hintKey])
+  const allowBlueskyFallback = detector.candidate === 'blockquote' && hints.hasBlueskyHint
+  if (!hasTagHint && !allowBlueskyFallback) return ''
+  const hasTag = hasTagHint ? token.content.match(getHtmlReg(detector.lookupTag)) : null
+  const isBlueskyFallback = detector.candidate === 'blockquote' && !hasTag && hints.hasBlueskyHint
+  if (!hasTag && !isBlueskyFallback) return ''
+  if (hasTag) {
+    appendHtmlBlockNewlineIfNeeded(token, hasTag)
+    if (detector.treatAsVideoIframe) {
+      result.isVideoIframe = true
+    }
+    return detector.matchedTag || detector.candidate
+  }
+  consumeBlockquoteEmbedScript(tokens, token, startIndex)
+  return 'blockquote'
+}
+
+const resolveHtmlWrapWithoutCaption = (matchedTag, result, htmlWrapWithoutCaption) => {
+  if (!htmlWrapWithoutCaption) return false
+  if (matchedTag === 'blockquote') {
+    return !!(result.isIframeTypeBlockquote && htmlWrapWithoutCaption.iframeTypeBlockquote)
+  }
+  return !!htmlWrapWithoutCaption[matchedTag]
+}
+
+export const detectHtmlFigureCandidate = (tokens, token, startIndex, htmlWrapWithoutCaption) => {
+  if (!token || token.type !== 'html_block') return null
+  const hints = getHtmlDetectionHints(token.content)
+  if (!hasAnyHtmlDetectionHint(hints)) return null
+
+  const result = {
+    isVideoIframe: false,
+    isIframeTypeBlockquote: false,
+  }
+
+  let matchedTag = ''
+  for (let i = 0; i < HTML_EMBED_CANDIDATES.length; i++) {
+    matchedTag = detectHtmlTagCandidate(tokens, token, startIndex, HTML_EMBED_CANDIDATES[i], hints, result)
+    if (matchedTag) break
+  }
+  if (!matchedTag) return null
+
+  if (matchedTag === 'blockquote') {
+    if (!hasKnownBlockquoteEmbedClass(token.content)) return null
+    result.isIframeTypeBlockquote = true
+  }
+
+  if (matchedTag === 'iframe' && isKnownVideoIframe(token.content)) {
+    result.isVideoIframe = true
+  }
+
+  return {
+    type: 'html',
+    tagName: matchedTag,
+    en: startIndex,
+    replaceInsteadOfWrap: false,
+    wrapWithoutCaption: resolveHtmlWrapWithoutCaption(matchedTag, result, htmlWrapWithoutCaption),
+    canWrap: true,
+    isVideoIframe: result.isVideoIframe,
+    isIframeTypeBlockquote: result.isIframeTypeBlockquote,
+  }
+}

package/embeds/providers.js

@@ -0,0 +1,27 @@
+export const HTML_EMBED_CANDIDATES = Object.freeze([
+  { candidate: 'video', lookupTag: 'video', hintKey: 'hasVideoHint' },
+  { candidate: 'audio', lookupTag: 'audio', hintKey: 'hasAudioHint' },
+  { candidate: 'iframe', lookupTag: 'iframe', hintKey: 'hasIframeHint' },
+  { candidate: 'blockquote', lookupTag: 'blockquote', hintKey: 'hasBlockquoteHint' },
+  {
+    candidate: 'div',
+    lookupTag: 'div',
+    hintKey: 'hasDivHint',
+    requiresIframeTag: true,
+    matchedTag: 'iframe',
+    treatAsVideoIframe: true,
+  },
+])
+
+export const BLOCKQUOTE_EMBED_CLASS_NAMES = new Set([
+  'twitter-tweet',
+  'instagram-media',
+  'text-post-media',
+  'bluesky-embed',
+  'mastodon-embed',
+])
+
+export const VIDEO_IFRAME_HOSTS = new Set([
+  'www.youtube-nocookie.com',
+  'player.vimeo.com',
+])

package/index.js

@@ -1,42 +1,164 @@
 import {
+  analyzeCaptionStart,
+  buildLabelClassLookup,
+  buildLabelPrefixMarkerRegFromMarkers,
+  getGeneratedLabelDefaults,
+  normalizeLabelPrefixMarkers,
   setCaptionParagraph,
   getMarkRegStateForLanguages,
+  stripLabelPrefixMarker,
 } from 'p7d-markdown-it-p-captions'
+import { detectHtmlFigureCandidate } from './embeds/detect.js'
 
-const htmlRegCache = new Map()
-const blueskyEmbedReg = /^<blockquote class="bluesky-embed"[^]*?>[\s\S]*?$/
-const videoIframeReg = /^<[^>]*? src="https:\/\/(?:www.youtube-nocookie.com|player.vimeo.com)\//i
-const classNameReg = /^<[^>]*? class="(twitter-tweet|instagram-media|text-post-media|bluesky-embed|mastodon-embed)"/
 const imageAttrsReg = /^ *\{(.*?)\} *$/
 const classAttrReg = /^\./
 const idAttrReg = /^#/
 const attrParseReg = /^(.*?)="?(.*)"?$/
 const sampLangReg = /^ *(?:samp|shell|console)(?:(?= )|$)/
-const endBlockquoteScriptReg = /<\/blockquote> *<script[^>]*?><\/script>$/
-const iframeTagReg = /<iframe(?=[\s>])/i
 const asciiLabelReg = /^[A-Za-z]/
 const CHECK_TYPE_TOKEN_MAP = {
   table_open: 'table',
   pre_open: 'pre',
   blockquote_open: 'blockquote',
 }
-const HTML_TAG_DETECTORS = [
-  { candidate: 'video', lookupTag: 'video', hintKey: 'hasVideoHint' },
-  { candidate: 'audio', lookupTag: 'audio', hintKey: 'hasAudioHint' },
-  { candidate: 'iframe', lookupTag: 'iframe', hintKey: 'hasIframeHint' },
-  { candidate: 'blockquote', lookupTag: 'blockquote', hintKey: 'hasBlockquoteHint' },
-  {
-    candidate: 'div',
-    lookupTag: 'div',
-    hintKey: 'hasDivHint',
-    requiresIframeTag: true,
-    matchedTag: 'iframe',
-    setVideoIframe: true,
-  },
-]
-const fallbackLabelDefaults = { en: 'Figure', ja: '図' }
-
 const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+const normalizeLanguageCode = (value) => {
+  if (value === null || value === undefined) return ''
+  const normalized = String(value).trim().toLowerCase()
+  if (!normalized) return ''
+  const separatorIndex = normalized.search(/[-_]/)
+  return separatorIndex === -1 ? normalized : normalized.slice(0, separatorIndex)
+}
+const normalizePreferredLanguages = (value, availableLanguages) => {
+  if (!Array.isArray(availableLanguages) || availableLanguages.length === 0) return []
+  const source = typeof value === 'string' ? [value] : (Array.isArray(value) ? value : [])
+  if (source.length === 0) return []
+  const allowed = new Set(availableLanguages)
+  const languages = []
+  const seen = new Set()
+  for (let i = 0; i < source.length; i++) {
+    const lang = normalizeLanguageCode(source[i])
+    if (!lang || seen.has(lang) || !allowed.has(lang)) continue
+    seen.add(lang)
+    languages.push(lang)
+  }
+  return languages
+}
+const prioritizeLanguage = (languages, preferredLanguage) => {
+  if (!preferredLanguage || languages.length === 0) return languages.slice()
+  const prioritized = []
+  prioritized.push(preferredLanguage)
+  for (let i = 0; i < languages.length; i++) {
+    if (languages[i] === preferredLanguage) continue
+    prioritized.push(languages[i])
+  }
+  return prioritized
+}
+const isAsciiAlphaCode = (code) => {
+  return (code >= 0x41 && code <= 0x5a) || (code >= 0x61 && code <= 0x7a)
+}
+const isJapaneseCharCode = (code) => {
+  return (
+    (code >= 0x3040 && code <= 0x30ff) ||
+    (code >= 0x31f0 && code <= 0x31ff) ||
+    (code >= 0x4e00 && code <= 0x9fff) ||
+    (code >= 0xff66 && code <= 0xff9f)
+  )
+}
+const isHyphenFenceLine = (src, lineStart) => {
+  if (typeof src !== 'string' || lineStart < 0 || lineStart >= src.length) return 0
+  let index = lineStart
+  let hyphenCount = 0
+  while (index < src.length && src.charCodeAt(index) === 0x2d) {
+    hyphenCount++
+    index++
+  }
+  if (hyphenCount < 3) return 0
+  while (index < src.length && src.charCodeAt(index) === 0x20) {
+    index++
+  }
+  if (index >= src.length || src.charCodeAt(index) !== 0x0a) return 0
+  return hyphenCount
+}
+const skipLeadingFrontmatter = (src) => {
+  if (typeof src !== 'string' || isHyphenFenceLine(src, 0) === 0) return src
+  let lineStart = src.indexOf('\n')
+  if (lineStart === -1) return src
+  lineStart++
+  while (lineStart < src.length) {
+    if (isHyphenFenceLine(src, lineStart) > 0) {
+      const nextLineStart = src.indexOf('\n', lineStart)
+      if (nextLineStart === -1) return ''
+      return src.slice(nextLineStart + 1)
+    }
+    const nextLineStart = src.indexOf('\n', lineStart)
+    if (nextLineStart === -1) break
+    lineStart = nextLineStart + 1
+  }
+  return src
+}
+const detectDocumentPrimaryLanguage = (src, availableLanguages) => {
+  if (!src || availableLanguages.indexOf('ja') === -1) return ''
+  const body = skipLeadingFrontmatter(src)
+  const limit = Math.min(body.length, 8192)
+  let japaneseCount = 0
+  let asciiAlphaCount = 0
+  for (let i = 0; i < limit; i++) {
+    const code = body.charCodeAt(i)
+    if (isJapaneseCharCode(code)) {
+      japaneseCount++
+      continue
+    }
+    if (isAsciiAlphaCode(code)) {
+      asciiAlphaCount++
+    }
+  }
+  if (japaneseCount === 0) return ''
+  if (asciiAlphaCount === 0) return 'ja'
+  return japaneseCount * 2 >= asciiAlphaCount ? 'ja' : ''
+}
+const sourceMayNeedPreferredLanguages = (state) => {
+  const src = state && typeof state.src === 'string' ? state.src : ''
+  return src.indexOf('![') !== -1
+}
+const resolvePreferredLanguagesForState = (state, opt) => {
+  const availableLanguages = (
+    opt &&
+    opt.markRegState &&
+    Array.isArray(opt.markRegState.languages)
+  ) ? opt.markRegState.languages : []
+  if (availableLanguages.length === 0) return []
+
+  const explicitPreferred = opt && Array.isArray(opt.preferredLanguages)
+    ? opt.preferredLanguages
+    : []
+  if (explicitPreferred.length > 0) return explicitPreferred
+
+  const optionLanguages = opt && Array.isArray(opt.normalizedOptionLanguages)
+    ? opt.normalizedOptionLanguages
+    : []
+  const baseLanguages = optionLanguages.length > 0 ? optionLanguages : availableLanguages
+  const env = state && state.env ? state.env : null
+  const envPreferred = normalizePreferredLanguages(env && env.preferredLanguages, availableLanguages)
+  if (envPreferred.length > 0) return envPreferred
+
+  const envLanguage = normalizeLanguageCode(env && (env.preferredLanguage || env.lang || env.language || env.locale))
+  if (envLanguage && baseLanguages.indexOf(envLanguage) !== -1) {
+    return prioritizeLanguage(baseLanguages, envLanguage)
+  }
+
+  const detectedLanguage = detectDocumentPrimaryLanguage(state && state.src ? state.src : '', baseLanguages)
+  if (detectedLanguage) {
+    return prioritizeLanguage(baseLanguages, detectedLanguage)
+  }
+  return baseLanguages
+}
+const needsPreferredLanguagesResolution = (opt) => {
+  if (!opt || !opt.markRegState || !Array.isArray(opt.markRegState.languages)) return false
+  if (opt.markRegState.languages.length <= 1) return false
+  if (Array.isArray(opt.preferredLanguages) && opt.preferredLanguages.length > 0) return false
+  return opt.autoAltCaption === true || opt.autoTitleCaption === true
+}
 const normalizeOptionalClassName = (value) => {
   if (value === null || value === undefined) return ''
   const normalized = String(value).trim()
@@ -50,36 +172,6 @@ const normalizeClassOptionWithFallback = (value, fallbackValue) => {
   const normalized = normalizeOptionalClassName(value)
   return normalized || fallbackValue
 }
-const normalizeLanguages = (value) => {
-  if (!Array.isArray(value)) return ['en', 'ja']
-  const normalized = []
-  const seen = new Set()
-  for (let i = 0; i < value.length; i++) {
-    const lang = value[i]
-    if (typeof lang !== 'string') continue
-    const trimmed = lang.trim()
-    if (!trimmed || seen.has(trimmed)) continue
-    seen.add(trimmed)
-    normalized.push(trimmed)
-  }
-  if (normalized.length === 0) return ['en', 'ja']
-  return normalized
-}
-const normalizeLabelPrefixMarkers = (value) => {
-  if (typeof value === 'string') {
-    return value ? [value] : []
-  }
-  if (Array.isArray(value)) {
-    const normalized = value.map(entry => String(entry)).filter(Boolean)
-    return normalized.length > 2 ? normalized.slice(0, 2) : normalized
-  }
-  return []
-}
-const buildLabelPrefixMarkerRegFromList = (markers) => {
-  if (!markers || markers.length === 0) return null
-  const pattern = markers.map(escapeRegExp).join('|')
-  return new RegExp('^(?:' + pattern + ')(?:[ \\t　]+)?')
-}
 const resolveLabelPrefixMarkerPair = (markers) => {
   if (!markers || markers.length === 0) return { prev: [], next: [] }
   if (markers.length === 1) {
@@ -87,26 +179,6 @@ const resolveLabelPrefixMarkerPair = (markers) => {
   }
   return { prev: [markers[0]], next: [markers[1]] }
 }
-const stripLeadingPrefix = (text, prefix) => {
-  if (typeof text !== 'string' || !text || !prefix) return text
-  if (text.startsWith(prefix)) return text.slice(prefix.length)
-  return text
-}
-const stripLabelPrefixMarkerFromInline = (inlineToken, markerText) => {
-  if (!inlineToken || !markerText) return
-  if (typeof inlineToken.content === 'string') {
-    inlineToken.content = stripLeadingPrefix(inlineToken.content, markerText)
-  }
-  if (inlineToken.children && inlineToken.children.length) {
-    for (let i = 0; i < inlineToken.children.length; i++) {
-      const child = inlineToken.children[i]
-      if (child && child.type === 'text' && typeof child.content === 'string') {
-        child.content = stripLeadingPrefix(child.content, markerText)
-        break
-      }
-    }
-  }
-}
 const getLabelPrefixMarkerMatch = (inlineToken, markerReg) => {
   if (!markerReg || !inlineToken || inlineToken.type !== 'inline') return null
   const content = typeof inlineToken.content === 'string' ? inlineToken.content : ''
@@ -149,20 +221,6 @@ const normalizeAutoLabelNumberSets = (value) => {
   return normalized
 }
 
-const buildLabelClassLookup = (opt) => {
-  const classPrefix = opt.classPrefix ? opt.classPrefix + '-' : ''
-  const defaultClasses = [classPrefix + 'label']
-  const withType = (type) => {
-    if (opt.removeMarkNameInCaptionClass) return defaultClasses
-    return [classPrefix + type + '-label', ...defaultClasses]
-  }
-  return {
-    img: withType('img'),
-    table: withType('table'),
-    default: defaultClasses,
-  }
-}
-
 const shouldApplyLabelNumbering = (captionType, opt) => {
   const setting = opt.autoLabelNumberSets
   if (!setting) return false
@@ -241,60 +299,23 @@ const getImageAltText = (token) => {
 
 const getImageTitleText = (token) => getTokenAttr(token, 'title')
 
-const detectCaptionLanguage = (text) => {
-  const target = (text || '').trim()
-  if (!target) return 'en'
-  for (let i = 0; i < target.length; i++) {
-    const char = target[i]
-    const code = target.charCodeAt(i)
-    if (isJapaneseCharCode(code)) return 'ja'
-    if (isSentenceBoundaryChar(char) || char === '\n') break
-  }
-  return 'en'
-}
-
-const isJapaneseCharCode = (code) => {
-  return (
-    (code >= 0x3040 && code <= 0x30ff) || // Hiragana + Katakana
-    (code >= 0x31f0 && code <= 0x31ff) || // Katakana extensions
-    (code >= 0x4e00 && code <= 0x9fff) || // CJK Unified Ideographs
-    (code >= 0xff66 && code <= 0xff9f)    // Half-width Katakana
-  )
-}
-
-const isSentenceBoundaryChar = (char) => {
-  return char === '.' || char === '!' || char === '?' || char === '。' || char === '！' || char === '？'
-}
-
-const getAutoFallbackLabel = (text) => {
-  const lang = detectCaptionLanguage(text)
-  if (lang === 'ja') return fallbackLabelDefaults.ja || fallbackLabelDefaults.en || ''
-  return fallbackLabelDefaults.en || fallbackLabelDefaults.ja || ''
-}
-
-const getPersistedFallbackLabel = (text, fallbackState) => {
-  if (!fallbackState) return getAutoFallbackLabel(text)
-  if (fallbackState.img) return fallbackState.img
-  const resolved = getAutoFallbackLabel(text)
-  fallbackState.img = resolved
-  return resolved
-}
-
-const buildCaptionWithFallback = (text, fallbackOption, fallbackState) => {
+const buildCaptionWithFallback = (text, fallbackOption, mark, markRegState, preferredLanguages) => {
   const trimmedText = (text || '').trim()
   if (!fallbackOption) return ''
+  if (!trimmedText) return ''
   let label = ''
+  let generatedDefaults = null
   if (typeof fallbackOption === 'string') {
     label = fallbackOption.trim()
   } else if (fallbackOption === true) {
-    label = getPersistedFallbackLabel(trimmedText, fallbackState)
+    generatedDefaults = getGeneratedLabelDefaults(mark, trimmedText, markRegState, preferredLanguages)
+    label = generatedDefaults && generatedDefaults.label ? generatedDefaults.label : ''
   }
-  if (!label) return trimmedText
-  const isAsciiLabel = asciiLabelReg.test(label)
-  if (!trimmedText) {
-    return isAsciiLabel ? label + '.' : label
+  if (!label) return fallbackOption === true ? '' : trimmedText
+  if (generatedDefaults) {
+    return label + (generatedDefaults.joint || '') + (generatedDefaults.space || '') + trimmedText
   }
-  return label + (isAsciiLabel ? '. ' : '　') + trimmedText
+  return label + (asciiLabelReg.test(label) ? '. ' : '　') + trimmedText
 }
 
 const createAutoCaptionParagraph = (captionText, TokenConstructor) => {
@@ -420,154 +441,55 @@ const ensureAutoFigureNumbering = (tokens, range, caption, figureNumberState, op
   updateInlineTokenContent(inlineToken, originalText, newLabelText)
 }
 
-const matchAutoCaptionText = (text, reg) => {
-  if (!text || !reg) return ''
+const matchAutoCaptionText = (text, opt, preferredMark = 'img') => {
+  if (!text || !opt || !opt.markRegState) return ''
   const trimmed = text.trim()
-  if (trimmed && reg.test(trimmed)) return trimmed
+  if (!trimmed) return ''
+  const analysis = analyzeCaptionStart(trimmed, {
+    markRegState: opt.markRegState,
+    preferredMark,
+  })
+  if (analysis) return trimmed
   return ''
 }
 
-const getAutoCaptionFromImage = (imageToken, opt, fallbackLabelState) => {
-  const imgCaptionMarkReg = opt && opt.imgCaptionMarkReg ? opt.imgCaptionMarkReg : null
+const getAutoCaptionFromImage = (imageToken, opt) => {
   if (!opt.autoCaptionDetection) return ''
-  if (!imgCaptionMarkReg && !opt.autoAltCaption && !opt.autoTitleCaption) return ''
+  if (!opt.autoAltCaption && !opt.autoTitleCaption && !(opt.markRegState && opt.markRegState.markReg && opt.markRegState.markReg.img)) return ''
 
   const altText = getImageAltText(imageToken)
-  let caption = matchAutoCaptionText(altText, imgCaptionMarkReg)
+  let caption = matchAutoCaptionText(altText, opt)
   if (caption) {
     clearImageAltAttr(imageToken)
     return caption
   }
   if (!caption && opt.autoAltCaption) {
     const altForFallback = altText || ''
-    caption = buildCaptionWithFallback(altForFallback, opt.autoAltCaption, fallbackLabelState)
-    if (imageToken) {
+    const fallbackCaption = buildCaptionWithFallback(altForFallback, opt.autoAltCaption, 'img', opt.markRegState, opt.preferredLanguages)
+    if (fallbackCaption && imageToken) {
       clearImageAltAttr(imageToken)
     }
+    caption = fallbackCaption
   }
   if (caption) return caption
 
   const titleText = getImageTitleText(imageToken)
-  caption = matchAutoCaptionText(titleText, imgCaptionMarkReg)
+  caption = matchAutoCaptionText(titleText, opt)
   if (caption) {
     clearImageTitleAttr(imageToken)
     return caption
   }
   if (!caption && opt.autoTitleCaption) {
     const titleForFallback = titleText || ''
-    caption = buildCaptionWithFallback(titleForFallback, opt.autoTitleCaption, fallbackLabelState)
-    if (imageToken) {
+    const fallbackCaption = buildCaptionWithFallback(titleForFallback, opt.autoTitleCaption, 'img', opt.markRegState, opt.preferredLanguages)
+    if (fallbackCaption && imageToken) {
       clearImageTitleAttr(imageToken)
     }
+    caption = fallbackCaption
   }
   return caption
 }
 
-const getHtmlReg = (tag) => {
-  const cached = htmlRegCache.get(tag)
-  if (cached) return cached
-  const regexStr = `^<${tag} ?[^>]*?>[\\s\\S]*?<\\/${tag}>(\\n| *?)(<script [^>]*?>(?:<\\/script>)?)? *(\\n|$)`
-  const reg = new RegExp(regexStr)
-  htmlRegCache.set(tag, reg)
-  return reg
-}
-
-const getHtmlDetectionHints = (content) => {
-  const hasBlueskyHint = content.indexOf('bluesky-embed') !== -1
-  const hasVideoHint = content.indexOf('<video') !== -1
-  const hasAudioHint = content.indexOf('<audio') !== -1
-  const hasIframeHint = content.indexOf('<iframe') !== -1
-  const hasBlockquoteHint = content.indexOf('<blockquote') !== -1
-  const hasDivHint = content.indexOf('<div') !== -1
-  return {
-    hasBlueskyHint,
-    hasVideoHint,
-    hasAudioHint,
-    hasIframeHint,
-    hasBlockquoteHint,
-    hasDivHint,
-    hasIframeTag: hasIframeHint || (hasDivHint && iframeTagReg.test(content)),
-    hasBlueskyEmbed: hasBlueskyHint && blueskyEmbedReg.test(content),
-  }
-}
-
-const hasAnyHtmlDetectionHint = (hints) => {
-  return !!(
-    hints.hasBlueskyHint ||
-    hints.hasVideoHint ||
-    hints.hasAudioHint ||
-    hints.hasIframeHint ||
-    hints.hasBlockquoteHint ||
-    hints.hasDivHint
-  )
-}
-
-const appendHtmlBlockNewlineIfNeeded = (token, hasTag) => {
-  if ((hasTag[2] && hasTag[3] !== '\n') || (hasTag[1] !== '\n' && hasTag[2] === undefined)) {
-    token.content += '\n'
-  }
-}
-
-const consumeBlockquoteEmbedScript = (tokens, token, startIndex) => {
-  let addedCont = ''
-  let j = startIndex + 1
-  while (j < tokens.length) {
-    const nextToken = tokens[j]
-    if (nextToken.type === 'inline' && endBlockquoteScriptReg.test(nextToken.content)) {
-      addedCont += nextToken.content + '\n'
-      if (tokens[j + 1] && tokens[j + 1].type === 'paragraph_close') {
-        tokens.splice(j + 1, 1)
-      }
-      nextToken.content = ''
-      if (nextToken.children) {
-        for (let k = 0; k < nextToken.children.length; k++) {
-          nextToken.children[k].content = ''
-        }
-      }
-      break
-    }
-    if (nextToken.type === 'paragraph_open') {
-      addedCont += '\n'
-      tokens.splice(j, 1)
-      continue
-    }
-    j++
-  }
-  token.content += addedCont
-}
-
-const detectHtmlTagCandidate = (tokens, token, startIndex, detector, hints, sp) => {
-  if (detector.requiresIframeTag && !hints.hasIframeTag) return ''
-  const hasTagHint = !!(detector.hintKey && hints[detector.hintKey])
-  const allowBlueskyFallback = detector.candidate === 'blockquote' && hints.hasBlueskyEmbed
-  if (!hasTagHint && !allowBlueskyFallback) return ''
-  const hasTag = hasTagHint ? token.content.match(getHtmlReg(detector.lookupTag)) : null
-  const isBlueskyBlockquote = detector.candidate === 'blockquote' && !hasTag && hints.hasBlueskyEmbed
-  if (!hasTag && !isBlueskyBlockquote) return ''
-  if (hasTag) {
-    appendHtmlBlockNewlineIfNeeded(token, hasTag)
-    if (detector.setVideoIframe) {
-      sp.isVideoIframe = true
-    }
-    return detector.matchedTag || detector.candidate
-  }
-  consumeBlockquoteEmbedScript(tokens, token, startIndex)
-  return 'blockquote'
-}
-
-const isIframeTypeEmbedBlockquote = (content) => {
-  return content.indexOf('class="') !== -1 && classNameReg.test(content)
-}
-
-const resolveHtmlWrapWithoutCaption = (matchedTag, sp, opt) => {
-  const htmlWrapWithoutCaption = opt.htmlWrapWithoutCaption
-  if (!htmlWrapWithoutCaption) return false
-  if (matchedTag === 'blockquote') {
-    return !!(sp.isIframeTypeBlockquote && htmlWrapWithoutCaption.iframeTypeBlockquote)
-  }
-  return !!htmlWrapWithoutCaption[matchedTag]
-}
-
 const checkPrevCaption = (tokens, n, caption, sp, opt, captionState) => {
   if(n < 3) return caption
   const captionStartToken = tokens[n-3]
@@ -579,11 +501,11 @@ const checkPrevCaption = (tokens, n, caption, sp, opt, captionState) => {
   const captionName = sp && sp.captionDecision ? sp.captionDecision.mark : ''
   if(!captionName) {
     if (opt.labelPrefixMarkerWithoutLabelPrevReg) {
-      const markerMatch = getLabelPrefixMarkerMatch(captionInlineToken, opt.labelPrefixMarkerWithoutLabelPrevReg)
-      if (markerMatch) {
-        stripLabelPrefixMarkerFromInline(captionInlineToken, markerMatch)
-        caption.isPrev = true
-      }
+        const markerMatch = getLabelPrefixMarkerMatch(captionInlineToken, opt.labelPrefixMarkerWithoutLabelPrevReg)
+        if (markerMatch) {
+          stripLabelPrefixMarker(captionInlineToken, markerMatch)
+          caption.isPrev = true
+        }
     }
     return
   }
@@ -603,11 +525,11 @@ const checkNextCaption = (tokens, en, caption, sp, opt, captionState) => {
   const captionName = sp && sp.captionDecision ? sp.captionDecision.mark : ''
   if(!captionName) {
     if (opt.labelPrefixMarkerWithoutLabelNextReg) {
-      const markerMatch = getLabelPrefixMarkerMatch(captionInlineToken, opt.labelPrefixMarkerWithoutLabelNextReg)
-      if (markerMatch) {
-        stripLabelPrefixMarkerFromInline(captionInlineToken, markerMatch)
-        caption.isNext = true
-      }
+        const markerMatch = getLabelPrefixMarkerMatch(captionInlineToken, opt.labelPrefixMarkerWithoutLabelNextReg)
+        if (markerMatch) {
+          stripLabelPrefixMarker(captionInlineToken, markerMatch)
+          caption.isNext = true
+        }
     }
     return
   }
@@ -852,38 +774,6 @@ const detectFenceToken = (token, n, caption) => {
   }
 }
 
-const detectHtmlBlockToken = (tokens, token, n, caption, sp, opt) => {
-  if (!token || token.type !== 'html_block') return null
-  const hints = getHtmlDetectionHints(token.content)
-  if (!hasAnyHtmlDetectionHint(hints)) return null
-  let matchedTag = ''
-  for (let i = 0; i < HTML_TAG_DETECTORS.length; i++) {
-    matchedTag = detectHtmlTagCandidate(tokens, token, n, HTML_TAG_DETECTORS[i], hints, sp)
-    if (matchedTag) break
-  }
-  if (!matchedTag) return null
-  if (matchedTag === 'blockquote') {
-    if (isIframeTypeEmbedBlockquote(token.content)) {
-      sp.isIframeTypeBlockquote = true
-    } else {
-      return null
-    }
-  }
-  if (matchedTag === 'iframe' && videoIframeReg.test(token.content)) {
-    sp.isVideoIframe = true
-  }
-  caption.name = matchedTag
-  const wrapWithoutCaption = resolveHtmlWrapWithoutCaption(matchedTag, sp, opt)
-  return {
-    type: 'html',
-    tagName: matchedTag,
-    en: n,
-    replaceInsteadOfWrap: false,
-    wrapWithoutCaption,
-    canWrap: true,
-  }
-}
-
 const hasLeadingImageChild = (token) => {
   return !!(token &&
     token.type === 'inline' &&
@@ -1004,15 +894,19 @@ const figureWithCaption = (state, opt) => {
     table: 0,
   }
 
-  const fallbackLabelState = {
-    img: null,
-  }
-
   const captionState = { tokens: state.tokens, Token: state.Token }
-  figureWithCaptionCore(state.tokens, opt, figureNumberState, fallbackLabelState, state.Token, captionState, null, 0)
+  const shouldResolvePreferredLanguages = !!(
+    opt.shouldResolvePreferredLanguages &&
+    sourceMayNeedPreferredLanguages(state)
+  )
+  const renderOpt = shouldResolvePreferredLanguages ? Object.create(opt) : opt
+  if (shouldResolvePreferredLanguages) {
+    renderOpt.preferredLanguages = resolvePreferredLanguagesForState(state, opt)
+  }
+  figureWithCaptionCore(state.tokens, renderOpt, figureNumberState, state.Token, captionState, null, 0)
 }
 
-const figureWithCaptionCore = (tokens, opt, figureNumberState, fallbackLabelState, TokenConstructor, captionState, parentType = null, startIndex = 0) => {
+const figureWithCaptionCore = (tokens, opt, figureNumberState, TokenConstructor, captionState, parentType = null, startIndex = 0) => {
   const rRange = { start: startIndex, end: startIndex }
   const rCaption = {
     name: '', nameSuffix: '', isPrev: false, isNext: false
@@ -1030,7 +924,7 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, fallbackLabelStat
     const containerType = getNestedContainerType(token)
 
     if (containerType && containerType !== 'blockquote') {
-      const closeIndex = figureWithCaptionCore(tokens, opt, figureNumberState, fallbackLabelState, TokenConstructor, captionState, containerType, n + 1)
+      const closeIndex = figureWithCaptionCore(tokens, opt, figureNumberState, TokenConstructor, captionState, containerType, n + 1)
       n = (typeof closeIndex === 'number' ? closeIndex : n) + 1
       continue
     }
@@ -1055,7 +949,12 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, fallbackLabelStat
       resetRangeState(rRange, n)
       resetCaptionState(rCaption)
       resetSpecialState(rSp)
-      detection = detectHtmlBlockToken(tokens, token, n, rCaption, rSp, opt)
+      detection = detectHtmlFigureCandidate(tokens, token, n, opt.htmlWrapWithoutCaption)
+      if (detection) {
+        rCaption.name = detection.tagName
+        rSp.isVideoIframe = !!detection.isVideoIframe
+        rSp.isIframeTypeBlockquote = !!detection.isIframeTypeBlockquote
+      }
     } else if (tokenType === 'fence') {
       resetRangeState(rRange, n)
       resetCaptionState(rCaption)
@@ -1070,7 +969,7 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, fallbackLabelStat
 
     if (!detection) {
       if (containerType === 'blockquote') {
-        const closeIndex = figureWithCaptionCore(tokens, opt, figureNumberState, fallbackLabelState, TokenConstructor, captionState, containerType, n + 1)
+        const closeIndex = figureWithCaptionCore(tokens, opt, figureNumberState, TokenConstructor, captionState, containerType, n + 1)
         n = (typeof closeIndex === 'number' ? closeIndex : n) + 1
       } else {
         n++
@@ -1087,7 +986,7 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, fallbackLabelStat
     let hasCaption = rCaption.isPrev || rCaption.isNext
     let pendingAutoCaption = ''
     if (!hasCaption && detection.type === 'image' && opt.autoCaptionDetection) {
-      pendingAutoCaption = getAutoCaptionFromImage(detection.imageToken, opt, fallbackLabelState)
+      pendingAutoCaption = getAutoCaptionFromImage(detection.imageToken, opt)
       if (pendingAutoCaption) {
         hasCaption = true
       }
@@ -1096,7 +995,7 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, fallbackLabelStat
     if (detection.canWrap === false) {
       let nextIndex = rRange.end + 1
       if (containerType === 'blockquote') {
-        const closeIndex = figureWithCaptionCore(tokens, opt, figureNumberState, fallbackLabelState, TokenConstructor, captionState, containerType, rRange.start + 1)
+        const closeIndex = figureWithCaptionCore(tokens, opt, figureNumberState, TokenConstructor, captionState, containerType, rRange.start + 1)
         nextIndex = Math.max(nextIndex, (typeof closeIndex === 'number' ? closeIndex : rRange.end) + 1)
       }
       n = nextIndex
@@ -1151,7 +1050,7 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, fallbackLabelStat
     }
 
     if (containerType === 'blockquote') {
-      const closeIndex = figureWithCaptionCore(tokens, opt, figureNumberState, fallbackLabelState, TokenConstructor, captionState, containerType, rRange.start + 1)
+      const closeIndex = figureWithCaptionCore(tokens, opt, figureNumberState, TokenConstructor, captionState, containerType, rRange.start + 1)
       const fallbackIndex = rCaption.name ? rRange.end : n
       nextIndex = Math.max(nextIndex, (typeof closeIndex === 'number' ? closeIndex : fallbackIndex) + 1)
     }
@@ -1165,6 +1064,7 @@ const mditFigureWithPCaption = (md, option) => {
   let opt = {
     // Caption languages delegated to p-captions.
     languages: ['en', 'ja'],
+    preferredLanguages: null, // optional tie-break order for generated fallback labels; defaults to inferred document order / languages
 
     // --- figure-wrapper behavior ---
     classPrefix: 'f',
@@ -1219,11 +1119,11 @@ const mditFigureWithPCaption = (md, option) => {
   }
   opt.classPrefix = normalizeOptionalClassName(opt.classPrefix)
   opt.allIframeTypeFigureClassName = normalizeOptionalClassName(opt.allIframeTypeFigureClassName)
-  opt.languages = normalizeLanguages(opt.languages)
   opt.markRegState = getMarkRegStateForLanguages(opt.languages)
-  opt.imgCaptionMarkReg = opt.markRegState && opt.markRegState.markReg
-    ? opt.markRegState.markReg.img
-    : null
+  opt.preferredLanguages = normalizePreferredLanguages(opt.preferredLanguages, opt.markRegState.languages)
+  if (opt.preferredLanguages.length === 0) opt.preferredLanguages = null
+  opt.normalizedOptionLanguages = normalizePreferredLanguages(opt.languages, opt.markRegState.languages)
+  opt.shouldResolvePreferredLanguages = needsPreferredLanguagesResolution(opt)
   opt.htmlWrapWithoutCaption = {
     iframe: !!opt.iframeWithoutCaption,
     video: !!opt.videoWithoutCaption,
@@ -1260,12 +1160,12 @@ const mditFigureWithPCaption = (md, option) => {
   // Precompute label-class permutations so numbering lookup doesn't rebuild arrays per caption.
   opt.labelClassLookup = buildLabelClassLookup(opt)
   const markerList = normalizeLabelPrefixMarkers(opt.labelPrefixMarker)
-  opt.labelPrefixMarkerReg = buildLabelPrefixMarkerRegFromList(markerList)
+  opt.labelPrefixMarkerReg = buildLabelPrefixMarkerRegFromMarkers(markerList)
   opt.cleanCaptionRegCache = new Map()
   if (opt.allowLabelPrefixMarkerWithoutLabel === true) {
     const markerPair = resolveLabelPrefixMarkerPair(markerList)
-    opt.labelPrefixMarkerWithoutLabelPrevReg = buildLabelPrefixMarkerRegFromList(markerPair.prev)
-    opt.labelPrefixMarkerWithoutLabelNextReg = buildLabelPrefixMarkerRegFromList(markerPair.next)
+    opt.labelPrefixMarkerWithoutLabelPrevReg = buildLabelPrefixMarkerRegFromMarkers(markerPair.prev)
+    opt.labelPrefixMarkerWithoutLabelNextReg = buildLabelPrefixMarkerRegFromMarkers(markerPair.next)
   } else {
     opt.labelPrefixMarkerWithoutLabelPrevReg = null
     opt.labelPrefixMarkerWithoutLabelNextReg = null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markdown-it-figure-with-p-caption",
-  "version": "0.16.1",
+  "version": "0.17.0",
   "description": "A markdown-it plugin. For a paragraph with only one image, a table or code block or blockquote, and by writing a caption paragraph immediately before or after, they are converted into the figure element with the figcaption element.",
   "main": "index.js",
   "type": "module",
@@ -29,10 +29,11 @@
     "markdown-it-attrs": "^4.3.1"
   },
   "dependencies": {
-    "p7d-markdown-it-p-captions": "^0.21.0"
+    "p7d-markdown-it-p-captions": "0.22.0"
   },
   "files": [
     "index.js",
+    "embeds/",
     "README.md",
     "LICENSE"
   ]