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

package/README.md

@@ -69,5 +69,36 @@ setMarkdownFigureNum(markdownCont)
 
 ![図2](image.jpg)
 
+段落。段落。段落。
+
+
+[Input]
+段落。段落。段落。
+
+Figure. キャプション
+
+![](image.jpg)
+
+段落。段落。段落。
+
+Figure. キャプション
+
+![](image.jpg)
+
+段落。段落。段落。
+
+[Output]
+段落。段落。段落。
+
+Figure1. キャプション
+
+![Figure 1](image.jpg)
+
+段落。段落。段落。
+
+Figure 2. キャプション
+
+![Figure 2](image.jpg)
+
 段落。段落。段落。
 ```

package/index.js

@@ -2,35 +2,59 @@ const setMarkdownFigureNum = (markdown, option) => {
 
   let opt = {
     img: true,
-    table: true,
+    table: false,
     code: false,
     samp: false,
     blockquote: false,
+    slide: false,
   }
-
   opt["pre-code"] = opt.code
   opt["pre-samp"] = opt.samp
+  if (option !== undefined) {
+    for (let o in option) {
+      opt[o] = option[o];
+    }
+  }
+
 
   const markAfterNum = '[A-Z0-9]{1,6}(?:[.-][A-Z0-9]{1,6}){0,5}';
-  const markAfterNumAfterJoint = '[.:．。：　]';
+  const joint = '[.:．。：　]';
+  const jointFullWidth = '[．。：　]';
+  const jointHalfWidth = '[.:]';
 
   const markAfterEn = '(?:' +
-    '[ 　]*' + markAfterNumAfterJoint + '(?:(?=[ ]+)|$)|' +
-    '[ 　]*' + markAfterNum + markAfterNumAfterJoint + '(?:(?=[ ]+)|$)|' +
-    '[ 　]*' + markAfterNum + '(?:(?=[ 　]+[^a-z])|$)|' +
-    '[.]' + markAfterNum + '(?:(?=[ 　]+[^a-z])|$)' +
+    ' *(?:' +
+      jointHalfWidth + '(?:(?=[ ]+)|$)|' +
+      jointFullWidth + '|' +
+      '(?=[ ]+[^0-9a-zA-Z])' +
+    ')|' +
+    ' *' + '(' + markAfterNum + ')(?:' +
+      jointHalfWidth + '(?:(?=[ ]+)|$)|' +
+      jointFullWidth + '|' +
+      '(?=[ ]+[^a-z])|$' +
+    ')|' +
+    '[.](' + markAfterNum + ')(?:' +
+      joint + '|(?=[ ]+[^a-z])|$' +
+    ')' +
   ')';
+
   const markAfterJa = '(?:' +
-    '[ 　]*(?:' + markAfterNumAfterJoint + '|(?=[ ]))|' +
-    '[ 　]*' + markAfterNum + '(?:' + markAfterNumAfterJoint + '(?:(?=[ ])|$))|' +
-    '[ 　]*' + markAfterNum + '(?:[:。．:：　]|(?=[ ])|$)' +
+    ' *(?:' +
+      jointHalfWidth + '(?:(?=[ ]+)|$)|' +
+      jointFullWidth + '|' +
+      '(?=[ ]+)' +
+    ')|' +
+    ' *' + '(' + markAfterNum + ')(?:' +
+      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
@@ -46,82 +70,151 @@ 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 + '|' +
-      '(?:(?:ソース)?コード|命令|プログラム|算譜|アルゴリズム|算法)' + markAfterJa +
+      '(?:(?:ソース)?コード|リスト|命令|プログラム|算譜|アルゴリズム|算法)' + markAfterJa +
     ')'),
     //terminal, prompt, command
     "pre-samp": new RegExp('^(?:' +
       '(?:[cC][oO][nN][sS][oO][lL][eE]|[tT][eE][rR][mM][iI][nN][aA][lL]|[pP][rR][oO][mM][pP][tT]|[cC][oO][mM]{2}[aA][nN][dD])'+ markAfterEn + '|' +
       '(?:端末|ターミナル|コマンド|(?:コマンド)?プロンプト)' + markAfterJa +
     ')'),
-    //quote, blockquote
+    //quote, blockquote, source
     "blockquote": new RegExp('^(?:' +
-      '(?:(?:[bB][lL][oO][cC][kK])?[qQ][uU][oO][tT][eE])'+ markAfterEn + '|' +
+      '(?:(?:[bB][lL][oO][cC][kK])?[qQ][uU][oO][tT][eE]|[sS][oO][uU][rR][cC][eE])'+ markAfterEn + '|' +
       '(?:引用(?:元)?|出典)' + markAfterJa +
+    ')'),
+    //slide
+    "slide": new RegExp('^(?:' +
+      '(?:[sS][lL][iI][dD][eE])'+ markAfterEn + '|' +
+      '(?:スライド)' + markAfterJa +
     ')')
+  };
+
+  const label = (hasMarkLabel, counter, isAlt) => {
+
+    let label = hasMarkLabel[0]
+
+    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
+      } else {
+        label = label.replace(new RegExp(joint +'$'), '') + ' ' + counter + isLabelLastJoint[1]
+      }
+    } else {
+      label += counter
+    }
+    return label
   }
-  
-  const label = (hasMarkLabel, hasFigureImageReg) => {
-    if (/ */.test(hasFigureImageReg[2])) {
-      if (/[^a-zA-Z]/.test(hasMarkLabel[0])) {
-        return hasMarkLabel[0].replace(new RegExp(markAfterNum + '$'), '')
+
+
+  const setImageAltNumber = (lines, n,  mark, hasMarkLabel, counter) => {
+    let hasPrevFigureImage = false
+    let isFigureImage
+    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(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 (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(figureImageReg))
+      //console.log(isFigureImage)
+      if (isFigureImage) {
+        lines[i] = lines[i].replace(new RegExp(figureImageReg), '$1' + label(hasMarkLabel, counter[mark], true) + '$4')
+        //console.log('ChangeNextLine: ' + lines[i])
       }
-     return hasMarkLabel[0]
+      break
     }
-    return ''
+    return
   }
 
   let n = 0
   let lines = []
   let lineBreaks = []
-  const hasFigureImageReg = /^( *\!\[ *)(.*?)( *\]\(.*?\))/
   const counter = {
     img: 0,
     table: 0,
     "pre-code": 0,
     "pre-samp": 0,
     blockquote: 0,
+    slide: 0,
   }
+
+
   lines = markdown.split(/\r\n|\n/)
   lineBreaks = markdown.match(/\r\n|\n/g);
+  let isBackquoteCodeBlock = false
+  let isTildeCodeBlock = false
+
+  if(lines.length === 0) return markdown
 
-  if(lines.length === 0) {
-    lines.push(markdown)
-  }
   while (n < lines.length) {
-    lines[n]
+    if (lines[n].match(/^ *```/)) {
+      if (isBackquoteCodeBlock) {
+        isBackquoteCodeBlock = false
+      } else {
+        isBackquoteCodeBlock = true
+      }
+    }
+    if (lines[n].match(/^ *~~~/)) {
+      if (isTildeCodeBlock) {
+        isTildeCodeBlock = false
+      } else {
+        isTildeCodeBlock = true
+      }
+    }
+    if (isBackquoteCodeBlock || isTildeCodeBlock) {
+      n++
+      continue
+    }
+
     for (let mark of Object.keys(markReg)) {
       const hasMarkLabel = lines[n].match(markReg[mark]);
-      //console.log(hasMarkLabel)
-      if (hasMarkLabel) {
+      //if (hasMarkLabel) console.log(hasMarkLabel)
+      if (hasMarkLabel && opt[mark]) {
         counter[mark]++
-        lines[n] = lines[n].replace(new RegExp('^([ 　]*)' + hasMarkLabel[0]), '$1' + label(hasMarkLabel, hasFigureImageReg) + counter[mark])
-
-        let hasNextFigureImage = false
-        //let hasPrevFigureImage = false
-        let i = n + 1
-        while (i < lines.length) {
-          if (/^\s*$/.test(lines[i])) {
-            i++
-            continue
-          }
-          if (lines[i].match(new RegExp(hasFigureImageReg))) {
-            lines[i] = lines[i].replace(new RegExp(hasFigureImageReg), '$1' + label(hasMarkLabel, hasFigureImageReg) + counter[mark] + '$3')
-            hasNextFigureImage = true
-          }
-          break
-        }
-        if (!hasNextFigureImage) {
-          i = n -1
-          while (i >= 0) {
-            if (/^\s$/.test(lines[i])) {
-            i--
-            continue
-            }
-            if (lines[i].match(new RegExp(hasFigureImageReg))) {
-              lines[i] = lines[i].replace(new RegExp(hasFigureImageReg), '$1' + label(hasMarkLabel, hasFigureImageReg) + counter[mark] + '$3')
-            }
-            break
-          }
+        //console.log('lines[n]: ' + lines[n])
+        lines[n] = lines[n].replace(new RegExp('^([ \t]*)' + hasMarkLabel[0]), '$1' + label(hasMarkLabel, counter[mark]))
+        if (mark === 'img') {
+          setImageAltNumber(lines, n, mark, hasMarkLabel, counter)
         }
       }
     }

package/package.json

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

package/test/examples.txt

@@ -39,7 +39,7 @@
 
 段落。段落。段落。
 
-図2 キャプション
+図3 キャプション
 
 ![](image.jpg)
 
@@ -61,33 +61,138 @@
 段落。段落。段落。
 
 
+
 [Input]
-段落。段落。段落。
+図 キャプション
+
+![図1](image.jpg)
 
 図 キャプション
 
+![図2](image.jpg)
+
+[Output]
+図1 キャプション
+
 ![図1](image.jpg)
 
-段落。段落。段落。
+図2 キャプション
+
+![図2](image.jpg)
+
+
+
+[Input]
+![図1](image.jpg)
 
 図 キャプション
 
 ![図2](image.jpg)
 
+図 キャプション
+[Output]
+![図1](image.jpg)
+
+図1 キャプション
+
+![図2](image.jpg)
+
+図2 キャプション
+
+[Input]
+段落。段落。段落。
+
+```
+図 キャプション
+
+![図1](image.jpg)
+```
+
+```
+Code. Caption
+```
+
 段落。段落。段落。
 
 [Output]
 段落。段落。段落。
 
-図1 キャプション
+```
+図 キャプション
 
 ![図1](image.jpg)
+```
+
+```
+Code. Caption
+```
+
+段落。段落。段落。
 
+
+[Input]
 段落。段落。段落。
 
+Figure. キャプション
+
+![](image.jpg)
+
+段落。段落。段落。
+
+Figure. キャプション
+
+![](image.jpg)
+
+段落。段落。段落。
+
+[Output]
+段落。段落。段落。
+
+Figure 1. キャプション
+
+![Figure 1](image.jpg)
+
+段落。段落。段落。
+
+Figure 2. キャプション
+
+![Figure 2](image.jpg)
+
+段落。段落。段落。
+
+
+[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/examples_paragraphnumber.txt

@@ -0,0 +1,28 @@
+[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

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)