From b6fb70f88a4bf270a36515e958fdf124a70543ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matth=C3=A4us=20G=2E=20Chajdas?= <dev@anteru.net>
Date: Fri, 31 Jul 2020 12:16:36 +0200
Subject: Improve HTML formatter output.

With the previous changes, we started to emit one <pre> per line for
line numbers. This breaks for instance the Sphinx-RTD-Theme, which
expects the line numbers to be formatted the same way as the normal
content. This commit makes the following changes:

* Emit a single <pre> inside the linenos div
* Wrap individual lines into <span> as needed
* Update all tests
* Don't yield empty <span> elements when no style is specified

This also makes the .html test files look correct when looked at with a
browser, as there is no extra whitespace in them which needs stripping.
---
 pygments/formatters/html.py                        | 12 ++++---
 ...inline_cls_step_1_start_1_special_0_anchor.html | 10 +++---
 ...line_cls_step_1_start_1_special_0_noanchor.html | 10 +++---
 ...inline_cls_step_1_start_1_special_3_anchor.html | 10 +++---
 ...line_cls_step_1_start_1_special_3_noanchor.html | 10 +++---
 ...inline_cls_step_1_start_8_special_0_anchor.html | 10 +++---
 ...line_cls_step_1_start_8_special_0_noanchor.html | 10 +++---
 ...inline_cls_step_1_start_8_special_3_anchor.html | 10 +++---
 ...line_cls_step_1_start_8_special_3_noanchor.html | 10 +++---
 ...inline_cls_step_2_start_1_special_0_anchor.html | 10 +++---
 ...line_cls_step_2_start_1_special_0_noanchor.html | 10 +++---
 ...inline_cls_step_2_start_1_special_3_anchor.html | 10 +++---
 ...line_cls_step_2_start_1_special_3_noanchor.html | 10 +++---
 ...inline_cls_step_2_start_8_special_0_anchor.html | 10 +++---
 ...line_cls_step_2_start_8_special_0_noanchor.html | 10 +++---
 ...inline_cls_step_2_start_8_special_3_anchor.html | 10 +++---
 ...line_cls_step_2_start_8_special_3_noanchor.html | 10 +++---
 ...line_nocls_step_1_start_1_special_0_anchor.html | 10 +++---
 ...ne_nocls_step_1_start_1_special_0_noanchor.html | 10 +++---
 ...line_nocls_step_1_start_1_special_3_anchor.html | 10 +++---
 ...ne_nocls_step_1_start_1_special_3_noanchor.html | 10 +++---
 ...line_nocls_step_1_start_8_special_0_anchor.html | 10 +++---
 ...ne_nocls_step_1_start_8_special_0_noanchor.html | 10 +++---
 ...line_nocls_step_1_start_8_special_3_anchor.html | 10 +++---
 ...ne_nocls_step_1_start_8_special_3_noanchor.html | 10 +++---
 ...line_nocls_step_2_start_1_special_0_anchor.html | 10 +++---
 ...ne_nocls_step_2_start_1_special_0_noanchor.html | 10 +++---
 ...line_nocls_step_2_start_1_special_3_anchor.html | 10 +++---
 ...ne_nocls_step_2_start_1_special_3_noanchor.html | 10 +++---
 ...line_nocls_step_2_start_8_special_0_anchor.html | 10 +++---
 ...ne_nocls_step_2_start_8_special_0_noanchor.html | 10 +++---
 ...line_nocls_step_2_start_8_special_3_anchor.html | 10 +++---
 ...ne_nocls_step_2_start_8_special_3_noanchor.html | 10 +++---
 .../table_cls_step_1_start_1_special_0_anchor.html | 38 ++++++++++------------
 ...able_cls_step_1_start_1_special_0_noanchor.html | 38 ++++++++++------------
 .../table_cls_step_1_start_1_special_3_anchor.html | 38 ++++++++++------------
 ...able_cls_step_1_start_1_special_3_noanchor.html | 38 ++++++++++------------
 .../table_cls_step_1_start_8_special_0_anchor.html | 38 ++++++++++------------
 ...able_cls_step_1_start_8_special_0_noanchor.html | 38 ++++++++++------------
 .../table_cls_step_1_start_8_special_3_anchor.html | 38 ++++++++++------------
 ...able_cls_step_1_start_8_special_3_noanchor.html | 38 ++++++++++------------
 .../table_cls_step_2_start_1_special_0_anchor.html | 38 ++++++++++------------
 ...able_cls_step_2_start_1_special_0_noanchor.html | 38 ++++++++++------------
 .../table_cls_step_2_start_1_special_3_anchor.html | 38 ++++++++++------------
 ...able_cls_step_2_start_1_special_3_noanchor.html | 38 ++++++++++------------
 .../table_cls_step_2_start_8_special_0_anchor.html | 38 ++++++++++------------
 ...able_cls_step_2_start_8_special_0_noanchor.html | 38 ++++++++++------------
 .../table_cls_step_2_start_8_special_3_anchor.html | 38 ++++++++++------------
 ...able_cls_step_2_start_8_special_3_noanchor.html | 38 ++++++++++------------
 ...able_nocls_step_1_start_1_special_0_anchor.html | 38 ++++++++++------------
 ...le_nocls_step_1_start_1_special_0_noanchor.html | 38 ++++++++++------------
 ...able_nocls_step_1_start_1_special_3_anchor.html | 38 ++++++++++------------
 ...le_nocls_step_1_start_1_special_3_noanchor.html | 38 ++++++++++------------
 ...able_nocls_step_1_start_8_special_0_anchor.html | 38 ++++++++++------------
 ...le_nocls_step_1_start_8_special_0_noanchor.html | 38 ++++++++++------------
 ...able_nocls_step_1_start_8_special_3_anchor.html | 38 ++++++++++------------
 ...le_nocls_step_1_start_8_special_3_noanchor.html | 38 ++++++++++------------
 ...able_nocls_step_2_start_1_special_0_anchor.html | 38 ++++++++++------------
 ...le_nocls_step_2_start_1_special_0_noanchor.html | 38 ++++++++++------------
 ...able_nocls_step_2_start_1_special_3_anchor.html | 38 ++++++++++------------
 ...le_nocls_step_2_start_1_special_3_noanchor.html | 38 ++++++++++------------
 ...able_nocls_step_2_start_8_special_0_anchor.html | 38 ++++++++++------------
 ...le_nocls_step_2_start_8_special_0_noanchor.html | 38 ++++++++++------------
 ...able_nocls_step_2_start_8_special_3_anchor.html | 38 ++++++++++------------
 ...le_nocls_step_2_start_8_special_3_noanchor.html | 38 ++++++++++------------
 65 files changed, 712 insertions(+), 836 deletions(-)

diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py
index c3100967..06327f64 100644
--- a/pygments/formatters/html.py
+++ b/pygments/formatters/html.py
@@ -677,7 +677,8 @@ class HtmlFormatter(Formatter):
                 else:
                     style = ''
 
-            line = '<pre%s>%s</pre>' % (style, line)
+            if style:
+                line = '<span%s>%s</span>' % (style, line)
 
             lines.append(line)
 
@@ -688,8 +689,8 @@ class HtmlFormatter(Formatter):
         # some configurations seem to mess up the formatting...
         yield 0, (
             '<table class="%stable">' % self.cssclass +
-            '<tr><td class="linenos"><div class="linenodiv">' +
-            ls + '</div></td><td class="code">'
+            '<tr><td class="linenos"><div class="linenodiv"><pre>' +
+            ls + '</pre></div></td><td class="code">'
         )
         yield 0, dummyoutfile.getvalue()
         yield 0, '</td></tr></table>'
@@ -723,7 +724,10 @@ class HtmlFormatter(Formatter):
                 else:
                     style = ' class="linenos"'
 
-            yield 1, '<span%s>%s</span>' % (style, line) + inner_line
+            if style:
+                yield 1, '<span%s>%s</span>' % (style, line) + inner_line
+            else:
+                yield 1, line +  inner_line
             num += 1
 
     def _wrap_lineanchors(self, inner):
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor.html
index 78b7675e..4c247cbc 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor.html
index 78b7675e..4c247cbc 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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_3_anchor.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor.html
index a133f7a8..0200a290 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor.html
index a133f7a8..0200a290 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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_8_special_0_anchor.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor.html
index e4000c6e..53dc0e72 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor.html
index e4000c6e..53dc0e72 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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_3_anchor.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor.html
index bcbd693c..1f2f5cac 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor.html
index bcbd693c..1f2f5cac 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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_2_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor.html
index 56275271..911d9b9b 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor.html
index 56275271..911d9b9b 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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_3_anchor.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor.html
index 9f10418b..7f2c5181 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor.html
index 9f10418b..7f2c5181 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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_8_special_0_anchor.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor.html
index 490d7484..ce635c0e 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor.html
index 490d7484..ce635c0e 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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_3_anchor.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor.html
index d6b50fbb..08d3da78 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor.html
index d6b50fbb..08d3da78 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor.html
@@ -1,8 +1,6 @@
 <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>
+ <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_nocls_step_1_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor.html
index 6bbdf29c..24fcc2f6 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor.html
index 6bbdf29c..24fcc2f6 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor.html
index 33b6330f..b6245f11 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor.html
index 33b6330f..b6245f11 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">3</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor.html
index 2692b73d..d38e2bab 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor.html
index 2692b73d..d38e2bab 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor.html
index c1a67b5c..332f729f 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor.html
index c1a67b5c..332f729f 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor.html
index 1a9e833a..9367b9c0 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor.html
index 1a9e833a..9367b9c0 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor.html
index cd89d205..6843e0f7 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor.html
index cd89d205..6843e0f7 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> </span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor.html
index 8f078e42..09bf305b 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor.html
index 8f078e42..09bf305b 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor.html
index 7d0ecdd8..39d7fc06 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor.html
index 7d0ecdd8..39d7fc06 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor.html
@@ -1,8 +1,6 @@
 <div class="highlight" style="background: #f8f8f8">
-  <pre style="line-height: 125%; margin: 0;">
-    <span></span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
-    <span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
-    <span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
-  </pre>
+ <pre style="line-height: 125%; margin: 0;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">  </span><span style="color: #408080; font-style: italic"># b</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span><span style="color: #408080; font-style: italic"># c</span>
+</pre>
 </div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor.html
index a34780d8..36653531 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre><a href="#-1">1</a></pre>
-        <pre><a href="#-2">2</a></pre>
-        <pre><a href="#-3">3</a></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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><a href="#-1">1</a>
+<a href="#-2">2</a>
+<a href="#-3">3</a></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
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor.html
index 04037b2c..ddc7594e 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre>1</pre>
-        <pre>2</pre>
-        <pre>3</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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre>1
+2
+3</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
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor.html
index c6f89066..ab0fdfb3 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre><a href="#-1">1</a></pre>
-        <pre><a href="#-2">2</a></pre>
-        <pre class="special"><a href="#-3">3</a></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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><a href="#-1">1</a>
+<a href="#-2">2</a>
+<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
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor.html
index 464b1b32..1f3c424b 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre>1</pre>
-        <pre>2</pre>
-        <pre class="special">3</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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre>1
+2
+<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
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor.html
index 0eacbbaf..03ff1442 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre><a href="#-8"> 8</a></pre>
-        <pre><a href="#-9"> 9</a></pre>
-        <pre><a href="#-10">10</a></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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><a href="#-8"> 8</a>
+<a href="#-9"> 9</a>
+<a href="#-10">10</a></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
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor.html
index c274351c..b8bf29ee 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre> 8</pre>
-        <pre> 9</pre>
-        <pre>10</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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre> 8
+ 9
+10</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
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor.html
index 95521c15..98d1abbb 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre><a href="#-8"> 8</a></pre>
-        <pre class="special"><a href="#-9"> 9</a></pre>
-        <pre><a href="#-10">10</a></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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><a href="#-8"> 8</a>
+<span class="special"><a href="#-9"> 9</a></span>
+<a href="#-10">10</a></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
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor.html
index 07601811..67642acd 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre> 8</pre>
-        <pre class="special"> 9</pre>
-        <pre>10</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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre> 8
+<span class="special"> 9</span>
+10</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
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor.html
index 566d4bcc..80e5bdb1 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre> </pre>
-        <pre><a href="#-2">2</a></pre>
-        <pre> </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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre> 
+<a href="#-2">2</a>
+ </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
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor.html
index b19d9af6..a95ad95f 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre> </pre>
-        <pre>2</pre>
-        <pre> </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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre> 
+2
+ </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
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor.html
index 921c13c9..1a4cc59f 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre> </pre>
-        <pre><a href="#-2">2</a></pre>
-        <pre class="special"> </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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre> 
+<a href="#-2">2</a>
+<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
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor.html
index dd177c14..34b469e9 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre> </pre>
-        <pre>2</pre>
-        <pre class="special"> </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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre> 
+2
+<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
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor.html
index a3091766..3bbb52a5 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre><a href="#-8"> 8</a></pre>
-        <pre>  </pre>
-        <pre><a href="#-10">10</a></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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><a href="#-8"> 8</a>
+  
+<a href="#-10">10</a></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
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor.html
index cfc968ff..907c06fc 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre> 8</pre>
-        <pre>  </pre>
-        <pre>10</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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre> 8
+  
+10</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
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor.html
index 1b30e6d7..a39b486d 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre><a href="#-8"> 8</a></pre>
-        <pre class="special">  </pre>
-        <pre><a href="#-10">10</a></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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><a href="#-8"> 8</a>
+<span class="special">  </span>
+<a href="#-10">10</a></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
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor.html
index 2a5ebde0..25bde602 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre> 8</pre>
-        <pre class="special">  </pre>
-        <pre>10</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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre> 8
+<span class="special">  </span>
+10</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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor.html
index 86ce85ea..92e4e413 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-1">1</a></pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-2">2</a></pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-3">3</a></pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-1">1</a></span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-2">2</a></span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-3">3</a></span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor.html
index c32f2745..196033a1 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">3</pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">3</span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor.html
index 1d17cad9..afa6152a 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-1">1</a></pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-2">2</a></pre>
-        <pre style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"><a href="#-3">3</a></pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-1">1</a></span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-2">2</a></span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"><a href="#-3">3</a></span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor.html
index 7b3bc29c..a72788df 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</pre>
-        <pre style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">3</pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">1</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">3</span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor.html
index c61cb280..23ed43af 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-8"> 8</a></pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-9"> 9</a></pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-10">10</a></pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-8"> 8</a></span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-9"> 9</a></span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-10">10</a></span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor.html
index af07ebb1..3248ba3a 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 9</pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 9</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor.html
index 122283b6..276b76d5 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-8"> 8</a></pre>
-        <pre style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"><a href="#-9"> 9</a></pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-10">10</a></pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-8"> 8</a></span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"><a href="#-9"> 9</a></span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-10">10</a></span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor.html
index f50cdcdd..4298ac69 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</pre>
-        <pre style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> 9</pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> 9</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor.html
index 6ed8c005..15c4975e 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-2">2</a></pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-2">2</a></span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor.html
index dba1249b..987bd12d 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor.html
index 69bf7428..da570378 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-2">2</a></pre>
-        <pre style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> </pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-2">2</a></span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> </span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor.html
index 87660afb..0f502688 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</pre>
-        <pre style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> </pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> </span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">2</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;"> </span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor.html
index ac7570f3..d0bef32d 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-8"> 8</a></pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">  </pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-10">10</a></pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-8"> 8</a></span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">  </span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-10">10</a></span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor.html
index 035aa795..98b94471 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">  </pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">  </span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor.html
index 0ed43dbd..baa70130 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-8"> 8</a></pre>
-        <pre style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">  </pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-10">10</a></pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-8"> 8</a></span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">  </span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"><a href="#-10">10</a></span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor.html
index 13e38705..6ba03c4f 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor.html
@@ -1,21 +1,19 @@
 <table class="highlighttable">
-  <tr>
-    <td class="linenos">
-      <div class="linenodiv">
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</pre>
-        <pre style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">  </pre>
-        <pre style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</pre>
-      </div>
-    </td>
-    <td class="code">
-      <div class="highlight" style="background: #f8f8f8">
-        <pre style="line-height: 125%; margin: 0;">
-          <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>
+ <tr>
+  <td class="linenos">
+   <div class="linenodiv">
+    <pre><span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;"> 8</span>
+<span style="color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px;">  </span>
+<span style="color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px;">10</span></pre>
+   </div>
+  </td>
+  <td class="code">
+   <div class="highlight" style="background: #f8f8f8">
+    <pre style="line-height: 125%; margin: 0;"><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
-- 
cgit v1.2.1