@peaceroad/markdown-it-numbering-ul-regarded-as-ol 0.1.2 → 0.1.4

package/README.md

@@ -108,9 +108,9 @@ md.use(mdNumUl, {
 - iii. c
 [HTML]
 <ol type="i" class="ol-lower-roman">
-<li><span class="li-num">i<span class="li-num-joint">.</span></span> a</li>
-<li><span class="li-num">ii<span class="li-num-joint">.</span></span> b</li>
-<li><span class="li-num">iii<span class="li-num-joint">.</span></span> c</li>
+<li>a</li>
+<li>b</li>
+<li>c</li>
 </ol>
 
 [Markdown]
@@ -192,9 +192,9 @@ md.use(mdNumUl, {
 <li>項目1</li>
 <li>項目2
 <ol type="i" class="ol-lower-roman">
-<li><span class="li-num">i<span class="li-num-joint">.</span></span> 項目2-i</li>
-<li><span class="li-num">ii<span class="li-num-joint">.</span></span> 項目2-ii</li>
-<li><span class="li-num">iii<span class="li-num-joint">.</span></span> 項目2-iii</li>
+<li>項目2-i</li>
+<li>項目2-ii</li>
+<li>項目2-iii</li>
 </ol>
 </li>
 <li>項目3</li>
@@ -209,15 +209,15 @@ md.use(mdNumUl, {
 - iii. 項目iii
 [HTML]
 <ol type="i" class="ol-lower-roman">
-<li><span class="li-num">i<span class="li-num-joint">.</span></span> 項目i</li>
-<li><span class="li-num">ii<span class="li-num-joint">.</span></span> 項目ii
+<li>項目i</li>
+<li>項目ii
 <ol class="ol-decimal">
 <li>項目ii-1</li>
 <li>項目ii-2</li>
 <li>項目ii-3</li>
 </ol>
 </li>
-<li><span class="li-num">iii<span class="li-num-joint">.</span></span> 項目iii</li>
+<li>項目iii</li>
 </ol>
 
 [Markdown]
@@ -255,17 +255,18 @@ md.use(mdNumUl, {
 <li>項目1</li>
 <li>項目2
 <ol type="i" class="ol-lower-roman">
-<li><span class="li-num">i<span class="li-num-joint">.</span></span> 項目2-i</li>
-<li><span class="li-num">ii<span class="li-num-joint">.</span></span> 項目2-ii
+<li>項目2-i</li>
+<li>項目2-ii
 <ol type="a" class="ol-lower-latin">
-<li><span class="li-num">a<span class="li-num-joint">.</span></span> 項目2-ii-a</li>
-<li><span class="li-num">b<span class="li-num-joint">.</span></span> 項目2-ii-b</li>
-<li><span class="li-num">c<span class="li-num-joint">.</span></span> 項目2-ii-c</li>
+<li>項目2-ii-a</li>
+<li>項目2-ii-b</li>
+<li>項目2-ii-c</li>
 </ol>
 </li>
-<li><span class="li-num">iii<span class="li-num-joint">.</span></span> 項目2-iii</li>
+<li>項目2-iii</li>
 </ol>
 </li>
 <li>項目3</li>
 </ol>
+
 ```

package/index.js

@@ -54,15 +54,15 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
       }
       let hasSymbol = null;
       while (sn < types[ltn].symbols.length) {
-        hasSymbol = inlineToken.content.match(new RegExp('^'+ '((' + types[ltn].prefix + ')' + types[ltn].symbols[sn] + '(' + types[ltn].suffix + ')(' + types[ltn].joint + '))'));
+        hasSymbol = inlineToken.content.match(new RegExp('^'+ '((' + types[ltn].prefix + ')' + types[ltn].symbols[sn] + '(' + types[ltn].suffix + ')(' + types[ltn].joint + '))([ 　])+'));
         if (!hasSymbol) { sn++; continue; }
 
         symbol.typesNum = ltn;
         symbol.contAll = hasSymbol[0];
-        symbol.cont = hasSymbol[1].replace(new RegExp('(' + types[ltn].joint + ')[ 　]*$'), '');
+        symbol.cont = hasSymbol[1].replace(new RegExp('(' + types[ltn].joint + ')'), '');
         symbol.prefix = hasSymbol[2];
-        symbol.suffix = hasSymbol[3].replace(new RegExp('(' + types[ltn].joint + ')[ 　]*$'), '');
-        symbol.joint = hasSymbol[4].replace(/　*$/, '');
+        symbol.suffix = hasSymbol[3].replace(new RegExp('(' + types[ltn].joint + ')'), '');
+        symbol.joint = hasSymbol[4].replace(/^[ 　]+$/, '');
         symbol.typePos = sn;
         symbol.num = sn + types[ltn].start;
         symbols.push(symbol);
@@ -70,7 +70,7 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
       }
       ltn++;
     }
-    //console.log('symbols: ' + symbols);
+    //console.log('symbols: ' + JSON.stringify(symbols));
     return symbols;
   }
 
@@ -88,7 +88,6 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
     startFlow.type = state.tokens[n].type;
     startFlow.pos = n;
     startFlow.level = list.level;
-    startFlow.psTypes = [];
     list.flows.push(startFlow);
 
     let cn = list.nextPos;
@@ -166,7 +165,6 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
       const parentToken = state.tokens[list.flows[plfn].pos];
       if (parentToken.type === 'ordered_list_open' && listFlow.symbols.length === 0) {
         const liVal = cnToken.info;
-
         let decimalSymbol = {
           typesNum: 0,
           typePos: liVal, 
@@ -190,7 +188,7 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
         list.flows[plfn].type = 'numbering_' + list.flows[plfn].type;
       }
 
-      //Set possible symbole types.
+      //Set possible symbol types.
       let sn = 0;
       while (sn < listFlow.symbols.length) {
         let plt = 0
@@ -252,11 +250,34 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
     return sn;
   }
 
+  function setOlTypes1All1(list, lfn, sn) {
+    let olTypes1All1 = true;
+    if (list.flows[lfn].typesNum !== 0) {
+      return olTypes1All1 = false;
+    }
+    let n = 0;
+    //console.log(list.flows)
+    while (n < list.flows.length) {
+      if (list.flows[n].type === 'list_item_open') {
+        //console.log(list.flows[n].symbols)
+        if (list.flows[lfn].level !== list.flows[n].level) {
+          n++; continue;
+        }
+        if (+list.flows[n].symbols[sn].cont !== 1) {
+          olTypes1All1 = false;
+          break;
+        }
+      }
+      n++
+    }
+    return olTypes1All1
+  }
+
+
   function setNumbers(state, list) {
     let lfn = 0;
     while (lfn < list.flows.length) {
       //console.log('list.flows[' + lfn + ']: '+ JSON.stringify(list.flows[lfn]));
-
       const cn = list.flows[lfn].pos;
       const isParent = list.flows[lfn].type.match(/(numbering_bullet|ordered)_list_open/);
       if (isParent) {
@@ -268,6 +289,9 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
         const ptn = getParentTypeNum(list, lfn);
         list.flows[lfn].typesNum = ptn;
         const sn = getSymbolsNum(list, lfn+1, lfn);
+        const olTypes1All1 = setOlTypes1All1(list, lfn, sn);
+        list.flows[lfn].olTypes1All1 = olTypes1All1
+        //console.log(olTypes1All1)
         //Set type and role attribute.
         let isOlTypes = false;
         let isOlTypes1 = false;
@@ -280,7 +304,6 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
             if (!isOlTypes1) {
               state.tokens[cn].attrSet('type', olTypes[otn][0]);
             }
-
             break;
           }
           otn++;
@@ -357,7 +380,7 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
         //Set value attribute.
         if (list.flows[lfn -1].type === 'list_item_open') {
           const psn = getSymbolsNum(list, lfn - 1, plfn);
-          if (+list.flows[lfn -1].symbols[psn].num + 1 !== +list.flows[lfn].symbols[sn].num) {
+          if (+list.flows[lfn -1].symbols[psn].num + 1 !== +list.flows[lfn].symbols[sn].num && !list.flows[plfn].olTypes1All1) {
             state.tokens[cn].attrSet('value', list.flows[lfn].symbols[sn].num);
           }
         }
@@ -445,7 +468,6 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
 
   function numUl (state) {
     let n = 0;
-
     //console.log(state.tokens);
     while (n < state.tokens.length) {
       const token = state.tokens[n];
@@ -471,5 +493,5 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
     return;
   }
   
-  md.core.ruler.before('linkify', 'numbering_ul', numUl);
+  md.core.ruler.after('linkify', 'numbering_ul', numUl);
 };

package/listTypes.json

@@ -5,7 +5,7 @@
   "start": 0,
   "prefix": "[(]?",
   "suffix": "[)]?",
-  "joint": "[.] *"
+  "joint": "[.]"
 },{
   "name": "lower-latin",
   "symbolsCont": "abcdefghijklmnopqrstuvwxyz",
@@ -13,7 +13,7 @@
   "start": 1,
   "prefix": "[(]?",
   "suffix": "[)]?",
-  "joint": "[.] *"
+  "joint": "[.]"
 },{
   "name": "upper-latin",
   "symbolsCont": "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
@@ -21,7 +21,7 @@
   "start": 1,
   "prefix": "[(]?",
   "suffix": "[)]?",
-  "joint": "[.] *"
+  "joint": "[.]"
 },{
   "name": "lower-roman",
   "symbolsCont": "ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹⅺⅻ",
@@ -29,7 +29,7 @@
   "start": 1,
   "prefix": "[(]?",
   "suffix": "[)]?",
-  "joint": "[.] *"
+  "joint": "[.]"
 },{
   "name": "upper-roman",
   "symbolsCont": "ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫ",
@@ -37,7 +37,7 @@
   "start": 1,
   "prefix": "[(]?",
   "suffix": "[)]?",
-  "joint": "[.] *"
+  "joint": "[.]"
 },{
   "name": "filled-circled-decimal",
   "symbolsCont": "❶❷❸❹❺❻❼❽❾❿⓫⓬⓭⓮⓯⓰⓱⓲⓳⓴",
@@ -45,7 +45,7 @@
   "start": 1,
   "prefix": "",
   "suffix": "",
-  "joint": " *"
+  "joint": ""
 },{
   "name": "circled-decimal",
   "symbolsCont": "⓪①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮⑯⑰⑱⑲⑳㉑㉒㉓㉔㉕㉖㉗㉘㉙㉚㉛㉜㉝㉞㉟㊱㊲㊳㊴㊵㊶㊷㊸㊹㊺㊻㊼㊽㊾㊿",
@@ -53,5 +53,5 @@
   "start": 0,
   "prefix": "",
   "suffix": "",
-  "joint": " *"
+  "joint": ""
 }]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markdown-it-numbering-ul-regarded-as-ol",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "This markdown-it plugin regard ul element with numbering lists as ol element.",
   "main": "index.js",
   "scripts": {

package/test/examples.txt

@@ -151,12 +151,12 @@
 </ol>
 
 [Markdown]
-- ❸項目❸
-- ❹項目❹
-    - ②項目❹-②
-    - ③項目❹-③
-    - ④項目❹-④
-- ❺項目❺
+- ❸ 項目❸
+- ❹ 項目❹
+    - ② 項目❹-②
+    - ③ 項目❹-③
+    - ④ 項目❹-④
+- ❺ 項目❺
 [HTML]
 <ol start="3" role="list" class="ol-filled-circled-decimal">
 <li aria-label="❸">項目❸</li>
@@ -199,3 +199,38 @@
 <li>項目3</li>
 </ol>
 
+
+[Markdown]
+- 1.0 項目1
+- 2.0 項目2
+- 3.0 項目3
+[HTML]
+<ul>
+<li>1.0 項目1</li>
+<li>2.0 項目2</li>
+<li>3.0 項目3</li>
+</ul>
+
+[Markdown]
+1. 1.0 項目1
+2. 2.0 項目2
+3. 3.0 項目3
+[HTML]
+<ol class="ol-decimal">
+<li>1.0 項目1</li>
+<li>2.0 項目2</li>
+<li>3.0 項目3</li>
+</ol>
+
+
+[Markdown]
+1. 1.0 項目1
+1. 2.0 項目2
+1. 3.0 項目3
+[HTML]
+<ol class="ol-decimal">
+<li>1.0 項目1</li>
+<li>2.0 項目2</li>
+<li>3.0 項目3</li>
+</ol>
+

package/test/test.js

@@ -48,7 +48,7 @@ setMs(example, ms);
 
 let n = 1;
 while(n < ms.length) {
-  //if (n >= 5) { n++; continue };
+//  if (n !== 17) { n++; continue };
   console.log('Test: ' + n + ' >>>');
   //console.log(ms[n].markdown);