Merge pull request markedjs#1007 from KostyaTretyak/revert

Revert 98ac7a4 and a477d1d
zhenalexfan · Jan 9, 2018 · 2c7056d · 2c7056d
2 parents 336f339 + 6e14d02
commit 2c7056d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 33 deletions.
diff --git a/lib/marked.js b/lib/marked.js
@@ -40,6 +40,10 @@ block.list = replace(block.list)
   ('def', '\\n+(?=' + block.def.source + ')')
   ();
 
+block.blockquote = replace(block.blockquote)
+  ('def', block.def)
+  ();
+
 block._tag = '(?!(?:'
   + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
   + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'

diff --git a/test/new/def_blocks.html b/test/new/def_blocks.html
@@ -6,8 +6,7 @@
 <hr>
 
 <blockquote>
-  <p>hello
-[2]: hello</p>
+  <p>hello</p>
 </blockquote>
 
 
@@ -25,6 +24,5 @@
 <blockquote>
   <p>foo
 bar
-[1]: foo
 bar</p>
 </blockquote>
diff --git a/test/new/toplevel_paragraphs.html b/test/new/toplevel_paragraphs.html
@@ -1,30 +1,30 @@
 <p>hello world
-    text after spaces
-    text after spaces</p>
+    how are you
+    how are you</p>
 
-<p>paragraph before code</p>
-<pre><code>text inside block code</code></pre>
+<p>hello world</p>
+<pre><code>how are you</code></pre>
 
-<p>paragraph before hr</p>
+<p>hello world</p>
 <hr>
 
-<p>paragraph before head with hash</p>
+<p>hello world</p>
 <h1 id="how-are-you">how are you</h1>
 
-<p>paragraph before head with equals</p>
+<p>hello world</p>
 <h1 id="how-are-you">how are you</h1>
 
-<p>paragraph before blockquote</p>
-<blockquote><p>text for blockquote</p></blockquote>
+<p>hello world</p>
+<blockquote><p>how are you</p></blockquote>
 
-<p>paragraph before list</p>
-<ul><li>text inside list</li></ul>
+<p>hello world</p>
+<ul><li>how are you</li></ul>
 
-<p>paragraph before div</p>
-<div>text inside div</div>
+<p>hello world</p>
+<div>how are you</div>
 
-<p>paragraph with span
-<span>text inside span</span></p>
+<p>hello world
+<span>how are you</span></p>
 
 <p>hello <a href="/are/you">world</a>
 </p>

diff --git a/test/new/toplevel_paragraphs.md b/test/new/toplevel_paragraphs.md
@@ -2,35 +2,35 @@
 gfm: true
 ---
 hello world
-    text after spaces
-    text after spaces
+    how are you
+    how are you
 
-paragraph before code
+hello world
 ```
-text inside block code
+how are you
 ```
 
-paragraph before hr
+hello world
 * * *
 
-paragraph before head with hash
+hello world
 # how are you
 
-paragraph before head with equals
+hello world
 how are you
 ===========
 
-paragraph before blockquote
-> text for blockquote
+hello world
+> how are you
 
-paragraph before list
-* text inside list
+hello world
+* how are you
 
-paragraph before div
-<div>text inside div</div>
+hello world
+<div>how are you</div>
 
-paragraph with span
-<span>text inside span</span>
+hello world
+<span>how are you</span>
 
 hello [world][how]