@peaceroad/markdown-it-strong-ja 0.3.4 → 0.3.5

package/index.js

@@ -85,32 +85,39 @@ const hasNextSymbol = (state, n, max, symbol, noMark) => {
     while (i < max) {
       tempNoMark += state.src[i]
       if (state.src.charCodeAt(i) === symbol && !hasBackslash(state, i)) {
-        noMark += state.src[n]
+        noMark += state.src.substring(n, i + 1)
         nextSymbolPos = i
         break
       }
       i++
     }
   }
-  return nextSymbolPos
+  return [nextSymbolPos, noMark]
 }
 
 const createInlines = (state, start, max, opt) => {
   let n = start
   let inlines = []
   let noMark = ''
-  let isInStartMark = true
   let textStart = n
-
   while (n < max) {
-    let nextSymbolPos = hasNextSymbol(state, n, max, 0x60, noMark)  // '`'
+    let nextSymbolPos = -1;
+    [nextSymbolPos, noMark] = hasNextSymbol(state, n, max, 0x60, noMark)  // '`'
     if (nextSymbolPos !== -1) {
+      if (nextSymbolPos === max - 1) {
+        inlinesPush(inlines, textStart, nextSymbolPos, nextSymbolPos - textStart + 1, 'text')
+        break
+      }
       n = nextSymbolPos + 1
       continue
     }
     if (opt.dollarMath) {
-      nextSymbolPos = hasNextSymbol(state, n, max, 0x24, noMark)  // '$'
+      [nextSymbolPos, noMark] = hasNextSymbol(state, n, max, 0x24, noMark)  // '$'
       if (nextSymbolPos !== -1) {
+        if (nextSymbolPos === max - 1) {
+          inlinesPush(inlines, textStart, nextSymbolPos, nextSymbolPos - textStart + 1, 'text')
+          break
+        }
         n = nextSymbolPos + 1
         continue
       }
@@ -142,9 +149,8 @@ const createInlines = (state, start, max, opt) => {
         continue
       }
     }
-
     if (state.src.charCodeAt(n) === 0x2A && !hasBackslash(state, n)) { // '*'
-      if (!isInStartMark) {
+      if (n !== 0) {
         inlinesPush(inlines, textStart, n - 1, n - textStart, 'text')
       }
       if (n === max - 1) {
@@ -165,10 +171,8 @@ const createInlines = (state, start, max, opt) => {
       n = i
       continue
     }
-    isInStartMark = false
     noMark += state.src[n]
-    //console.log('noMark: ' + noMark)
-    if (n === max - 1 || max < 3) {
+    if (n === max - 1) {
       inlinesPush(inlines, textStart, n, n - textStart + 1, 'text')
       break
     }
@@ -482,11 +486,8 @@ const strongJa = (state, silent, opt) => {
   if (silent) return false
   const start = state.pos
   let max = state.posMax
-  const hasCurlyAttributes = state.md.core.ruler.__rules__.filter(rule => {
-    rule.name === 'curly_attributes' // markdown-it-attrs
-  })
   let attributesSrc
-  if (hasCurlyAttributes) {
+  if (opt.hasCurlyAttributes) {
     attributesSrc = state.src.match(/( *){.*?}$/)
     if (attributesSrc) {
       max = state.src.slice(0, attributesSrc.index).length
@@ -536,7 +537,11 @@ const strongJa = (state, silent, opt) => {
 const mditStrongJa = (md, option) => {
   const opt = {
     dollarMath: true,
+    hasCurlyAttributes: false,
   }
+  opt.hasCurlyAttributes = md.core.ruler.__rules__.filter(rule => {
+    rule.name === 'curly_attributes' // markdown-it-attrs
+  })
   if (option !== undefined) {
     for (let o in option) {
         opt[o] = option[o]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peaceroad/markdown-it-strong-ja",
   "description": "This is a plugin for markdown-it. It is an alternative to the standard `**` (strong)  and `*` (em) processing. It also processes strings that cannot be converted by the standard.",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "main": "index.js",
   "type": "module",
   "scripts": {

package/test/example-complex.txt

@@ -336,3 +336,31 @@ b<span>c</span>*
 <p>*<em><em><span>a</span></em>b</em></p>
 
 
+[Markdown]
+*`a`*
+[HTML]
+<p><em><code>a</code></em></p>
+
+[Markdown]
+**z`a`b**
+[HTML]
+<p><strong>z<code>a</code>b</strong></p>
+
+[Markdown]
+**`a`
+[HTML]
+<p>**<code>a</code></p>
+
+[Markdown]
+**<b>a</b>**
+[HTML:false]
+<p><strong>&lt;b&gt;a&lt;/b&gt;</strong></p>
+[HTML:true]
+<p><strong><b>a</b></strong></p>
+
+[Markdown]
+**<br>
+[HTML:false]
+<p>**&lt;br&gt;</p>
+[HTML:true]
+<p>**<br></p>

package/test/test.js

@@ -15,7 +15,7 @@ const check = (ms, example) => {
   let n = 1
   while (n < ms.length) {
     //if (n !== 23 ) { n++; continue }
-    //if (n !== 36 ) { n++; continue }
+    //if (n !== 59 ) { n++; continue }
     const m = ms[n].markdown
     console.log('Test [' + n + ', HTML: false] >>>')
     const h = md.render(m)