Merge 2f8ae12e94 into ff643c5bf5

lib/helpers/parse_link_destination.js

@@ -59,7 +59,6 @@ module.exports = function parseLinkDestination(str, pos, max) {
 
     if (code === 0x28 /* ( */) {
       level++;
-      if (level > 1) { break; }
     }
 
     if (code === 0x29 /* ) */) {

lib/rules_inline/emphasis.js

@@ -77,7 +77,7 @@ module.exports.postProcess = function emphasis(state) {
       delimiters = state.delimiters,
       max = state.delimiters.length;
 
-  for (i = 0; i < max; i++) {
+  for (i = max - 1; i >= 0; i--) {
     startDelim = delimiters[i];
 
     if (startDelim.marker !== 0x5F/* _ */ && startDelim.marker !== 0x2A/* * */) {
@@ -96,11 +96,11 @@ module.exports.postProcess = function emphasis(state) {
     //
     // `<em><em>whatever</em></em>` -> `<strong>whatever</strong>`
     //
-    isStrong = i + 1 < max &&
+    isStrong = i - 1 >= 0 &&
-               delimiters[i + 1].end === startDelim.end - 1 &&
+               delimiters[i - 1].end === startDelim.end + 1 &&
-               delimiters[i + 1].token === startDelim.token + 1 &&
+               delimiters[i - 1].token === startDelim.token - 1 &&
-               delimiters[startDelim.end - 1].token === endDelim.token - 1 &&
+               delimiters[startDelim.end + 1].token === endDelim.token + 1 &&
-               delimiters[i + 1].marker === startDelim.marker;
+               delimiters[i - 1].marker === startDelim.marker;
 
     ch = String.fromCharCode(startDelim.marker);
 
@@ -119,9 +119,9 @@ module.exports.postProcess = function emphasis(state) {
     token.content = '';
 
     if (isStrong) {
-      state.tokens[delimiters[i + 1].token].content = '';
+      state.tokens[delimiters[i - 1].token].content = '';
-      state.tokens[delimiters[startDelim.end - 1].token].content = '';
+      state.tokens[delimiters[startDelim.end + 1].token].content = '';
-      i++;
+      i--;
     }
   }
 };

test/fixtures/commonmark/spec.txt

@@ -11,10 +11,12 @@ license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
 ## What is Markdown?
 
 Markdown is a plain text format for writing structured documents,
-based on conventions used for indicating formatting in email and
+based on conventions for indicating formatting in email
-usenet posts.  It was developed in 2004 by John Gruber, who wrote
+and usenet posts.  It was developed by John Gruber (with
-the first Markdown-to-HTML converter in Perl, and it soon became
+help from Aaron Swartz) and released in 2004 in the form of a
-ubiquitous.  In the next decade, dozens of implementations were
+[syntax description](http://daringfireball.net/projects/markdown/syntax)
+and a Perl script (`Markdown.pl`) for converting Markdown to
+HTML.  In the next decade, dozens of implementations were
 developed in many languages.  Some extended the original
 Markdown syntax with conventions for footnotes, tables, and
 other document elements.  Some allowed Markdown documents to be
@@ -312,7 +314,7 @@ form feed (`U+000C`), or carriage return (`U+000D`).
 characters].
 
 A [Unicode whitespace character](@) is
-any code point in the Unicode `Zs` class, or a tab (`U+0009`),
+any code point in the Unicode `Zs` general category, or a tab (`U+0009`),
 carriage return (`U+000D`), newline (`U+000A`), or form feed
 (`U+000C`).
 
@@ -331,7 +333,7 @@ is `!`, `"`, `#`, `$`, `%`, `&`, `'`, `(`, `)`,
 
 A [punctuation character](@) is an [ASCII
 punctuation character] or anything in
-the Unicode classes `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`.
+the general Unicode categories  `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`.
 
 ## Tabs
 
@@ -402,8 +404,8 @@ as indentation with four spaces would:
 Normally the `>` that begins a block quote may be followed
 optionally by a space, which is not considered part of the
 content.  In the following case `>` is followed by a tab,
-which is treated as if it were expanded into spaces.
+which is treated as if it were expanded into three spaces.
-Since one of theses spaces is considered part of the
+Since one of these spaces is considered part of the
 delimiter, `foo` is considered to be indented six spaces
 inside the block quote context, so we get an indented
 code block starting with two spaces.
@@ -5936,7 +5938,7 @@ The following rules define emphasis and strong emphasis:
 7.  A double `**` [can close strong emphasis](@)
     iff it is part of a [right-flanking delimiter run].
 
-8.  A double `__` [can close strong emphasis]
+8.  A double `__` [can close strong emphasis] iff
     it is part of a [right-flanking delimiter run]
     and either (a) not part of a [left-flanking delimiter run]
     or (b) part of a [left-flanking delimiter run]
@@ -5976,8 +5978,8 @@ the following principles resolve ambiguity:
     an interpretation `<strong>...</strong>` is always preferred to
     `<em><em>...</em></em>`.
 
-14. An interpretation `<strong><em>...</em></strong>` is always
+14. An interpretation `<em><strong>...</strong></em>` is always
-    preferred to `<em><strong>..</strong></em>`.
+    preferred to `<strong><em>..</em></strong>`.
 
 15. When two potential emphasis or strong emphasis spans overlap,
     so that the second begins before the first ends and ends after
@@ -7000,14 +7002,14 @@ Rule 14:
 ```````````````````````````````` example
 ***foo***
 .
-<p><strong><em>foo</em></strong></p>
+<p><em><strong>foo</strong></em></p>
 ````````````````````````````````
 
 
 ```````````````````````````````` example
 _____foo_____
 .
-<p><strong><strong><em>foo</em></strong></strong></p>
+<p><em><strong><strong>foo</strong></strong></em></p>
 ````````````````````````````````
 
 
@@ -7148,8 +7150,7 @@ A [link destination](@) consists of either
 - a nonempty sequence of characters that does not include
   ASCII space or control characters, and includes parentheses
   only if (a) they are backslash-escaped or (b) they are part of
-  a balanced pair of unescaped parentheses that is not itself
+  a balanced pair of unescaped parentheses.
-  inside a balanced pair of unescaped parentheses.
 
 A [link title](@)  consists of either
 
@@ -7255,35 +7256,29 @@ Parentheses inside the link destination may be escaped:
 <p><a href="(foo)">link</a></p>
 ````````````````````````````````
 
-One level of balanced parentheses is allowed without escaping:
+Any number parentheses are allowed without escaping, as long as they are
-
+balanced:
-```````````````````````````````` example
-[link]((foo)and(bar))
-.
-<p><a href="(foo)and(bar)">link</a></p>
-````````````````````````````````
-
-However, if you have parentheses within parentheses, you need to escape
-or use the `<...>` form:
 
 ```````````````````````````````` example
 [link](foo(and(bar)))
 .
-<p>[link](foo(and(bar)))</p>
+<p><a href="foo(and(bar))">link</a></p>
 ````````````````````````````````
 
+However, if you have unbalanced parentheses, you need to escape or use the
+`<...>` form:
 
 ```````````````````````````````` example
-[link](foo(and\(bar\)))
+[link](foo\(and\(bar\))
 .
-<p><a href="foo(and(bar))">link</a></p>
+<p><a href="foo(and(bar)">link</a></p>
 ````````````````````````````````
 
 
 ```````````````````````````````` example
-[link](<foo(and(bar))>)
+[link](<foo(and(bar)>)
 .
-<p><a href="foo(and(bar))">link</a></p>
+<p><a href="foo(and(bar)">link</a></p>
 ````````````````````````````````
 
 
@@ -8326,11 +8321,11 @@ The link labels are case-insensitive:
 ````````````````````````````````
 
 
-If you just want bracketed text, you can backslash-escape the
+If you just want a literal `!` followed by bracketed text, you can
-opening `!` and `[`:
+backslash-escape the opening `[`:
 
 ```````````````````````````````` example
-\!\[foo]
+!\[foo]
 
 [foo]: /url "title"
 .

test/misc.js

@@ -203,8 +203,8 @@ describe('Misc', function () {
 
     md.enable('emphasis');
 
-    assert.strictEqual(md.render('___foo___'), '<p><strong><em>foo</em></strong></p>\n');
+    assert.strictEqual(md.render('___foo___'), '<p><em><strong>foo</strong></em></p>\n');
-    assert.strictEqual(md.renderInline('___foo___'), '<strong><em>foo</em></strong>');
+    assert.strictEqual(md.renderInline('___foo___'), '<em><strong>foo</strong></em>');
   });
 
   it('Should correctly check block termination rules when those are disabled (#13)', function () {