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

package/index.js

@@ -1,123 +1,37 @@
-const setMarkdownFigureNum = (markdown, option) => {
+import { markReg as markRegEx, joint as jointStr } from "p7d-markdown-it-p-captions"
 
-  let opt = {
-    img: true,
-    table: false,
-    code: false,
-    samp: false,
-    blockquote: false,
-    slide: false,
-    noSetAlt: false,
-    setImgAlt: false,
-  }
-  opt["pre-code"] = opt.code
-  opt["pre-samp"] = opt.samp
-  if (option !== undefined) {
-    for (let o in option) {
-      opt[o] = option[o];
-    }
-  }
 
+const markReg = markRegEx
+const joint = jointStr
+//console.log(markReg)
+//console.log(joint)
 
-  const markAfterNum = '[A-Z0-9]{1,6}(?:[.-][A-Z0-9]{1,6}){0,5}';
-  const joint = '[.:．。：　]';
-  const jointFullWidth = '[．。：　]';
-  const jointHalfWidth = '[.:]';
-
-  const markAfterEn = '(?:' +
-    ' *(?:' +
-      jointHalfWidth + '(?:(?=[ ]+)|$)|' +
-      jointFullWidth + '|' +
-      '(?=[ ]+[^0-9a-zA-Z])' +
-    ')|' +
-    ' *' + '(' + markAfterNum + ')(?:' +
-      jointHalfWidth + '(?:(?=[ ]+)|$)|' +
-      jointFullWidth + '|' +
-      '(?=[ ]+[^a-z])|$' +
-    ')|' +
-    '[.](' + markAfterNum + ')(?:' +
-      joint + '|(?=[ ]+[^a-z])|$' +
-    ')|' +
-    '[ 　]*$' +
-  ')';
-
-  const markAfterJa = '(?:' +
-    ' *(?:' +
-      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 + '|' +
-      '(?:図|イラスト|写真)' + markAfterJa +
-    ')'),
-    //movie, video
-    "video": new RegExp('^(?:' +
-      '(?:[mM][oO][vV][iI][eE]|[vV][iI][dD][eE][oO])'+ markAfterEn + '|' +
-      '(?:動画|ビデオ)' + markAfterJa +
-    ')'),
-    //table
-    "table": new RegExp('^(?:' +
-      '(?:[tT][aA][bB][lL][eE])'+ markAfterEn + '|' +
-      '(?:表)' + markAfterJa +
-    ')'),
-    //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 +
-    ')'),
-    //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, source
-    "blockquote": new RegExp('^(?:' +
-      '(?:(?:[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]
-    let LabelIsEn = /[a-zA-Z]/.test(label)
-    let spaceBeforeCounter = ''
-    if (LabelIsEn) {
-      spaceBeforeCounter = ' '
-    }
+const label = (hasMarkLabel, counter, isAlt) => {
+  let label = hasMarkLabel[0]
+  //console.log('label: ' + label + ' counter: ' + counter)
+  let LabelIsEn = /^[a-zA-Z]/.test(label)
+  const spaceBeforeCounter = LabelIsEn ? ' ' : ''
 
-    if (hasMarkLabel[3]) {
-      label = hasMarkLabel[0].replace(new RegExp(hasMarkLabel[3] + '$'), '')
-    }
-    let isLabelLastJoint = label.match(new RegExp('(' + joint +')$'))
+  //console.log(hasMarkLabel)
+  if (hasMarkLabel[3]) {
+    label = hasMarkLabel[0].replace(new RegExp(hasMarkLabel[3] + '$'), '')
+  } else if (hasMarkLabel[4]) {
+    label = hasMarkLabel[4]
+  }
+  let hasLabelLastJoint = hasMarkLabel[0].match(new RegExp('(' + joint +')$'))
 
-    if (isLabelLastJoint) {
-      if (isAlt) {
-        label = label.replace(new RegExp(joint +'$'), '') + spaceBeforeCounter + counter
-      } else {
-        label = label.replace(new RegExp(joint +'$'), '') + spaceBeforeCounter + counter + isLabelLastJoint[1]
-      }
+  if (hasLabelLastJoint) {
+    if (isAlt) {
+      label = label.replace(new RegExp(joint +'$'), '') + spaceBeforeCounter + counter
     } else {
-      label += counter
+      label = label.replace(new RegExp(joint +'$'), '') + spaceBeforeCounter + counter + hasLabelLastJoint[1]
     }
-    return label
+  } else {
+    label += counter
   }
+  //console.log('label: ' + label)
+  return label
+}
 
 
   const setImageAltNumber = (lines, n,  mark, hasMarkLabel, counter) => {
@@ -175,6 +89,19 @@ const setMarkdownFigureNum = (markdown, option) => {
     return
   }
 
+const setMarkdownFigureNum = (markdown, option) => {
+    let opt = {
+      img: true,
+      table: false,
+      'pre-code': false,
+      'pre-samp': false,
+      blockquote: false,
+      slide: false,
+      noSetAlt: false,
+      setImgAlt: false,
+    }
+    if (option) Object.assign(opt, option)
+
   let n = 0
   let lines = []
   let lineBreaks = []
@@ -187,11 +114,11 @@ const setMarkdownFigureNum = (markdown, option) => {
     slide: 0,
   }
 
-
   lines = markdown.split(/\r\n|\n/)
   lineBreaks = markdown.match(/\r\n|\n/g);
   let isBackquoteCodeBlock = false
   let isTildeCodeBlock = false
+  let isMathBlock = false
 
   if(lines.length === 0) return markdown
 
@@ -210,17 +137,24 @@ const setMarkdownFigureNum = (markdown, option) => {
         isTildeCodeBlock = true
       }
     }
-    if (isBackquoteCodeBlock || isTildeCodeBlock) {
+    if (lines[n].match(/^ *\$\$/)) {
+      if (isMathBlock) {
+        isMathBlock = false
+      } else {
+        isMathBlock = true
+      }
+    }
+    if (isBackquoteCodeBlock || isTildeCodeBlock || isMathBlock) {
       n++
       continue
     }
 
+    //console.log('====== n: ' + n + ' lines[n]: ' + lines[n])
     for (let mark of Object.keys(markReg)) {
       const hasMarkLabel = lines[n].match(markReg[mark])
-      //if (hasMarkLabel) console.log(hasMarkLabel)
       if (hasMarkLabel && opt[mark]) {
+        //console.log(hasMarkLabel)
         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' && !opt.noSetAlt) {
           setImageAltNumber(lines, n, mark, hasMarkLabel, counter)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markown-figure-num-setting",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Set figure number for p7d-markdown-it-p-captions.",
   "type": "module",
   "main": "index.js",
@@ -16,5 +16,8 @@
   "bugs": {
     "url": "https://github.com/peaceroad/markown-figure-num-setting/issues"
   },
-  "homepage": "https://github.com/peaceroad/markown-figure-num-setting#readme"
+  "homepage": "https://github.com/peaceroad/markown-figure-num-setting#readme",
+  "dependencies": {
+    "p7d-markdown-it-p-captions": "^0.17.0"
+  }
 }

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

@@ -18,19 +18,38 @@
 
 
 [Input]
-図
+図3 キャプション
 
 ![ALT-A](image.jpg)
 
-図
+図6 キャプション
 
 ![ALT-B](image.jpg)
 
 [Output]
-図1
+図1 キャプション
 
 ![ALT-A](image.jpg)
 
-図2
+図2 キャプション
 
 ![ALT-B](image.jpg)
+
+
+[Input]
+図 キャプション
+
+![](image.jpg)
+
+図 キャプション
+
+![](image.jpg)
+
+[Output]
+図1 キャプション
+
+![](image.jpg)
+
+図2 キャプション
+
+![](image.jpg)

package/test/examples.txt

@@ -200,23 +200,41 @@ Figure 2. キャプション
 
 
 [Input]
-図
+図 キャプション
 
 ![](image.jpg)
 
-図
+図 キャプション
 
 ![](image.jpg)
 [Output]
-図1
+図1 キャプション
 
 ![図1](image.jpg)
 
-図2
+図2 キャプション
 
 ![図2](image.jpg)
 
 
+[Input]
+図
+
+![](image.jpg)
+
+図
+
+![](image.jpg)
+[Output]
+図
+
+![](image.jpg)
+
+図
+
+![](image.jpg)
+
+
 [Input]
 図　
 
@@ -255,37 +273,37 @@ Figure 2. キャプション
 [Input]
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図1
+図1 キャプション
 
 ![図1](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図2
+図2 キャプション
 
 ![図2](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図
+図 キャプション
 
 ![図](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図2
+図2 キャプション
 
 ![図2](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図
+図 キャプション
 
 ![図](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図2
+図2 キャプション
 
 ![図2](Src)
 
@@ -293,37 +311,37 @@ Figure 2. キャプション
 [Output]
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図1
+図1 キャプション
 
 ![図1](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図2
+図2 キャプション
 
 ![図2](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図3
+図3 キャプション
 
 ![図3](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図4
+図4 キャプション
 
 ![図4](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図5
+図5 キャプション
 
 ![図5](Src)
 
 段落。段落。段落。段落。段落。段落。段落。段落。段落。
 
-図6
+図6 キャプション
 
 ![図6](Src)
 

package/test/test.js

@@ -10,6 +10,8 @@ if (isWindows) {
   __dirname = __dirname.replace(/^\/+/, '').replace(/\//g, '\\')
 }
 
+let pass = true
+
 const check = (name, ex) => {
   const exCont = fs.readFileSync(ex, 'utf-8').trim()
   let ms = [];
@@ -35,7 +37,7 @@ const check = (name, ex) => {
 
   n = 1
   while(n < ms.length) {
-    //if (n !== 10) { n++; continue }
+    //if (n !== 11) {n++; continue }
     console.log('Test: ' + n + ' >>>')
     const m = ms[n].inputMarkdown
     let h
@@ -51,9 +53,10 @@ const check = (name, ex) => {
     try {
       assert.strictEqual(h, ms[n].outputMarkdown)
     } catch(e) {
+      pass = false
       console.log('incorrect: ')
-      //console.log(m)
-      //console.log('::convert ->')
+      console.log(m)
+      console.log('::convert ->')
       console.log('H: ' + h +'\n\nC: ' + ms[n].outputMarkdown)
     }
     n++
@@ -66,6 +69,8 @@ const example = {
   noSetAlt: __dirname + path.sep + 'examples-no-set-alt.txt',
 }
 for (let ex in example) {
+  console.log('[' + ex + '] >>> ' + example[ex])
   check(ex, example[ex])
 }
 
+if (pass) console.log('\nAll tests passed.')