diff options
| author | Matthäus G. Chajdas <Anteru@users.noreply.github.com> | 2021-02-12 20:40:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 20:40:15 +0100 |
| commit | efd9aa5a955fd512fcf9d1980f206f795cea9075 (patch) | |
| tree | 68062e12525d93206c51a2989d9285e45842fc90 | |
| parent | aa0c35b640ae45714dccf9af3214f1550b5ae20f (diff) | |
| download | pygments-git-efd9aa5a955fd512fcf9d1980f206f795cea9075.tar.gz | |
Fix/1698 lineos wrapping (#1701)
* Fix #1698.
* Change default line number styling.
Instead of hardcoding black/light gray, use transparent/inherit which
makes it "neutral" out of the box. linenospecial is still hard-coded and
may look wrong, but that needs fixing in the style.
* Prettify the test files.
* Fix incorrect wrapping of TD linenos.
The padding would get applied twice to "special" lines, once via
<pre>, once via the <span>, which was not consistent with inline
line numbers where the .special style would override the default
style.
To fix this, we now emit "normal" and "special" lines for td.linenos
line numbers, and the normal style is applied to "normal". This brings
td.linenos closer to inline line numbers, and also makes the styling
between noclasses=True and noclasses=False consistent.
* Document the line number styling changes.
52 files changed, 154 insertions, 132 deletions
@@ -39,6 +39,23 @@ Version 2.8.0 - Changed setuptools to use a declarative config through ``setup.cfg``. Building Pygments now requires setuptools 39.2+. - Added markdown to MarkdownLexer aliases (#1687) +- Changed line number handling + + * In ``<table>`` based output, the ``td.linenos`` element will have either a + ``normal`` or ``special`` class attached. Previously, only ``special`` line + numbers got a class. This prevents styles from getting applied twice - + once via ``<pre>``, once via ``<span class="special">``. This also means + that ``td.linenos pre`` is no longer styled, instead, use + ``td.linenos .normal`` and ``td.linenos .special``. + * In the "inline" style, the DOM element order was changed. The line number + is added first, then the line is wrapped is wrapped by the highlighter. + This fixes lines not being fully highlighted. + * The visual output for inline and non-inline line numbers & highlighting, + as well as class-based and inline styling is now consistent. + * Line number styles are set to ``background-color: transparent`` and + ``color: inherit`` by default. This works much better with dark styles + which don't have colors set for line numbers. + - Removed "raw" alias from RawTokenLexer, so that it cannot be selected by alias. - Added prompt colors to the Solarized theme (#1529) diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py index 6b36183d..3ba104f3 100644 --- a/pygments/formatters/html.py +++ b/pygments/formatters/html.py @@ -552,9 +552,9 @@ class HtmlFormatter(Formatter): def get_linenos_style_defs(self): lines = [ 'pre { %s }' % self._pre_style, - 'td.linenos pre { %s }' % self._linenos_style, + 'td.linenos .normal { %s }' % self._linenos_style, 'span.linenos { %s }' % self._linenos_style, - 'td.linenos pre.special { %s }' % self._linenos_special_style, + 'td.linenos .special { %s }' % self._linenos_special_style, 'span.linenos.special { %s }' % self._linenos_special_style, ] @@ -682,7 +682,7 @@ class HtmlFormatter(Formatter): if special_line: style = ' class="special"' else: - style = '' + style = ' class="normal"' if style: line = '<span%s>%s</span>' % (style, line) @@ -930,11 +930,16 @@ class HtmlFormatter(Formatter): linewise, e.g. line number generators. """ source = self._format_lines(tokensource) + + # As a special case, we wrap line numbers before line highlighting + # so the line numbers get wrapped in the highlighting tag. + if not self.nowrap and self.linenos == 2: + source = self._wrap_inlinelinenos(source) + if self.hl_lines: source = self._highlight_lines(source) + if not self.nowrap: - if self.linenos == 2: - source = self._wrap_inlinelinenos(source) if self.lineanchors: source = self._wrap_lineanchors(source) if self.linespans: diff --git a/pygments/style.py b/pygments/style.py index 989a61cd..3bf2b156 100644 --- a/pygments/style.py +++ b/pygments/style.py @@ -176,10 +176,10 @@ class Style(metaclass=StyleMeta): highlight_color = '#ffffcc' #: line number font color - line_number_color = '#000000' + line_number_color = 'inherit' #: line number background color - line_number_background_color = '#f0f0f0' + line_number_background_color = 'transparent' #: special line number font color line_number_special_color = '#000000' 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 891b10dd..f0299cbb 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #408080; font-style: italic"># a</span> -<a href="#-2"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span> -<a href="#-3"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #408080; font-style: italic"># c</span> + <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #408080; font-style: italic"># a</span> +<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span> +<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #408080; font-style: italic"># c</span> </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 6098070d..fae1da70 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #408080; font-style: italic"># a</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #408080; font-style: italic"># c</span> + <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #408080; font-style: italic"># a</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #408080; font-style: italic"># c</span> </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 7f1e2f94..436d3c18 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #408080; font-style: italic"># a</span> -<a href="#-2"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span> + <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #408080; font-style: italic"># a</span> +<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span> <a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #408080; font-style: italic"># c</span> </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 8a417269..6d2b4d38 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #408080; font-style: italic"># a</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span> + <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #408080; font-style: italic"># a</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #408080; font-style: italic"># c</span> </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 d3cc83ee..0fa9dd78 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span> -<a href="#-9"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #408080; font-style: italic"># b</span> -<a href="#-10"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span> + <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span> +<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #408080; font-style: italic"># b</span> +<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span> </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 58bbddc8..4ae62b4d 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span> + <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span> </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 c44459d9..0f3daf92 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span> + <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span> <a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #408080; font-style: italic"># b</span> -<a href="#-10"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span> +<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span> </pre> </div> 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 90f1e9bc..43174f5d 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span> + <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #408080; font-style: italic"># b</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span> </pre> </div> 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 c578bb92..a719d322 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># a</span> -<a href="#-2"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span> -<a href="#-3"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># c</span> + <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># a</span> +<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span> +<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># c</span> </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 bf4bf25d..10b1e06c 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># a</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># c</span> + <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># a</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># c</span> </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 4b4241de..0c2334aa 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># a</span> -<a href="#-2"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span> + <pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># a</span> +<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #408080; font-style: italic"># b</span> <a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># c</span> </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 d198ce0d..04c69f54 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># a</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span> + <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># a</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #408080; font-style: italic"># b</span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># c</span> </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 35fc36a6..8462306a 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span> -<a href="#-9"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># b</span> -<a href="#-10"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span> + <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span> +<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># b</span> +<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span> </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 56a09210..4773f52e 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># b</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span> + <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># b</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span> </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 fbf293ce..b51fb6f8 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span> + <pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #408080; font-style: italic"># a</span> <a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #408080; font-style: italic"># b</span> -<a href="#-10"><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span> +<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #408080; font-style: italic"># c</span> </pre> </div> 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 81f314dc..98ef6a7b 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,6 +1,6 @@ <div class="highlight" style="background: #f8f8f8"> - <pre style="line-height: 125%;"><span></span><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span> + <pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #408080; font-style: italic"># a</span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #408080; font-style: italic"># b</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #408080; font-style: italic"># c</span> </pre> </div> 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 36653531..f4348161 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><a href="#-1">1</a> -<a href="#-2">2</a> -<a href="#-3">3</a></pre> + <pre><span class="normal"><a href="#-1">1</a></span> +<span class="normal"><a href="#-2">2</a></span> +<span class="normal"><a href="#-3">3</a></span></pre> </div> </td> <td class="code"> 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 ddc7594e..d3d325b5 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre>1 -2 -3</pre> + <pre><span class="normal">1</span> +<span class="normal">2</span> +<span class="normal">3</span></pre> </div> </td> <td class="code"> 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 ab0fdfb3..5c01c52c 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 @@ -2,8 +2,8 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><a href="#-1">1</a> -<a href="#-2">2</a> + <pre><span class="normal"><a href="#-1">1</a></span> +<span class="normal"><a href="#-2">2</a></span> <span class="special"><a href="#-3">3</a></span></pre> </div> </td> 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 1f3c424b..1cbd0e6c 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 @@ -2,8 +2,8 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre>1 -2 + <pre><span class="normal">1</span> +<span class="normal">2</span> <span class="special">3</span></pre> </div> </td> 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 03ff1442..81c7a139 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><a href="#-8"> 8</a> -<a href="#-9"> 9</a> -<a href="#-10">10</a></pre> + <pre><span class="normal"><a href="#-8"> 8</a></span> +<span class="normal"><a href="#-9"> 9</a></span> +<span class="normal"><a href="#-10">10</a></span></pre> </div> </td> <td class="code"> 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 b8bf29ee..07fba684 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre> 8 - 9 -10</pre> + <pre><span class="normal"> 8</span> +<span class="normal"> 9</span> +<span class="normal">10</span></pre> </div> </td> <td class="code"> 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 98d1abbb..aeeffeff 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><a href="#-8"> 8</a> + <pre><span class="normal"><a href="#-8"> 8</a></span> <span class="special"><a href="#-9"> 9</a></span> -<a href="#-10">10</a></pre> +<span class="normal"><a href="#-10">10</a></span></pre> </div> </td> <td class="code"> 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 67642acd..0d709908 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre> 8 + <pre><span class="normal"> 8</span> <span class="special"> 9</span> -10</pre> +<span class="normal">10</span></pre> </div> </td> <td class="code"> 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 80e5bdb1..bd2180af 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre> -<a href="#-2">2</a> - </pre> + <pre><span class="normal"> </span> +<span class="normal"><a href="#-2">2</a></span> +<span class="normal"> </span></pre> </div> </td> <td class="code"> 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 a95ad95f..c343e4f9 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre> -2 - </pre> + <pre><span class="normal"> </span> +<span class="normal">2</span> +<span class="normal"> </span></pre> </div> </td> <td class="code"> 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 1a4cc59f..63316d23 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 @@ -2,8 +2,8 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre> -<a href="#-2">2</a> + <pre><span class="normal"> </span> +<span class="normal"><a href="#-2">2</a></span> <span class="special"> </span></pre> </div> </td> 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 34b469e9..719d68bc 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 @@ -2,8 +2,8 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre> -2 + <pre><span class="normal"> </span> +<span class="normal">2</span> <span class="special"> </span></pre> </div> </td> 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 3bbb52a5..b443f221 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><a href="#-8"> 8</a> - -<a href="#-10">10</a></pre> + <pre><span class="normal"><a href="#-8"> 8</a></span> +<span class="normal"> </span> +<span class="normal"><a href="#-10">10</a></span></pre> </div> </td> <td class="code"> 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 907c06fc..82750ebe 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre> 8 - -10</pre> + <pre><span class="normal"> 8</span> +<span class="normal"> </span> +<span class="normal">10</span></pre> </div> </td> <td class="code"> 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 a39b486d..b2e87d45 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><a href="#-8"> 8</a> + <pre><span class="normal"><a href="#-8"> 8</a></span> <span class="special"> </span> -<a href="#-10">10</a></pre> +<span class="normal"><a href="#-10">10</a></span></pre> </div> </td> <td class="code"> 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 25bde602..74e1b8be 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre> 8 + <pre><span class="normal"> 8</span> <span class="special"> </span> -10</pre> +<span class="normal">10</span></pre> </div> </td> <td class="code"> 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 41ea57f3..efbed240 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre> </div> </td> <td class="code"> 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 07ded26c..4e2fc44e 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">1</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">3</span></pre> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></pre> </div> </td> <td class="code"> 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 f43e8bb7..5db1fa58 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 @@ -2,8 +2,8 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre> </div> </td> 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 6e901af9..c0808c30 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 @@ -2,8 +2,8 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">1</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></pre> </div> </td> 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 2d69b757..7928c32b 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre> </div> </td> <td class="code"> 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 e9387996..a9e04f36 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 9</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span></pre> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre> </div> </td> <td class="code"> 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 6cd0f9fa..9402619b 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre> </div> </td> <td class="code"> 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 12ed3fbd..5c8fd7ae 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span></pre> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre> </div> </td> <td class="code"> 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 eee93929..75def9ab 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span></pre> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre> </div> </td> <td class="code"> 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 b67689b3..450940bf 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span></pre> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre> </div> </td> <td class="code"> 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 11a44446..db6be9f7 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 @@ -2,8 +2,8 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre> </div> </td> 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 eecace44..851e20d4 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 @@ -2,8 +2,8 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">2</span> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre> </div> </td> 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 576a524c..afa37c98 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre> </div> </td> <td class="code"> 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 f29ea4bf..e24f9d14 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> </span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span></pre> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre> </div> </td> <td class="code"> 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 30ac581b..25b1ba5a 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre> </div> </td> <td class="code"> 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 a2ca8b8b..0dea8469 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 @@ -2,9 +2,9 @@ <tr> <td class="linenos"> <div class="linenodiv"> - <pre><span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;"> 8</span> + <pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span> <span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span> -<span style="color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px;">10</span></pre> +<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre> </div> </td> <td class="code"> diff --git a/tests/test_html_formatter.py b/tests/test_html_formatter.py index a4be6126..5dd71734 100644 --- a/tests/test_html_formatter.py +++ b/tests/test_html_formatter.py @@ -147,12 +147,12 @@ def test_get_style_defs_contains_default_line_numbers_styles(): style_defs = HtmlFormatter().get_style_defs().splitlines() assert style_defs[1] == ( - 'td.linenos pre ' - '{ color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }' + 'td.linenos .normal ' + '{ color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }' ) assert style_defs[2] == ( 'span.linenos ' - '{ color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }' + '{ color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }' ) @@ -166,7 +166,7 @@ def test_get_style_defs_contains_style_specific_line_numbers_styles(): style_defs = HtmlFormatter(style=TestStyle).get_style_defs().splitlines() assert style_defs[1] == ( - 'td.linenos pre ' + 'td.linenos .normal ' '{ color: #ff0000; background-color: #0000ff; padding-left: 5px; padding-right: 5px; }' ) assert style_defs[2] == ( @@ -174,7 +174,7 @@ def test_get_style_defs_contains_style_specific_line_numbers_styles(): '{ color: #ff0000; background-color: #0000ff; padding-left: 5px; padding-right: 5px; }' ) assert style_defs[3] == ( - 'td.linenos pre.special ' + 'td.linenos .special ' '{ color: #00ff00; background-color: #ffffff; padding-left: 5px; padding-right: 5px; }' ) assert style_defs[4] == ( |
