Fix #632. (#2101)

* Fix #632.

The doc string indicates that the linenos table is wrapped in <div class="highlight">,
but the actual implementation puts the <div> inside the table cell containing the code.
This seems to cause issues as explained in #632, and given it doesn't match the
documentation, this PR restores the original behavior.

* Fix sample code in comment.

* Update CHANGES.

* Refactor the wrapping logic.

Instead of calling _wrap_div() at the end of wrap(), _wrap_div()
is now called after wrap/_wrap_tablinelinenos. This yields the
desired behavior but removes the custom <div> generation code.

64 files changed, 192 insertions, 256 deletions

diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_filename.html
index 31af3398..861165cd 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
 <span class="normal"><a href="#-2">2</a></span>
-<span class="normal"><a href="#-3">3</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_nofilename.html
index 6f39fa2d..af31392b 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
 <span class="normal"><a href="#-2">2</a></span>
-<span class="normal"><a href="#-3">3</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_filename.html
index 133031b6..a27ddbae 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
 <span class="normal">2</span>
-<span class="normal">3</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_nofilename.html
index 56a54ba5..b3044e7b 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
 <span class="normal">2</span>
-<span class="normal">3</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_filename.html
index 754f8cd4..ee74013e 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
 <span class="normal"><a href="#-2">2</a></span>
-<span class="special"><a href="#-3">3</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="special"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_nofilename.html
index 3221c5df..a4a3f8e6 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
 <span class="normal"><a href="#-2">2</a></span>
-<span class="special"><a href="#-3">3</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="special"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_filename.html
index e638f17d..f9107825 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
 <span class="normal">2</span>
-<span class="special">3</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="special">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_nofilename.html
index 1fd80cbe..e79e4368 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
 <span class="normal">2</span>
-<span class="special">3</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="special">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_filename.html
index 8aa459a3..1a396a7f 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
 <span class="normal"><a href="#-9"> 9</a></span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_nofilename.html
index 5786e131..04f76cb1 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
 <span class="normal"><a href="#-9"> 9</a></span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_filename.html
index 86d658fd..99675f07 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
 <span class="normal"> 9</span>
-<span class="normal">10</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_nofilename.html
index 6a6e141a..1d69eaf3 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
 <span class="normal"> 9</span>
-<span class="normal">10</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_filename.html
index fadd4e82..9a47c603 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
 <span class="special"><a href="#-9"> 9</a></span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_nofilename.html
index d2a966ab..03285e99 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
 <span class="special"><a href="#-9"> 9</a></span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_filename.html
index a0c1059a..0205691b 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
 <span class="special"> 9</span>
-<span class="normal">10</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_nofilename.html
index cd9017f2..b94db013 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
 <span class="special"> 9</span>
-<span class="normal">10</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_filename.html
index ff154f64..bd13be4f 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
 <span class="normal"><a href="#-2">2</a></span>
-<span class="normal"> </span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_nofilename.html
index bed80e38..fcacc18c 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
 <span class="normal"><a href="#-2">2</a></span>
-<span class="normal"> </span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_filename.html
index 281f2d40..4a418e6e 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
 <span class="normal">2</span>
-<span class="normal"> </span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_nofilename.html
index 30b4e334..7128962d 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
 <span class="normal">2</span>
-<span class="normal"> </span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_filename.html
index a6effc2e..60cab0e8 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
 <span class="normal"><a href="#-2">2</a></span>
-<span class="special"> </span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_nofilename.html
index 7bcbf8e4..848e666c 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
 <span class="normal"><a href="#-2">2</a></span>
-<span class="special"> </span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_filename.html
index fb5080b2..a690bd08 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
 <span class="normal">2</span>
-<span class="special"> </span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_nofilename.html
index 530793d6..31ceb56b 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
 <span class="normal">2</span>
-<span class="special"> </span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_filename.html
index 171ab69e..3a750e9b 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
 <span class="normal">  </span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_nofilename.html
index 5dd97da4..68375638 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
 <span class="normal">  </span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_filename.html
index c211136e..bc0a078c 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
 <span class="normal">  </span>
-<span class="normal">10</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_nofilename.html
index ffda7b16..a8125e8d 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
 <span class="normal">  </span>
-<span class="normal">10</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_filename.html
index 95dee537..36a8e5f3 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
 <span class="special">  </span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_nofilename.html
index 29dd5c13..200fffef 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
 <span class="special">  </span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_filename.html
index 60511ad1..f9efd122 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
+<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
 <span class="special">  </span>
-<span class="normal">10</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_nofilename.html
index a4722251..2d9d86ea 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
+<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
 <span class="special">  </span>
-<span class="normal">10</span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><span class="c1"># a</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_filename.html
index 78c18146..1cdc6bb5 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_nofilename.html
index 27c7349e..6bad0df2 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_filename.html
index ec3a6f43..ffd88d40 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_nofilename.html
index 0d6c68c8..62c5a6ed 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_filename.html
index a01aa468..e719f8e4 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_nofilename.html
index 88b61fdc..e07cebe5 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_filename.html
index c65a8df7..fbb6cde3 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_nofilename.html
index 3f9d3a9d..ce4bfa89 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_filename.html
index 97b7d659..3402b4c5 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_nofilename.html
index 5cda8c81..2eb3396c 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_filename.html
index c95c4d49..51b2dba4 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_nofilename.html
index b70b386e..91f66e15 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_filename.html
index 48b71b02..7e5aadf9 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
 <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_nofilename.html
index 18dc8f78..b10fdcac 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
 <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_filename.html
index ed42a684..8067f7e5 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
 <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_nofilename.html
index 259c8133..f3fde8b6 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
 <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_filename.html
index 4cc88049..8be13f0a 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_nofilename.html
index b7d21716..f72b3260 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_filename.html
index 16c995eb..512db3bf 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_nofilename.html
index 1568403f..26d6723f 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_filename.html
index f8d4d4aa..0270512d 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_nofilename.html
index 054ab560..d6f4d3ca 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_filename.html
index 87e87ee6..1f6dc86a 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_nofilename.html
index 87508454..c606d01a 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_filename.html
index e7a540de..b90f2b05 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_nofilename.html
index c63cfb22..926dd8cb 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_filename.html
index 3f184e86..16232951 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_nofilename.html
index 13950b26..0252dce5 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_filename.html
index a34833d4..791f6403 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
 <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_nofilename.html
index b44f02e4..bbc20f6d 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
 <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_filename.html
index e59bdbc8..5c04be38 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_filename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><th class="filename" colspan="2"><div class="highlight"><span class="filename">testfilename</span></div></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
 <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_nofilename.html
index deb84142..fc75b66d 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_nofilename.html
@@ -1,7 +1,6 @@
-<table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
+<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
 <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
 <span style="color: #3D7B7B; font-style: italic"># b</span>
 <span style="color: #3D7B7B; font-style: italic"># c</span>
-</pre></div>
-</td></tr></table>
\ No newline at end of file
+</pre></div></td></tr></table></div>