From f9d2b3fb56cad884a9b29b4903cfe4a4f1685204 Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Mon, 25 Nov 2019 13:16:27 -0800
Subject: [PATCH 01/11] Added support for TOCs that don't start with h1 headers

---
 lib/markdown2.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/markdown2.py b/lib/markdown2.py
index 3a5d5d9b..9a646ce0 100755
--- a/lib/markdown2.py
+++ b/lib/markdown2.py
@@ -2293,13 +2293,19 @@ def calculate_toc_html(toc):
 
     This expects the `_toc` attribute to have been set on this instance.
     """
-    if toc is None:
+    if not toc:
         return None
 
     def indent():
         return '  ' * (len(h_stack) - 1)
     lines = []
     h_stack = [0]   # stack of header-level numbers
+    # Check first item in list, and start building our table early if we don't start with an <h1>
+    first_header_level = toc[0][0]
+    for i in range(1, first_header_level):
+        lines.append("%s<ul>" % indent())
+        h_stack.append(i)
+    # Build TOC
     for level, id, name in toc:
         if level > h_stack[-1]:
             lines.append("%s<ul>" % indent())
@@ -2314,6 +2320,7 @@ def indent():
                 lines.append("%s</ul></li>" % indent())
         lines.append('%s<li><a href="#%s">%s</a>' % (
             indent(), id, name))
+    # Added closing tags
     while len(h_stack) > 1:
         h_stack.pop()
         if not lines[-1].endswith("</li>"):

From 4773b35c69d5b627445e144dffb4fe93de622a33 Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Mon, 25 Nov 2019 13:54:52 -0800
Subject: [PATCH 02/11] Added support for non-standard headers throughout the
 toc

---
 lib/markdown2.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/markdown2.py b/lib/markdown2.py
index 9a646ce0..7438407e 100755
--- a/lib/markdown2.py
+++ b/lib/markdown2.py
@@ -2300,16 +2300,12 @@ def indent():
         return '  ' * (len(h_stack) - 1)
     lines = []
     h_stack = [0]   # stack of header-level numbers
-    # Check first item in list, and start building our table early if we don't start with an <h1>
-    first_header_level = toc[0][0]
-    for i in range(1, first_header_level):
-        lines.append("%s<ul>" % indent())
-        h_stack.append(i)
     # Build TOC
     for level, id, name in toc:
         if level > h_stack[-1]:
-            lines.append("%s<ul>" % indent())
-            h_stack.append(level)
+            while level > h_stack[-1]:
+                lines.append("%s<ul>" % indent())
+                h_stack.append(h_stack[-1] + 1)
         elif level == h_stack[-1]:
             lines[-1] += "</li>"
         else:

From fe6f84526c33c651c0303e48afaae4b73c4e3d68 Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Tue, 26 Nov 2019 07:55:02 -0800
Subject: [PATCH 03/11] Added test cases

---
 test/tm-cases/toc_6.html     | 35 +++++++++++++++++++++++++++++++++++
 test/tm-cases/toc_6.opts     |  1 +
 test/tm-cases/toc_6.tags     |  1 +
 test/tm-cases/toc_6.text     | 25 +++++++++++++++++++++++++
 test/tm-cases/toc_6.toc_html | 21 +++++++++++++++++++++
 5 files changed, 83 insertions(+)
 create mode 100644 test/tm-cases/toc_6.html
 create mode 100644 test/tm-cases/toc_6.opts
 create mode 100644 test/tm-cases/toc_6.tags
 create mode 100644 test/tm-cases/toc_6.text
 create mode 100644 test/tm-cases/toc_6.toc_html

diff --git a/test/tm-cases/toc_6.html b/test/tm-cases/toc_6.html
new file mode 100644
index 00000000..251ec1ae
--- /dev/null
+++ b/test/tm-cases/toc_6.html
@@ -0,0 +1,35 @@
+<p>Testing toc starting with a deeper header than h1</p>
+
+<h3 id="fruit">Fruit</h3>
+
+<ul>
+<li>apples</li>
+</ul>
+
+<h2 id="veggies">Veggies</h2>
+
+<ul>
+<li>carrots</li>
+</ul>
+
+<p>Testing a jump in toc over more than two "layers"</p>
+
+<h5 id="meat">Meat</h5>
+
+<ul>
+<li>beef</li>
+</ul>
+
+<h1 id="dairy">Dairy</h1>
+
+<ul>
+<li>milk</li>
+</ul>
+
+<p>Testing proper closing tags at end of toc</p>
+
+<h3 id="sugar">Sugar</h3>
+
+<ul>
+<li>candy</li>
+</ul>
diff --git a/test/tm-cases/toc_6.opts b/test/tm-cases/toc_6.opts
new file mode 100644
index 00000000..ac671854
--- /dev/null
+++ b/test/tm-cases/toc_6.opts
@@ -0,0 +1 @@
+{"extras": ["toc"]}
diff --git a/test/tm-cases/toc_6.tags b/test/tm-cases/toc_6.tags
new file mode 100644
index 00000000..2b2472e0
--- /dev/null
+++ b/test/tm-cases/toc_6.tags
@@ -0,0 +1 @@
+toc extra
diff --git a/test/tm-cases/toc_6.text b/test/tm-cases/toc_6.text
new file mode 100644
index 00000000..610fecdd
--- /dev/null
+++ b/test/tm-cases/toc_6.text
@@ -0,0 +1,25 @@
+Testing toc starting with a deeper header than h1
+
+### Fruit
+
+- apples
+
+## Veggies
+
+- carrots
+
+Testing a jump in toc over more than two "layers"
+
+##### Meat
+
+- beef
+
+# Dairy
+
+- milk
+
+Testing proper closing tags at end of toc
+
+### Sugar
+
+- candy
diff --git a/test/tm-cases/toc_6.toc_html b/test/tm-cases/toc_6.toc_html
new file mode 100644
index 00000000..52712a09
--- /dev/null
+++ b/test/tm-cases/toc_6.toc_html
@@ -0,0 +1,21 @@
+<ul>
+  <ul>
+    <ul>
+      <li><a href="#fruit">Fruit</a></li>
+    </ul></li>
+    <li><a href="#veggies">Veggies</a>
+    <ul>
+      <ul>
+        <ul>
+          <li><a href="#meat">Meat</a></li>
+        </ul></li>
+      </ul></li>
+    </ul></li>
+  </ul></li>
+  <li><a href="#dairy">Dairy</a>
+  <ul>
+    <ul>
+      <li><a href="#sugar">Sugar</a></li>
+    </ul></li>
+  </ul></li>
+</ul>

From 77fbd4aca29ffacd7f9ceef40ca270a09af6e9dd Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Tue, 26 Nov 2019 10:14:06 -0800
Subject: [PATCH 04/11] Test case fix

---
 test/tm-cases/toc_2.toc_html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/tm-cases/toc_2.toc_html b/test/tm-cases/toc_2.toc_html
index 08288703..dceb843b 100644
--- a/test/tm-cases/toc_2.toc_html
+++ b/test/tm-cases/toc_2.toc_html
@@ -6,8 +6,10 @@
     <ul>
       <li><a href="#beef">Beef</a>
       <ul>
-        <li><a href="#steak">Steak</a></li>
-        <li><a href="#burgers">Burgers</a></li>
+        <ul>
+          <li><a href="#steak">Steak</a></li>
+          <li><a href="#burgers">Burgers</a></li>
+        </ul></li>
       </ul></li>
       <li><a href="#chicken">Chicken</a></li>
       <li><a href="#pork">Pork</a>

From 4f5031f9097dca1919bf731ceda176aaddc6b76f Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Tue, 26 Nov 2019 10:15:29 -0800
Subject: [PATCH 05/11] Test case fix

---
 test/tm-cases/toc_3.toc_html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/tm-cases/toc_3.toc_html b/test/tm-cases/toc_3.toc_html
index 08288703..dceb843b 100644
--- a/test/tm-cases/toc_3.toc_html
+++ b/test/tm-cases/toc_3.toc_html
@@ -6,8 +6,10 @@
     <ul>
       <li><a href="#beef">Beef</a>
       <ul>
-        <li><a href="#steak">Steak</a></li>
-        <li><a href="#burgers">Burgers</a></li>
+        <ul>
+          <li><a href="#steak">Steak</a></li>
+          <li><a href="#burgers">Burgers</a></li>
+        </ul></li>
       </ul></li>
       <li><a href="#chicken">Chicken</a></li>
       <li><a href="#pork">Pork</a>

From 4ef14d61cca71a3529fee7e9394c2ec37b82f5b7 Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Tue, 26 Nov 2019 13:54:27 -0800
Subject: [PATCH 06/11] Fixed code highlighting unit tests

Which broke for some reason??
---
 test/tm-cases/fenced_code_blocks_leading_lang_space.html  | 4 ++--
 test/tm-cases/fenced_code_blocks_safe_highlight.html      | 4 ++--
 test/tm-cases/fenced_code_blocks_syntax_highlighting.html | 4 ++--
 test/tm-cases/fenced_code_blocks_syntax_indentation.html  | 4 ++--
 test/tm-cases/issue3_bad_code_color_hack.html             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/tm-cases/fenced_code_blocks_leading_lang_space.html b/test/tm-cases/fenced_code_blocks_leading_lang_space.html
index 8f7a090a..a61524b3 100644
--- a/test/tm-cases/fenced_code_blocks_leading_lang_space.html
+++ b/test/tm-cases/fenced_code_blocks_leading_lang_space.html
@@ -1,3 +1,3 @@
-<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
-    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
+<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
+    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>
diff --git a/test/tm-cases/fenced_code_blocks_safe_highlight.html b/test/tm-cases/fenced_code_blocks_safe_highlight.html
index df5bbec5..a08985a7 100644
--- a/test/tm-cases/fenced_code_blocks_safe_highlight.html
+++ b/test/tm-cases/fenced_code_blocks_safe_highlight.html
@@ -1,5 +1,5 @@
-<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
-    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
+<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
+    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>
 
 <p>That's using the <em>fenced-code-blocks</em> extra with Python
diff --git a/test/tm-cases/fenced_code_blocks_syntax_highlighting.html b/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
index df5bbec5..a08985a7 100644
--- a/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
+++ b/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
@@ -1,5 +1,5 @@
-<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
-    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
+<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
+    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>
 
 <p>That's using the <em>fenced-code-blocks</em> extra with Python
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.html b/test/tm-cases/fenced_code_blocks_syntax_indentation.html
index 11a7c241..37b5723e 100644
--- a/test/tm-cases/fenced_code_blocks_syntax_indentation.html
+++ b/test/tm-cases/fenced_code_blocks_syntax_indentation.html
@@ -1,5 +1,5 @@
 <div class="codehilite"><pre><span></span><code><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span>
-    <span class="k">print</span> <span class="s2">&quot;foo&quot;</span>
+    <span class="nb">print</span> <span class="s2">&quot;foo&quot;</span>
 
-    <span class="k">print</span> <span class="s2">&quot;bar&quot;</span>
+    <span class="nb">print</span> <span class="s2">&quot;bar&quot;</span>
 </code></pre></div>
diff --git a/test/tm-cases/issue3_bad_code_color_hack.html b/test/tm-cases/issue3_bad_code_color_hack.html
index 46f329aa..8aedb76c 100644
--- a/test/tm-cases/issue3_bad_code_color_hack.html
+++ b/test/tm-cases/issue3_bad_code_color_hack.html
@@ -7,6 +7,6 @@ <h2>заголовок</h2>
 <p>Some python code:</p>
 
 <div class="codehilite"><pre><span></span><code><span class="c1"># комментарий</span>
-<span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
-    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
+<span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
+    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>

From 80a5dd22c86bb17204bca2e88dfb14cbcd1618bf Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Tue, 26 Nov 2019 14:09:37 -0800
Subject: [PATCH 07/11] Revert "Fixed code highlighting unit tests"

This reverts commit 4ef14d61cca71a3529fee7e9394c2ec37b82f5b7.
---
 test/tm-cases/fenced_code_blocks_leading_lang_space.html  | 4 ++--
 test/tm-cases/fenced_code_blocks_safe_highlight.html      | 4 ++--
 test/tm-cases/fenced_code_blocks_syntax_highlighting.html | 4 ++--
 test/tm-cases/fenced_code_blocks_syntax_indentation.html  | 4 ++--
 test/tm-cases/issue3_bad_code_color_hack.html             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/tm-cases/fenced_code_blocks_leading_lang_space.html b/test/tm-cases/fenced_code_blocks_leading_lang_space.html
index a61524b3..8f7a090a 100644
--- a/test/tm-cases/fenced_code_blocks_leading_lang_space.html
+++ b/test/tm-cases/fenced_code_blocks_leading_lang_space.html
@@ -1,3 +1,3 @@
-<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
-    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
+<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
+    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>
diff --git a/test/tm-cases/fenced_code_blocks_safe_highlight.html b/test/tm-cases/fenced_code_blocks_safe_highlight.html
index a08985a7..df5bbec5 100644
--- a/test/tm-cases/fenced_code_blocks_safe_highlight.html
+++ b/test/tm-cases/fenced_code_blocks_safe_highlight.html
@@ -1,5 +1,5 @@
-<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
-    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
+<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
+    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>
 
 <p>That's using the <em>fenced-code-blocks</em> extra with Python
diff --git a/test/tm-cases/fenced_code_blocks_syntax_highlighting.html b/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
index a08985a7..df5bbec5 100644
--- a/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
+++ b/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
@@ -1,5 +1,5 @@
-<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
-    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
+<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
+    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>
 
 <p>That's using the <em>fenced-code-blocks</em> extra with Python
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.html b/test/tm-cases/fenced_code_blocks_syntax_indentation.html
index 37b5723e..11a7c241 100644
--- a/test/tm-cases/fenced_code_blocks_syntax_indentation.html
+++ b/test/tm-cases/fenced_code_blocks_syntax_indentation.html
@@ -1,5 +1,5 @@
 <div class="codehilite"><pre><span></span><code><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span>
-    <span class="nb">print</span> <span class="s2">&quot;foo&quot;</span>
+    <span class="k">print</span> <span class="s2">&quot;foo&quot;</span>
 
-    <span class="nb">print</span> <span class="s2">&quot;bar&quot;</span>
+    <span class="k">print</span> <span class="s2">&quot;bar&quot;</span>
 </code></pre></div>
diff --git a/test/tm-cases/issue3_bad_code_color_hack.html b/test/tm-cases/issue3_bad_code_color_hack.html
index 8aedb76c..46f329aa 100644
--- a/test/tm-cases/issue3_bad_code_color_hack.html
+++ b/test/tm-cases/issue3_bad_code_color_hack.html
@@ -7,6 +7,6 @@ <h2>заголовок</h2>
 <p>Some python code:</p>
 
 <div class="codehilite"><pre><span></span><code><span class="c1"># комментарий</span>
-<span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
-    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
+<span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
+    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>

From 043ee7b6a947ad40485b9d8f88761e01c174790f Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Sat, 30 Nov 2019 10:17:40 -0800
Subject: [PATCH 08/11] Removed Python 3.4 support

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 93208f8f..9367b46b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 python:
   - "2.7"
   - "pypy"
-  - "3.4"
   - "3.5"
   - "3.6"
   - "3.7-dev"

From 7bb6e63ef876c8420ea2eda17300b1a3de778de4 Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Sat, 30 Nov 2019 10:18:49 -0800
Subject: [PATCH 09/11] Revert "Revert "Fixed code highlighting unit tests""

This reverts commit 80a5dd22c86bb17204bca2e88dfb14cbcd1618bf.
---
 test/tm-cases/fenced_code_blocks_leading_lang_space.html  | 4 ++--
 test/tm-cases/fenced_code_blocks_safe_highlight.html      | 4 ++--
 test/tm-cases/fenced_code_blocks_syntax_highlighting.html | 4 ++--
 test/tm-cases/fenced_code_blocks_syntax_indentation.html  | 4 ++--
 test/tm-cases/issue3_bad_code_color_hack.html             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/tm-cases/fenced_code_blocks_leading_lang_space.html b/test/tm-cases/fenced_code_blocks_leading_lang_space.html
index 8f7a090a..a61524b3 100644
--- a/test/tm-cases/fenced_code_blocks_leading_lang_space.html
+++ b/test/tm-cases/fenced_code_blocks_leading_lang_space.html
@@ -1,3 +1,3 @@
-<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
-    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
+<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
+    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>
diff --git a/test/tm-cases/fenced_code_blocks_safe_highlight.html b/test/tm-cases/fenced_code_blocks_safe_highlight.html
index df5bbec5..a08985a7 100644
--- a/test/tm-cases/fenced_code_blocks_safe_highlight.html
+++ b/test/tm-cases/fenced_code_blocks_safe_highlight.html
@@ -1,5 +1,5 @@
-<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
-    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
+<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
+    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>
 
 <p>That's using the <em>fenced-code-blocks</em> extra with Python
diff --git a/test/tm-cases/fenced_code_blocks_syntax_highlighting.html b/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
index df5bbec5..a08985a7 100644
--- a/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
+++ b/test/tm-cases/fenced_code_blocks_syntax_highlighting.html
@@ -1,5 +1,5 @@
-<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
-    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
+<div class="codehilite"><pre><span></span><code><span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
+    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>
 
 <p>That's using the <em>fenced-code-blocks</em> extra with Python
diff --git a/test/tm-cases/fenced_code_blocks_syntax_indentation.html b/test/tm-cases/fenced_code_blocks_syntax_indentation.html
index 11a7c241..37b5723e 100644
--- a/test/tm-cases/fenced_code_blocks_syntax_indentation.html
+++ b/test/tm-cases/fenced_code_blocks_syntax_indentation.html
@@ -1,5 +1,5 @@
 <div class="codehilite"><pre><span></span><code><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span>
-    <span class="k">print</span> <span class="s2">&quot;foo&quot;</span>
+    <span class="nb">print</span> <span class="s2">&quot;foo&quot;</span>
 
-    <span class="k">print</span> <span class="s2">&quot;bar&quot;</span>
+    <span class="nb">print</span> <span class="s2">&quot;bar&quot;</span>
 </code></pre></div>
diff --git a/test/tm-cases/issue3_bad_code_color_hack.html b/test/tm-cases/issue3_bad_code_color_hack.html
index 46f329aa..8aedb76c 100644
--- a/test/tm-cases/issue3_bad_code_color_hack.html
+++ b/test/tm-cases/issue3_bad_code_color_hack.html
@@ -7,6 +7,6 @@ <h2>заголовок</h2>
 <p>Some python code:</p>
 
 <div class="codehilite"><pre><span></span><code><span class="c1"># комментарий</span>
-<span class="k">if</span> <span class="bp">True</span><span class="p">:</span>
-    <span class="k">print</span> <span class="s2">&quot;hi&quot;</span>
+<span class="k">if</span> <span class="kc">True</span><span class="p">:</span>
+    <span class="nb">print</span> <span class="s2">&quot;hi&quot;</span>
 </code></pre></div>

From 3e38011454872acc27301166e54805ef296fbf7c Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Sun, 1 Dec 2019 07:30:33 -0800
Subject: [PATCH 10/11] Name fix

---
 CONTRIBUTORS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index bd8deb15..d12afcd2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -42,4 +42,4 @@ Sym Roe (github.com/symroe)
 Alex Elzenaar (github.com/aelzenaar)
 Francisco Saldaña (github.com/FrankSalad)
 Shivam Kumar Jha (github.com/thealphadollar)
-ryanvilbrandt (github.com/ryanvilbrandt)
+Ryan Vilbrandt (github.com/ryanvilbrandt)

From 58b4d1b784d3fd2357f0793a77632c2938e805a9 Mon Sep 17 00:00:00 2001
From: ryanvilbrandt <ryan.vilbrandt@gmail.com>
Date: Sat, 16 Oct 2021 12:57:09 -0700
Subject: [PATCH 11/11] Added task_list_checkable extra

---
 lib/markdown2.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/markdown2.py b/lib/markdown2.py
index 7438407e..4c0654c0 100755
--- a/lib/markdown2.py
+++ b/lib/markdown2.py
@@ -1682,15 +1682,14 @@ def _do_lists(self, text):
         (.*)                   # list item text = \2
     ''', re.M | re.X | re.S)
 
-    _task_list_warpper_str = r'<input type="checkbox" class="task-list-item-checkbox" %sdisabled> %s'
+    _task_list_warpper_str = r'<input type="checkbox" class="task-list-item-checkbox" %s%s> %s'
 
     def _task_list_item_sub(self, match):
         marker = match.group(1)
         item_text = match.group(2)
-        if marker in ['[x]','[X]']:
-                return self._task_list_warpper_str % ('checked ', item_text)
-        elif marker == '[ ]':
-                return self._task_list_warpper_str % ('', item_text)
+        checked_str = "" if marker == '[ ]' else "checked "
+        disabled_str = "" if "task_list_checkable" in self.extras else "disabled"
+        return self._task_list_warpper_str % (checked_str, disabled_str, item_text)
 
     _last_li_endswith_two_eols = False
     def _list_item_sub(self, match):