Merge pull request #312 from thombashi/fix_toc_depth_init_311

Fix _toc_depth initialization: #311
trentm · Oct 15, 2018 · 9d5111a · 9d5111a
2 parents db84b92 + 4004122
commit 9d5111a
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git a/lib/markdown2.py b/lib/markdown2.py
@@ -236,8 +236,11 @@ def __init__(self, html4tags=False, tab_width=4, safe_mode=None,
                 extras = dict([(e, None) for e in extras])
             self.extras.update(extras)
         assert isinstance(self.extras, dict)
-        if "toc" in self.extras and "header-ids" not in self.extras:
-            self.extras["header-ids"] = None   # "toc" implies "header-ids"
+
+        if "toc" in self.extras:
+            if "header-ids" not in self.extras:
+                self.extras["header-ids"] = None   # "toc" implies "header-ids"
+
             if self.extras["toc"] is None:
                 self._toc_depth = 6
             else:

diff --git a/test/tm-cases/toc_5.html b/test/tm-cases/toc_5.html
@@ -0,0 +1,13 @@
+<h1 id="fruit">Fruit</h1>
+
+<ul>
+<li>apples</li>
+<li>bananas</li>
+</ul>
+
+<h1 id="veggies">Veggies</h1>
+
+<ul>
+<li>carrots</li>
+<li>lettuce</li>
+</ul>
diff --git a/test/tm-cases/toc_5.opts b/test/tm-cases/toc_5.opts
@@ -0,0 +1 @@
+{"extras": ["toc", "header-ids"]}
diff --git a/test/tm-cases/toc_5.tags b/test/tm-cases/toc_5.tags
@@ -0,0 +1 @@
+toc extra
diff --git a/test/tm-cases/toc_5.text b/test/tm-cases/toc_5.text
@@ -0,0 +1,10 @@
+# Fruit
+
+- apples
+- bananas
+
+# Veggies
+
+- carrots
+- lettuce
+
diff --git a/test/tm-cases/toc_5.toc_html b/test/tm-cases/toc_5.toc_html
@@ -0,0 +1,4 @@
+<ul>
+  <li><a href="#fruit">Fruit</a></li>
+  <li><a href="#veggies">Veggies</a></li>
+</ul>