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

package/README.md

@@ -102,3 +102,26 @@ Figure 2. キャプション
 
 段落。段落。段落。
 ```
+
+
+## Option
+
+### noSetAlt
+
+[Input]
+図 キャプション
+
+![ALT-A](image.jpg)
+
+図 キャプション
+
+![ALT-B](image.jpg)
+
+[Output]
+図1 キャプション
+
+![ALT-A](image.jpg)
+
+図2 キャプション
+
+![ALT-B](image.jpg)

package/index.js

@@ -7,6 +7,8 @@ const setMarkdownFigureNum = (markdown, option) => {
     samp: false,
     blockquote: false,
     slide: false,
+    noSetAlt: false,
+    setImgAlt: false,
   }
   opt["pre-code"] = opt.code
   opt["pre-samp"] = opt.samp
@@ -35,7 +37,8 @@ const setMarkdownFigureNum = (markdown, option) => {
     ')|' +
     '[.](' + markAfterNum + ')(?:' +
       joint + '|(?=[ ]+[^a-z])|$' +
-    ')' +
+    ')|' +
+    '[ 　]*$' +
   ')';
 
   const markAfterJa = '(?:' +
@@ -48,13 +51,14 @@ const setMarkdownFigureNum = (markdown, option) => {
       jointHalfWidth + '(?:(?=[ ]+)|$)|' +
       jointFullWidth + '|' +
       '(?=[ ]+)|$' +
-    ')' +
+    ')|' +
+    '[ 　]*$' +
   ')';
 
   const markReg = {
     //fig(ure)?, illust, photo
     "img": new RegExp('^(?:' +
-      '(?:[fF][iI][gG](?:[uU][rR][eE])?|[iI][lL]{2}[uU][sS][tT]|[pP][hH][oO[tT][oO])'+ markAfterEn + '|' +
+      '(?:[fF][iI][gG](?:[uU][rR][eE])?|[iI][lL]{2}[uU][sS][tT]|[pP][hH][oO][tT][oO])'+ markAfterEn + '|' +
       '(?:図|イラスト|写真)' + markAfterJa +
     ')'),
     //movie, video
@@ -69,7 +73,7 @@ const setMarkdownFigureNum = (markdown, option) => {
     ')'),
     //code(block)?, program
     "pre-code": new RegExp('^(?:' +
-      '(?:[cC][oO][dD][eE](?:[bB][lL][oO][cC][kK])?|[pP][rR][oO][gG][rR][aA][mM]|[aA][lL][gG][oO][rR][iI[tT][hH][mM])'+ markAfterEn + '|' +
+      '(?:[cC][oO][dD][eE](?:[bB][lL][oO][cC][kK])?|[pP][rR][oO][gG][rR][aA][mM]|[aA][lL][gG][oO][rR][iI][tT][hH][mM])'+ markAfterEn + '|' +
       '(?:(?:ソース)?コード|リスト|命令|プログラム|算譜|アルゴリズム|算法)' + markAfterJa +
     ')'),
     //terminal, prompt, command
@@ -92,16 +96,22 @@ const setMarkdownFigureNum = (markdown, option) => {
   const label = (hasMarkLabel, counter, isAlt) => {
 
     let label = hasMarkLabel[0]
+    let LabelIsEn = /[a-zA-Z]/.test(label)
+    let spaceBeforeCounter = ''
+    if (LabelIsEn) {
+      spaceBeforeCounter = ' '
+    }
 
     if (hasMarkLabel[3]) {
       label = hasMarkLabel[0].replace(new RegExp(hasMarkLabel[3] + '$'), '')
     }
     let isLabelLastJoint = label.match(new RegExp('(' + joint +')$'))
+
     if (isLabelLastJoint) {
       if (isAlt) {
-        label = label.replace(new RegExp(joint +'$'), '') + ' ' + counter
+        label = label.replace(new RegExp(joint +'$'), '') + spaceBeforeCounter + counter
       } else {
-        label = label.replace(new RegExp(joint +'$'), '') + ' ' + counter + isLabelLastJoint[1]
+        label = label.replace(new RegExp(joint +'$'), '') + spaceBeforeCounter + counter + isLabelLastJoint[1]
       }
     } else {
       label += counter
@@ -111,47 +121,54 @@ 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
+
+      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
     }
@@ -199,13 +216,13 @@ const setMarkdownFigureNum = (markdown, option) => {
     }
 
     for (let mark of Object.keys(markReg)) {
-      const hasMarkLabel = lines[n].match(markReg[mark]);
+      const hasMarkLabel = lines[n].match(markReg[mark])
       //if (hasMarkLabel) console.log(hasMarkLabel)
       if (hasMarkLabel && opt[mark]) {
         counter[mark]++
         //console.log('lines[n]: ' + lines[n])
         lines[n] = lines[n].replace(new RegExp('^([ \t]*)' + hasMarkLabel[0]), '$1' + label(hasMarkLabel, counter[mark]))
-        if (mark === 'img') {
+        if (mark === 'img' && !opt.noSetAlt) {
           setImageAltNumber(lines, n, mark, hasMarkLabel, counter)
         }
       }

package/package.json

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

package/test/examples-no-set-alt.txt

@@ -0,0 +1,36 @@
+[Input]
+図 キャプション
+
+![ALT-A](image.jpg)
+
+図 キャプション
+
+![ALT-B](image.jpg)
+
+[Output]
+図1 キャプション
+
+![ALT-A](image.jpg)
+
+図2 キャプション
+
+![ALT-B](image.jpg)
+
+
+[Input]
+図
+
+![ALT-A](image.jpg)
+
+図
+
+![ALT-B](image.jpg)
+
+[Output]
+図1
+
+![ALT-A](image.jpg)
+
+図2
+
+![ALT-B](image.jpg)

package/test/examples.txt

@@ -161,3 +161,170 @@ 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 キャプション
+
+
+
+[Input]
+図
+
+![](image.jpg)
+
+図
+
+![](image.jpg)
+[Output]
+図1
+
+![図1](image.jpg)
+
+図2
+
+![図2](image.jpg)
+
+
+[Input]
+図　
+
+![](image.jpg)
+
+図　
+
+![](image.jpg)
+[Output]
+図1　
+
+![図1](image.jpg)
+
+図2　
+
+![図2](image.jpg)
+
+[Input]
+図 
+
+![](image.jpg)
+
+図 
+
+![](image.jpg)
+[Output]
+図1 
+
+![図1](image.jpg)
+
+図2 
+
+![図2](image.jpg)
+
+
+[Input]
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図1
+
+![図1](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図2
+
+![図2](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図
+
+![図](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図2
+
+![図2](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図
+
+![図](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図2
+
+![図2](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+[Output]
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図1
+
+![図1](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図2
+
+![図2](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図3
+
+![図3](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図4
+
+![図4](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図5
+
+![図5](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。
+
+図6
+
+![図6](Src)
+
+段落。段落。段落。段落。段落。段落。段落。段落。段落。

package/test/test.js

@@ -2,46 +2,70 @@ import assert from 'assert'
 import fs from 'fs'
 import path from 'path'
 import setMarkdownFigureNum from '../index.js'
+import setMarkdownFigureNumWithNoSetAlt from '../index.js'
 
 let __dirname = path.dirname(new URL(import.meta.url).pathname)
 const isWindows = (process.platform === 'win32')
 if (isWindows) {
   __dirname = __dirname.replace(/^\/+/, '').replace(/\//g, '\\')
 }
-const example = __dirname + path.sep + 'examples.txt'
-const exampleCont = fs.readFileSync(example, 'utf-8').trim()
-let ms = [];
-let ms0 = exampleCont.split(/\n*\[Input\]\n/)
-let n = 1;
-while(n < ms0.length) {
-  let mhs = ms0[n].split(/\n+\[Output[^\]]*?\]\n/)
-  let i = 1
-  while (i < 2) {
-    if (mhs[i] === undefined) {
-      mhs[i] = ''
-    } else {
-      mhs[i] = mhs[i].replace(/$/,'\n')
+
+const check = (name, ex) => {
+  const exCont = fs.readFileSync(ex, 'utf-8').trim()
+  let ms = [];
+  let ms0 = exCont.split(/\n*\[Input\]\n/)
+  let n = 1;
+  while(n < ms0.length) {
+    let mhs = ms0[n].split(/\n+\[Output[^\]]*?\]\n/)
+    let i = 1
+    while (i < 2) {
+      if (mhs[i] === undefined) {
+        mhs[i] = ''
+      } else {
+        mhs[i] = mhs[i].replace(/$/,'\n')
+      }
+      i++
     }
-    i++
+    ms[n] = {
+      inputMarkdown: mhs[0].trim(),
+      outputMarkdown: mhs[1].trim(),
+    };
+    n++
   }
-  ms[n] = {
-    inputMarkdown: mhs[0].trim(),
-    outputMarkdown: mhs[1].trim(),
-  };
-  n++
-}
 
-n = 1;
-while(n < ms.length) {
-  //if (n !== 1) { n++; continue }
-  console.log('Test: ' + n + ' >>>')
-  const m = ms[n].inputMarkdown
-  const h = setMarkdownFigureNum(m)
-  try {
-    assert.strictEqual(h, ms[n].outputMarkdown)
-  } catch(e) {
-    console.log('incorrect: ')
-    console.log('H: ' + h +'\n\nC: ' + ms[n].outputMarkdown)
+  n = 1
+  while(n < ms.length) {
+    //if (n !== 10) { n++; continue }
+    console.log('Test: ' + n + ' >>>')
+    const m = ms[n].inputMarkdown
+    let h
+    let option = {}
+    if (name === 'default') {
+      h = setMarkdownFigureNum(m)
+    }
+    if (name === 'noSetAlt') {
+      option.noSetAlt = true
+      h = setMarkdownFigureNumWithNoSetAlt(m, option)
+    }
+
+    try {
+      assert.strictEqual(h, ms[n].outputMarkdown)
+    } catch(e) {
+      console.log('incorrect: ')
+      //console.log(m)
+      //console.log('::convert ->')
+      console.log('H: ' + h +'\n\nC: ' + ms[n].outputMarkdown)
+    }
+    n++
   }
-  n++
-}
+}
+
+
+const example = {
+  default: __dirname + path.sep + 'examples.txt',
+  noSetAlt: __dirname + path.sep + 'examples-no-set-alt.txt',
+}
+for (let ex in example) {
+  check(ex, example[ex])
+}
+

package/test/examples_paragraphnumber.txt

@@ -1,28 +0,0 @@
-[Input]
-This line is [Figure][#flag] paragraph.
-
-Figure. A caption.
-
-![](cat.jpg) {#flag}
-
-Figure. A caption.
-
-![](cat.jpg) {#flag2}
-
-A paragraph. [Figure][#flag2] paragraph.
-
-[Output]
-This line is [Figure 1][] paragraph.
-
-Figure 1. A caption.
-
-![Figure 1](cat.jpg) {#figure1}
-
-Figure 2. A caption.
-
-![Figure 2](cat.jpg) {#figure2}
-
-A paragraph. [Figure 2][] paragraph.
-
-[Figure 1]: #figure1
-[Figure 2]: #figure2