@peaceroad/markdown-it-figure-with-p-caption 0.8.1 → 0.9.0

package/index.js

@@ -1,573 +1,555 @@
 import mditPCaption from 'p7d-markdown-it-p-captions'
 
-const mditFigureWithPCaption = (md, option) => {
-
-  let opt = {
-    classPrefix: 'f',
-    figureClassThatWrapsIframeTypeBlockquote: 'f-img',
-    styleProcess : true,
-    hasNumClass: false,
-    scaleSuffix: false,
-    dquoteFilename: false,
-    strongFilename: false,
-    bLabel: false,
-    strongLabel: false,
-    jointSpaceUseHalfWidth: false,
-    oneImageWithoutCaption: false,
-    iframeWithoutCaption: false,
-    videoWithoutCaption: false,
-    iframeTypeBlockquoteWithoutCaption: false,
-    removeUnnumberedLabel: false,
-    removeUnnumberedLabelExceptMarks: [],
-    multipleImages: true,
-    imgAltCaption: false,
-    imgTitleCaption: false,
-    roleDocExample: false,
-  };
-  if (option !== undefined) {
-    for (let o in option) {
-        opt[o] = option[o];
-    }
+const checkPrevCaption = (state, n, caption) => {
+  if(n < 3) return caption
+  const captionStartToken = state.tokens[n-3]
+  const captionEndToken = state.tokens[n-1]
+  if (captionStartToken === undefined || captionEndToken === undefined) return caption
+
+  if (captionStartToken.type !== 'paragraph_open' && captionEndToken.type !== 'paragraph_close') return caption
+  let captionName = ''
+  if (captionStartToken.attrs) {
+    captionStartToken.attrs.forEach(attr => {
+      let hasCaptionName = attr[1].match(/^f-(.+)$/)
+      if (attr[0] === 'class' && hasCaptionName) captionName = hasCaptionName[1]
+    })
   }
+  if(!captionName) return caption
+  caption.name = captionName
+  caption.hasPrev = true
+  return caption
+}
 
-  function checkPrevCaption(state, n, en, tagName, caption) {
-    if(n < 3) {return caption;}
-    const captionStartToken = state.tokens[n-3];
-    const captionEndToken = state.tokens[n-1];
-    if (captionStartToken === undefined || captionEndToken === undefined) {
-      return caption;
-    }
-    if (captionStartToken.type !== 'paragraph_open'
-      && captionEndToken.type !== 'paragraph_close') {
-      return caption;
+const changePrevCaptionPosition = (state, n, caption) => {
+  const captionStartToken = state.tokens[n-3]
+  const captionInlineToken = state.tokens[n-2]
+  const captionEndToken = state.tokens[n-1]
+  let isNoCaption = false
+  if (captionInlineToken.attrs) {
+    for (let attr of captionInlineToken.attrs) {
+      if (attr[0] === 'class' && attr[1] === 'nocaption') isNoCaption = true
     }
-    let captionName = '';
-    if (captionStartToken.attrs) {
-      captionStartToken.attrs.forEach(attr => {
-        let hasCaptionName = attr[1].match(/^f-(.+)$/);
-        if (attr[0] === 'class' && hasCaptionName) {
-          captionName = hasCaptionName[1];
-        }
-      });
-    }
-    if(!captionName) {return caption;}
-    caption.name = captionName;
-    caption.hasPrev = true;
-    return caption;
+  }
+  if (isNoCaption) {
+    state.tokens.splice(n-3, 3)
+    return
   }
 
-  function changePrevCaptionPosition(state, n, en, tagName, caption) {
-    const captionStartToken = state.tokens[n-3];
-    const captionInlineToken = state.tokens[n-2];
-    const captionEndToken = state.tokens[n-1];
-    let isNoCaption = false
-    if (captionInlineToken.attrs) {
-      for (let attr of captionInlineToken.attrs) {
-        if (attr[0] === 'class' && attr[1] === 'nocaption') {
-          isNoCaption = true
-        }
+  captionStartToken.attrs.forEach(attr => {
+    if (attr[0] === 'class') {
+      attr[1] = attr[1].replace(new RegExp(' *?f-' + caption.name), '').trim()
+      if(attr[1] === '') {
+        captionStartToken.attrs.splice(captionStartToken.attrIndex('class'), 1)
       }
     }
-    if (isNoCaption) {
-      state.tokens.splice(n-3, 3)
-      return
-    }
-
-    captionStartToken.attrs.forEach(attr => {
-      if (attr[0] === 'class') {
-        attr[1] = attr[1].replace(new RegExp(' *?f-' + caption.name), '').trim();
-        if(attr[1] === '') {
-          captionStartToken.attrs.splice(captionStartToken.attrIndex('class'), 1);
-        }
-      }
-    });
-    captionStartToken.type = 'figcaption_open';
-    captionStartToken.tag = 'figcaption';
-
-    captionEndToken.type = 'figcaption_close';
-    captionEndToken.tag = 'figcaption';
-    state.tokens.splice(n + 2, 0, captionStartToken, captionInlineToken, captionEndToken);
-    state.tokens.splice(n-3, 3);
-    return true;
-  }
+  })
+  captionStartToken.type = 'figcaption_open'
+  captionStartToken.tag = 'figcaption'
+  captionEndToken.type = 'figcaption_close'
+  captionEndToken.tag = 'figcaption'
+  state.tokens.splice(n + 2, 0, captionStartToken, captionInlineToken, captionEndToken)
+  state.tokens.splice(n-3, 3)
+  return true
+}
 
-  function checkNextCaption(state, n, en, tagName, caption) {
-    if (en + 2 > state.tokens.length) { return caption; }
-    const captionStartToken = state.tokens[en+1];
-    const captionEndToken = state.tokens[en+3];
-    if (captionStartToken === undefined || captionEndToken === undefined) {
-      return caption;
-    }
-    if (captionStartToken.type !== 'paragraph_open'
-      && captionEndToken.type !== 'paragraph_close') {
-      return caption;
-    }
-    let captionName = '';
-    if (captionStartToken.attrs) {
-      captionStartToken.attrs.forEach(attr => {
-        let hasCaptionName = attr[1].match(/^f-(.+)$/);
-        if (attr[0] === 'class' && hasCaptionName) {
-          captionName = hasCaptionName[1];
-        }
-      });
-    }
-    if(!captionName) { return caption; }
-    caption.name = captionName;
-    caption.hasNext = true;
-    return caption;
-  }
+const checkNextCaption = (state, en, caption) => {
+  if (en + 2 > state.tokens.length) return caption
+  const captionStartToken = state.tokens[en+1]
+  const captionEndToken = state.tokens[en+3]
+  if (captionStartToken === undefined || captionEndToken === undefined) return caption
+  if (captionStartToken.type !== 'paragraph_open' && captionEndToken.type !== 'paragraph_close') return caption
 
-  function changeNextCaptionPosition(state, n, en, tagName, caption) {
-    const captionStartToken = state.tokens[en+2]; // +1: text node for figure.
-    const captionInlineToken = state.tokens[en+3];
-    const captionEndToken = state.tokens[en+4];
+  let captionName = ''
+  if (captionStartToken.attrs) {
     captionStartToken.attrs.forEach(attr => {
-      if (attr[0] === 'class') {
-        attr[1] = attr[1].replace(new RegExp(' *?f-' + caption.name), '').trim();
-        if(attr[1] === '') {
-          captionStartToken.attrs.splice(captionStartToken.attrIndex('class'), 1);
-        }
-      }
-    });
-    captionStartToken.type = 'figcaption_open';
-    captionStartToken.tag = 'figcaption';
-
-    captionEndToken.type = 'figcaption_close';
-    captionEndToken.tag = 'figcaption';
-
-    state.tokens.splice(en, 0, captionStartToken, captionInlineToken, captionEndToken);
-    state.tokens.splice(en+5, 3);
-    return true;
+      let hasCaptionName = attr[1].match(/^f-(.+)$/)
+      if (attr[0] === 'class' && hasCaptionName) captionName = hasCaptionName[1]
+    })
   }
+  if(!captionName) return caption
+  caption.name = captionName
+  caption.hasNext = true
+  return caption
+}
 
-  const wrapWithFigure = (state, range, tagName, caption, replaceInsteadOfWrap, sp) => {
-    let n = range.start;
-    let en = range.end;
-    const figureStartToken = new state.Token('figure_open', 'figure', 1);
-    figureStartToken.attrSet('class', 'f-' + tagName);
-    if (sp.isVideoIframe) {
-      figureStartToken.attrSet('class', 'f-video');
-    }
-    if (sp.isIframeTypeBlockQuote) {
-      let figureClassThatWrapsIframeTypeBlockquote = 'i-frame'
-      if (caption.prev || caption.next) {
-        if (caption.name === 'img') {
-          figureClassThatWrapsIframeTypeBlockquote = 'f-img'
-        }
-        figureStartToken.attrSet('class', figureClassThatWrapsIframeTypeBlockquote)
-      } else {
-        console.log('else::')
-        figureClassThatWrapsIframeTypeBlockquote = opt.figureClassThatWrapsIframeTypeBlockquote
-        figureStartToken.attrSet('class', figureClassThatWrapsIframeTypeBlockquote)
+const changeNextCaptionPosition = (state, en, caption) => {
+  const captionStartToken = state.tokens[en+2] // +1: text node for figure.
+  const captionInlineToken = state.tokens[en+3]
+  const captionEndToken = state.tokens[en+4]
+  captionStartToken.attrs.forEach(attr => {
+    if (attr[0] === 'class') {
+      attr[1] = attr[1].replace(new RegExp(' *?f-' + caption.name), '').trim()
+      if(attr[1] === '') {
+        captionStartToken.attrs.splice(captionStartToken.attrIndex('class'), 1)
       }
     }
-    if(/pre-(?:code|samp)/.test(tagName) && opt.roleDocExample) {
-      figureStartToken.attrSet('role', 'doc-example');
-    }
-    const figureEndToken = new state.Token('figure_close', 'figure', -1);
-    const breakToken = new state.Token('text', '', 0);
-    breakToken.content = '\n';
-    if (opt.styleProcess && caption.hasNext && sp.attrs.length > 0) {
-      for (let attr of sp.attrs) {
-        figureStartToken.attrJoin(attr[0], attr[1]);
+  })
+  captionStartToken.type = 'figcaption_open'
+  captionStartToken.tag = 'figcaption'
+  captionEndToken.type = 'figcaption_close'
+  captionEndToken.tag = 'figcaption'
+  state.tokens.splice(en, 0, captionStartToken, captionInlineToken, captionEndToken)
+  state.tokens.splice(en+5, 3)
+  return true
+}
+
+const wrapWithFigure = (state, range, tagName, caption, replaceInsteadOfWrap, sp, opt) => {
+  let n = range.start
+  let en = range.end
+  const figureStartToken = new state.Token('figure_open', 'figure', 1)
+  figureStartToken.attrSet('class', 'f-' + tagName)
+  if (sp.isVideoIframe) {
+    figureStartToken.attrSet('class', 'f-video')
+  }
+  if (sp.isIframeTypeBlockQuote) {
+    let figureClassThatWrapsIframeTypeBlockquote = 'i-frame'
+    if (caption.prev || caption.next) {
+      if (caption.name === 'img') {
+        figureClassThatWrapsIframeTypeBlockquote = 'f-img'
       }
+      figureStartToken.attrSet('class', figureClassThatWrapsIframeTypeBlockquote)
+    } else {
+      figureClassThatWrapsIframeTypeBlockquote = opt.figureClassThatWrapsIframeTypeBlockquote
+      figureStartToken.attrSet('class', figureClassThatWrapsIframeTypeBlockquote)
     }
-   // For vsce
-    if(state.tokens[n].attrs) {
-      for (let attr of state.tokens[n].attrs) {
-        figureStartToken.attrJoin(attr[0], attr[1]);
-      }
+  }
+  if(/pre-(?:code|samp)/.test(tagName) && opt.roleDocExample) {
+    figureStartToken.attrSet('role', 'doc-example')
+  }
+  const figureEndToken = new state.Token('figure_close', 'figure', -1)
+  const breakToken = new state.Token('text', '', 0)
+  breakToken.content = '\n'
+  if (opt.styleProcess && caption.hasNext && sp.attrs.length > 0) {
+    for (let attr of sp.attrs) {
+      figureStartToken.attrJoin(attr[0], attr[1])
     }
-    ///
-    if (replaceInsteadOfWrap) {
-      state.tokens.splice(en, 1, breakToken, figureEndToken, breakToken);
-      state.tokens.splice(n, 1, figureStartToken, breakToken);
-      en = en + 2;
-      //console.log(state.tokens[n].type, state.tokens[en].type);
-    } else {
-      state.tokens.splice(en+1, 0, figureEndToken, breakToken);
-      state.tokens.splice(n, 0, figureStartToken, breakToken);
-      en = en + 3;
-      //console.log(state.tokens[n].type, state.tokens[en].type);
+  }
+  // For vsce
+  //console.log(caption)
+  if(state.tokens[n].attrs && caption.name === 'img') {
+    for (let attr of state.tokens[n].attrs) {
+      figureStartToken.attrJoin(attr[0], attr[1])
     }
-    range.start = n;
-    range.end = en;
-    return range;
   }
-
-  function checkCaption(state, n, en, tagName, caption) {
-
-    caption = checkPrevCaption(state, n, en, tagName, caption);
-    if (caption.hasPrev) return caption;
-    caption = checkNextCaption(state, n, en, tagName, caption);
-    return caption;
+  if (replaceInsteadOfWrap) {
+    state.tokens.splice(en, 1, breakToken, figureEndToken, breakToken)
+    state.tokens.splice(n, 1, figureStartToken, breakToken)
+    en = en + 2
+    //console.log(state.tokens[n].type, state.tokens[en].type)
+  } else {
+    state.tokens.splice(en+1, 0, figureEndToken, breakToken)
+    state.tokens.splice(n, 0, figureStartToken, breakToken)
+    en = en + 3
+    //console.log(state.tokens[n].type, state.tokens[en].type)
   }
+  range.start = n
+  range.end = en
+  return range
+}
 
-  function figureWithCaption(state) {
-    let n = 0;
-    while (n < state.tokens.length) {
-      const token = state.tokens[n];
-      const nextToken = state.tokens[n+1];
-      let en = n;
-      let range = {
-        start: n,
-        end: en,
-      }
-      let checkToken = false;
-      let hasCloseTag = false;
-      let tagName = '';
-      let caption = {
-        name: '',
-        nameSuffix: '',
-        hasPrev: false,
-        hasNext: false,
-      };
-      const sp = {
-        attrs: [],
-        isVideoIframe: false,
-        isIframeTypeBlockQuote: false,
-        hasImgCaption: false,
-      }
+const checkCaption = (state, n, en, caption) => {
+  caption = checkPrevCaption(state, n, caption)
+  if (caption.hasPrev) return caption
+  caption = checkNextCaption(state, en, caption)
+  return caption
+}
 
-      const checkTags = ['table', 'pre', 'blockquote'];
-      let cti = 0;
-      while (cti < checkTags.length) {
-        if (token.type === checkTags[cti] + '_open') {
-          if (n > 1) {
-            if (state.tokens[n-2].type === 'figure_open') { // +linebreak
-              cti++; continue;
-            }
-          }
-          checkToken = true;
-          tagName = token.tag;
-          while (en < state.tokens.length) {
-            if(state.tokens[en].type === tagName + '_close') {
-              hasCloseTag = true;
-              break;
-            };
-            en++;
-          }
-          range.end = en;
-          caption = checkCaption(state, n, en, tagName, caption);
-          if (caption.hasPrev || caption.hasNext) {
-            range = wrapWithFigure(state, range, tagName, caption, false, sp);
-            break;
+const figureWithCaption = (state, opt) => {
+  let n = 0
+  while (n < state.tokens.length) {
+    const token = state.tokens[n]
+    const nextToken = state.tokens[n+1]
+    let en = n
+    let range = {
+      start: n,
+      end: en,
+    }
+    let checkToken = false
+    let hasCloseTag = false
+    let tagName = ''
+    let caption = {
+      name: '',
+      nameSuffix: '',
+      hasPrev: false,
+      hasNext: false,
+    };
+    const sp = {
+      attrs: [],
+      isVideoIframe: false,
+      isIframeTypeBlockQuote: false,
+      hasImgCaption: false,
+    }
+
+    const checkTags = ['table', 'pre', 'blockquote']
+    let cti = 0
+    while (cti < checkTags.length) {
+      if (token.type === checkTags[cti] + '_open') {
+        if (n > 1) {
+          if (state.tokens[n-2].type === 'figure_open') { // +linebreak
+            cti++; continue;
           }
-          break;
         }
-
-        if(token.type === 'fence') {
-          if (token.tag === 'code' && token.block) {
-            checkToken = true;
-            let isSampInfo = false
-            if (/^ *(?:samp|shell|console)(?:(?= )|$)/.test(token.info)) {
-              token.tag = 'samp';
-              isSampInfo = true
-            }
-            if (isSampInfo) {
-              tagName = 'pre-samp';
-            } else {
-              tagName = 'pre-code';
-            }
-            caption = checkCaption(state, n, en, tagName, caption);
-            if (caption.hasPrev || caption.hasNext) {
-              range = wrapWithFigure(state, range, tagName, caption, false, sp);
-              break;
-            }
+        checkToken = true
+        caption.name = checkTags
+        tagName = token.tag
+        while (en < state.tokens.length) {
+          if(state.tokens[en].type === tagName + '_close') {
+            hasCloseTag = true
+            break
           }
-          break;
+          en++
         }
-        cti++;
+        range.end = en
+        caption = checkCaption(state, n, en, caption)
+        if (caption.hasPrev || caption.hasNext) {
+          range = wrapWithFigure(state, range, tagName, caption, false, sp, opt)
+        }
+        break
       }
 
-      if (token.type === 'html_block') {
-        const tags = ['video', 'audio', 'iframe', 'blockquote'];
-        let ctj = 0;
-        while (ctj < tags.length) {
-          const hasTag = token.content.match(new RegExp('^<'+ tags[ctj] + ' ?[^>]*?>[\\s\\S]*?<\\/' + tags[ctj] + '>(\\n| *?)(<script [^>]*?>(?:<\\/script>)?)? *(\\n|$)'));
-          if (!hasTag) {
-            ctj++;
-            continue;
+      if(token.type === 'fence') {
+        if (token.tag === 'code' && token.block) {
+          checkToken = true
+          let isSampInfo = false
+          if (/^ *(?:samp|shell|console)(?:(?= )|$)/.test(token.info)) {
+            token.tag = 'samp'
+            isSampInfo = true
           }
-          if ((hasTag[2] && hasTag[3] !== '\n') ||
-            (hasTag[1] !== '\n' && hasTag[2] === undefined)) {
-            token.content += '\n'
+          if (isSampInfo) {
+            tagName = 'pre-samp'
+          } else {
+            tagName = 'pre-code'
           }
-          tagName = tags[ctj];
-          checkToken = true;
-          if (tagName === 'blockquote') {
-            //text-post-media: threads
-            if(/^<[^>]*? class="(?:twitter-tweet|instagram-media|text-post-media|bluesky-embed)"/.test(token.content)) {
-              sp.isIframeTypeBlockQuote = true
-            } else {
-              ctj++;
-              continue;
-            }
+          caption = checkCaption(state, n, en, caption)
+          if (caption.hasPrev || caption.hasNext) {
+            range = wrapWithFigure(state, range, tagName, caption, false, sp, opt)
+            break
           }
-          break;
         }
-        if (!checkToken) {n++; continue;}
-        if (tagName === 'iframe') {
-          if(/^<[^>]*? src="https:\/\/(?:www.youtube-nocookie.com|player.vimeo.com)\//i.test(token.content)) {
-            sp.isVideoIframe = true
+        break
+      }
+      cti++
+    }
+
+    if (token.type === 'html_block') {
+      const tags = ['video', 'audio', 'iframe', 'blockquote']
+      let ctj = 0
+      while (ctj < tags.length) {
+        const hasTag = token.content.match(new RegExp('^<'+ tags[ctj] + ' ?[^>]*?>[\\s\\S]*?<\\/' + tags[ctj] + '>(\\n| *?)(<script [^>]*?>(?:<\\/script>)?)? *(\\n|$)'))
+        if (!hasTag) {
+          ctj++
+          continue
+        }
+        if ((hasTag[2] && hasTag[3] !== '\n') || (hasTag[1] !== '\n' && hasTag[2] === undefined)) {
+          token.content += '\n'
+        }
+        tagName = tags[ctj]
+        caption.name = tags[ctj]
+        checkToken = true
+        if (tagName === 'blockquote') {
+          //text-post-media: threads
+          if(/^<[^>]*? class="(?:twitter-tweet|instagram-media|text-post-media|bluesky-embed)"/.test(token.content)) {
+            sp.isIframeTypeBlockQuote = true
+          } else {
+            ctj++
+            continue
           }
         }
-        if(sp.isIframeTypeBlockQuote) {
-          if(n > 2) {
-            if (state.tokens[n-2].children) {
-              if (state.tokens[n-2].children.length > 1) {
-                if (state.tokens[n-2].children[1].attrs) {
-                  if (state.tokens[n-2].children[1].attrs[0][0] === 'class') {
-                    if (state.tokens[n-2].children[1].attrs[0][1] === 'f-img-label') {
-                      sp.hasImgCaption = true;
-                      /* For now, I think I should use figure instead of blockquoe for caption. */
-                    }
+        break
+      }
+      if (!checkToken) {n++; continue;}
+      if (tagName === 'iframe') {
+        if(/^<[^>]*? src="https:\/\/(?:www.youtube-nocookie.com|player.vimeo.com)\//i.test(token.content)) {
+          sp.isVideoIframe = true
+        }
+      }
+      if(sp.isIframeTypeBlockQuote) {
+        if(n > 2) {
+          if (state.tokens[n-2].children) {
+            if (state.tokens[n-2].children.length > 1) {
+              if (state.tokens[n-2].children[1].attrs) {
+                if (state.tokens[n-2].children[1].attrs[0][0] === 'class') {
+                  if (state.tokens[n-2].children[1].attrs[0][1] === 'f-img-label') {
+                    sp.hasImgCaption = true
+                    /* For now, I think I should use figure instead of blockquoe for caption. */
                   }
                 }
               }
             }
           }
-          if (n + 2 < state.tokens.length) {
-            if (state.tokens[n+2].children) {
-              if (state.tokens[n+2].children.length > 1) {
-                if (state.tokens[n+2].children[1].attrs) {
-                  if (state.tokens[n+2].children[1].attrs[0][0] === 'class' &&
-                    state.tokens[n+2].children[1].attrs[0][1] === 'f-img-label') {
-                    sp.hasImgCaption = true;
-                  }
+        }
+        if (n + 2 < state.tokens.length) {
+          if (state.tokens[n+2].children) {
+            if (state.tokens[n+2].children.length > 1) {
+              if (state.tokens[n+2].children[1].attrs) {
+                if (state.tokens[n+2].children[1].attrs[0][0] === 'class' &&
+                  state.tokens[n+2].children[1].attrs[0][1] === 'f-img-label') {
+                  sp.hasImgCaption = true
                 }
               }
             }
           }
         }
-        caption = checkCaption(state, n, en, tagName, caption);
-        if (caption.hasPrev || caption.hasNext) {
-          range = wrapWithFigure(state, range, tagName, caption, false, sp);
-          n = en + 2;
-        } else if ((opt.iframeWithoutCaption && (tagName === 'iframe')) ||
-          (opt.videoWithoutCaption && (tagName === 'video')) ||
-          (opt.iframeTypeBlockquoteWithoutCaption && (tagName === 'blockquote'))) {
-          range = wrapWithFigure(state, range, tagName, caption, false, sp);
-          n = en + 2;
-        }
       }
+      caption = checkCaption(state, n, en, caption)
+      if (caption.hasPrev || caption.hasNext) {
+        range = wrapWithFigure(state, range, tagName, caption, false, sp, opt)
+        n = en + 2
+      } else if ((opt.iframeWithoutCaption && (tagName === 'iframe')) ||
+        (opt.videoWithoutCaption && (tagName === 'video')) ||
+        (opt.iframeTypeBlockquoteWithoutCaption && (tagName === 'blockquote'))) {
+        range = wrapWithFigure(state, range, tagName, caption, false, sp, opt)
+        n = en + 2
+      }
+    }
 
-
-      if (token.type === 'paragraph_open' && nextToken.type === 'inline' && nextToken.children[0].type === 'image') {
-        let ntChildTokenIndex = 1
-        let imageNum = 1
-        let isMultipleImagesHorizontal = true
-        let isMultipleImagesVertical = true
-        checkToken = true
-        while (ntChildTokenIndex < nextToken.children.length) {
-          const ntChildToken = nextToken.children[ntChildTokenIndex]
-          if (ntChildTokenIndex === nextToken.children.length - 1) {
-             let imageAttrs = ntChildToken.content.match(/^ *\{(.*?)\} *$/)
-            if(ntChildToken.type === 'text' && imageAttrs) {
-              imageAttrs = imageAttrs[1].split(/ +/)
-              let iai = 0
-              while (iai < imageAttrs.length) {
-                if (/^\./.test(imageAttrs[iai])) {
-                  imageAttrs[iai] = imageAttrs[iai].replace(/^\./, "class=")
-                }
-                if (/^#/.test(imageAttrs[iai])) {
-                  imageAttrs[iai] = imageAttrs[iai].replace(/^\#/, "id=")
-                }
-                let imageAttr = imageAttrs[iai].match(/^(.*?)="?(.*)"?$/)
-                if (!imageAttr || !imageAttr[1]) {
-                  iai++
-                  continue
-                }
-                sp.attrs.push([imageAttr[1], imageAttr[2]])
+    if (token.type === 'paragraph_open' && nextToken.type === 'inline' && nextToken.children[0].type === 'image') {
+      let ntChildTokenIndex = 1
+      let imageNum = 1
+      let isMultipleImagesHorizontal = true
+      let isMultipleImagesVertical = true
+      checkToken = true
+      caption.name = 'img'
+      while (ntChildTokenIndex < nextToken.children.length) {
+        const ntChildToken = nextToken.children[ntChildTokenIndex]
+        if (ntChildTokenIndex === nextToken.children.length - 1) {
+           let imageAttrs = ntChildToken.content.match(/^ *\{(.*?)\} *$/)
+          if(ntChildToken.type === 'text' && imageAttrs) {
+            imageAttrs = imageAttrs[1].split(/ +/)
+            let iai = 0
+            while (iai < imageAttrs.length) {
+              if (/^\./.test(imageAttrs[iai])) {
+                imageAttrs[iai] = imageAttrs[iai].replace(/^\./, "class=")
+              }
+              if (/^#/.test(imageAttrs[iai])) {
+                imageAttrs[iai] = imageAttrs[iai].replace(/^\#/, "id=")
+              }
+              let imageAttr = imageAttrs[iai].match(/^(.*?)="?(.*)"?$/)
+              if (!imageAttr || !imageAttr[1]) {
                 iai++
+                continue
               }
-              break
+              sp.attrs.push([imageAttr[1], imageAttr[2]])
+              iai++
             }
-          }
-
-          if (!opt.multipleImages) {
-            checkToken = false
             break
           }
-          if (ntChildToken.type === 'image') {
-            imageNum += 1
-          } else if (ntChildToken.type === 'text' && /^ *$/.test(ntChildToken.content)) {
-            isMultipleImagesVertical = false
-            if (isMultipleImagesVertical) {
-              isMultipleImagesHorizontal = false
-            }
-          } else if (ntChildToken.type === 'softbreak') {
+        }
+
+        if (!opt.multipleImages) {
+          checkToken = false
+          break
+        }
+        if (ntChildToken.type === 'image') {
+          imageNum += 1
+        } else if (ntChildToken.type === 'text' && /^ *$/.test(ntChildToken.content)) {
+          isMultipleImagesVertical = false
+          if (isMultipleImagesVertical) {
             isMultipleImagesHorizontal = false
-            if (isMultipleImagesHorizontal) {
-              isMultipleImagesVertical = false
-            }
-          } else {
-            checkToken = false
-            break
           }
-          ntChildTokenIndex++
-        }
-        if (checkToken && imageNum > 1 && opt.multipleImages) {
+        } else if (ntChildToken.type === 'softbreak') {
+         isMultipleImagesHorizontal = false
           if (isMultipleImagesHorizontal) {
-            caption.nameSuffix = '-horizontal'
-          } else if (isMultipleImagesVertical) {
-            caption.nameSuffix = '-vertical'
-          } else {
-            caption.nameSuffix = '-multiple'
-          }
-          ntChildTokenIndex = 0
-          while (ntChildTokenIndex < nextToken.children.length) {
-            const ccToken = nextToken.children[ntChildTokenIndex]
-            if (ccToken.type === 'text' && /^ *$/.test(ccToken.content)) {
-              ccToken.content = ''
-            }
-            ntChildTokenIndex++
+            isMultipleImagesVertical = false
           }
+        } else {
+          checkToken = false
+          break
         }
-        en = n + 2;
-        range.end = en;
-        tagName = 'img';
-        nextToken.children[0].type = 'image';
-
-        if (opt.imgAltCaption) setAltToLabel(state, n, en, tagName, caption, opt)
-        if (opt.imgTitleCaption) setTitleToLabel(state, n, en, tagName, caption, opt)
-
-        caption = checkCaption(state, n, en, tagName, caption, opt);
-
-        if (opt.oneImageWithoutCaption && state.tokens[n-1]) {
-          if (state.tokens[n-1].type === 'list_item_open') {checkToken = false;}
+        ntChildTokenIndex++
+      }
+      if (checkToken && imageNum > 1 && opt.multipleImages) {
+        if (isMultipleImagesHorizontal) {
+          caption.nameSuffix = '-horizontal'
+        } else if (isMultipleImagesVertical) {
+          caption.nameSuffix = '-vertical'
+        } else {
+          caption.nameSuffix = '-multiple'
         }
-        if (checkToken && (opt.oneImageWithoutCaption || caption.hasPrev || caption.hasNext)) {
-          if (caption.nameSuffix) tagName += caption.nameSuffix
-          range = wrapWithFigure(state, range, tagName, caption, true, sp)
+        ntChildTokenIndex = 0
+        while (ntChildTokenIndex < nextToken.children.length) {
+          const ccToken = nextToken.children[ntChildTokenIndex]
+          if (ccToken.type === 'text' && /^ *$/.test(ccToken.content)) {
+           ccToken.content = ''
+          }
+          ntChildTokenIndex++
         }
       }
+      en = n + 2
+      range.end = en
+      tagName = 'img'
+      nextToken.children[0].type = 'image'
 
-      if (!checkToken || !caption.name) {n++; continue;}
+      if (opt.imgAltCaption) setAltToLabel(state, n, en, tagName, caption, opt)
+      if (opt.imgTitleCaption) setTitleToLabel(state, n, en, tagName, caption, opt)
+      caption = checkCaption(state, n, en, caption)
 
-      n = range.start;
-      en = range.end;
-      if (caption.hasPrev) {
-        changePrevCaptionPosition(state, n, en, tagName, caption);
-        n = en + 1;
-        continue;
+      if (opt.oneImageWithoutCaption && state.tokens[n-1]) {
+        if (state.tokens[n-1].type === 'list_item_open') checkToken = false
       }
-      if (caption.hasNext) {
-        changeNextCaptionPosition(state, n, en, tagName, caption);
-        n = en + 4;
-        continue;
+      if (checkToken && (opt.oneImageWithoutCaption || caption.hasPrev || caption.hasNext)) {
+        if (caption.nameSuffix) tagName += caption.nameSuffix
+        range = wrapWithFigure(state, range, tagName, caption, true, sp, opt)
       }
-      n = en + 1;
     }
-    return;
-  }
 
-  const setAltToLabel = (state, n, en, tagName, caption, opt) => {
-    if (n < 2) return false
-    if (state.tokens[n+1].children[0].type !== 'image' || !state.tokens[n-2].children) return false
-    if (state.tokens[n-2].children[2]) {
-      state.tokens[n+1].content = state.tokens[n+1].content.replace(/^!\[.*?\]/, '![' + state.tokens[n-2].children[2].content + ']')
-      if (!state.tokens[n+1].children[0].children[0]) {
-        const textToken  = new state.Token('text', '', 0)
-        state.tokens[n+1].children[0].children.push(textToken)
-      }
-      // Set figure label:
-      //state.tokens[n+1].children[0].children[0].content = state.tokens[n-2].children[2].content
-      // Set img alt to empty value:
-      state.tokens[n+1].children[0].children[0].content = ''
+    if (!checkToken || !caption.name) {n++; continue;}
+
+    n = range.start
+    en = range.end
+    if (caption.hasPrev) {
+      changePrevCaptionPosition(state, n, caption)
+      n = en + 1
+      continue
     }
-    // Set figure label:
-    //state.tokens[n+1].children[0].content = state.tokens[n-2].children[2].content
-    // Set img alt to empty value:
-    state.tokens[n+1].children[0].content = ''
-    //console.log(state.tokens[n+1].children[0])
-    return true
+    if (caption.hasNext) {
+      changeNextCaptionPosition(state, en, caption)
+      n = en + 4
+      continue
+    }
+    n = en + 1
   }
+  return
+}
 
-  const setTitleToLabel = (state, n, en, tagName, caption, opt) => {
-    if (n < 2) return false
-    if (state.tokens[n+1].children[0].type !== 'image') return false
-    if (!state.tokens[n-2].children[0]) return false
-    state.tokens[n+1].children[0].attrSet('alt', state.tokens[n+1].children[0].content)
+const setAltToLabel = (state, n, en, tagName, caption, opt) => {
+  if (n < 2) return false
+  if (state.tokens[n+1].children[0].type !== 'image' || !state.tokens[n-2].children) return false
+  if (state.tokens[n-2].children[2]) {
+    state.tokens[n+1].content = state.tokens[n+1].content.replace(/^!\[.*?\]/, '![' + state.tokens[n-2].children[2].content + ']')
     if (!state.tokens[n+1].children[0].children[0]) {
       const textToken  = new state.Token('text', '', 0)
       state.tokens[n+1].children[0].children.push(textToken)
     }
-    let i = 0
-    while (0 < state.tokens[n+1].children[0].attrs.length) {
-      if (state.tokens[n+1].children[0].attrs[i][0] === 'title') {
-        state.tokens[n+1].children[0].attrs.splice(i, i + 1)
-        break
-      } else {
-        state.tokens[n+1].children[0].attrJoin('title', '')
-      }
-      i++
-    }
-    //console.log(state.tokens[n+1].children[0])
-    return true
+    // Set figure label:
+    //state.tokens[n+1].children[0].children[0].content = state.tokens[n-2].children[2].content
+    // Set img alt to empty value:
+    state.tokens[n+1].children[0].children[0].content = ''
   }
+  // Set figure label:
+  //state.tokens[n+1].children[0].content = state.tokens[n-2].children[2].content
+  // Set img alt to empty value:
+  state.tokens[n+1].children[0].content = ''
+  //console.log(state.tokens[n+1].children[0])
+  return true
+}
 
-  const imgAttrToPCaption = (state, startLine) => {
-    let pos = state.bMarks[startLine] + state.tShift[startLine]
-    let max = state.eMarks[startLine]
-    let inline = state.src.slice(pos, max)
-    let label = ''
-    if (opt.imgAltCaption && typeof opt.imgAltCaption === 'string') label = opt.imgAltCaption
-    if (opt.imgTitleCaption && typeof opt.imgTitleCaption === 'string') label = opt.imgTitleCaption
-    let caption = ''
-    let imgAttrUsedCaption = ''
-
-    const img = inline.match(/^( *!\[)(.*?)\]\( *?((.*?)(?: +?\"(.*?)\")?) *?\)( *?\{.*?\})? *$/)
-    if (!img) return
-
-    let hasLabel
-    if (opt.imgAltCaption) {
-      caption = img[2]
-      hasLabel = img[2].match(new RegExp('^' + opt.imgAltCaption))
-      imgAttrUsedCaption = 'alt'
+const setTitleToLabel = (state, n, en, tagName, caption, opt) => {
+  if (n < 2) return false
+  if (state.tokens[n+1].children[0].type !== 'image') return false
+  if (!state.tokens[n-2].children[0]) return false
+  state.tokens[n+1].children[0].attrSet('alt', state.tokens[n+1].children[0].content)
+  if (!state.tokens[n+1].children[0].children[0]) {
+    const textToken  = new state.Token('text', '', 0)
+    state.tokens[n+1].children[0].children.push(textToken)
+  }
+  let i = 0
+  while (0 < state.tokens[n+1].children[0].attrs.length) {
+    if (state.tokens[n+1].children[0].attrs[i][0] === 'title') {
+      state.tokens[n+1].children[0].attrs.splice(i, i + 1)
+      break
+    } else {
+      state.tokens[n+1].children[0].attrJoin('title', '')
     }
-    if (opt.imgTitleCaption) {
-      if (!img[5]) img[5] = ''
-      caption = img[5]
-      hasLabel = img[5].match(new RegExp('^' + opt.imgTitleCaption))
-      imgAttrUsedCaption = 'title'
+    i++
+  }
+  //console.log(state.tokens[n+1].children[0])
+  return true
+}
+
+const imgAttrToPCaption = (state, startLine, opt) => {
+  let pos = state.bMarks[startLine] + state.tShift[startLine]
+  let max = state.eMarks[startLine]
+  let inline = state.src.slice(pos, max)
+  let label = ''
+  if (opt.imgAltCaption && typeof opt.imgAltCaption === 'string') label = opt.imgAltCaption
+  if (opt.imgTitleCaption && typeof opt.imgTitleCaption === 'string') label = opt.imgTitleCaption
+  let caption = ''
+  let imgAttrUsedCaption = ''
+
+  const img = inline.match(/^( *!\[)(.*?)\]\( *?((.*?)(?: +?\"(.*?)\")?) *?\)( *?\{.*?\})? *$/)
+  if (!img) return
+
+  let hasLabel
+  if (opt.imgAltCaption) {
+    caption = img[2]
+    hasLabel = img[2].match(new RegExp('^' + opt.imgAltCaption))
+    imgAttrUsedCaption = 'alt'
+  }
+  if (opt.imgTitleCaption) {
+    if (!img[5]) img[5] = ''
+    caption = img[5]
+    hasLabel = img[5].match(new RegExp('^' + opt.imgTitleCaption))
+    imgAttrUsedCaption = 'title'
+  }
+  let token
+  token = state.push('paragraph_open', 'p', 1)
+  token.map = [startLine, startLine + 1]
+  token = state.push('inline', '', 0)
+  if (hasLabel) {
+    token.content = caption
+  } else {
+    if (!label) {
+      if (imgAttrUsedCaption === 'alt') {
+        label = opt.imgAltCaption
+      } else if (imgAttrUsedCaption === 'title') {
+        label = opt.imgTitleCaption
+      } else if (imgAttrUsedCaption) {
+        label = 'Figure'
+      }
     }
-    let token
-    token = state.push('paragraph_open', 'p', 1)
-    token.map = [startLine, startLine + 1]
-    token = state.push('inline', '', 0)
-    if (hasLabel) {
-      token.content = caption
+    token.content = label
+    if (/[a-zA-Z]/.test(label)) {
+      token.content += '.'
+      if (caption) token.content += ' '
     } else {
-      if (!label) {
-        if (imgAttrUsedCaption === 'alt') {
-          label = opt.imgAltCaption
-        } else if (imgAttrUsedCaption === 'title') {
-          label = opt.imgTitleCaption
-        } else if (imgAttrUsedCaption) {
-          label = 'Figure'
-        }
-      }
-      token.content = label
-      if (/[a-zA-Z]/.test(label)) {
-        token.content += '.'
-        if (caption) token.content += ' '
-      } else {
-        token.content += '　'
-      }
-      token.content += caption
+      token.content += '　'
     }
-    token.map = [startLine, startLine + 1]
-    token.children = []
-    if (caption.length === 0) {
-      token.attrs = [['class', 'nocaption']]
+    token.content += caption
+  }
+  token.map = [startLine, startLine + 1]
+  token.children = []
+  if (caption.length === 0) {
+    token.attrs = [['class', 'nocaption']]
+  }
+  token = state.push('paragraph_close', 'p', -1)
+  return
+}
+
+const mditFigureWithPCaption = (md, option) => {
+
+  let opt = {
+    classPrefix: 'f',
+    figureClassThatWrapsIframeTypeBlockquote: 'f-img',
+    styleProcess : true,
+    hasNumClass: false,
+    scaleSuffix: false,
+    dquoteFilename: false,
+    strongFilename: false,
+    bLabel: false,
+    strongLabel: false,
+    jointSpaceUseHalfWidth: false,
+    oneImageWithoutCaption: false,
+    iframeWithoutCaption: false,
+    videoWithoutCaption: false,
+    iframeTypeBlockquoteWithoutCaption: false,
+    removeUnnumberedLabel: false,
+    removeUnnumberedLabelExceptMarks: [],
+    multipleImages: true,
+    imgAltCaption: false,
+    imgTitleCaption: false,
+    roleDocExample: false,
+  }
+  if (option !== undefined) {
+    for (let o in option) {
+        opt[o] = option[o]
     }
-    token = state.push('paragraph_close', 'p', -1)
-    return
   }
 
   if (opt.imgAltCaption || opt.imgTitleCaption) {
-    md.block.ruler.before('paragraph', 'img_attr_caption', imgAttrToPCaption)
+    md.block.ruler.before('paragraph', 'img_attr_caption', (state) => {
+      imgAttrToPCaption(state, state.line, opt)
+    })
   }
   md.use(mditPCaption, {
     classPrefix: opt.classPrefix,
@@ -580,7 +562,11 @@ const mditFigureWithPCaption = (md, option) => {
     removeUnnumberedLabel: opt.removeUnnumberedLabel,
     removeUnnumberedLabelExceptMarks: opt.removeUnnumberedLabelExceptMarks,
   })
-  md.core.ruler.before('linkify', 'figure_with_caption', figureWithCaption);
+
+  //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.
+  md.core.ruler.before('replacements', 'figure_with_caption', (state) => {
+    figureWithCaption(state, opt)
+  })
 }
 
 export default mditFigureWithPCaption

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markdown-it-figure-with-p-caption",
-  "version": "0.8.1",
+  "version": "0.9.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",
@@ -15,11 +15,11 @@
   },
   "devDependencies": {
     "@peaceroad/markdown-it-renderer-fence": "^0.1.1",
-    "highlight.js": "^11.9.0",
+    "highlight.js": "^11.10.0",
     "markdown-it": "^14.1.0",
-    "markdown-it-attrs": "^4.1.6"
+    "markdown-it-attrs": "^4.2.0"
   },
   "dependencies": {
-    "p7d-markdown-it-p-captions": "^0.13.0"
+    "p7d-markdown-it-p-captions": "^0.14.0"
   }
 }

package/test/examples-no-option.txt

@@ -672,3 +672,31 @@ Slide. A caption.
 <blockquote class="twitter-tweet"><p lang="ja" dir="ltr">XXXXX <a href="https://t.co/XXXXX">https://t.co/XXXXX</a></p>&mdash; User (@twitter) <a href="https://twitter.com/UserID/status/XXXXX">August 4, 2022</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
 </figure>
 
+
+[Markdown]
+コード Hello world
+
+```js {.style}
+console.log('Hello world')
+```
+[HTML]
+<figure class="f-pre-code">
+<figcaption><span class="f-pre-code-label">コード</span> Hello world</figcaption>
+<pre><code class="language-js style">console.log('Hello world')
+</code></pre>
+</figure>
+
+
+[Markdown]
+```js {.style}
+console.log('Hello world')
+```
+
+コード Hello world
+[HTML]
+<figure class="f-pre-code">
+<pre><code class="language-js style">console.log('Hello world')
+</code></pre>
+<figcaption><span class="f-pre-code-label">コード</span> Hello world</figcaption>
+</figure>
+