Merge pull request #6 from digitalmoksha/sync-with-11.0

Sync from 10.0.0 to 11.0.0

Author: digitalmoksha

CHANGELOG.md

@@ -1,3 +1,8 @@
+11.0.0
+-------
+
+Synced with markdown-it 11.0.0, see the [CHANGELOG](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
+
 10.0.0
 -------
 

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 11.0.0_
 
 ---
 
@@ -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
 

lib/motion-markdown-it/index.rb

@@ -352,7 +352,7 @@ def set(options)
     # 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 +474,7 @@ def use(plugin, *args)
     # - 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 +542,4 @@ def renderInline(src, env = {})
     end
 
   end
-end
+end

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

@@ -67,10 +67,10 @@ def self.replace_rare(inlineTokens)
                           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
 

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

@@ -113,8 +113,14 @@ def self.process_inlines(tokens, state)
             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
 

lib/motion-markdown-it/version.rb

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

spec/motion-markdown-it/fixtures/markdown-it/smartquotes.txt

@@ -137,3 +137,10 @@ and “that”.</p>
 <p>“this” and<br>
 “that”.</p>
 .
+
+Should allow quotes adjacent to other punctuation characters, #643:
+.
+The dog---"'man's' best friend"
+.
+<p>The dog—“‘man’s’ best friend”</p>
+.

spec/motion-markdown-it/fixtures/markdown-it/tables.txt

@@ -168,59 +168,59 @@ bar|bar
 Second line should not contain symbols except "-", ":", "|" and " ":
 .
 foo|foo
----|---s
+-----|-----s
 bar|bar
 .
 <p>foo|foo
-—|---s
+-----|-----s
 bar|bar</p>
 .
 
 
 Second line should contain "|" symbol:
 .
 foo|foo
----:---
+-----:-----
 bar|bar
 .
 <p>foo|foo
-—:---
+-----:-----
 bar|bar</p>
 .
 
 
 Second line should not have empty columns in the middle:
 .
 foo|foo
----||---
+-----||-----
 bar|bar
 .
 <p>foo|foo
-—||—
+-----||-----
 bar|bar</p>
 .
 
 
 Wrong alignment symbol position:
 .
 foo|foo
----|-::-
+-----|-::-
 bar|bar
 .
 <p>foo|foo
-—|-::-
+-----|-::-
 bar|bar</p>
 .
 
 
 Title line should contain "|" symbol:
 .
 foo
----|---
+-----|-----
 bar|bar
 .
 <p>foo
-—|---
+-----|-----
 bar|bar</p>
 .
 

spec/motion-markdown-it/fixtures/markdown-it/typographer.txt

@@ -79,3 +79,16 @@ markdownit--awesome
 <p>–markdownit – super–</p>
 <p>markdownit–awesome</p>
 .
+
+regression tests for #624
+.
+1---2---3
+
+1--2--3
+
+1 -- -- 3
+.
+<p>1—2—3</p>
+<p>1–2–3</p>
+<p>1 – – 3</p>
+.