From 1df58933c788c9a673b35b4463cca8e4a48e51aa Mon Sep 17 00:00:00 2001
From: "shigeru.nakajima" <shigeru.nakajima@luxiar.com>
Date: Tue, 18 Nov 2014 13:14:32 +0900
Subject: [PATCH] Fix to heading regular expression for GFM #201.

---
 lib/marked.js                     | 3 ++-
 test/new/gfm_hashtag.gfm.html     | 5 +++++
 test/new/gfm_hashtag.gfm.text     | 5 +++++
 test/new/gfm_hashtag.nogfm.html   | 5 +++++
 test/new/gfm_hashtag.nogfm.text   | 5 +++++
 test/tests/gfm_hashtag.gfm.html   | 5 +++++
 test/tests/gfm_hashtag.gfm.text   | 5 +++++
 test/tests/gfm_hashtag.nogfm.html | 5 +++++
 test/tests/gfm_hashtag.nogfm.text | 5 +++++
 9 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 test/new/gfm_hashtag.gfm.html
 create mode 100644 test/new/gfm_hashtag.gfm.text
 create mode 100644 test/new/gfm_hashtag.nogfm.html
 create mode 100644 test/new/gfm_hashtag.nogfm.text
 create mode 100644 test/tests/gfm_hashtag.gfm.html
 create mode 100644 test/tests/gfm_hashtag.gfm.text
 create mode 100644 test/tests/gfm_hashtag.nogfm.html
 create mode 100644 test/tests/gfm_hashtag.nogfm.text

diff --git a/lib/marked.js b/lib/marked.js
index 142eccf00aa..eac080268f8 100644
--- a/lib/marked.js
+++ b/lib/marked.js
@@ -76,7 +76,8 @@ block.normal = merge({}, block);
 
 block.gfm = merge({}, block.normal, {
   fences: /^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,
-  paragraph: /^/
+  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
new file mode 100644
index 00000000000..6f9e43f52d8
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..7656ecfd7ce
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..ecd95d692e1
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..7656ecfd7ce
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..6f9e43f52d8
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..7656ecfd7ce
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..ecd95d692e1
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..7656ecfd7ce
--- /dev/null
+++ b/test/tests/gfm_hashtag.nogfm.text
@@ -0,0 +1,5 @@
+#header
+
+# header1
+
+#  header2