@peaceroad/markown-figure-num-setting 0.1.2 → 0.1.3

package/index.js

@@ -111,47 +111,55 @@ const setMarkdownFigureNum = (markdown, option) => {
 
 
   const setImageAltNumber = (lines, n,  mark, hasMarkLabel, counter) => {
+    let hasPrevFigureImage = false
     let isFigureImage
-    const isFigureImageReg = /^([ \t]*\!\[) *?(.*?([0-9]*)) *?(\]\(.*?\))/
-    let hasPrevCaption
+    const figureImageReg = /^([ \t]*\!\[) *?(.*?([0-9]*)) *?(\]\(.*?\))/
     let i
     i = n - 1
+    //console.log('lines[n]: ' + lines[n])
+    //console.log('CheckPrevLine')
     while (i >= 0) {
       if (/^[ \t]*$/.test(lines[i])) {
         i--
         continue
       }
-      isFigureImage =  lines[i].match(new RegExp(isFigureImageReg))
-      if (isFigureImage) {
-        let j =  i - 1
-        while (j >= 0) {
-          if (/^[ \t]*$/.test(lines[j])) {
-            j--
-            continue
-          }
-          if (lines[j].match(new RegExp(isFigureImageReg[2]))) {
-            hasPrevCaption  = true
-          }
-          if (!hasPrevCaption) {
-            lines[i] = lines[i].replace(new RegExp(isFigureImageReg), '$1' + label(hasMarkLabel, counter[mark], true) + '$4')
-          }
+      isFigureImage =  lines[i].match(new RegExp(figureImageReg))
+      if (!isFigureImage) break
+      //console.log(isFigureImage)
+
+      let j =  i
+      while (j >= 0) {
+        if (/^[ \t]*$/.test(lines[j])) {
+          j--
+          continue
+        }
+        //console.log(isFigureImage[3], (counter.img - 1).toString())
+        if (isFigureImage[3] === (counter.img - 1).toString()) {
+          hasPrevFigureImage = false
           break
         }
+        lines[i] = lines[i].replace(new RegExp(figureImageReg), '$1' + label(hasMarkLabel, counter[mark], true) + '$4')
+        //console.log('ChangePrevLine: ' + lines[i])
+        hasPrevFigureImage = true
+        break
       }
       break
     }
 
-    if (isFigureImage) return
+    if (hasPrevFigureImage) return
 
+    //console.log('CheckNextLine')
     i = n + 1
     while (i < lines.length) {
       if (/^[\t ]*$/.test(lines[i])) {
         i++
         continue
       }
-      isFigureImage =  lines[i].match(new RegExp(isFigureImageReg))
+      isFigureImage =  lines[i].match(new RegExp(figureImageReg))
+      //console.log(isFigureImage)
       if (isFigureImage) {
-        lines[i] = lines[i].replace(new RegExp(isFigureImageReg), '$1' + label(hasMarkLabel, counter[mark], true) + '$4')
+        lines[i] = lines[i].replace(new RegExp(figureImageReg), '$1' + label(hasMarkLabel, counter[mark], true) + '$4')
+        //console.log('ChangeNextLine: ' + lines[i])
       }
       break
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markown-figure-num-setting",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Set figure number for p7d-markdown-it-p-captions.",
   "type": "module",
   "main": "index.js",

package/test/examples.txt

@@ -161,3 +161,38 @@ Figure 2. キャプション
 段落。段落。段落。
 
 
+[Input]
+図 キャプション
+
+![](image.jpg)
+
+図 キャプション
+
+![](image.jpg)
+
+[Output]
+図1 キャプション
+
+![図1](image.jpg)
+
+図2 キャプション
+
+![図2](image.jpg)
+
+
+[Input]
+![](image.jpg)
+
+図 キャプション
+
+![](image.jpg)
+
+図 キャプション
+[Output]
+![図1](image.jpg)
+
+図1 キャプション
+
+![図2](image.jpg)
+
+図2 キャプション

package/test/test.js

@@ -33,7 +33,7 @@ while(n < ms0.length) {
 
 n = 1;
 while(n < ms.length) {
-  //if (n !== 1) { n++; continue }
+  //if (n !== 8) { n++; continue }
   console.log('Test: ' + n + ' >>>')
   const m = ms[n].inputMarkdown
   const h = setMarkdownFigureNum(m)