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

package/index.js

@@ -54,7 +54,7 @@ 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].replace(/^\\\\/,'\\') + '(' + types[ltn].suffix + ')(' + types[ltn].joint + '))([ 　])+', 'u'));
         if (!hasSymbol) { sn++; continue; }
 
         symbol.typesNum = ltn;
@@ -75,13 +75,12 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
   }
 
   function processListToken (state, n, list) {
-    list.level++;
     const flow = {
       level: -1,
       type: '',
       pos: -1,
       attrs: [],
-      psTypes: [], //psymbol symbol types.
+      psTypes: [], //parent symbol types.
       symbols: [],
     };
     const startFlow = Object.create(flow);
@@ -94,22 +93,22 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
     while (cn < state.tokens.length) {
       const cnToken = state.tokens[cn];
       //console.log('cn: ' + cn + ', list.level: ' + list.level + ', cnToken.type: ', cnToken.type, ', cnToken.content: ' + cnToken.content);
-
       const isCnListOpen = cnToken.type.match(/(bullet|ordered)_list_open/);
       const isCnListClose = cnToken.type.match(/(bullet|ordered)_list_close/);
 
       if (isCnListClose) {
         let stcn = list.flows.length - 1;
+        let st = {};
         while (stcn > -1) {
           //console.log('stcn: ' + stcn + ', list.flows[stcn].type: ' + list.flows[stcn].type);
           list.nextPos = cn + 1;
-          if(list.flows[stcn].type.match(/(bullet|ordered)_list_open/) && list.level === list.flows[stcn].level) {
+          st = list.flows[stcn].type.match(/(numbering_)?(?:bullet|ordered)_list_open/);
+          if(st && list.level === list.flows[stcn].level) {
             break;
           }
           stcn--;
         }
-
-        if (/numbering_(?:bullet|ordered)_list_open/.test(list.flows[stcn].type)) {
+        if (st[1]) {
           isCnListClose[0] = 'numbering_' + isCnListClose[0];
           cnToken.tag = 'ol';
         }
@@ -154,7 +153,7 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
       //Check parent list flow number.
       let plfn = list.flows.length - 2;
       while (plfn > -1) {
-        if (list.flows[plfn].type.match(/(bullet|ordered)_list_open/) && listFlow.level === list.flows[plfn].level) {
+        if (/(?:bullet|ordered)_list_open/.test(list.flows[plfn].type) && listFlow.level === list.flows[plfn].level) {
           break;
         }
         plfn--; continue;
@@ -167,7 +166,7 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
         const liVal = cnToken.info;
         let decimalSymbol = {
           typesNum: 0,
-          typePos: liVal, 
+          typePos: liVal,
           contAll: liVal + '. ',
           cont: liVal,
           prefix: '',
@@ -180,6 +179,9 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
 
       list.nextPos = cn + 1;
       if (listFlow.symbols.length === 0) {
+        if (/^numbering_/.test(list.flows[plfn].type)) {
+          list.flows[plfn].type = list.flows[plfn].type.replace(/^numbering_/, '');
+        }
         cn++; continue;
       }
 
@@ -273,7 +275,6 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
     return olTypes1All1
   }
 
-
   function setNumbers(state, list) {
     let lfn = 0;
     while (lfn < list.flows.length) {
@@ -292,6 +293,7 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
         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;
@@ -371,19 +373,39 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
 
       // list.flows[lfn].symbols.length > 0 for bullet list.
       if (list.flows[lfn].type === 'list_item_open' && list.flows[lfn].symbols.length) {
+        
         const plfn = getParentNum(list, lfn);
         //console.log('plfn: ' + plfn + ', list.flows[pn]: ' + JSON.stringify(list.flows[plfn]));
+        if (list.flows[plfn].type === 'bullet_list_open') {
+          lfn++; continue;
+        }
         const sn = getSymbolsNum(list, lfn, plfn);
         //console.log('sn: ' + sn);
         //console.log('symbols.num: ' + +list.flows[lfn].symbols[sn].num);
 
         //Set value attribute.
+        //console.log('!!Set Value' + JSON.stringify(list.flows[lfn]))
+        
+        const psn = getSymbolsNum(list, lfn - 1, plfn);
+        /*
         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 && !list.flows[plfn].olTypes1All1) {
             state.tokens[cn].attrSet('value', list.flows[lfn].symbols[sn].num);
           }
         }
+        */
+        let blfn = lfn - 1;
+        while (blfn) {
+          //console.log('level[lfn]: ' + list.flows[lfn].level + ', level[blfn]: ' + list.flows[blfn].level)
+          if (list.flows[blfn].type === 'list_item_open' && list.flows[lfn].level === list.flows[blfn].level) {
+            //console.log(list.flows[blfn].symbols[psn].num +  list.flows[lfn].symbols[sn].num)
+            if (+list.flows[blfn].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);
+            }
+            break;
+          }
+          blfn--
+        }
 
         //Set list num span element.
         if (opt.describeListNumber) {
@@ -471,27 +493,27 @@ module.exports = function numbering_ul_regarded_as_ol_plugin(md, option) {
     //console.log(state.tokens);
     while (n < state.tokens.length) {
       const token = state.tokens[n];
-      const isListOpen = token.type.match(/(bullet|ordered)_list_open/);
+      const isListOpen = /(bullet|ordered)_list_open/.test(token.type);
       if (!isListOpen) { n++; continue; }
 
       let list = {
-        level: 0,
+        level: 1,
         flows: [],
         nextPos: n + 1,
       };
       processListToken(state, n, list);
-      //console.log('list: ' + JSON.stringify(list));
 
       /*
       if(!opt.noChangeBulletOneOrderedList) {
         modifyBulletOneOrderedList(state, n, list);
       }
       */
-      setNumbers(state, list);
+        setNumbers(state, list);
+
       n = list.nextPos;
     }
     return;
   }
-  
+
   md.core.ruler.after('linkify', 'numbering_ul', numUl);
 };

package/listTypes.json

@@ -54,4 +54,28 @@
   "prefix": "",
   "suffix": "",
   "joint": ""
-}]
+},{
+  "name": "circled-lower-latin",
+  "symbolsCont": "ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ",
+  "symbols": ["\u24D0","\u24D1","\u24D2","\u24D3","\u24D4","\u24D5","\u24D6","\u24D7","\u24D8","\u24D9","\u24DA","\u24DB","\u24DC","\u24DD","\u24DE","\u24DF","\u24E0","\u24E1","\u24E2","\u24E3","\u24E4","\u24E5","\u24E6","\u24E7","\u24E8","\u24E9"],
+  "start": 1,
+  "prefix": "",
+  "suffix": "",
+  "joint": ""
+},{
+  "name": "circled-upper-latin",
+  "symbolsCont": "ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀⓁⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌⓍⓎⓏ",
+  "symbols": ["\u24B6","\u24B7","\u24B8","\u24B9","\u24BA","\u24BB","\u24BC","\u24BD","\u24BE","\u24BF","\u24C0","\u24C1","\u24C2","\u24C3","\u24C4","\u24C5","\u24C6","\u24C7","\u24C8","\u24C9","\u24CA","\u24CB","\u24CC","\u24CD","\u24CE","\u24CF"],
+  "start": 1,
+  "prefix": "",
+  "suffix": "",
+  "joint": ""
+},{
+  "name": "filled-circled-upper-latin",
+  "symbolsCont": "🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝🅞🅟🅠🅡🅢🅣🅤🅥🅦🅧🅨🅩",
+  "symbols": ["\\u{1F150}","\\u{1F151}","\\u{1F152}","\\u{1F153}","\\u{1F154}","\\u{1F155}","\\u{1F156}","\\u{1F157}","\\u{1F158}","\\u{1F159}","\\u{1F15A}","\\u{1F15B}","\\u{1F15C}","\\u{1F15D}","\\u{1F15E}","\\u{1F15F}","\\u{1F160}","\\u{1F161}","\\u{1F162}","\\u{1F163}","\\u{1F164}","\\u{1F165}","\\u{1F166}","\\u{1F167}","\\u{1F168}","\\u{1F169}"],
+  "start": 1,
+  "prefix": "",
+  "suffix": "",
+  "joint": ""
+}]

package/package.json

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

package/test/examples-spantitle.txt

@@ -199,3 +199,91 @@
 <li>項目3</li>
 </ol>
 
+[Markdown]
+- ⓐ 項目1
+- ⓑ 項目2
+- ⓒ 項目3
+[HTML]
+<ol class="ol-circled-lower-latin">
+<li><span class="li-num">ⓐ</span> 項目1</li>
+<li><span class="li-num">ⓑ</span> 項目2</li>
+<li><span class="li-num">ⓒ</span> 項目3</li>
+</ol>
+
+[Markdown]
+- Ⓐ 項目1
+- Ⓑ 項目2
+- Ⓒ 項目3
+[HTML]
+<ol class="ol-circled-upper-latin">
+<li><span class="li-num">Ⓐ</span> 項目1</li>
+<li><span class="li-num">Ⓑ</span> 項目2</li>
+<li><span class="li-num">Ⓒ</span> 項目3</li>
+</ol>
+
+[Markdown]
+- 🅐 項目1
+- 🅑 項目2
+- 🅒 項目3
+[HTML]
+<ol class="ol-filled-circled-upper-latin">
+<li><span class="li-num">🅐</span> 項目1</li>
+<li><span class="li-num">🅑</span> 項目2</li>
+<li><span class="li-num">🅒</span> 項目3</li>
+</ol>
+
+
+[Markdown]
+- 項目1
+- 2. 項目2
+- 項目3
+[HTML]
+<ul>
+<li>項目1</li>
+<li>
+<ol start="2" class="ol-decimal">
+<li>項目2</li>
+</ol>
+</li>
+<li>項目3</li>
+</ul>
+
+[Markdown]
+- 項目1
+- B. 項目2
+- 項目3
+[HTML]
+<ul>
+<li>項目1</li>
+<li>B. 項目2</li>
+<li>項目3</li>
+</ul>
+
+[Markdown]
+1. 項目1
+    1. 項目2
+2. 項目3
+[HTML]
+<ol class="ol-decimal">
+<li>項目1
+<ol class="ol-decimal">
+<li>項目2</li>
+</ol>
+</li>
+<li>項目3</li>
+</ol>
+
+[Markdown]
+1. 項目1
+    - 項目1-1
+3. 項目3
+[HTML]
+<ol class="ol-decimal">
+<li>項目1
+<ul>
+<li>項目1-1</li>
+</ul>
+</li>
+<li value="3">項目3</li>
+</ol>
+

package/test/test.js

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