From 0109eb4d606c73328d70d6da86b13549e8ae5222 Mon Sep 17 00:00:00 2001
From: papaeye <papaeye@gmail.com>
Date: Sat, 21 Jul 2012 21:59:45 +0900
Subject: Added support for <foo>+<bar> lexers of Pygments

---
 markdown/extensions/fenced_code.py    |  2 +-
 tests/extensions/github_flavored.html |  9 +++++++++
 tests/extensions/github_flavored.txt  | 11 +++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 markdown/extensions/fenced_code.py

diff --git a/markdown/extensions/fenced_code.py b/markdown/extensions/fenced_code.py
old mode 100644
new mode 100755
index 457b35d..9a1284f
--- a/markdown/extensions/fenced_code.py
+++ b/markdown/extensions/fenced_code.py
@@ -81,7 +81,7 @@ from markdown.extensions.codehilite import CodeHilite, CodeHiliteExtension
 
 # Global vars
 FENCED_BLOCK_RE = re.compile( \
-    r'(?P<fence>^(?:~{3,}|`{3,}))[ ]*(\{?\.?(?P<lang>[a-zA-Z0-9_-]*)\}?)?[ ]*\n(?P<code>.*?)(?<=\n)(?P=fence)[ ]*$',
+    r'(?P<fence>^(?:~{3,}|`{3,}))[ ]*(\{?\.?(?P<lang>[a-zA-Z0-9_+-]*)\}?)?[ ]*\n(?P<code>.*?)(?<=\n)(?P=fence)[ ]*$',
     re.MULTILINE|re.DOTALL
     )
 CODE_WRAP = '<pre><code%s>%s</code></pre>'
diff --git a/tests/extensions/github_flavored.html b/tests/extensions/github_flavored.html
index 42577dc..063303a 100644
--- a/tests/extensions/github_flavored.html
+++ b/tests/extensions/github_flavored.html
@@ -29,4 +29,13 @@
 +     return _wrap_diff(CONTEXT_DIFF_HEADER_PATTERN,
 +                       CONTEXT_DIFF_LINE_PATTERN,
 +```
+</code></pre>
+
+<p>Test support for foo+bar lexer names.</p>
+<pre><code class="html+jinja">&lt;title&gt;{% block title %}{% endblock %}&lt;/title&gt;
+&lt;ul&gt;
+{% for user in users %}
+  &lt;li&gt;&lt;a href=&quot;{{ user.url }}&quot;&gt;{{ user.username }}&lt;/a&gt;&lt;/li&gt;
+{% endfor %}
+&lt;/ul&gt;
 </code></pre>
\ No newline at end of file
diff --git a/tests/extensions/github_flavored.txt b/tests/extensions/github_flavored.txt
index d0737bd..4f362b7 100644
--- a/tests/extensions/github_flavored.txt
+++ b/tests/extensions/github_flavored.txt
@@ -32,3 +32,14 @@ index 0000000..6e956a9
 +                       CONTEXT_DIFF_LINE_PATTERN,
 +```
 ```
+
+Test support for foo+bar lexer names.
+
+```html+jinja
+<title>{% block title %}{% endblock %}</title>
+<ul>
+{% for user in users %}
+  <li><a href="{{ user.url }}">{{ user.username }}</a></li>
+{% endfor %}
+</ul>
+```
-- 
cgit v1.2.3