Merge branch 'hotfix/#191' into develop

showdownjs · Aug 23, 2015 · e754668 · e754668
2 parents b6c8b49 + 3df7062
commit e754668
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 7 deletions.
diff --git a/dist/showdown.js b/dist/showdown.js
diff --git a/dist/showdown.js.map b/dist/showdown.js.map
diff --git a/dist/showdown.min.js b/dist/showdown.min.js
diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
diff --git a/src/subParsers/blockGamut.js b/src/subParsers/blockGamut.js
@@ -5,6 +5,9 @@
 showdown.subParser('blockGamut', function (text, options, globals) {
   'use strict';
 
+  // we parse blockquotes first so that we can have headings and hrs
+  // inside blockquotes
+  text = showdown.subParser('blockQuotes')(text, options, globals);
   text = showdown.subParser('headers')(text, options, globals);
 
   // Do Horizontal Rules:
@@ -16,7 +19,6 @@ showdown.subParser('blockGamut', function (text, options, globals) {
   text = showdown.subParser('tables')(text, options, globals);
   text = showdown.subParser('lists')(text, options, globals);
   text = showdown.subParser('codeBlocks')(text, options, globals);
-  text = showdown.subParser('blockQuotes')(text, options, globals);
 
   // We already ran _HashHTMLBlocks() before, in Markdown(), but that
   // was to escape raw HTML in the original Markdown source. This time,

diff --git a/src/subParsers/blockQuotes.js b/src/subParsers/blockQuotes.js
@@ -14,7 +14,7 @@ showdown.subParser('blockQuotes', function (text, options, globals) {
    /gm, function(){...});
    */
 
-  text = text.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) {
+  text = text.replace(/((^[ \t]{0,3}>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) {
     var bq = m1;
 
     // attacklab: hack around Konqueror 3.5.4 bug:

diff --git a/test/cases/blockquote-followed-by-code.html b/test/cases/blockquote-followed-by-code.html
@@ -0,0 +1,9 @@
+<blockquote>
+    <p>a blockquote with a 4 space indented line (not code)</p>
+</blockquote>
+<p>sep</p>
+<blockquote>
+    <p>a blockquote</p>
+</blockquote>
+<pre><code>with some code after
+</code></pre>
diff --git a/test/cases/blockquote-followed-by-code.md b/test/cases/blockquote-followed-by-code.md
@@ -0,0 +1,8 @@
+> a blockquote
+    with a 4 space indented line (not code)
+
+sep
+
+> a blockquote
+
+    with some code after
diff --git a/test/cases/blockquote-inside-code.html b/test/cases/blockquote-inside-code.html
@@ -0,0 +1,8 @@
+<pre><code>&gt; this is a pseudo blockquote
+    &gt; inside a code block
+</code></pre>
+
+<p>foo</p>
+<pre><code>&gt; this is another bq
+    inside code
+</code></pre>
diff --git a/test/cases/blockquote-inside-code.md b/test/cases/blockquote-inside-code.md
@@ -0,0 +1,7 @@
+    > this is a pseudo blockquote
+    > inside a code block
+
+foo
+
+    > this is another bq
+    inside code
diff --git a/test/issues/#191.blockquote-followed-by-an-heading.html b/test/issues/#191.blockquote-followed-by-an-heading.html
@@ -0,0 +1,4 @@
+<blockquote>
+    <p>a blockquote</p>
+    <h1 id="followedbyanheading">followed by an heading</h1>
+</blockquote>
diff --git a/test/issues/#191.blockquote-followed-by-an-heading.md b/test/issues/#191.blockquote-followed-by-an-heading.md
@@ -0,0 +1,2 @@
+> a blockquote
+# followed by an heading