@peaceroad/markdown-it-figure-with-p-caption 0.18.0 → 0.19.0

package/README.md

@@ -52,6 +52,7 @@ Optionally, you can auto-number image and table caption paragraphs starting from
 
 - Inline HTML `<iframe>` elements become `<figure class="f-video">` when they point to known video hosts (YouTube `www.youtube.com`, `youtube.com`, `www.youtube-nocookie.com`, `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).
+- `videoWithoutCaption` classifies an iframe (including one nested in a `<div>` wrapper) as video only when its `src` host is one of the known YouTube/Vimeo hosts. A generic iframe wrapper still requires `iframeWithoutCaption`.
 - 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`.
@@ -102,9 +103,10 @@ Every option below is forwarded verbatim to `p7d-markdown-it-p-captions`, which
 
 - `autoLabelNumberSets`: enable numbering per media type. Pass an array such as `['img']`, `['table']`, or `['img', 'table']`.
 - `autoLabelNumber`: shorthand for turning numbering on for both images and tables without passing the array yourself. Provide `autoLabelNumberSets` explicitly (e.g., `['img']`) when you need finer control—the explicit array always wins.
+- Do not pass p-captions' lower-level `setFigureNumber` option to this plugin. Figure numbering is owned by `autoLabelNumber` / `autoLabelNumberSets`; `setFigureNumber` is rejected during setup to prevent two numbering systems from mutating the same caption.
 - Counters start at `1` near the top of the document and increment sequentially per media type. Figures and tables keep independent counters even when mixed together.
 - The counter only advances when a real caption exists (paragraph, auto-detected alt/title, or fallback text). Figures emitted solely because of `imageOnlyParagraphWithoutCaption` / `oneImageWithoutCaption` stay unnumbered.
-- Manual numbers inside the caption text (e.g., `Figure 5.`) always win. The plugin updates its internal counter so the next automatic number becomes `6`. This applies to captions sourced from paragraphs, auto detection, and fallback captions.
+- Manual numbers inside the caption text (e.g., `Figure 5.`) always win. The plugin reads the exact `captionDecision.number` supplied by `p7d-markdown-it-p-captions` and updates its decimal counter so the next automatic number becomes `6`. Explicit compound/alphanumeric numbers (e.g., `Figure A.` or `Figure A.5.`) are preserved without appending an automatic number and do not seed the decimal counter. This applies to captions sourced from paragraphs, auto detection, and fallback captions.
 
 ## Basic Usage
 
@@ -362,6 +364,8 @@ Slide. A Speaker Deck.
 
 ### Auto alt/title detection
 
+The consumed `alt` or `title` value is cleared only after the image paragraph is confirmed to be wrappable. Tight-list images and image paragraphs with trailing non-image text keep their original accessibility attributes and baseline rendering.
+
 ```
 [Markdown]
 ![Figure. A cat.](cat.jpg)

package/embeds/detect.js

@@ -6,7 +6,7 @@ import {
 
 const htmlRegCache = new Map()
 const openingClassAttrReg = /^<[^>]*?\bclass=(?:"([^"]*)"|'([^']*)')/i
-const openingSrcAttrReg = /^<[^>]*?\bsrc=(?:"([^"]*)"|'([^']*)')/i
+const iframeSrcAttrReg = /<iframe\b[^>]*?\bsrc=(?:"([^"]*)"|'([^']*)')/i
 const endBlockquoteScriptReg = /<\/blockquote> *<script[^>]*?><\/script>$/i
 const targetHtmlHintReg = /<(?:video|audio|iframe|blockquote|div)\b/i
 const blueskyEmbedHintReg = /bluesky-embed/i
@@ -90,6 +90,13 @@ const getOpeningAttrValue = (content, reg) => {
   return match[1] || match[2] || ''
 }
 
+const getAttrValue = (content, reg) => {
+  if (typeof content !== 'string') 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
@@ -106,14 +113,14 @@ const hasKnownBlockquoteEmbedClass = (content) => {
 }
 
 const isKnownVideoIframe = (content) => {
-  const src = getOpeningAttrValue(content, openingSrcAttrReg)
+  const src = getAttrValue(content, iframeSrcAttrReg)
   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) => {
+const detectHtmlTagCandidate = (tokens, token, startIndex, detector, hints) => {
   if (detector.requiresIframeTag && !hints.hasIframeTag) return ''
   const hasTagHint = !!(detector.hintKey && hints[detector.hintKey])
   const allowBlueskyFallback = detector.candidate === 'blockquote' && hints.hasBlueskyHint
@@ -123,9 +130,6 @@ const detectHtmlTagCandidate = (tokens, token, startIndex, detector, hints, resu
   if (!hasTag && !isBlueskyFallback) return ''
   if (hasTag) {
     appendHtmlBlockNewlineIfNeeded(token, hasTag)
-    if (detector.treatAsVideoIframe) {
-      result.isVideoIframe = true
-    }
     return detector.matchedTag || detector.candidate
   }
   consumeBlockquoteEmbedScript(tokens, token, startIndex)
@@ -155,7 +159,7 @@ export const detectHtmlFigureCandidate = (tokens, token, startIndex, htmlWrapWit
 
   let matchedTag = ''
   for (let i = 0; i < HTML_EMBED_CANDIDATES.length; i++) {
-    matchedTag = detectHtmlTagCandidate(tokens, token, startIndex, HTML_EMBED_CANDIDATES[i], hints, result)
+    matchedTag = detectHtmlTagCandidate(tokens, token, startIndex, HTML_EMBED_CANDIDATES[i], hints)
     if (matchedTag) break
   }
   if (!matchedTag) return null

package/embeds/providers.js

@@ -9,7 +9,6 @@ export const HTML_EMBED_CANDIDATES = Object.freeze([
     hintKey: 'hasDivHint',
     requiresIframeTag: true,
     matchedTag: 'iframe',
-    treatAsVideoIframe: true,
   },
 ])
 

package/index.js

@@ -22,6 +22,9 @@ const CHECK_TYPE_TOKEN_MAP = {
   pre_open: 'pre',
   blockquote_open: 'blockquote',
 }
+const hasOwnOption = (option, name) => !!(
+  option && Object.prototype.hasOwnProperty.call(option, name)
+)
 const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 const normalizeLanguageCode = (value) => {
   if (value === null || value === undefined) return ''
@@ -190,6 +193,7 @@ const resolvePreferredLanguagesForState = (state, opt) => {
 }
 const needsPreferredLanguagesResolution = (opt) => {
   if (!opt || !opt.markRegState || !Array.isArray(opt.markRegState.languages)) return false
+  if (!opt.autoCaptionDetection) return false
   if (opt.markRegState.languages.length <= 1) return false
   return opt.autoAltCaption === true || opt.autoTitleCaption === true
 }
@@ -306,7 +310,7 @@ const normalizeAutoLabelNumberSets = (value) => {
   if (!value) return normalized
   if (Array.isArray(value)) {
     for (const entry of value) {
-      if (normalized.hasOwnProperty(entry)) normalized[entry] = true
+      if (entry === 'img' || entry === 'table') normalized[entry] = true
     }
     return normalized
   }
@@ -505,29 +509,18 @@ const updateInlineTokenContent = (inlineToken, originalText, newText) => {
     inlineToken.content.slice(index + originalText.length)
 }
 
-const parseTrailingPositiveInteger = (text) => {
+const parsePositiveInteger = (text) => {
   if (typeof text !== 'string' || text.length === 0) return null
-  let end = text.length - 1
-  while (end >= 0 && text.charCodeAt(end) === 0x20) end--
-  if (end < 0) return null
-  const lastCode = text.charCodeAt(end)
-  if (lastCode < 0x30 || lastCode > 0x39) return null
-  let start = end
-  while (start >= 0) {
-    const code = text.charCodeAt(start)
-    if (code < 0x30 || code > 0x39) break
-    start--
-  }
   let value = 0
-  let digitBase = 1
-  for (let i = end; i > start; i--) {
-    value += (text.charCodeAt(i) - 0x30) * digitBase
-    digitBase *= 10
+  for (let i = 0; i < text.length; i++) {
+    const code = text.charCodeAt(i)
+    if (code < 0x30 || code > 0x39) return null
+    value = value * 10 + code - 0x30
   }
   return value
 }
 
-const ensureAutoFigureNumbering = (tokens, range, caption, figureNumberState, opt) => {
+const ensureAutoFigureNumbering = (tokens, range, caption, figureNumberState, sp, opt) => {
   const captionType = caption.name === 'img' ? 'img' : (caption.name === 'table' ? 'table' : '')
   if (!captionType) return
   if (!shouldApplyLabelNumbering(captionType, opt)) return
@@ -536,19 +529,12 @@ const ensureAutoFigureNumbering = (tokens, range, caption, figureNumberState, op
   const labelTextToken = getInlineLabelTextToken(inlineToken, captionType, opt)
   if (!labelTextToken || typeof labelTextToken.content !== 'string') return
   const originalText = labelTextToken.content
-  let end = originalText.length - 1
-  while (end >= 0 && originalText.charCodeAt(end) === 0x20) end--
-  if (end >= 0) {
-    const code = originalText.charCodeAt(end)
-    if (code >= 0x30 && code <= 0x39) {
-      const explicitValue = parseTrailingPositiveInteger(originalText)
-      if (explicitValue !== null) {
-        if (explicitValue > (figureNumberState[captionType] || 0)) {
-          figureNumberState[captionType] = explicitValue
-        }
-        return
-      }
+  if (sp && sp.captionDecision && sp.captionDecision.hasExplicitNumber) {
+    const explicitValue = parsePositiveInteger(sp.captionDecision.number)
+    if (explicitValue !== null && explicitValue > (figureNumberState[captionType] || 0)) {
+      figureNumberState[captionType] = explicitValue
     }
+    return
   }
   figureNumberState[captionType] = (figureNumberState[captionType] || 0) + 1
   const baseLabel = originalText.trim()
@@ -571,89 +557,87 @@ const matchAutoCaptionText = (text, opt, preferredMark = 'img') => {
   return ''
 }
 
-const getAutoCaptionFromImage = (imageToken, opt) => {
-  if (!opt.autoCaptionDetection) return ''
-  if (!opt.autoAltCaption && !opt.autoTitleCaption && !(opt.markRegState && opt.markRegState.markReg && opt.markRegState.markReg.img)) return ''
+const getAutoCaptionFromImage = (imageToken, opt, preferredLanguages) => {
+  if (!opt.autoAltCaption && !opt.autoTitleCaption && !(opt.markRegState && opt.markRegState.markReg && opt.markRegState.markReg.img)) return null
 
   const altText = getImageAltText(imageToken)
   let caption = matchAutoCaptionText(altText, opt)
   if (caption) {
-    clearImageAltAttr(imageToken)
-    return caption
+    return { text: caption, source: 'alt' }
   }
-  if (!caption && opt.autoAltCaption) {
+  if (opt.autoAltCaption) {
     const altForFallback = altText || ''
-    const fallbackCaption = buildCaptionWithFallback(altForFallback, opt.autoAltCaption, 'img', opt.markRegState, opt.preferredLanguages)
-    if (fallbackCaption && imageToken) {
-      clearImageAltAttr(imageToken)
-    }
+    const fallbackCaption = buildCaptionWithFallback(altForFallback, opt.autoAltCaption, 'img', opt.markRegState, preferredLanguages)
     caption = fallbackCaption
   }
-  if (caption) return caption
+  if (caption) return { text: caption, source: 'alt' }
 
   const titleText = getImageTitleText(imageToken)
   caption = matchAutoCaptionText(titleText, opt)
   if (caption) {
-    clearImageTitleAttr(imageToken)
-    return caption
+    return { text: caption, source: 'title' }
   }
-  if (!caption && opt.autoTitleCaption) {
+  if (opt.autoTitleCaption) {
     const titleForFallback = titleText || ''
-    const fallbackCaption = buildCaptionWithFallback(titleForFallback, opt.autoTitleCaption, 'img', opt.markRegState, opt.preferredLanguages)
-    if (fallbackCaption && imageToken) {
-      clearImageTitleAttr(imageToken)
-    }
+    const fallbackCaption = buildCaptionWithFallback(titleForFallback, opt.autoTitleCaption, 'img', opt.markRegState, preferredLanguages)
     caption = fallbackCaption
   }
-  return caption
+  return caption ? { text: caption, source: 'title' } : null
+}
+
+const consumeAutoCaptionSource = (imageToken, autoCaption) => {
+  if (!imageToken || !autoCaption) return
+  if (autoCaption.source === 'alt') {
+    clearImageAltAttr(imageToken)
+  } else if (autoCaption.source === 'title') {
+    clearImageTitleAttr(imageToken)
+  }
 }
 
 const checkPrevCaption = (tokens, n, caption, sp, opt, captionState) => {
-  if(n < 3) return caption
-  const captionStartToken = tokens[n-3]
-  const captionInlineToken = tokens[n-2]
-  const captionEndToken = tokens[n-1]
+  if (n < 3) return
+  const captionStartToken = tokens[n - 3]
+  const captionInlineToken = tokens[n - 2]
+  const captionEndToken = tokens[n - 1]
   if (captionStartToken === undefined || captionEndToken === undefined) return
   if (captionStartToken.type !== 'paragraph_open' || captionEndToken.type !== 'paragraph_close') return
-  setCaptionParagraph(n-3, captionState, caption, null, sp, opt)
+  setCaptionParagraph(n - 3, captionState, caption, null, sp, opt)
   const captionName = sp && sp.captionDecision ? sp.captionDecision.mark : ''
-  if(!captionName) {
+  if (!captionName) {
     if (opt.labelPrefixMarkerWithoutLabelPrevReg) {
-        const markerMatch = getLabelPrefixMarkerMatch(captionInlineToken, opt.labelPrefixMarkerWithoutLabelPrevReg)
-        if (markerMatch) {
-          stripLabelPrefixMarker(captionInlineToken, markerMatch)
-          caption.isPrev = true
-        }
+      const markerMatch = getLabelPrefixMarkerMatch(captionInlineToken, opt.labelPrefixMarkerWithoutLabelPrevReg)
+      if (markerMatch) {
+        stripLabelPrefixMarker(captionInlineToken, markerMatch)
+        caption.isPrev = true
+      }
     }
     return
   }
   caption.name = captionName
   caption.isPrev = true
-  return
 }
 
 const checkNextCaption = (tokens, en, caption, sp, opt, captionState) => {
-  if (en + 2 > tokens.length) return
-  const captionStartToken = tokens[en+1]
-  const captionInlineToken = tokens[en+2]
-  const captionEndToken = tokens[en+3]
+  if (en + 3 >= tokens.length) return
+  const captionStartToken = tokens[en + 1]
+  const captionInlineToken = tokens[en + 2]
+  const captionEndToken = tokens[en + 3]
   if (captionStartToken === undefined || captionEndToken === undefined) return
   if (captionStartToken.type !== 'paragraph_open' || captionEndToken.type !== 'paragraph_close') return
-  setCaptionParagraph(en+1, captionState, caption, null, sp, opt)
+  setCaptionParagraph(en + 1, captionState, caption, null, sp, opt)
   const captionName = sp && sp.captionDecision ? sp.captionDecision.mark : ''
-  if(!captionName) {
+  if (!captionName) {
     if (opt.labelPrefixMarkerWithoutLabelNextReg) {
-        const markerMatch = getLabelPrefixMarkerMatch(captionInlineToken, opt.labelPrefixMarkerWithoutLabelNextReg)
-        if (markerMatch) {
-          stripLabelPrefixMarker(captionInlineToken, markerMatch)
-          caption.isNext = true
-        }
+      const markerMatch = getLabelPrefixMarkerMatch(captionInlineToken, opt.labelPrefixMarkerWithoutLabelNextReg)
+      if (markerMatch) {
+        stripLabelPrefixMarker(captionInlineToken, markerMatch)
+        caption.isNext = true
+      }
     }
     return
   }
   caption.name = captionName
   caption.isNext = true
-  return
 }
 
 const cleanCaptionTokenAttrs = (token, captionName, opt) => {
@@ -730,7 +714,6 @@ const changePrevCaptionPosition = (tokens, n, caption, opt) => {
   captionEndToken.level = figureBaseLevel + 1
   tokens.splice(n + 2, 0, captionStartToken, captionInlineToken, captionEndToken)
   tokens.splice(n-3, 3)
-  return true
 }
 
 const changeNextCaptionPosition = (tokens, en, caption, opt) => {
@@ -750,7 +733,6 @@ const changeNextCaptionPosition = (tokens, en, caption, opt) => {
   captionEndToken.level = figureBaseLevel + 1
   tokens.splice(en, 0, captionStartToken, captionInlineToken, captionEndToken)
   tokens.splice(en+4, 3)
-  return true
 }
 
 const getTokenMap = (token) => {
@@ -852,14 +834,12 @@ const wrapWithFigure = (tokens, range, checkTokenTagName, caption, replaceInstea
   }
   range.start = n
   range.end = en
-  return
 }
 
 const checkCaption = (tokens, n, en, caption, sp, opt, captionState) => {
   checkPrevCaption(tokens, n, caption, sp, opt, captionState)
   if (caption.isPrev) return
   checkNextCaption(tokens, en, caption, sp, opt, captionState)
-  return
 }
 
 const getNestedContainerType = (token) => {
@@ -971,6 +951,7 @@ const detectImageParagraph = (nextToken, n, caption, sp, opt) => {
   let isMultipleImagesHorizontal = true
   let isMultipleImagesVertical = true
   let isValid = true
+  let trailingAttrToken = null
   caption.name = 'img'
   if (childrenLength === 1) {
     return {
@@ -1006,7 +987,7 @@ const detectImageParagraph = (nextToken, n, caption, sp, opt) => {
             for (let i = 0; i < parsedAttrs.length; i++) {
               sp.attrs.push(parsedAttrs[i])
             }
-            child.content = ''
+            trailingAttrToken = child
             break
           }
         }
@@ -1044,12 +1025,6 @@ const detectImageParagraph = (nextToken, n, caption, sp, opt) => {
     } else {
       caption.nameSuffix = '-multiple'
     }
-    for (let i = 0; i < childrenLength; i++) {
-      const child = children[i]
-      if (isOnlySpacesText(child)) {
-        child.content = ''
-      }
-    }
   }
   const en = n + 2
   let tagName = 'img'
@@ -1062,6 +1037,22 @@ const detectImageParagraph = (nextToken, n, caption, sp, opt) => {
     wrapWithoutCaption: isValid && allowImageParagraphWithoutCaption,
     canWrap: isValid,
     imageToken,
+    inlineToken: nextToken,
+    trailingAttrToken,
+  }
+}
+
+const applyImageParagraphTransform = (detection) => {
+  if (!detection || detection.type !== 'image') return
+  if (detection.trailingAttrToken) {
+    detection.trailingAttrToken.content = ''
+  }
+  if (!detection.inlineToken || detection.tagName === 'img') return
+  const children = detection.inlineToken.children
+  for (let i = 0; i < children.length; i++) {
+    if (isOnlySpacesText(children[i])) {
+      children[i].content = ''
+    }
   }
 }
 
@@ -1071,16 +1062,19 @@ const figureWithCaption = (state, opt) => {
     table: 0,
   }
 
-  const captionState = { tokens: state.tokens, Token: state.Token }
+  const captionState = {
+    tokens: state.tokens,
+    Token: state.Token,
+    preferredLanguages: opt.preferredLanguages,
+  }
   const shouldResolvePreferredLanguages = !!(
     opt.shouldResolvePreferredLanguages &&
     sourceMayNeedPreferredLanguages(state)
   )
-  const renderOpt = shouldResolvePreferredLanguages ? Object.create(opt) : opt
   if (shouldResolvePreferredLanguages) {
-    renderOpt.preferredLanguages = resolvePreferredLanguagesForState(state, opt)
+    captionState.preferredLanguages = resolvePreferredLanguagesForState(state, opt)
   }
-  figureWithCaptionCore(state.tokens, renderOpt, figureNumberState, state.Token, captionState, null, 0)
+  figureWithCaptionCore(state.tokens, opt, figureNumberState, state.Token, captionState, null, 0)
 }
 
 const figureWithCaptionCore = (tokens, opt, figureNumberState, TokenConstructor, captionState, parentType = null, startIndex = 0) => {
@@ -1161,9 +1155,9 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, TokenConstructor,
     applyCaptionDrivenFigureClass(rCaption, rSp, opt)
 
     let hasCaption = rCaption.isPrev || rCaption.isNext
-    let pendingAutoCaption = ''
+    let pendingAutoCaption = null
     if (!hasCaption && detection.type === 'image' && opt.autoCaptionDetection) {
-      pendingAutoCaption = getAutoCaptionFromImage(detection.imageToken, opt)
+      pendingAutoCaption = getAutoCaptionFromImage(detection.imageToken, opt, captionState.preferredLanguages)
       if (pendingAutoCaption) {
         hasCaption = true
       }
@@ -1179,21 +1173,18 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, TokenConstructor,
       continue
     }
 
-    let shouldWrap = false
-    if (detection.type === 'html') {
-      shouldWrap = detection.canWrap !== false && (hasCaption || detection.wrapWithoutCaption)
-    } else if (detection.type === 'image') {
-      shouldWrap = detection.canWrap !== false && (hasCaption || detection.wrapWithoutCaption)
-      if (token.hidden === true) {
-        shouldWrap = false
-      }
-    } else {
-      shouldWrap = detection.canWrap !== false && hasCaption
+    let shouldWrap = hasCaption
+    if (detection.type === 'html' || detection.type === 'image') {
+      shouldWrap = shouldWrap || detection.wrapWithoutCaption
+    }
+    if (detection.type === 'image' && token.hidden === true) {
+      shouldWrap = false
     }
 
     if (shouldWrap) {
       if (pendingAutoCaption) {
-        const captionTokens = createAutoCaptionParagraph(pendingAutoCaption, TokenConstructor)
+        consumeAutoCaptionSource(detection.imageToken, pendingAutoCaption)
+        const captionTokens = createAutoCaptionParagraph(pendingAutoCaption.text, TokenConstructor)
         tokens.splice(rRange.start, 0, ...captionTokens)
         const insertedLength = captionTokens.length
         rRange.start += insertedLength
@@ -1202,7 +1193,8 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, TokenConstructor,
         checkCaption(tokens, rRange.start, rRange.end, rCaption, rSp, opt, captionState)
         applyCaptionDrivenFigureClass(rCaption, rSp, opt)
       }
-      ensureAutoFigureNumbering(tokens, rRange, rCaption, figureNumberState, opt)
+      applyImageParagraphTransform(detection)
+      ensureAutoFigureNumbering(tokens, rRange, rCaption, figureNumberState, rSp, opt)
       wrapWithFigure(tokens, rRange, detection.tagName, rCaption, detection.replaceInsteadOfWrap, rSp, opt, TokenConstructor)
     }
 
@@ -1221,8 +1213,6 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, TokenConstructor,
       } else if (rCaption.isNext) {
         changeNextCaptionPosition(tokens, en, rCaption, opt)
         nextIndex = en + 4
-      } else {
-        nextIndex = en + 1
       }
     }
 
@@ -1238,7 +1228,7 @@ const figureWithCaptionCore = (tokens, opt, figureNumberState, TokenConstructor,
 }
 
 const mditFigureWithPCaption = (md, option) => {
-  let opt = {
+  const opt = {
     // Caption languages delegated to p-captions.
     languages: ['en', 'ja'],
     preferredLanguages: null, // compatibility tie-break for generated fallback labels; prefer env.locale / env.preferredLocales per render
@@ -1287,16 +1277,18 @@ const mditFigureWithPCaption = (md, option) => {
     labelClassFollowsFigure: false,
     figureToLabelClassMap: null,
   }
-  const hasExplicitAutoLabelNumberSets = option && Object.prototype.hasOwnProperty.call(option, 'autoLabelNumberSets')
-  const hasExplicitImageOnlyParagraphWithoutCaption = option && Object.prototype.hasOwnProperty.call(option, 'imageOnlyParagraphWithoutCaption')
-  const hasExplicitFigureClassThatWrapsIframeTypeBlockquote = option && Object.prototype.hasOwnProperty.call(option, 'figureClassThatWrapsIframeTypeBlockquote')
-  const hasExplicitFigureClassThatWrapsSlides = option && Object.prototype.hasOwnProperty.call(option, 'figureClassThatWrapsSlides')
-  const hasExplicitLabelClassFollowsFigure = option && Object.prototype.hasOwnProperty.call(option, 'labelClassFollowsFigure')
+  const hasExplicitAutoLabelNumberSets = hasOwnOption(option, 'autoLabelNumberSets')
+  const hasExplicitImageOnlyParagraphWithoutCaption = hasOwnOption(option, 'imageOnlyParagraphWithoutCaption')
+  const hasExplicitFigureClassThatWrapsIframeTypeBlockquote = hasOwnOption(option, 'figureClassThatWrapsIframeTypeBlockquote')
+  const hasExplicitFigureClassThatWrapsSlides = hasOwnOption(option, 'figureClassThatWrapsSlides')
+  const hasExplicitLabelClassFollowsFigure = hasOwnOption(option, 'labelClassFollowsFigure')
+  if (hasOwnOption(option, 'setFigureNumber')) {
+    throw new Error('setFigureNumber is not supported by figure-with-p-caption; use autoLabelNumber or autoLabelNumberSets')
+  }
   if (option) Object.assign(opt, option)
   opt.imageOnlyParagraphWithoutCaption = hasExplicitImageOnlyParagraphWithoutCaption
     ? !!opt.imageOnlyParagraphWithoutCaption
     : !!opt.oneImageWithoutCaption
-  opt.oneImageWithoutCaption = !!opt.oneImageWithoutCaption
   if (!hasExplicitLabelClassFollowsFigure && opt.figureToLabelClassMap) {
     opt.labelClassFollowsFigure = true
   }
@@ -1356,7 +1348,7 @@ const mditFigureWithPCaption = (md, option) => {
     opt.labelPrefixMarkerWithoutLabelNextReg = null
   }
 
-  //If nextCaption has `{}` style and `f-img-multipleImages`, when upgraded to markdown-it-attrs@4.2.0, the existing script will have `{}` style on nextCaption. Therefore, since markdown-it-attrs is md.core.ruler.before('linkify'), figure_with_caption will be processed after it.
+  // Run after markdown-it-attrs has attached paragraph attrs, but before text replacements.
   md.core.ruler.before('replacements', 'figure_with_caption', (state) => {
     figureWithCaption(state, opt)
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markdown-it-figure-with-p-caption",
-  "version": "0.18.0",
+  "version": "0.19.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",
@@ -20,16 +20,16 @@
     "url": "https://github.com/peaceroad/p7d-markdown-it-figure-with-p-caption/issues"
   },
   "devDependencies": {
-    "@peaceroad/markdown-it-cjk-breaks-mod": "^0.1.11",
-    "@peaceroad/markdown-it-renderer-fence": "^0.7.0",
-    "@peaceroad/markdown-it-renderer-image": "^0.15.0",
-    "@peaceroad/markdown-it-strong-ja": "^0.9.1",
+    "@peaceroad/markdown-it-cjk-breaks-mod": "^0.1.14",
+    "@peaceroad/markdown-it-renderer-fence": "^0.8.0",
+    "@peaceroad/markdown-it-renderer-image": "^0.16.0",
+    "@peaceroad/markdown-it-strong-ja": "^0.9.4",
     "highlight.js": "^11.11.1",
-    "markdown-it": "^14.1.0",
-    "markdown-it-attrs": "^4.3.1"
+    "markdown-it": "^14.3.0",
+    "markdown-it-attrs": "^5.0.0"
   },
   "dependencies": {
-    "p7d-markdown-it-p-captions": "0.23.0"
+    "p7d-markdown-it-p-captions": "0.24.0"
   },
   "files": [
     "index.js",