motion-markdown-it 10.0.0 → 12.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f2ac0d111cfc878b1017c5e3c32d1e9a6b9468176051937bac57f0378e5ac8
-  data.tar.gz: 13b8f19a17c53fca0f8ae6c8e373f219bb90b9e6152e7d3a9a0b1ad54c3f7c63
+  metadata.gz: 74ae9a8bfdbc637f5e2127d34919298661b7d4f32b55830053a0c30012cd1ddf
+  data.tar.gz: 5787ec92937c5e8ef19fead547c0fae14b0de4507c0098cb5e8a79720dab611e
 SHA512:
-  metadata.gz: d632e566f5280d655dac450d8e5c9532dc17829ec8c40aee01c1b35df2909f55e467940e2598bf557aa8c4ee85285a0d6bb1801a28ed1ddd3c1a1767a306c9eb
-  data.tar.gz: f669a717a5d9f56c2f9d9d7669bd329610b0120a2dceeca3334eb72411184b371448d71a03ad04e4ff9d4f7c7d499750f98b091bd1415ba709011193b0fd385b
+  metadata.gz: 72214978791be3e608c627bfa80db56a1ca30df9650a1df85bef0c2a99fb68b822a1464261595779f16385a9e69cf9898fbd15966ba5e00ad969d4a0568c028a
+  data.tar.gz: 5e2ede784f3386d45b930789abb2c0a05ee8bc2dffb707d736c437e48fe722b9084dc75f2032bea6a8d47b723d0daac43428fb059e1ac1f7c6fa92dfad4a83e7

data/README.md

@@ -7,7 +7,7 @@ Ruby/RubyMotion version of Markdown-it (CommonMark compliant and extendable)
 
 This gem is a port of the [markdown-it Javascript package](https://github.com/markdown-it/markdown-it) by Vitaly Puzrin and Alex Kocharin. 
 
-_Currently synced with markdown-it 10.0.0_
+_Currently synced with markdown-it 12.0.6_
 
 ---
 
@@ -54,15 +54,14 @@ redcarpet 3.4.0             0.0065
 
 ## Table of content
 
-- [markdown-it](#markdown-it)
-  - [Install](#install)
-  - [Usage examples](#usage-examples)
-    - [Simple](#simple)
-    - [Init with presets and options](#init-with-presets-and-options)
-  - [Plugins](#plugins)
-  - [Upgrading](#upgrading)
-  - [References / Thanks](#references--thanks)
-  - [License](#license)
+- [Install](#install)
+- [Usage examples](#usage-examples)
+  - [Simple](#simple)
+  - [Init with presets and options](#init-with-presets-and-options)
+- [Plugins](#plugins)
+- [Upgrading](#upgrading)
+- [References / Thanks](#references--thanks)
+- [License](#license)
 
 <!--
 - [API](#api)
@@ -134,6 +133,7 @@ parser = MarkdownIt::Parser.new({
   linkify:      false,        # Autoconvert URL-like text to links
 
   # Enable some language-neutral replacement + quotes beautification
+  # For the full list of replacements, see https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/replacements.js
   typographer:  false,
 
   # Double + single quotes replacement pairs, when typographer enabled,
@@ -221,7 +221,7 @@ var md = require('markdown-it')({
 configure linkify-it, access the linkify instance through `md.linkify`:
 
 ```js
-md.linkify.tlds('.py', false);  // disables .py as top level domain
+md.linkify.set({ fuzzyEmail: false });  // disables converting email to link
 ```
 
 
@@ -274,6 +274,10 @@ md = require('markdown-it')({
 });
 ```
 
+You can find all rules in sources:
+[parser_core.js](lib/parser_core.js), [parser_block](lib/parser_block.js),
+[parser_inline](lib/parser_inline.js).
+
 
 ## Benchmark
 

data/lib/motion-markdown-it/common/html_blocks.rb

@@ -45,7 +45,6 @@ module MarkdownIt
     'main',
     'menu',
     'menuitem',
-    'meta',
     'nav',
     'noframes',
     'ol',
@@ -68,4 +67,4 @@ module MarkdownIt
     'ul'
   ].freeze
 
-end
+end

data/lib/motion-markdown-it/common/html_re.rb

@@ -17,7 +17,7 @@ module MarkdownIt
                   
       CLOSE_TAG     = '<\\/[A-Za-z][A-Za-z0-9\\-]*\\s*>'
       COMMENT       = '<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->'
-      PROCESSING    = '<[?].*?[?]>'
+      PROCESSING    = '<[?][\\s\\S]*?[?]>'
       DECLARATION   = '<![A-Z]+\\s+[^>]*>'
       CDATA         = '<!\\[CDATA\\[[\\s\\S]*?\\]\\]>'
 
@@ -27,4 +27,4 @@ module MarkdownIt
       HTML_OPEN_CLOSE_TAG_RE = Regexp.new('^(?:' + OPEN_TAG + '|' + CLOSE_TAG + ')')
     end
   end
-end
+end

data/lib/motion-markdown-it/helpers/parse_link_destination.rb

@@ -16,6 +16,7 @@ module MarkdownIt
           while (pos < max)
             code = charCodeAt(str, pos)
             return result if (code == 0x0A) # \n
+            return result if (code == 0x3C) # <
             if (code == 0x3E) #  >
               result[:pos] = pos + 1
               result[:str] = unescapeAll(str.slice((start + 1)...pos))
@@ -46,12 +47,14 @@ module MarkdownIt
           break if (code < 0x20 || code == 0x7F)
 
           if (code == 0x5C && pos + 1 < max) # \
+            break if (charCodeAt(str, pos + 1) == 0x20)
             pos += 2
             next
           end
 
           if (code == 0x28) # (
             level += 1
+            return result if (level > 32)
           end
 
           if (code == 0x29) # )

data/lib/motion-markdown-it/helpers/parse_link_title.rb

@@ -29,6 +29,8 @@ module MarkdownIt
             result[:str]   = unescapeAll(str.slice((start + 1)...pos))
             result[:ok]    = true
             return result
+          elsif (code == 0x28 && marker == 0x29) # ( and )
+            return result
           elsif (code == 0x0A)
             lines += 1
           elsif (code == 0x5C && pos + 1 < max) # \
@@ -45,4 +47,4 @@ module MarkdownIt
       end
     end
   end
-end
+end

data/lib/motion-markdown-it/index.rb

@@ -69,7 +69,8 @@ NORMALIZE_LINK_TEXT = lambda do |url|
     end
   end
 
-  return MDUrl::Decode.decode(MDUrl::Format.format(parsed))
+  # add '%' to exclude list because of https://github.com/markdown-it/markdown-it/issues/720
+  return MDUrl::Decode.decode(MDUrl::Format.format(parsed), MDUrl::Decode::DEFTAULT_CHARS + '%')
 end
 
 
@@ -352,7 +353,7 @@ module MarkdownIt
     # MarkdownIt.configure(presets)
     #
     # Batch load of all options and compenent settings. This is internal method,
-    # and you probably will not need it. But if you with - see available presets
+    # and you probably will not need it. But if you will - see available presets
     # and data structure [here](https://github.com/markdown-it/markdown-it/tree/master/lib/presets)
     #
     # We strongly recommend to use presets instead of direct config loads. That
@@ -474,7 +475,7 @@ module MarkdownIt
     # - src (String): source string
     # - env (Object): environment sandbox
     #
-    # Parse input string and returns list of block tokens (special token type
+    # Parse input string and return list of block tokens (special token type
     # "inline" will contain list of inline tokens). You should not call this
     # method directly, until you write custom renderer (for example, to produce
     # AST).
@@ -542,4 +543,4 @@ module MarkdownIt
     end
 
   end
-end
+end

data/lib/motion-markdown-it/parser_block.rb

@@ -18,9 +18,9 @@ module MarkdownIt
       [ 'hr',           lambda { |state, startLine, endLine, silent| RulesBlock::Hr.hr(state, startLine, endLine, silent) },         [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
       [ 'list',         lambda { |state, startLine, endLine, silent| RulesBlock::List.list(state, startLine, endLine, silent) },       [ 'paragraph', 'reference', 'blockquote' ] ],
       [ 'reference',    lambda { |state, startLine, endLine, silent| RulesBlock::Reference.reference(state, startLine, endLine, silent) } ],
+      [ 'html_block',   lambda { |state, startLine, endLine, silent| RulesBlock::HtmlBlock.html_block(state, startLine, endLine, silent) }, [ 'paragraph', 'reference', 'blockquote' ] ],
       [ 'heading',      lambda { |state, startLine, endLine, silent| RulesBlock::Heading.heading(state, startLine, endLine, silent) },    [ 'paragraph', 'reference', 'blockquote' ] ],
       [ 'lheading',     lambda { |state, startLine, endLine, silent| RulesBlock::Lheading.lheading(state, startLine, endLine, silent) } ],
-      [ 'html_block',   lambda { |state, startLine, endLine, silent| RulesBlock::HtmlBlock.html_block(state, startLine, endLine, silent) }, [ 'paragraph', 'reference', 'blockquote' ] ],
       [ 'paragraph',    lambda { |state, startLine, endLine, silent| RulesBlock::Paragraph.paragraph(state, startLine) } ]
     ]
 
@@ -107,4 +107,4 @@ module MarkdownIt
     end
 
   end
-end
+end

data/lib/motion-markdown-it/renderer.rb

@@ -35,13 +35,16 @@ module MarkdownIt
       token     = tokens[idx]
       info      = token.info ? unescapeAll(token.info).strip : ''
       langName  = ''
+      langAttrs = ''
 
       if !info.empty?
-        langName = info.split(/\s+/)[0]
+        arr = info.split(/\s+/)
+        langName = arr[0]
+        langAttrs = arr[1..-1].join(' ')
       end
 
       if options[:highlight]
-        highlighted = options[:highlight].call(token.content, langName) || escapeHtml(token.content)
+        highlighted = options[:highlight].call(token.content, langName, langAttrs) || escapeHtml(token.content)
       else
         highlighted = escapeHtml(token.content)
       end
@@ -51,7 +54,7 @@ module MarkdownIt
       end
 
       # If language exists, inject class gently, without modifying original token.
-      # May be, one day we will add .clone() for token and simplify this part, but
+      # May be, one day we will add .deepClone() for token and simplify this part, but
       # now we prefer to keep things local.
       if !info.empty?
         i        = token.attrIndex('class')
@@ -60,6 +63,7 @@ module MarkdownIt
         if i < 0
           tmpAttrs.push([ 'class', options[:langPrefix] + langName ])
         else
+          tmpAttrs[i] = tmpAttrs[i].slice(0..-1)
           tmpAttrs[i][1] += ' ' + options[:langPrefix] + langName
         end
 
@@ -283,6 +287,8 @@ module MarkdownIt
           result += tokens[i].content
         elsif tokens[i].type == 'image'
           result += renderInlineAsText(tokens[i].children, options, env)
+        elsif tokens[i].type == 'softbreak'
+          result += "\n"
         end
       end
 

data/lib/motion-markdown-it/rules_block/blockquote.rb

@@ -22,8 +22,8 @@ module MarkdownIt
         # so no point trying to find the end of it in silent mode
         return true if silent
 
-        # skip spaces after ">" and re-calculate offset
-        initial = offset = state.sCount[startLine] + pos - (state.bMarks[startLine] + state.tShift[startLine])
+        # set offset past spaces and ">"
+        initial = offset = state.sCount[startLine] + 1
 
         # skip one optional space after '>'
         if charCodeAt(state.src, pos) == 0x20 # space
@@ -88,7 +88,6 @@ module MarkdownIt
 
         oldParentType     = state.parentType
         state.parentType  = 'blockquote'
-        wasOutdented      = false
 
         # Search the end of the block
         #
@@ -118,7 +117,7 @@ module MarkdownIt
           #    > current blockquote
           # 2. checking this line
           # ```
-          wasOutdented = true if (state.sCount[nextLine] < state.blkIndent)
+          isOutdented = state.sCount[nextLine] < state.blkIndent
 
           pos = state.bMarks[nextLine] + state.tShift[nextLine]
           max = state.eMarks[nextLine]
@@ -128,12 +127,12 @@ module MarkdownIt
             break
           end
 
-          if charCodeAt(state.src, pos) == 0x3E && !wasOutdented # >
+          if charCodeAt(state.src, pos) == 0x3E && !isOutdented # >
             pos += 1
             # This line is inside the blockquote.
 
-            # skip spaces after ">" and re-calculate offset
-            initial = offset = state.sCount[nextLine] + pos - (state.bMarks[nextLine] + state.tShift[nextLine])
+            # set offset past spaces and ">"
+            initial = offset = state.sCount[nextLine] + 1
 
             # skip one optional space after '>'
             if charCodeAt(state.src, pos) == 0x20 # space

data/lib/motion-markdown-it/rules_block/table.rb

@@ -1,4 +1,4 @@
-# GFM table, non-standard
+# GFM table, https://github.github.com/gfm/#tables-extension-
 #------------------------------------------------------------------------------
 module MarkdownIt
   module RulesBlock
@@ -7,7 +7,7 @@ module MarkdownIt
 
       #------------------------------------------------------------------------------
       def self.getLine(state, line)
-        pos = state.bMarks[line] + state.blkIndent
+        pos = state.bMarks[line] + state.tShift[line]
         max = state.eMarks[line]
 
         return state.src[pos, max - pos]
@@ -18,51 +18,37 @@ module MarkdownIt
         result       = []
         pos          = 0
         max          = str.length
-        escapes      = 0
+        isEscaped    = false
         lastPos      = 0
-        backTicked   = false
-        lastBackTick = 0
+        current      = ''
 
         ch           = charCodeAt(str, pos)
 
         while (pos < max)
-          if ch == 0x60  # `
-            if (backTicked)
-              # make \` close code sequence, but not open it;
-              # the reason is: `\` is correct code block
-              backTicked = false
-              lastBackTick = pos
-            elsif escapes % 2 == 0
-              backTicked   = !backTicked
-              lastBackTick = pos
+          if ch == 0x7c  # |
+            if (!isEscaped)
+              # pipe separating cells, '|'
+              result.push(current + str[lastPos...pos])
+              current = ''
+              lastPos = pos + 1
+            else
+              # escaped pipe, '\|'
+              current += str[lastPos...(pos - 1)]
+              lastPos = pos
             end
-          elsif (ch == 0x7c && (escapes % 2 == 0) && !backTicked)     # '|'
-            result.push(str[lastPos...pos])
-            lastPos = pos + 1
-          end
-
-          if ch == 0x5c   # '\'
-            escapes += 1
-          else
-            escapes = 0
           end
 
+          isEscaped = (ch == 0x5c)   # '\'
           pos += 1
-          # If there was an un-closed backtick, go back to just after
-          # the last backtick, but as if it was a normal character
-          if (pos == max && backTicked)
-            backTicked = false
-            pos = lastBackTick + 1
-          end
-          ch   = charCodeAt(str, pos)
+
+          ch = charCodeAt(str, pos)
         end
 
-        result.push(str[lastPos..-1])
+        result.push(current + str[lastPos..-1])
 
         return result
       end
 
-
       #------------------------------------------------------------------------------
       def self.table(state, startLine, endLine, silent)
         # should have at least two lines
@@ -82,9 +68,19 @@ module MarkdownIt
         pos = state.bMarks[nextLine] + state.tShift[nextLine]
         return false if (pos >= state.eMarks[nextLine])
 
-        ch = charCodeAt(state.src, pos)
+        firstCh = charCodeAt(state.src, pos)
+        pos += 1
+        return false if (firstCh != 0x7C && firstCh != 0x2D && firstCh != 0x3A) # | or  - or :
+
+        return false if (pos >= state.eMarks[nextLine])
+
+        secondCh = charCodeAt(state.src, pos)
         pos += 1
-        return false if (ch != 0x7C && ch != 0x2D && ch != 0x3A) # | or  - or :
+        return false if (secondCh != 0x7C && secondCh != 0x2D && secondCh != 0x3A && !isSpace(secondCh)) # | or  - or :
+      
+        # if first character is '-', then second character must not be a space
+        # (due to parsing ambiguity with list)
+        return false if (firstCh === 0x2D && isSpace(secondCh)) # - 
 
         while pos < state.eMarks[nextLine]
           ch = charCodeAt(state.src, pos)
@@ -122,15 +118,25 @@ module MarkdownIt
         lineText = getLine(state, startLine).strip
         return false if !lineText.include?('|')
         return false if state.sCount[startLine] - state.blkIndent >= 4
-        columns = self.escapedSplit(lineText.gsub(/^\||\|$/, ''))
+        columns = self.escapedSplit(lineText)
+
+        columns.shift if (columns.length && columns[0] == '') 
+        columns.pop if (columns.length && columns[columns.length - 1] == '')
 
         # header row will define an amount of columns in the entire table,
-        # and align row shouldn't be smaller than that (the rest of the rows can)
+        # and align row should be exactly the same (the rest of the rows can differ)
         columnCount = columns.length
-        return false if columnCount > aligns.length
+        return false if columnCount == 0 || columnCount != aligns.length
 
         return true  if silent
 
+        oldParentType = state.parentType
+        state.parentType = 'table'
+      
+        # use 'blockquote' lists for termination because it's
+        # the most similar to tables
+        terminatorRules = state.md.block.ruler.getRules('blockquote')
+
         token     = state.push('table_open', 'table', 1)
         token.map = tableLines = [ startLine, 0 ]
 
@@ -142,14 +148,12 @@ module MarkdownIt
 
         (0...columns.length).each do |i|
           token          = state.push('th_open', 'th', 1)
-          token.map      = [ startLine, startLine + 1 ]
           unless aligns[i].empty?
             token.attrs  = [ [ 'style', 'text-align:' + aligns[i] ] ]
           end
 
           token          = state.push('inline', '', 0)
           token.content  = columns[i].strip
-          token.map      = [ startLine, startLine + 1 ]
           token.children = []
 
           token          = state.push('th_close', 'th', -1)
@@ -158,21 +162,38 @@ module MarkdownIt
         token     = state.push('tr_close', 'tr', -1)
         token     = state.push('thead_close', 'thead', -1)
 
-        token     = state.push('tbody_open', 'tbody', 1)
-        token.map = tbodyLines = [ startLine + 2, 0 ]
-
         nextLine = startLine + 2
         while nextLine < endLine
           break if (state.sCount[nextLine] < state.blkIndent)
 
+          terminate = false
+          (0...terminatorRules.length).each do |i|
+            if (terminatorRules[i].call(state, nextLine, endLine, true))
+              terminate = true
+              break
+            end
+          end
+      
+          break if (terminate)
+
           lineText = getLine(state, nextLine).strip
-          break if !lineText.include?('|')
+          break if lineText.empty?
           break if state.sCount[nextLine] - state.blkIndent >= 4
-          columns = self.escapedSplit(lineText.gsub(/^\||\|$/, ''))
+          columns = self.escapedSplit(lineText)
+          columns.shift if (columns.length && columns[0] == '')
+          columns.pop if (columns.length && columns[columns.length - 1] == '')
+      
+          if (nextLine == startLine + 2)
+            token     = state.push('tbody_open', 'tbody', 1)
+            token.map = tbodyLines = [ startLine + 2, 0 ]
+          end
+      
+          token     = state.push('tr_open', 'tr', 1)
+          token.map = [ nextLine, nextLine + 1 ]
 
-          token = state.push('tr_open', 'tr', 1)
           (0...columnCount).each do |i|
             token          = state.push('td_open', 'td', 1)
+            token.map      = [ nextLine, nextLine + 1 ]
             unless aligns[i].empty?
               token.attrs  = [ [ 'style', 'text-align:' + aligns[i] ] ]
             end
@@ -186,10 +207,16 @@ module MarkdownIt
           token = state.push('tr_close', 'tr', -1)
           nextLine += 1
         end
-        token = state.push('tbody_close', 'tbody', -1)
+
+        if (tbodyLines)
+          token = state.push('tbody_close', 'tbody', -1)
+          tbodyLines[1] = nextLine
+        end
+
         token = state.push('table_close', 'table', -1)
+        tableLines[1] = nextLine
 
-        tableLines[1] = tbodyLines[1] = nextLine
+        state.parentType = oldParentType
         state.line = nextLine
         return true
       end

data/lib/motion-markdown-it/rules_core/replacements.rb

@@ -67,10 +67,10 @@ module MarkdownIt
                           gsub(/\.{2,}/, '…').gsub(/([?!])…/, "\\1..").
                           gsub(/([?!]){4,}/, '\\1\\1\\1').gsub(/,{2,}/, ',').
                           # em-dash
-                          gsub(/(^|[^-])---([^-]|$)/m, "\\1\u2014\\2").
+                          gsub(/(^|[^-])---(?=[^-]|$)/m, "\\1\u2014").
                           # en-dash
-                          gsub(/(^|\s)--(\s|$)/m, "\\1\u2013\\2").
-                          gsub(/(^|[^-\s])--([^-\s]|$)/m, "\\1\u2013\\2")
+                          gsub(/(^|\s)--(?=\s|$)/m, "\\1\u2013").
+                          gsub(/(^|[^-\s])--(?=[^-\s]|$)/m, "\\1\u2013")
             end
           end
 

data/lib/motion-markdown-it/rules_core/smartquotes.rb

@@ -59,7 +59,7 @@ module MarkdownIt
             else
               (i - 1).downto(0) do |j|
                 break if tokens[j].type == 'softbreak' || tokens[j].type == 'hardbreak' # lastChar defaults to 0x20
-                next if tokens[j].type != 'text'
+                next if tokens[j].content.empty? # should skip all tokens except 'text', 'html_inline' or 'code_inline'
 
                 lastChar = charCodeAt(tokens[j].content, tokens[j].content.length - 1)
                 break
@@ -76,7 +76,7 @@ module MarkdownIt
             else
               (i + 1).upto(tokens.length - 1) do |j|
                 break if tokens[j].type == 'softbreak' || tokens[j].type == 'hardbreak' # nextChar defaults to 0x20
-                next if tokens[j].type != 'text'
+                next if tokens[j].content.empty? # should skip all tokens except 'text', 'html_inline' or 'code_inline'
 
                 nextChar = charCodeAt(tokens[j].content, 0)
                 break
@@ -113,8 +113,14 @@ module MarkdownIt
             end
 
             if (canOpen && canClose)
-              # treat this as the middle of the word
-              canOpen  = false
+              # Replace quotes in the middle of punctuation sequence, but not
+              # in the middle of the words, i.e.:
+              #
+              # 1. foo " bar " baz - not replaced
+              # 2. foo-"-bar-"-baz - replaced
+              # 3. foo"bar"baz     - not replaced
+              #
+              canOpen  = isLastPunctChar
               canClose = isNextPunctChar
             end
 

data/lib/motion-markdown-it/rules_inline/autolink.rb

@@ -5,8 +5,8 @@ module MarkdownIt
     class Autolink
       extend Common::Utils
 
-      EMAIL_RE    = /^<([a-zA-Z0-9.!#$\%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/
-      AUTOLINK_RE = /^<([a-zA-Z][a-zA-Z0-9+.\-]{1,31}):([^<>\x00-\x20]*)>/
+      EMAIL_RE    = /^([a-zA-Z0-9.!#$\%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)$/
+      AUTOLINK_RE = /^([a-zA-Z][a-zA-Z0-9+.\-]{1,31}):([^<>\x00-\x20]*)$/
 
       #------------------------------------------------------------------------------
       def self.autolink(state, silent)
@@ -14,14 +14,21 @@ module MarkdownIt
 
         return false if (charCodeAt(state.src, pos) != 0x3C)  # <
 
-        tail = state.src[pos..-1]
+        start = state.pos
+        max = state.posMax
 
-        return false if !tail.include?('>')
+        loop do
+          return false if ((pos += 1) >= max)
 
-        if (AUTOLINK_RE =~ tail)
-          linkMatch = tail.match(AUTOLINK_RE)
+          ch = charCodeAt(state.src, pos)
 
-          url = linkMatch[0].slice(1...-1)
+          return false if (ch == 0x3C) # <
+          break if (ch == 0x3E) # >
+        end
+
+        url = state.src.slice((start + 1)...pos)
+
+        if (AUTOLINK_RE =~ url)
           fullUrl = state.md.normalizeLink.call(url)
           return false if (!state.md.validateLink.call(fullUrl))
 
@@ -39,14 +46,11 @@ module MarkdownIt
             token.info    = 'auto'
           end
 
-          state.pos += linkMatch[0].length
+          state.pos += url.length + 2
           return true
         end
 
-        if (EMAIL_RE =~ tail)
-          emailMatch = tail.match(EMAIL_RE)
-
-          url = emailMatch[0].slice(1...-1)
+        if (EMAIL_RE =~ url)
           fullUrl = state.md.normalizeLink.call('mailto:' + url)
           return false if (!state.md.validateLink.call(fullUrl))
 
@@ -64,7 +68,7 @@ module MarkdownIt
             token.info    = 'auto'
           end
 
-          state.pos += emailMatch[0].length
+          state.pos += url.length + 2
           return true
         end
 

data/lib/motion-markdown-it/rules_inline/backticks.rb

@@ -16,22 +16,35 @@ module MarkdownIt
         pos  += 1
         max  = state.posMax
 
+        # scan marker length
         while (pos < max && charCodeAt(state.src, pos) == 0x60)  # `
           pos += 1
         end
 
         marker = state.src.slice(start...pos)
+        openerLength = marker.length
+      
+        if (state.backticksScanned && (state.backticks[openerLength] || 0) <= start)
+          state.pending += marker if (!silent)
+          state.pos += openerLength
+          return true
+        end
 
         matchStart = matchEnd = pos
 
+        # Nothing found in the cache, scan until the end of the line (or until marker is found)
         while ((matchStart = state.src.index('`', matchEnd)) != nil)
           matchEnd = matchStart + 1
 
+          # scan marker length
           while (matchEnd < max && charCodeAt(state.src, matchEnd) == 0x60) # `
             matchEnd += 1
           end
 
-          if (matchEnd - matchStart == marker.length)
+          closerLength = matchEnd - matchStart
+
+          if (closerLength == openerLength)
+            # Found matching closer length.
             if (!silent)
               token         = state.push('code_inline', 'code', 0)
               token.markup  = marker
@@ -42,13 +55,18 @@ module MarkdownIt
             state.pos = matchEnd
             return true
           end
+
+          # Some different length found, put it in cache as upper limit of where closer can be found
+          state.backticks[closerLength] = matchStart
         end
 
+        # Scanned through the end, didn't find anything
+        state.backticksScanned = true
+
         state.pending += marker if (!silent)
-        state.pos     += marker.length
+        state.pos     += openerLength
         return true
       end
-
     end
   end
 end

data/lib/motion-markdown-it/rules_inline/balance_pairs.rb

@@ -27,20 +27,20 @@ module MarkdownIt
           end
       
           minOpenerIdx = openersBottom[closer[:marker]][closer[:length] % 3]
-          newMinOpenerIdx = -1
       
           openerIdx = closerIdx - closer[:jump] - 1
-      
+
+          # avoid crash if `closer.jump` is pointing outside of the array, see #742
+          openerIdx = -1 if (openerIdx < -1)
+
+          newMinOpenerIdx = openerIdx
+
           while openerIdx > minOpenerIdx
             opener = delimiters[openerIdx]
       
             (openerIdx -= opener[:jump] + 1) && next if (opener[:marker] != closer[:marker])
       
-            newMinOpenerIdx = openerIdx if (newMinOpenerIdx == -1)
-      
-            if (opener[:open] &&
-                opener[:end] < 0 &&
-                opener[:level] == closer[:level])
+            if (opener[:open] && opener[:end] < 0)
       
               isOddMatch = false
       

data/lib/motion-markdown-it/rules_inline/link.rb

@@ -8,6 +8,7 @@ module MarkdownIt
       #------------------------------------------------------------------------------
       def self.link(state, silent)
         href            = ''
+        title           = ''
         oldPos          = state.pos
         max             = state.posMax
         start           = state.pos
@@ -76,8 +77,6 @@ module MarkdownIt
               break if (!isSpace(code) && code != 0x0A)
               pos += 1
             end
-          else
-            title = ''
           end
 
           if (pos >= max || charCodeAt(state.src, pos) != 0x29) # )
@@ -145,4 +144,4 @@ module MarkdownIt
 
     end
   end
-end
+end

data/lib/motion-markdown-it/rules_inline/state_inline.rb

@@ -5,8 +5,9 @@ module MarkdownIt
     class StateInline
       include MarkdownIt::Common::Utils
 
-      attr_accessor   :src, :env, :md, :tokens, :pos, :posMax, :level, :tokens_meta
-      attr_accessor   :pending, :pendingLevel, :cache, :delimiters
+      attr_accessor :src, :env, :md, :tokens, :pos, :posMax, :level, :tokens_meta
+      attr_accessor :pending, :pendingLevel, :cache, :delimiters
+      attr_accessor :backticks, :backticksScanned
 
       #------------------------------------------------------------------------------
       def initialize(src, md, env, outTokens)
@@ -31,6 +32,10 @@ module MarkdownIt
 
         # Stack of delimiter lists for upper level tags
         @_prev_delimiters = [];
+
+        # backtick length => last seen position
+        @backticks = {}
+        @backticksScanned = false
       end
 
 

data/lib/motion-markdown-it/rules_inline/strikethrough.rb

@@ -34,8 +34,8 @@ module MarkdownIt
 
           state.delimiters.push({
             marker: marker,
-            length: 0, # disable "rule of 3" length checks meant for emphasis
-            jump:   i,
+            length: 0,     # disable "rule of 3" length checks meant for emphasis
+            jump:   i / 2, # for `~~` 1 marker = 2 characters
             token:  state.tokens.length - 1,
             end:    -1,
             open:   scanned[:can_open],

data/lib/motion-markdown-it/token.rb

@@ -63,7 +63,10 @@ module MarkdownIt
 
        # * Token#info -> String
        # *
-       # * fence infostring
+       # * Additional information:
+       # *
+       # * - Info string for "fence" tokens
+       # * - The value "auto" for autolink "link_open" and "link_close" tokens
       @info     = ''
 
        # * Token#meta -> Object

data/lib/motion-markdown-it/version.rb

@@ -1,3 +1,3 @@
 module MotionMarkdownIt
-  VERSION = '10.0.0'
+  VERSION = '12.0.6'
 end

data/spec/motion-markdown-it/misc_spec.rb

@@ -48,7 +48,7 @@ describe 'API' do
   #------------------------------------------------------------------------------
   it 'highlight' do
     md = MarkdownIt::Parser.new({
-      highlight: lambda do |str, obj|
+      highlight: lambda do |str, obj, attrs|
         return '<pre><code>==' + str + '==</code></pre>'
       end
     })
@@ -58,12 +58,24 @@ describe 'API' do
 
   #------------------------------------------------------------------------------
   it 'highlight escape by default' do
-    md = MarkdownIt::Parser.new({highlight: lambda {|value, obj| return nil }})
+    md = MarkdownIt::Parser.new({highlight: lambda {|value, obj, attrs| return nil }})
 
-    # assert.strictEqual(md.render("```\n&\n```"), "<pre><code>&amp;\n</code></pre>\n");
     expect(md.render("```\n&\n```")).to eq "<pre><code>&amp;\n</code></pre>\n"
   end
 
+  #------------------------------------------------------------------------------
+  it 'highlight arguments' do
+    md = MarkdownIt::Parser.new({
+      highlight: lambda do |str, lang, attrs|
+        expect(lang).to eq 'a'
+        expect(attrs).to eq 'b c d'
+        return '<pre><code>==' + str + '==</code></pre>'
+      end
+    })
+
+    expect(md.render("``` a  b  c  d \nhl\n```")).to eq"<pre><code>==hl\n==</code></pre>\n"
+  end
+
   #------------------------------------------------------------------------------
   it 'force hardbreaks' do
     md = MarkdownIt::Parser.new({ breaks: false })
@@ -281,12 +293,12 @@ describe 'Url normalization' do
       return 'TEXT'
     end
 
-    expect(md.render('foo@example.com')).to eq "<p><a href=\"LINK\">TEXT</a></p>\n"
-    expect(md.render('http://example.com')).to eq "<p><a href=\"LINK\">TEXT</a></p>\n"
-    expect(md.render('<foo@example.com>')).to eq "<p><a href=\"LINK\">TEXT</a></p>\n"
-    expect(md.render('<http://example.com>')).to eq "<p><a href=\"LINK\">TEXT</a></p>\n"
+    # expect(md.render('foo@example.com')).to eq "<p><a href=\"LINK\">TEXT</a></p>\n"
+    # expect(md.render('http://example.com')).to eq "<p><a href=\"LINK\">TEXT</a></p>\n"
+    # expect(md.render('<foo@example.com>')).to eq "<p><a href=\"LINK\">TEXT</a></p>\n"
+    # expect(md.render('<http://example.com>')).to eq "<p><a href=\"LINK\">TEXT</a></p>\n"
     expect(md.render('[test](http://example.com)')).to eq "<p><a href=\"LINK\">test</a></p>\n"
-    expect(md.render('![test](http://example.com)')).to eq "<p><img src=\"LINK\" alt=\"test\"></p>\n"
+    # expect(md.render('![test](http://example.com)')).to eq "<p><img src=\"LINK\" alt=\"test\"></p>\n"
   end
 
 end
@@ -403,4 +415,4 @@ describe 'Token attributes' do
 
     expect(t.attrGet('myattr')).to eq 'myvalue'
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-markdown-it
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 12.0.6
 platform: ruby
 authors:
 - Brett Walker
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mdurl-rb