Fix to heading regular expression for GFM markedjs#201.

readmeio · Aug 24, 2015 · 85d27e9 · 85d27e9
1 parent 6201e93
commit 85d27e9
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 2 deletions.
diff --git a/lib/marked.js b/lib/marked.js
@@ -75,8 +75,9 @@ block.normal = merge({}, block);
  */
 
 block.gfm = merge({}, block.normal, {
-  fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,
-  paragraph: /^/
+  fences: /^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,
+  paragraph: /^/,
+  heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/
 });
 
 block.gfm.paragraph = replace(block.paragraph)

diff --git a/test/new/gfm_hashtag.gfm.html b/test/new/gfm_hashtag.gfm.html
@@ -0,0 +1,5 @@
+<p>#header</p>
+
+<h1 id="header1">header1</h1>
+
+<h1 id="header2">header2</h1>
diff --git a/test/new/gfm_hashtag.gfm.text b/test/new/gfm_hashtag.gfm.text
@@ -0,0 +1,5 @@
+#header
+
+# header1
+
+#  header2
diff --git a/test/new/gfm_hashtag.nogfm.html b/test/new/gfm_hashtag.nogfm.html
@@ -0,0 +1,5 @@
+<h1 id="header">header</h1>
+
+<h1 id="header1">header1</h1>
+
+<h1 id="header2">header2</h1>
diff --git a/test/new/gfm_hashtag.nogfm.text b/test/new/gfm_hashtag.nogfm.text
@@ -0,0 +1,5 @@
+#header
+
+# header1
+
+#  header2
diff --git a/test/tests/gfm_hashtag.gfm.html b/test/tests/gfm_hashtag.gfm.html
@@ -0,0 +1,5 @@
+<p>#header</p>
+
+<h1 id="header1">header1</h1>
+
+<h1 id="header2">header2</h1>
diff --git a/test/tests/gfm_hashtag.gfm.text b/test/tests/gfm_hashtag.gfm.text
@@ -0,0 +1,5 @@
+#header
+
+# header1
+
+#  header2
diff --git a/test/tests/gfm_hashtag.nogfm.html b/test/tests/gfm_hashtag.nogfm.html
@@ -0,0 +1,5 @@
+<h1 id="header">header</h1>
+
+<h1 id="header1">header1</h1>
+
+<h1 id="header2">header2</h1>
diff --git a/test/tests/gfm_hashtag.nogfm.text b/test/tests/gfm_hashtag.nogfm.text
@@ -0,0 +1,5 @@
+#header
+
+# header1
+
+#  header2