@peaceroad/markdown-it-figure-with-p-caption 0.4.3 → 0.4.4

package/index.js

@@ -284,11 +284,13 @@ module.exports = function figure_with_caption_plugin(md, option) {
         }
       }
 
-      if (token.type === 'paragraph_open'
-        && nextToken.type === 'inline'
-        && nextToken.children[0].type === 'image'
-        && nextToken.children.length === 1
-        && state.tokens[n+2].type === 'paragraph_close') {
+
+      if (token.type === 'paragraph_open' && nextToken.type === 'inline' && nextToken.children[0].type === 'image' && state.tokens[n+2].type === 'paragraph_close' && nextToken.children.length < 3) {
+        if (nextToken.children.length === 2) {
+          if (!nextToken.children[nextToken.children.length - 1].type === 'text' || !/^ *?\{.*?\}$/.test(nextToken.children[nextToken.children.length - 1].content)) {
+            n++; continue;
+          }
+        }
         checkToken = true;
         en = n + 2;
         range.end = en;
@@ -296,9 +298,9 @@ module.exports = function figure_with_caption_plugin(md, option) {
         nextToken.children[0].type = 'image';
         caption = checkCaption(state, n, en, tagName, caption);
         if (opt.oneImageWithoutCaption && state.tokens[n-1]) {
-          if (state.tokens[n-1].type === 'list_item_open') {n++; continue;}
+          if (state.tokens[n-1].type === 'list_item_open') {checkToken = false;}
         }
-        if (opt.oneImageWithoutCaption || caption.hasPrev || caption.hasNext) {
+        if (checkToken && (opt.oneImageWithoutCaption || caption.hasPrev || caption.hasNext)) {
           range = wrapWithFigure(state, range, tagName, true);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markdown-it-figure-with-p-caption",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "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",
   "scripts": {
@@ -13,7 +13,8 @@
     "url": "https://github.com/peaceroad/p7d-markdown-it-figure-with-p-caption/issues"
   },
   "devDependencies": {
-    "markdown-it": "^12.1.0"
+    "markdown-it": "^12.1.0",
+    "markdown-it-attrs": "^4.1.4"
   },
   "dependencies": {
     "p7d-markdown-it-p-captions": "^0.9.0"

package/test/examples.txt

@@ -666,3 +666,20 @@ A paragraph.
 <p>A paragraph.</p>
 
 
+[Markdown]
+Figure. A Caption.
+
+![Figure](cat.jpg) {.style}
+[HTML]
+<figure class="f-img style">
+<figcaption><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A Caption.</figcaption>
+<img src="cat.jpg" alt="Figure">
+</figure>
+
+[Markdown]
+Figure. A Caption.
+
+![Figure](cat.jpg) Text {.style}
+[HTML]
+<p class="f-img"><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A Caption.</p>
+<p class="style"><img src="cat.jpg" alt="Figure"> Text</p>

package/test/test.js

@@ -4,6 +4,7 @@ const md = require('markdown-it')({ html: true });
 const mdOneImage = require('markdown-it')({ html: true });
 const mdFigureWithPCaption = require('../index.js');
 
+const attrs = require('../node_modules/markdown-it-attrs');
 
 md.use(mdFigureWithPCaption, {
   dquoteFilename: true,
@@ -17,8 +18,7 @@ mdOneImage.use(mdFigureWithPCaption, {
   strongFilename: true,
   oneImageWithoutCaption: true,
   hasNumClass: true,
-});
-
+}).use(attrs);
 
 const example = __dirname + '/examples.txt';
 const mdPath = __dirname + '/examples.md';