Regenerate HTML test files.

128 files changed, 864 insertions, 1472 deletions

diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_filename.html
index 0cd6cb37..1181ae5c 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
 <a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
 <a href="#-3"><span class="linenos">3</span></a><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_nofilename.html
index 1296cc3e..d354e4ad 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
 <a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
 <a href="#-3"><span class="linenos">3</span></a><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_filename.html
index 9d7300ae..c015e971 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
 <span class="linenos">2</span><span class="c1"># b</span>
 <span class="linenos">3</span><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_nofilename.html
index 4c247cbc..c3e4828f 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
 <span class="linenos">2</span><span class="c1"># b</span>
 <span class="linenos">3</span><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_filename.html
index 75776e25..0962c0f2 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
 <a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
 <a href="#-3"><span class="linenos special">3</span></a><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_nofilename.html
index 2d34b609..addbab4e 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
 <a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
 <a href="#-3"><span class="linenos special">3</span></a><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_filename.html
index c5d15c51..1ce231f3 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
 <span class="linenos">2</span><span class="c1"># b</span>
 <span class="linenos special">3</span><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_nofilename.html
index 0200a290..c1ee9fde 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
 <span class="linenos">2</span><span class="c1"># b</span>
 <span class="linenos special">3</span><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_filename.html
index 3a390f69..f93b41eb 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
 <a href="#-9"><span class="linenos"> 9</span></a><span class="c1"># b</span>
 <a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_nofilename.html
index 4238be45..7073ef7b 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
 <a href="#-9"><span class="linenos"> 9</span></a><span class="c1"># b</span>
 <a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_filename.html
index 7ae75630..b3693e17 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
 <span class="linenos"> 9</span><span class="c1"># b</span>
 <span class="linenos">10</span><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_nofilename.html
index 53dc0e72..7426b0c7 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
 <span class="linenos"> 9</span><span class="c1"># b</span>
 <span class="linenos">10</span><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_filename.html
index 29237ea9..6fcfd797 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
 <a href="#-9"><span class="linenos special"> 9</span></a><span class="c1"># b</span>
 <a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_nofilename.html
index 9ebd6731..bf6f7beb 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
 <a href="#-9"><span class="linenos special"> 9</span></a><span class="c1"># b</span>
 <a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_filename.html
index de9ea759..7de25d11 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
 <span class="linenos special"> 9</span><span class="c1"># b</span>
 <span class="linenos">10</span><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_nofilename.html
index 1f2f5cac..5310d128 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
 <span class="linenos special"> 9</span><span class="c1"># b</span>
 <span class="linenos">10</span><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_filename.html
index 36a342fa..f9f7f76e 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
 <a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
 <a href="#-3"><span class="linenos"> </span></a><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_nofilename.html
index 2c643a3f..3ad9aaa8 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
 <a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
 <a href="#-3"><span class="linenos"> </span></a><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_filename.html
index de546699..358b2504 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
 <span class="linenos">2</span><span class="c1"># b</span>
 <span class="linenos"> </span><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_nofilename.html
index 911d9b9b..e3fbbb1e 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
 <span class="linenos">2</span><span class="c1"># b</span>
 <span class="linenos"> </span><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_filename.html
index d1827675..8cd8ad1f 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
 <a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
 <a href="#-3"><span class="linenos special"> </span></a><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_nofilename.html
index 70f9512e..d98933ea 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
 <a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
 <a href="#-3"><span class="linenos special"> </span></a><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_filename.html
index d14fc45b..69879eec 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
 <span class="linenos">2</span><span class="c1"># b</span>
 <span class="linenos special"> </span><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_nofilename.html
index 7f2c5181..2a36086a 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
 <span class="linenos">2</span><span class="c1"># b</span>
 <span class="linenos special"> </span><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_filename.html
index 0af3d705..085efe6e 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
 <a href="#-9"><span class="linenos">  </span></a><span class="c1"># b</span>
 <a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_nofilename.html
index 03d61423..e319c06e 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
 <a href="#-9"><span class="linenos">  </span></a><span class="c1"># b</span>
 <a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_filename.html
index 4bd40743..8b9ee317 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
 <span class="linenos">  </span><span class="c1"># b</span>
 <span class="linenos">10</span><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_nofilename.html
index ce635c0e..029ec441 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
 <span class="linenos">  </span><span class="c1"># b</span>
 <span class="linenos">10</span><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_filename.html
index dedb4a68..69f9b14f 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
 <a href="#-9"><span class="linenos special">  </span></a><span class="c1"># b</span>
 <a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_nofilename.html
index 7314eeb7..657b2588 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
 <a href="#-9"><span class="linenos special">  </span></a><span class="c1"># b</span>
 <a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_filename.html
index 8134afd5..49c913aa 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight"><span class="filename">testfilename</span>
- <pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
+<div class="highlight">
+<span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
 <span class="linenos special">  </span><span class="c1"># b</span>
 <span class="linenos">10</span><span class="c1"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_nofilename.html
index 08d3da78..731968cd 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight">
- <pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
+<div class="highlight"><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
 <span class="linenos special">  </span><span class="c1"># b</span>
 <span class="linenos">10</span><span class="c1"># c</span>
-</pre>
-</div>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_filename.html
index 4734b098..ff2f9305 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_nofilename.html
index f0299cbb..0ec74e4b 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_filename.html
index 8d1572a7..e9ff4982 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_nofilename.html
index fae1da70..52a35417 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_filename.html
index 731554eb..1f7268ca 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_nofilename.html
index 436d3c18..0eb4bacc 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_filename.html
index bc20d57a..d69a297a 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_nofilename.html
index 6d2b4d38..8e2dba9e 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_filename.html
index e68f0ede..e65ce8df 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_nofilename.html
index 0fa9dd78..ea8cc2da 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_filename.html
index c9a20dc9..df4f61e6 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_nofilename.html
index 4ae62b4d..e5aeebb4 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_filename.html
index 2ba1c5c8..021a3007 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_nofilename.html
index 0f3daf92..383e3b52 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_filename.html
index 55dbacc7..96cc2947 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_nofilename.html
index 43174f5d..aa629965 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_filename.html
index 28416c3e..ada74c83 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_nofilename.html
index a719d322..2e4d908b 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_filename.html
index 51c4199a..b508e3ce 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_nofilename.html
index 10b1e06c..a395fd84 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_filename.html
index 4597a838..c8863b78 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_nofilename.html
index 0c2334aa..39c4e7b3 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_filename.html
index a9aafc4e..a0d9f831 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_nofilename.html
index 04c69f54..15cd8f9c 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_filename.html
index dd568966..cf011d95 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_nofilename.html
index 8462306a..3cac80ba 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_filename.html
index a43477ae..f6234510 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_nofilename.html
index 4773f52e..ac0afe15 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">  </span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_filename.html
index dc63bf07..86155580 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_nofilename.html
index b51fb6f8..b75c56e5 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span>
-<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span></a><span style="color: #408080; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
+<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_filename.html
index ff1d26c6..75865233 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_filename.html
@@ -1,6 +1,7 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span>
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8">
+<span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
 </pre>
 </div>
+
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_nofilename.html
index 98ef6a7b..785e7a24 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_nofilename.html
@@ -1,6 +1,5 @@
-<div class="highlight" style="background: #f8f8f8">
- <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-</pre>
-</div>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">  </span><span style="color: #3D7B7B; font-style: italic"># b</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+
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 a850fac0..663b5558 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 f4348161..71d2bd4b 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"><a href="#-1">1</a></span>
+<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 class="highlight"><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>
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 64f2b871..e17a93b9 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal">1</span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 d3d325b5..a2e511dc 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal">1</span>
+<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 class="highlight"><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>
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 cd341761..995e807f 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 5c01c52c..7f2b6b44 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"><a href="#-1">1</a></span>
+<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 class="highlight"><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>
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 0bcfb2d0..72c90479 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal">1</span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 1cbd0e6c..af24acc3 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal">1</span>
+<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 class="highlight"><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>
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 8ed1cc76..80b060f5 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 81c7a139..ea426b35 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"><a href="#-8"> 8</a></span>
+<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 class="highlight"><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>
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 bb228b6c..a7901912 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> 8</span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 07fba684..61589692 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> 8</span>
+<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 class="highlight"><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>
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 263744a5..bd94e85d 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 aeeffeff..a9a566a3 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"><a href="#-8"> 8</a></span>
+<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 class="highlight"><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>
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 5e4b3e4d..ed35675f 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> 8</span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 0d709908..4f5f603a 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> 8</span>
+<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 class="highlight"><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>
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 af394e5d..96835fd0 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> </span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 bd2180af..c9f7f8b1 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> </span>
+<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 class="highlight"><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>
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 ae08d46e..56de8ccf 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> </span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 c343e4f9..742f0a37 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> </span>
+<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 class="highlight"><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>
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 96e4e0e2..69930595 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> </span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 63316d23..716b2c1d 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> </span>
+<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 class="highlight"><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>
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 9f72184d..b429b747 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> </span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 719d68bc..1fc07565 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> </span>
+<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 class="highlight"><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>
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 2c485024..4419bc6e 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 b443f221..1c03c403 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"><a href="#-8"> 8</a></span>
+<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 class="highlight"><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>
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 8d6f197b..31ef6e02 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> 8</span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 82750ebe..1f606f6e 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> 8</span>
+<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 class="highlight"><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>
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 2215f065..9ff8ebd0 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 b2e87d45..17dbdd14 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"><a href="#-8"> 8</a></span>
+<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 class="highlight"><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>
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 c3e77f65..7848ce21 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <div class="highlight">
-    <span class="filename">testfilename</span>
-   </div>
-  </th>
- </tr><tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> 8</span>
+<tr><th colspan="2" class="filename"><div class="highlight"><span class="filename">testfilename</span></div></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 class="highlight"><pre><span></span><span class="c1"># a</span>
 <span class="c1"># b</span>
 <span class="c1"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+</pre></div>
+</td>
+</tr>
 </table>
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 74e1b8be..5bfb95bf 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,19 +1,11 @@
-<table class="highlighttable">
- <tr>
-  <td class="linenos">
-   <div class="linenodiv">
-    <pre><span class="normal"> 8</span>
+<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 class="highlight"><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>
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 66582b69..74e64514 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 efbed240..109f6a94 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 eec949fc..48de1a3e 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 4e2fc44e..64e39d9f 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 12e606a3..c61f1089 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 5db1fa58..b9e740bc 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 c6c92120..34e963dc 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 c0808c30..5af15050 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 c0bb4658..1ef4c210 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 7928c32b..6f291df4 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 fedf8aab..dac8610c 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 a9e04f36..721957df 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 50087f26..7c43ff2c 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 9402619b..73ceff69 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 7a0ce3b6..94d79f90 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 5c8fd7ae..6b8bc1ab 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 6b9b33c0..80dc6f55 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 75def9ab..7515599f 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 ecaa52d2..f5cb2848 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 450940bf..f7d7127d 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 9c827419..cce78286 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 db6be9f7..5f548e28 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 c094ea56..12e7862a 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 851e20d4..c1197734 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 79a51c28..e1f61d20 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 afa37c98..21620d84 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 57587592..cc3efcc8 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 e24f9d14..1eeaf97c 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 08f506d7..6527e7a2 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 25b1ba5a..f756960f 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>
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 a79329cc..b5a07ab5 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,25 +1,14 @@
 <table class="highlighttable">
- <tr>
-  <th colspan="2" class="filename">
-   <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>
+<tr><th colspan="2" class="filename"><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>
 <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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr>
 </table>
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 0dea8469..bf5f67b2 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,19 +1,11 @@
-<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>
+<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: #408080; font-style: italic"># a</span>
-<span style="color: #408080; font-style: italic"># b</span>
-<span style="color: #408080; font-style: italic"># c</span>
-</pre>
-   </div>
-  </td>
- </tr>
-</table>
\ No newline at end of file
+<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: #3D7B7B; font-style: italic"># b</span>
+<span style="color: #3D7B7B; font-style: italic"># c</span>
+</pre></div>
+</td>
+</tr></table>