@peaceroad/markdown-it-figure-with-p-caption 0.9.1 → 0.10.0

package/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.ignoreWords": [
+        "figcaption"
+    ]
+}

package/index.js

@@ -1,12 +1,15 @@
-import mditPCaption from 'p7d-markdown-it-p-captions'
+import {setCaptionParagraph} from 'p7d-markdown-it-p-captions'
 
-const checkPrevCaption = (state, n, caption) => {
+const checkPrevCaption = (state, n, caption, sp, opt) => {
   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
+
+  caption = setCaptionParagraph(n-3, state, caption, sp, opt)
+
   let captionName = ''
   if (captionStartToken.attrs) {
     captionStartToken.attrs.forEach(attr => {
@@ -16,7 +19,7 @@ const checkPrevCaption = (state, n, caption) => {
   }
   if(!captionName) return caption
   caption.name = captionName
-  caption.hasPrev = true
+  caption.isPrev = true
   return caption
 }
 
@@ -52,13 +55,15 @@ const changePrevCaptionPosition = (state, n, caption) => {
   return true
 }
 
-const checkNextCaption = (state, en, caption) => {
+const checkNextCaption = (state, en, caption, sp, opt) => {
   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
 
+  caption = setCaptionParagraph(en+1, state, caption, sp, opt)
+
   let captionName = ''
   if (captionStartToken.attrs) {
     captionStartToken.attrs.forEach(attr => {
@@ -68,7 +73,7 @@ const checkNextCaption = (state, en, caption) => {
   }
   if(!captionName) return caption
   caption.name = captionName
-  caption.hasNext = true
+  caption.isNext = true
   return caption
 }
 
@@ -93,18 +98,18 @@ const changeNextCaptionPosition = (state, en, caption) => {
   return true
 }
 
-const wrapWithFigure = (state, range, tagName, caption, replaceInsteadOfWrap, sp, opt) => {
+const wrapWithFigure = (state, range, checkTokenTagName, 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)
+  figureStartToken.attrSet('class', 'f-' + checkTokenTagName)
   if (sp.isVideoIframe) {
     figureStartToken.attrSet('class', 'f-video')
   }
-  if (sp.isIframeTypeBlockQuote) {
+  if (sp.isIframeTypeBlockquote) {
     let figureClassThatWrapsIframeTypeBlockquote = 'i-frame'
-    if (caption.prev || caption.next) {
-      if (caption.name === 'img') {
+    if (caption.isPrev || caption.isNext) {
+      if (caption.name === 'blockquote' || caption.name === 'img') {
         figureClassThatWrapsIframeTypeBlockquote = 'f-img'
       }
       figureStartToken.attrSet('class', figureClassThatWrapsIframeTypeBlockquote)
@@ -113,13 +118,15 @@ const wrapWithFigure = (state, range, tagName, caption, replaceInsteadOfWrap, sp
       figureStartToken.attrSet('class', figureClassThatWrapsIframeTypeBlockquote)
     }
   }
-  if(/pre-(?:code|samp)/.test(tagName) && opt.roleDocExample) {
+
+
+  if(/pre-(?:code|samp)/.test(checkTokenTagName) && 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) {
+  if (opt.styleProcess && caption.isNext && sp.attrs.length > 0) {
     for (let attr of sp.attrs) {
       figureStartToken.attrJoin(attr[0], attr[1])
     }
@@ -147,10 +154,10 @@ const wrapWithFigure = (state, range, tagName, caption, replaceInsteadOfWrap, sp
   return range
 }
 
-const checkCaption = (state, n, en, caption) => {
-  caption = checkPrevCaption(state, n, caption)
-  if (caption.hasPrev) return caption
-  caption = checkNextCaption(state, en, caption)
+const checkCaption = (state, n, en, caption, sp, opt) => {
+  caption = checkPrevCaption(state, n, caption, sp, opt)
+  if (caption.isPrev) return caption
+  caption = checkNextCaption(state, en, caption, sp, opt)
   return caption
 }
 
@@ -166,63 +173,71 @@ const figureWithCaption = (state, opt) => {
     }
     let checkToken = false
     let hasCloseTag = false
-    let tagName = ''
+    let checkTokenTagName = ''
     let caption = {
+      mark: '',
       name: '',
       nameSuffix: '',
-      hasPrev: false,
-      hasNext: false,
+      isPrev: false,
+      isNext: false,
     };
     const sp = {
       attrs: [],
       isVideoIframe: false,
-      isIframeTypeBlockQuote: false,
+      isIframeTypeBlockquote: false,
       hasImgCaption: false,
     }
 
-    const checkTags = ['table', 'pre', 'blockquote']
+    const checkTypes = ['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;
-          }
+    //console.log(state.tokens[n].type, state.tokens[n].tag)
+    while (cti < checkTypes.length) {
+      if (token.type === checkTypes[cti] + '_open') {
+        // for n-1 token is line-break
+        if (n > 1 && state.tokens[n-2].type === 'figure_open') {
+          cti++; continue
         }
         checkToken = true
-        caption.name = checkTags[cti]
-        tagName = token.tag
+        checkTokenTagName = token.tag
+        caption.name = checkTypes[cti]
+        if (checkTypes[cti] === 'pre') {
+          if (state.tokens[n+1].tag === 'code') caption.mark = 'pre-code'
+          if (state.tokens[n+1].tag === 'samp') caption.mark = 'pre-samp'
+          caption.name = caption.mark
+        }
         while (en < state.tokens.length) {
-          if(state.tokens[en].type === tagName + '_close') {
+          if(state.tokens[en].type === checkTokenTagName + '_close') {
             hasCloseTag = true
             break
           }
           en++
         }
         range.end = en
-        caption = checkCaption(state, n, en, caption)
-        if (caption.hasPrev || caption.hasNext) {
-          range = wrapWithFigure(state, range, tagName, caption, false, sp, opt)
+        caption = checkCaption(state, n, en, caption, sp, opt)
+        if (caption.isPrev || caption.isNext) {
+          range = wrapWithFigure(state, range, checkTokenTagName, caption, false, sp, opt)
         }
         break
       }
 
-      if(token.type === 'fence') {
+      if (token.type === 'fence') {
         if (token.tag === 'code' && token.block) {
           checkToken = true
-          let isSampInfo = false
+          let isSamp = false
           if (/^ *(?:samp|shell|console)(?:(?= )|$)/.test(token.info)) {
             token.tag = 'samp'
-            isSampInfo = true
+            isSamp = true
           }
-          if (isSampInfo) {
-            tagName = 'pre-samp'
+          if (isSamp) {
+            checkTokenTagName = 'pre-samp'
+            caption.name = 'pre-samp'
           } else {
-            tagName = 'pre-code'
+            checkTokenTagName = 'pre-code'
+            caption.name = 'pre-code'
           }
-          caption = checkCaption(state, n, en, caption)
-          if (caption.hasPrev || caption.hasNext) {
-            range = wrapWithFigure(state, range, tagName, caption, false, sp, opt)
+          caption = checkCaption(state, n, en, caption, sp, opt)
+          if (caption.isPrev || caption.isNext) {
+            range = wrapWithFigure(state, range, checkTokenTagName, caption, false, sp, opt)
             break
           }
         }
@@ -243,13 +258,13 @@ const figureWithCaption = (state, opt) => {
         if ((hasTag[2] && hasTag[3] !== '\n') || (hasTag[1] !== '\n' && hasTag[2] === undefined)) {
           token.content += '\n'
         }
-        tagName = tags[ctj]
+        checkTokenTagName = tags[ctj]
         caption.name = tags[ctj]
         checkToken = true
-        if (tagName === 'blockquote') {
+        if (checkTokenTagName === 'blockquote') {
           //text-post-media: threads
           if(/^<[^>]*? class="(?:twitter-tweet|instagram-media|text-post-media|bluesky-embed)"/.test(token.content)) {
-            sp.isIframeTypeBlockQuote = true
+            sp.isIframeTypeBlockquote = true
           } else {
             ctj++
             continue
@@ -258,47 +273,20 @@ const figureWithCaption = (state, opt) => {
         break
       }
       if (!checkToken) {n++; continue;}
-      if (tagName === 'iframe') {
+      if (checkTokenTagName === '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
-                }
-              }
-            }
-          }
-        }
-      }
-      caption = checkCaption(state, n, en, caption)
-      if (caption.hasPrev || caption.hasNext) {
-        range = wrapWithFigure(state, range, tagName, caption, false, sp, opt)
+
+      caption = checkCaption(state, n, en, caption, sp, opt)
+      if (caption.isPrev || caption.isNext) {
+        range = wrapWithFigure(state, range, checkTokenTagName, 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)
+      } else if ((opt.iframeWithoutCaption && (checkTokenTagName === 'iframe')) ||
+        (opt.videoWithoutCaption && (checkTokenTagName === 'video')) ||
+        (opt.iframeTypeBlockquoteWithoutCaption && (checkTokenTagName === 'blockquote'))) {
+        range = wrapWithFigure(state, range, checkTokenTagName, caption, false, sp, opt)
         n = en + 2
       }
     }
@@ -348,7 +336,7 @@ const figureWithCaption = (state, opt) => {
             isMultipleImagesHorizontal = false
           }
         } else if (ntChildToken.type === 'softbreak') {
-         isMultipleImagesHorizontal = false
+          isMultipleImagesHorizontal = false
           if (isMultipleImagesHorizontal) {
             isMultipleImagesVertical = false
           }
@@ -370,26 +358,26 @@ const figureWithCaption = (state, opt) => {
         while (ntChildTokenIndex < nextToken.children.length) {
           const ccToken = nextToken.children[ntChildTokenIndex]
           if (ccToken.type === 'text' && /^ *$/.test(ccToken.content)) {
-           ccToken.content = ''
+            ccToken.content = ''
           }
           ntChildTokenIndex++
         }
       }
       en = n + 2
       range.end = en
-      tagName = 'img'
+      checkTokenTagName = '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, caption)
+      if (opt.imgAltCaption) setAltToLabel(state, n)
+      if (opt.imgTitleCaption) setTitleToLabel(state, n, en, checkTokenTagName, caption, opt)
+      caption = checkCaption(state, n, en, caption, sp, opt)
 
       if (opt.oneImageWithoutCaption && state.tokens[n-1]) {
         if (state.tokens[n-1].type === 'list_item_open') checkToken = false
       }
-      if (checkToken && (opt.oneImageWithoutCaption || caption.hasPrev || caption.hasNext)) {
-        if (caption.nameSuffix) tagName += caption.nameSuffix
-        range = wrapWithFigure(state, range, tagName, caption, true, sp, opt)
+      if (checkToken && (opt.oneImageWithoutCaption || caption.isPrev || caption.isNext)) {
+        if (caption.nameSuffix) checkTokenTagName += caption.nameSuffix
+        range = wrapWithFigure(state, range, checkTokenTagName, caption, true, sp, opt)
       }
     }
 
@@ -397,12 +385,12 @@ const figureWithCaption = (state, opt) => {
 
     n = range.start
     en = range.end
-    if (caption.hasPrev) {
+    if (caption.isPrev) {
       changePrevCaptionPosition(state, n, caption)
       n = en + 1
       continue
     }
-    if (caption.hasNext) {
+    if (caption.isNext) {
       changeNextCaptionPosition(state, en, caption)
       n = en + 4
       continue
@@ -412,11 +400,11 @@ const figureWithCaption = (state, opt) => {
   return
 }
 
-const setAltToLabel = (state, n, en, tagName, caption, opt) => {
+const setAltToLabel = (state, n) => {
   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-2].children) {
+    state.tokens[n+1].content = state.tokens[n+1].content.replace(/^!\[.*?\]/, '![' + state.tokens[n-2].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)
@@ -434,7 +422,7 @@ const setAltToLabel = (state, n, en, tagName, caption, opt) => {
   return true
 }
 
-const setTitleToLabel = (state, n, en, tagName, caption, opt) => {
+const setTitleToLabel = (state, n, en, checkTokenTagName, 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
@@ -547,21 +535,11 @@ const mditFigureWithPCaption = (md, option) => {
   }
 
   if (opt.imgAltCaption || opt.imgTitleCaption) {
+    opt.oneImageWithoutCaption = false
     md.block.ruler.before('paragraph', 'img_attr_caption', (state) => {
       imgAttrToPCaption(state, state.line, opt)
     })
   }
-  md.use(mditPCaption, {
-    classPrefix: opt.classPrefix,
-    dquoteFilename: opt.dquoteFilename,
-    strongFilename: opt.strongFilename,
-    hasNumClass: opt.hasNumClass,
-    bLabel: opt.bLabel,
-    strongLabel: opt.strongLabel,
-    jointSpaceUseHalfWidth: opt.jointSpaceUseHalfWidth,
-    removeUnnumberedLabel: opt.removeUnnumberedLabel,
-    removeUnnumberedLabelExceptMarks: opt.removeUnnumberedLabelExceptMarks,
-  })
 
   //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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markdown-it-figure-with-p-caption",
-  "version": "0.9.1",
+  "version": "0.10.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,6 +20,6 @@
     "markdown-it-attrs": "^4.2.0"
   },
   "dependencies": {
-    "p7d-markdown-it-p-captions": "^0.14.0"
+    "p7d-markdown-it-p-captions": "^0.15.1"
   }
 }

package/test/examples-img-alt-caption.en.txt

@@ -0,0 +1,51 @@
+[Markdown]
+![A caption.](cat.jpg)
+
+[HTML]
+<figure class="f-img">
+<figcaption><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A caption.</figcaption>
+<img src="cat.jpg" alt="">
+</figure>
+
+
+[Markdown]
+![Figure. A caption.](cat.jpg)
+
+[HTML]
+<figure class="f-img">
+<figcaption><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A caption.</figcaption>
+<img src="cat.jpg" alt="">
+</figure>
+
+
+[Markdown]
+![](cat.jpg)
+
+[HTML]
+<figure class="f-img">
+<img src="cat.jpg" alt="">
+</figure>
+
+
+[Markdown]
+Figure. A caption.
+
+![](cat.jpg)
+
+[HTML]
+<p>Figure. A caption.</p>
+<figure class="f-img">
+<img src="cat.jpg" alt="">
+</figure>
+
+
+[Markdown]
+![Figure 12. A caption.](cat.jpg)
+
+[HTML]
+<figure class="f-img">
+<figcaption><span class="f-img-label">Figure 12<span class="f-img-label-joint">.</span></span> A caption.</figcaption>
+<img src="cat.jpg" alt="">
+</figure>
+
+

package/test/{examples-img-alt-caption.txt → examples-img-alt-caption.ja.txt}

@@ -1,89 +1,84 @@
 [Markdown]
-![A caption.](cat.jpg)
+![図1　キャプション](cat.jpg)
 
 [HTML]
 <figure class="f-img">
-<figcaption><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A caption.</figcaption>
+<figcaption><span class="f-img-label">図1<span class="f-img-label-joint">　</span></span>キャプション</figcaption>
 <img src="cat.jpg" alt="">
 </figure>
 
 
 [Markdown]
-![Figure. A caption.](cat.jpg)
-
-[HTML]
-<figure class="f-img">
-<figcaption><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A caption.</figcaption>
-<img src="cat.jpg" alt="">
-</figure>
-
+図 キャプション
 
-[Markdown]
-![](cat.jpg)
+![図1　キャプション](cat.jpg)
 
 [HTML]
+<p>図 キャプション</p>
 <figure class="f-img">
+<figcaption><span class="f-img-label">図1<span class="f-img-label-joint">　</span></span>キャプション</figcaption>
 <img src="cat.jpg" alt="">
 </figure>
 
 
 [Markdown]
-Figure. A caption.
+![A caption.](cat.jpg)
 
-![](cat.jpg)
+![図 A caption.](cat.jpg)
 
 [HTML]
-<p class="f-img"><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A caption.</p>
 <figure class="f-img">
+<figcaption><span class="f-img-label">図<span class="f-img-label-joint">　</span></span>A caption.</figcaption>
 <img src="cat.jpg" alt="">
 </figure>
-
-
-[Markdown]
-![Figure 12. A caption.](cat.jpg)
-
-[HTML]
 <figure class="f-img">
-<figcaption><span class="f-img-label">Figure 12<span class="f-img-label-joint">.</span></span> A caption.</figcaption>
+<figcaption><span class="f-img-label">図</span> A caption.</figcaption>
 <img src="cat.jpg" alt="">
 </figure>
 
 
 [Markdown]
-![図1　キャプション](cat.jpg)
 
-[HTML]
-<figure class="f-img">
-<figcaption><span class="f-img-label">図1<span class="f-img-label-joint">　</span></span>キャプション</figcaption>
-<img src="cat.jpg" alt="">
-</figure>
+```
+code
+```
 
-
-[Markdown]
-図 キャプション
-
-![図1　キャプション](cat.jpg)
+![A caption.](cat.jpg)
 
 [HTML]
-<p class="f-img"><span class="f-img-label">図</span> キャプション</p>
+<pre><code>code
+</code></pre>
 <figure class="f-img">
-<figcaption><span class="f-img-label">図1<span class="f-img-label-joint">　</span></span>キャプション</figcaption>
+<figcaption><span class="f-img-label">図<span class="f-img-label-joint">　</span></span>A caption.</figcaption>
 <img src="cat.jpg" alt="">
 </figure>
 
 
 [Markdown]
-![A caption.](cat.jpg)
 
-![図 A caption.](cat.jpg)
+| h1 | h2 |
+|----|----|
+| 11 | 12 |
+
+![A caption.](cat.jpg)
 
 [HTML]
+<table>
+<thead>
+<tr>
+<th>h1</th>
+<th>h2</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>11</td>
+<td>12</td>
+</tr>
+</tbody>
+</table>
 <figure class="f-img">
 <figcaption><span class="f-img-label">図<span class="f-img-label-joint">　</span></span>A caption.</figcaption>
 <img src="cat.jpg" alt="">
 </figure>
-<figure class="f-img">
-<figcaption><span class="f-img-label">図</span> A caption.</figcaption>
-<img src="cat.jpg" alt="">
-</figure>
 

package/test/{examples-img-title-caption.txt → examples-img-title-caption.en.txt}

@@ -42,7 +42,7 @@ Figure. A caption.
 ![](cat.jpg)
 
 [HTML]
-<p class="f-img"><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A caption.</p>
+<p>Figure. A caption.</p>
 <figure class="f-img">
 <img src="cat.jpg" alt="">
 </figure>
@@ -58,33 +58,3 @@ Figure. A caption.
 </figure>
 
 
-[Markdown]
-![猫](cat.jpg "図1　キャプション")
-
-[HTML]
-<figure class="f-img">
-<figcaption><span class="f-img-label">図1<span class="f-img-label-joint">　</span></span>キャプション</figcaption>
-<img src="cat.jpg" alt="猫">
-</figure>
-
-[Markdown]
-![](cat.jpg "図 キャプション")
-
-[HTML]
-<figure class="f-img">
-<figcaption><span class="f-img-label">図</span> キャプション</figcaption>
-<img src="cat.jpg" alt="">
-</figure>
-
-
-[Markdown]
-図 キャプション
-
-![猫](cat.jpg "図23 Caption")
-
-[HTML]
-<p class="f-img"><span class="f-img-label">図</span> キャプション</p>
-<figure class="f-img">
-<figcaption><span class="f-img-label">図23</span> Caption</figcaption>
-<img src="cat.jpg" alt="猫">
-</figure>

package/test/examples-img-title-caption.ja.txt

@@ -0,0 +1,30 @@
+[Markdown]
+![猫](cat.jpg "図1　キャプション")
+
+[HTML]
+<figure class="f-img">
+<figcaption><span class="f-img-label">図1<span class="f-img-label-joint">　</span></span>キャプション</figcaption>
+<img src="cat.jpg" alt="猫">
+</figure>
+
+[Markdown]
+![](cat.jpg "図 キャプション")
+
+[HTML]
+<figure class="f-img">
+<figcaption><span class="f-img-label">図</span> キャプション</figcaption>
+<img src="cat.jpg" alt="">
+</figure>
+
+
+[Markdown]
+図 キャプション
+
+![猫](cat.jpg "図23 Caption")
+
+[HTML]
+<p>図 キャプション</p>
+<figure class="f-img">
+<figcaption><span class="f-img-label">図23</span> Caption</figcaption>
+<img src="cat.jpg" alt="猫">
+</figure>

package/test/examples-no-option.txt

@@ -700,3 +700,16 @@ console.log('Hello world')
 <figcaption><span class="f-pre-code-label">コード</span> Hello world</figcaption>
 </figure>
 
+
+[Markdown]
+
+```
+code
+```
+
+![A caption.](cat.jpg)
+
+[HTML]
+<pre><code>code
+</code></pre>
+<p><img src="cat.jpg" alt="A caption."></p>

package/test/examples-one-image-without-caption.txt

@@ -43,3 +43,17 @@ Figure. A Caption.
 </figure>
 
 
+[Markdown]
+
+```
+code
+```
+
+![A caption.](cat.jpg)
+
+[HTML]
+<pre><code>code
+</code></pre>
+<figure class="f-img">
+<img src="cat.jpg" alt="A caption.">
+</figure>

package/test/test.js

@@ -50,11 +50,10 @@ const mdConsole = mdit({
         return highlightjs.highlight(str, { language: lang }).value
       } catch (__) {}
     }
-    return ''
+    return str
   }
 }).use(mdFigureWithPCaption, opt).use(mditAttrs).use(mditRndererFence);
 
-
 let __dirname = path.dirname(new URL(import.meta.url).pathname)
 const isWindows = (process.platform === 'win32')
 if (isWindows) {
@@ -126,7 +125,7 @@ const runTest = (process, pat, pass, testId) => {
   while(n <= end) {
 
     if (!ms[n]
-//      || n != 3
+      //|| n != 24
     ) {
       n++
       continue
@@ -135,6 +134,7 @@ const runTest = (process, pat, pass, testId) => {
     const m = ms[n].markdown;
     const h = process.render(m)
     console.log('Test: ' + n + ' >>>');
+    //console.log(ms[n].markdown);
     try {
       assert.strictEqual(h, ms[n].html);
     } catch(e) {
@@ -161,22 +161,20 @@ pass = runTest(mdVideoWithoutCaption, testData.videoWithoutCaption, pass)
 pass = runTest(mdConsole, testData.console, pass)
 
 
-opt.oneImageWithoutCaption = false
-
 opt.imgAltCaption = 'Figure'
 const mdImgAltCaption = mdit({html: true}).use(mdFigureWithPCaption, opt).use(mditAttrs).use(mditRndererFence);
-pass = runTest(mdImgAltCaption, testData.imgAltCaption, pass, [1, 5])
+pass = runTest(mdImgAltCaption, testData.imgAltCaption.replace(/\.txt$/, '.en.txt'), pass)
 opt.imgAltCaption = '図'
 const mdImgAltCaptionJa = mdit({html: true}).use(mdFigureWithPCaption, opt).use(mditAttrs).use(mditRndererFence);
-pass = runTest(mdImgAltCaptionJa, testData.imgAltCaption, pass, [6 , 99])
+pass = runTest(mdImgAltCaptionJa, testData.imgAltCaption.replace(/\.txt$/, '.ja.txt'),  pass)
 
 opt.imgAltCaption = false
 
 opt.imgTitleCaption = 'Figure'
 const mdImgTitleCaption = mdit({html: true}).use(mdFigureWithPCaption, opt).use(mditAttrs).use(mditRndererFence);
-pass = runTest(mdImgTitleCaption, testData.imgTitleCaption, pass, [1, 6])
+pass = runTest(mdImgTitleCaption, testData.imgTitleCaption.replace(/\.txt$/, '.en.txt'), pass)
 opt.imgTitleCaption = '図'
 const mdImgTitleCaptionJa = mdit({html: true}).use(mdFigureWithPCaption, opt).use(mditAttrs).use(mditRndererFence);
-pass = runTest(mdImgTitleCaptionJa, testData.imgTitleCaption, pass, [7, 99])
+pass = runTest(mdImgTitleCaptionJa, testData.imgTitleCaption.replace(/.txt$/, '.ja.txt'), pass)
 
 if (pass) console.log('Passed all test.')