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

package/index.js

@@ -14,6 +14,7 @@ module.exports = function figure_with_caption_plugin(md, option) {
     strongLabel: false,
     jointSpaceUseHalfWidth: false,
     oneImageWithoutCaption: false,
+    removeUnnumberedLabel: false,
   };
   if (option !== undefined) {
     for (let o in option) {
@@ -25,6 +26,9 @@ module.exports = function figure_with_caption_plugin(md, option) {
     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;
@@ -71,6 +75,9 @@ module.exports = function figure_with_caption_plugin(md, option) {
     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;
@@ -154,6 +161,7 @@ module.exports = function figure_with_caption_plugin(md, option) {
 
   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;
   }
@@ -276,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;
@@ -288,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);
         }
       }
@@ -322,6 +332,7 @@ module.exports = function figure_with_caption_plugin(md, option) {
     bLabel: opt.bLabel,
     strongLabel: opt.strongLabel,
     jointSpaceUseHalfWidth: opt.jointSpaceUseHalfWidth,
+    removeUnnumberedLabel: opt.removeUnnumberedLabel,
   });
   md.core.ruler.before('linkify', 'figure_with_caption', figureWithCaption);
   md.renderer.rules['fence_samp'] = function (tokens, idx, options, env, slf) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markdown-it-figure-with-p-caption",
-  "version": "0.4.2",
+  "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,9 +13,10 @@
     "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.8.0"
+    "p7d-markdown-it-p-captions": "^0.9.0"
   }
 }

package/test/examples.txt

@@ -372,9 +372,16 @@ A paragraph.
 </figure>
 <p>A paragraph.</p>
 
+
 [Markdown]
 A paragraph.
 
+Figure. A cat.
+
+![Figure](cat.jpg)
+
+A paragraph.
+
 Video. A mp4.
 
 <video controls width="400" height="300">
@@ -382,8 +389,14 @@ Video. A mp4.
 </video>
 
 A paragraph.
+
 [HTML]
 <p>A paragraph.</p>
+<figure class="f-img">
+<figcaption><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A cat.</figcaption>
+<img src="cat.jpg" alt="Figure">
+</figure>
+<p>A paragraph.</p>
 <figure class="f-video">
 <figcaption><span class="f-video-label">Video<span class="f-video-label-joint">.</span></span> A mp4.</figcaption>
 <video controls width="400" height="300">
@@ -392,6 +405,37 @@ A paragraph.
 </figure>
 <p>A paragraph.</p>
 
+
+[Markdown]
+A paragraph.
+
+Figure. A cat.
+
+![Figure](cat.jpg)
+
+Video. A mp4.
+
+<video controls width="400" height="300">
+<source src="example.mp4" type="video/mp4">
+</video>
+
+A paragraph.
+
+[HTML]
+<p>A paragraph.</p>
+<figure class="f-img">
+<figcaption><span class="f-img-label">Figure<span class="f-img-label-joint">.</span></span> A cat.</figcaption>
+<img src="cat.jpg" alt="Figure">
+</figure>
+<figure class="f-video">
+<figcaption><span class="f-video-label">Video<span class="f-video-label-joint">.</span></span> A mp4.</figcaption>
+<video controls width="400" height="300">
+<source src="example.mp4" type="video/mp4">
+</video>
+</figure>
+<p>A paragraph.</p>
+
+
 [Markdown]
 A paragraph.
 
@@ -621,3 +665,21 @@ A paragraph.
 </figure>
 <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

@@ -1,18 +1,24 @@
 const assert = require('assert');
 const fs = require('fs');
-const md = require('markdown-it')({
-  html: true,
-});
+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,
   strongFilename: true,
-  oneImageWithoutCaption: true,
+  oneImageWithoutCaption: false,
   hasNumClass: true,
 });
 
+mdOneImage.use(mdFigureWithPCaption, {
+  dquoteFilename: true,
+  strongFilename: true,
+  oneImageWithoutCaption: true,
+  hasNumClass: true,
+}).use(attrs);
 
 const example = __dirname + '/examples.txt';
 const mdPath = __dirname + '/examples.md';
@@ -40,12 +46,18 @@ while(n < ms0.length) {
 
 n = 1;
 while(n < ms.length) {
-  //if (n !== 24) { n++; continue };
+  //if (n !== 22) { n++; continue };
   console.log('Test: ' + n + ' >>>');
   //console.log(ms[n].markdown);
 
   const m = ms[n].markdown;
-  const h = md.render(m);
+  let h = ''
+  if (n > 20) {
+    h = mdOneImage.render(m);
+  } else {
+    h = md.render(m);
+  }
+
   try {
     assert.strictEqual(h, ms[n].html);
   } catch(e) {