summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMatthäus G. Chajdas <dev@anteru.net>2022-12-11 12:52:23 +0100
committerMatthäus G. Chajdas <dev@anteru.net>2022-12-11 12:52:23 +0100
commit147b22face65617514ccfa8512c6b097b07cad4c (patch)
tree56a06e1627d9e159f84becb4664d0ec46788a8f5 /tests
parent956518d6d6b62e755f8a3869c5cb143a243fdc4d (diff)
downloadpygments-git-147b22face65617514ccfa8512c6b097b07cad4c.tar.gz
Improve whitespace handling in Python.
This triggers a new case in the HtmlFormatter, which emits an empty span at the end of the line for a new line, as those are removed by the split-by-parts code. This requires separate post-processing. Doesn't fix all whitespace issues with Python either, but we're done to 360 failing examples with that, from previously >400.
Diffstat (limited to 'tests')
-rw-r--r--tests/examplefiles/csound/test.orc.output4
-rw-r--r--tests/examplefiles/evoque/test.evoque.output4
-rw-r--r--tests/examplefiles/genshi/genshi_example.xml+genshi.output8
-rw-r--r--tests/examplefiles/md/example.md.output4
-rw-r--r--tests/examplefiles/myghty/test.myt.output226
-rw-r--r--tests/examplefiles/postgresql/postgresql_test.txt.output8
-rw-r--r--tests/examplefiles/pycon/pycon_ctrlc_traceback.output72
-rw-r--r--tests/examplefiles/pycon/pycon_test.pycon.output8
-rw-r--r--tests/examplefiles/pytb/database.pytb.output4
-rw-r--r--tests/examplefiles/python/linecontinuation.py.output54
-rw-r--r--tests/examplefiles/python/py3_test.txt.output4
-rw-r--r--tests/examplefiles/python/switch_case.txt.output52
-rw-r--r--tests/examplefiles/python/unicodedoc.py.output28
-rw-r--r--tests/examplefiles/vim/vimrc.output14
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_nofilename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_filename.html6
-rw-r--r--tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_nofilename.html6
-rw-r--r--tests/snippets/md/test_code_block_with_language.txt2
-rw-r--r--tests/snippets/python/test_bytes_escape_codes.txt2
-rw-r--r--tests/snippets/python/test_floats.txt2
-rw-r--r--tests/snippets/python/test_fstring_01a.txt2
-rw-r--r--tests/snippets/python/test_fstring_01b.txt2
-rw-r--r--tests/snippets/python/test_fstring_02a.txt2
-rw-r--r--tests/snippets/python/test_fstring_02b.txt2
-rw-r--r--tests/snippets/python/test_fstring_03a.txt2
-rw-r--r--tests/snippets/python/test_fstring_03b.txt2
-rw-r--r--tests/snippets/python/test_fstring_04a.txt2
-rw-r--r--tests/snippets/python/test_fstring_04b.txt2
-rw-r--r--tests/snippets/python/test_fstring_05a.txt2
-rw-r--r--tests/snippets/python/test_fstring_05b.txt2
-rw-r--r--tests/snippets/python/test_fstring_06a.txt2
-rw-r--r--tests/snippets/python/test_fstring_06b.txt2
-rw-r--r--tests/snippets/python/test_fstring_07a.txt2
-rw-r--r--tests/snippets/python/test_fstring_07b.txt2
-rw-r--r--tests/snippets/python/test_fstring_08a.txt2
-rw-r--r--tests/snippets/python/test_fstring_08b.txt2
-rw-r--r--tests/snippets/python/test_fstring_09a.txt2
-rw-r--r--tests/snippets/python/test_fstring_09b.txt2
-rw-r--r--tests/snippets/python/test_fstring_10a.txt2
-rw-r--r--tests/snippets/python/test_fstring_10b.txt2
-rw-r--r--tests/snippets/python/test_fstring_11a.txt2
-rw-r--r--tests/snippets/python/test_fstring_11b.txt2
-rw-r--r--tests/snippets/python/test_fstring_12a.txt4
-rw-r--r--tests/snippets/python/test_fstring_12b.txt4
-rw-r--r--tests/snippets/python/test_fstring_13a.txt4
-rw-r--r--tests/snippets/python/test_fstring_13b.txt4
-rw-r--r--tests/snippets/python/test_fstring_14a.txt2
-rw-r--r--tests/snippets/python/test_fstring_14b.txt2
-rw-r--r--tests/snippets/python/test_fstring_15a.txt2
-rw-r--r--tests/snippets/python/test_fstring_15b.txt2
-rw-r--r--tests/snippets/python/test_fstring_16a.txt2
-rw-r--r--tests/snippets/python/test_fstring_16b.txt2
-rw-r--r--tests/snippets/python/test_fstring_17a.txt2
-rw-r--r--tests/snippets/python/test_fstring_17b.txt2
-rw-r--r--tests/snippets/python/test_fstring_18a.txt2
-rw-r--r--tests/snippets/python/test_fstring_18b.txt2
-rw-r--r--tests/snippets/python/test_fstring_19a.txt22
-rw-r--r--tests/snippets/python/test_fstring_19b.txt22
-rw-r--r--tests/snippets/python/test_fstring_20a.txt2
-rw-r--r--tests/snippets/python/test_fstring_20b.txt2
-rw-r--r--tests/snippets/python/test_fstring_21a.txt2
-rw-r--r--tests/snippets/python/test_fstring_21b.txt2
-rw-r--r--tests/snippets/python/test_fstring_22a.txt2
-rw-r--r--tests/snippets/python/test_fstring_22b.txt2
-rw-r--r--tests/snippets/python/test_fstring_23a.txt2
-rw-r--r--tests/snippets/python/test_fstring_23b.txt2
-rw-r--r--tests/snippets/python/test_fstring_24a.txt6
-rw-r--r--tests/snippets/python/test_fstring_24b.txt6
-rw-r--r--tests/snippets/python/test_fstring_25a.txt2
-rw-r--r--tests/snippets/python/test_fstring_25b.txt2
-rw-r--r--tests/snippets/python/test_fstring_26a.txt2
-rw-r--r--tests/snippets/python/test_fstring_26b.txt2
-rw-r--r--tests/snippets/python/test_fstring_27a.txt2
-rw-r--r--tests/snippets/python/test_fstring_27b.txt2
-rw-r--r--tests/snippets/python/test_fstring_28a.txt2
-rw-r--r--tests/snippets/python/test_fstring_28b.txt2
-rw-r--r--tests/snippets/python/test_fstring_29a.txt2
-rw-r--r--tests/snippets/python/test_fstring_29b.txt2
-rw-r--r--tests/snippets/python/test_fstring_30a.txt6
-rw-r--r--tests/snippets/python/test_fstring_30b.txt6
-rw-r--r--tests/snippets/python/test_fstring_31a.txt4
-rw-r--r--tests/snippets/python/test_fstring_31b.txt4
-rw-r--r--tests/snippets/python/test_fstring_32a.txt2
-rw-r--r--tests/snippets/python/test_fstring_32b.txt2
-rw-r--r--tests/snippets/python/test_fstring_33a.txt2
-rw-r--r--tests/snippets/python/test_fstring_33b.txt2
-rw-r--r--tests/snippets/python/test_fstring_34a.txt2
-rw-r--r--tests/snippets/python/test_fstring_34b.txt2
-rw-r--r--tests/snippets/python/test_fstring_35a.txt2
-rw-r--r--tests/snippets/python/test_fstring_35b.txt2
-rw-r--r--tests/snippets/python/test_fstring_36a.txt4
-rw-r--r--tests/snippets/python/test_fstring_36b.txt4
-rw-r--r--tests/snippets/python/test_needs_name.txt2
-rw-r--r--tests/snippets/python/test_pep_515.txt12
-rw-r--r--tests/snippets/python/test_raw_fstring.txt10
-rw-r--r--tests/snippets/python/test_string_escape_codes.txt2
-rw-r--r--tests/snippets/python/test_walrus_operator.txt2
-rw-r--r--tests/snippets/python2/test_cls_builtin.txt8
-rw-r--r--tests/test_latex_formatter.py6
224 files changed, 761 insertions, 761 deletions
diff --git a/tests/examplefiles/csound/test.orc.output b/tests/examplefiles/csound/test.orc.output
index 9fe8a1e3..646d2065 100644
--- a/tests/examplefiles/csound/test.orc.output
+++ b/tests/examplefiles/csound/test.orc.output
@@ -374,10 +374,10 @@
'pyrun' Name.Builtin
' ' Text.Whitespace
'{{' Literal.String
-'\n' Text
+'\n' Text.Whitespace
'# Python' Comment.Single
-'\n' Text
+'\n' Text.Whitespace
'}}' Literal.String
'\n' Text.Whitespace
diff --git a/tests/examplefiles/evoque/test.evoque.output b/tests/examplefiles/evoque/test.evoque.output
index 7d86091e..b05829e2 100644
--- a/tests/examplefiles/evoque/test.evoque.output
+++ b/tests/examplefiles/evoque/test.evoque.output
@@ -117,7 +117,7 @@
'{' Punctuation
' \n #table_row' Literal.String
' ' Text
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'}' Punctuation
@@ -240,7 +240,7 @@
'"' Literal.String.Double
',' Punctuation
' ' Text
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'rows' Name
diff --git a/tests/examplefiles/genshi/genshi_example.xml+genshi.output b/tests/examplefiles/genshi/genshi_example.xml+genshi.output
index abe3c62f..473e978b 100644
--- a/tests/examplefiles/genshi/genshi_example.xml+genshi.output
+++ b/tests/examplefiles/genshi/genshi_example.xml+genshi.output
@@ -760,7 +760,7 @@
"'" Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'for' Keyword
@@ -1057,7 +1057,7 @@
'field_name' Name
'}' Comment.Preproc
'${' Comment.Preproc
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'field' Name
@@ -1214,7 +1214,7 @@
"'" Literal.String.Single
' ' Text
'and' Operator.Word
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'constraints' Name
@@ -1223,7 +1223,7 @@
']' Punctuation
' ' Text
'and' Operator.Word
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'len' Name.Builtin
diff --git a/tests/examplefiles/md/example.md.output b/tests/examplefiles/md/example.md.output
index c0d48290..806f0085 100644
--- a/tests/examplefiles/md/example.md.output
+++ b/tests/examplefiles/md/example.md.output
@@ -372,10 +372,10 @@
'import' Keyword.Namespace
' ' Text
'token' Name
-'\n' Text
+'\n' Text.Whitespace
'# comment' Comment.Single
-'\n' Text
+'\n' Text.Whitespace
'```\n' Literal.String.Backtick
diff --git a/tests/examplefiles/myghty/test.myt.output b/tests/examplefiles/myghty/test.myt.output
index 5937952f..97b40bb0 100644
--- a/tests/examplefiles/myghty/test.myt.output
+++ b/tests/examplefiles/myghty/test.myt.output
@@ -38,15 +38,15 @@
'%' Operator
'doc' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
'global' Keyword
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'import' Keyword.Namespace
@@ -55,22 +55,22 @@
',' Operator
' ' Text
're' Name.Namespace
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'import' Keyword.Namespace
' ' Text
'highlight' Name.Namespace
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'/' Operator
'%' Operator
'global' Keyword
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
@@ -78,7 +78,7 @@
' ' Text
'section' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
@@ -97,46 +97,46 @@
'%' Operator
'doc' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'toc' Name
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'path' Name
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'description' Name
'=' Operator
'None' Keyword.Constant
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'onepage' Name
'=' Operator
'False' Keyword.Constant
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'/' Operator
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'item' Name
@@ -149,7 +149,7 @@
'(' Punctuation
'path' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'if' Keyword
@@ -160,7 +160,7 @@
' ' Text
'None' Keyword.Constant
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'raise' Keyword
@@ -172,16 +172,16 @@
'+' Operator
' ' Text
'path' Name
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'/' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'A' Name
@@ -213,7 +213,7 @@
'<%' Name.Tag
'python' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'content' Name
@@ -225,7 +225,7 @@
'content' Name
'(' Punctuation
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
're2' Name
@@ -252,7 +252,7 @@
'.' Operator
'S' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'content' Name
@@ -278,16 +278,16 @@
' ' Text
'content' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'/' Operator
'%' Operator
'python' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'%' Operator
' ' Text
@@ -301,7 +301,7 @@
' ' Text
'1' Literal.Number.Integer
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'h3' Name
@@ -445,20 +445,20 @@
' ' Text
'formatplain' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
'%' Operator
'filter' Name.Builtin
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'import' Keyword.Namespace
' ' Text
're' Name.Namespace
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'f' Name
@@ -495,7 +495,7 @@
' ' Text
'f' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'f' Name
@@ -515,13 +515,13 @@
'"' Literal.String.Double
'</p>' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'f' Name
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
@@ -529,7 +529,7 @@
'%' Operator
'filter' Name.Builtin
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
@@ -559,7 +559,7 @@
'both' Literal.String.Double
'"' Literal.String.Double
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'span' Name
@@ -593,13 +593,13 @@
'=' Operator
'False' Keyword.Constant
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'title' Name
@@ -607,7 +607,7 @@
'=' Operator
' ' Text
'None' Keyword.Constant
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'syntaxtype' Name
@@ -617,7 +617,7 @@
"'" Literal.String.Single
'python' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'html_escape' Name
@@ -625,7 +625,7 @@
'=' Operator
' ' Text
'False' Keyword.Constant
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'use_sliders' Name
@@ -633,22 +633,22 @@
'=' Operator
' ' Text
'False' Keyword.Constant
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'/' Operator
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'def' Keyword
@@ -658,7 +658,7 @@
'f' Name
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'f' Name
@@ -673,7 +673,7 @@
' ' Text
'4' Literal.Number.Integer
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'g' Name
@@ -682,7 +682,7 @@
' ' Text
"'" Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'lines' Name
@@ -700,7 +700,7 @@
'\\n' Literal.String.Escape
'"' Literal.String.Double
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'whitespace' Name
@@ -708,7 +708,7 @@
'=' Operator
' ' Text
'None' Keyword.Constant
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'for' Keyword
@@ -719,7 +719,7 @@
' ' Text
'lines' Name
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'if' Keyword
@@ -730,7 +730,7 @@
' ' Text
'None' Keyword.Constant
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'match' Name
@@ -749,7 +749,7 @@
' ' Text
'line' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'if' Keyword
@@ -762,7 +762,7 @@
' ' Text
'None' Keyword.Constant
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'whitespace' Name
@@ -775,9 +775,9 @@
'(' Punctuation
'1' Literal.Number.Integer
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'if' Keyword
@@ -790,7 +790,7 @@
' ' Text
'None' Keyword.Constant
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'line' Name
@@ -818,9 +818,9 @@
' ' Text
'line' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'if' Keyword
@@ -855,7 +855,7 @@
' ' Text
'None' Keyword.Constant
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'g' Name
@@ -872,11 +872,11 @@
'\\n' Literal.String.Escape
'"' Literal.String.Double
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
@@ -886,9 +886,9 @@
'rstrip' Name
'(' Punctuation
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'p' Name
@@ -909,7 +909,7 @@
'.' Operator
'S' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'def' Keyword
@@ -919,7 +919,7 @@
'match' Name
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
@@ -964,7 +964,7 @@
'"' Literal.String.Double
'</pre>' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'content' Name
@@ -996,14 +996,14 @@
'</pre>' Literal.String.Double
'"' Literal.String.Double
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'/' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'div' Name
@@ -1072,20 +1072,20 @@
'"' Literal.String.Double
'>' Operator
' ' Text
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'name' Name
'=' Operator
'None' Keyword.Constant
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'show' Name
@@ -1093,7 +1093,7 @@
"'" Literal.String.Single
'show' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'hide' Name
@@ -1101,7 +1101,7 @@
"'" Literal.String.Single
'hide' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
@@ -1109,14 +1109,14 @@
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'if' Keyword
@@ -1127,7 +1127,7 @@
' ' Text
'None' Keyword.Constant
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'name' Name
@@ -1147,7 +1147,7 @@
' ' Text
'0' Literal.Number.Integer
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'name' Name
@@ -1156,7 +1156,7 @@
'=' Operator
' ' Text
'1' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'm' Name
@@ -1171,7 +1171,7 @@
'=' Operator
' ' Text
'name' Name
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'name' Name
@@ -1188,7 +1188,7 @@
'(' Punctuation
'name' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
@@ -1196,7 +1196,7 @@
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'javascript' Name
':' Punctuation
@@ -1234,13 +1234,13 @@
'both' Literal.String.Double
'"' Literal.String.Double
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'name' Name
@@ -1248,7 +1248,7 @@
'=' Operator
' ' Text
'None' Keyword.Constant
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'class_' Name
@@ -1256,20 +1256,20 @@
'=' Operator
' ' Text
'None' Keyword.Constant
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'/' Operator
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'if' Keyword
@@ -1280,7 +1280,7 @@
' ' Text
'None' Keyword.Constant
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'name' Name
@@ -1304,14 +1304,14 @@
"'" Literal.String.Single
']' Punctuation
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'/' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'div' Name
@@ -1358,14 +1358,14 @@
'both' Literal.String.Double
'"' Literal.String.Double
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'link' Name
@@ -1373,7 +1373,7 @@
"'" Literal.String.Single
'sql' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
@@ -1381,14 +1381,14 @@
'%' Operator
'args' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'href' Name
@@ -1403,7 +1403,7 @@
'SELF:popboxlink' Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
@@ -1411,20 +1411,20 @@
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
-' ' Text
+' ' Text.Whitespace
'\'\'\'PYESC<& nav.myt:link, href=href, text=link, class_="codepoplink" &>PYESC\'\'\'' Literal.String.Doc
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'/' Operator
'%' Operator
'method' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'<' Operator
'%' Operator
@@ -1438,14 +1438,14 @@
'both' Literal.String.Double
'"' Literal.String.Double
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'\t' Text
'<' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'\t\t' Text
'c' Name
@@ -1457,7 +1457,7 @@
'content' Name
'(' Punctuation
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'\t\t' Text
'c' Name
@@ -1487,7 +1487,7 @@
'(' Punctuation
')' Punctuation
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'\t' Text
'<' Operator
@@ -1495,7 +1495,7 @@
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
@@ -1540,14 +1540,14 @@
'both' Literal.String.Double
'"' Literal.String.Double
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'\t' Text
'<' Operator
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
'\t\t' Text
'c' Name
@@ -1559,7 +1559,7 @@
'content' Name
'(' Punctuation
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'\t\t' Text
'c' Name
@@ -1589,7 +1589,7 @@
'(' Punctuation
')' Punctuation
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'\t' Text
'<' Operator
@@ -1597,7 +1597,7 @@
'%' Operator
'init' Name
'>' Operator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'<' Operator
diff --git a/tests/examplefiles/postgresql/postgresql_test.txt.output b/tests/examplefiles/postgresql/postgresql_test.txt.output
index fd9e2cd5..1e73a265 100644
--- a/tests/examplefiles/postgresql/postgresql_test.txt.output
+++ b/tests/examplefiles/postgresql/postgresql_test.txt.output
@@ -73,7 +73,7 @@
'$' Literal.String
'' Literal.String.Delimiter
'$' Literal.String
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'if' Keyword
@@ -84,19 +84,19 @@
' ' Text
'b' Name
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'a' Name
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'b' Name
-'\n' Text
+'\n' Text.Whitespace
'$' Literal.String
'' Literal.String.Delimiter
diff --git a/tests/examplefiles/pycon/pycon_ctrlc_traceback.output b/tests/examplefiles/pycon/pycon_ctrlc_traceback.output
index ce3bf6e3..6bdb3e01 100644
--- a/tests/examplefiles/pycon/pycon_ctrlc_traceback.output
+++ b/tests/examplefiles/pycon/pycon_ctrlc_traceback.output
@@ -4,13 +4,13 @@
'import' Keyword.Namespace
' ' Text
'os' Name.Namespace
-'\n' Text
+'\n' Text.Whitespace
'>>> ' Generic.Prompt
'print' Name.Builtin
' ' Text
'os' Name
-'\n' Text
+'\n' Text.Whitespace
"<module 'os' from '/file/path.py'>\n" Generic.Output
@@ -26,7 +26,7 @@
'10' Literal.Number.Integer
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
@@ -39,7 +39,7 @@
'+' Operator
' ' Text
'2' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
@@ -47,7 +47,7 @@
'(' Punctuation
'x' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
@@ -59,17 +59,17 @@
' ' Text
'5' Literal.Number.Integer
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
'raise' Keyword
' ' Text
'Exception' Name.Exception
-'\n' Text
+'\n' Text.Whitespace
'...' Generic.Prompt
-'\n' Text
+'\n' Text.Whitespace
'0\n' Generic.Output
@@ -105,15 +105,15 @@
' ' Text
'True' Keyword.Constant
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
'...' Generic.Prompt
-'\n' Text
+'\n' Text.Whitespace
'^CTraceback (most recent call last):\n' Generic.Output
@@ -132,10 +132,10 @@
')' Punctuation
':' Punctuation
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
'...' Generic.Prompt
-'\n' Text
+'\n' Text.Whitespace
'>>> ' Generic.Prompt
'class' Keyword
@@ -146,21 +146,21 @@
')' Punctuation
':' Punctuation
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
'...' Generic.Prompt
-'\n' Text
+'\n' Text.Whitespace
'>>> ' Generic.Prompt
'try' Keyword
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
'try' Keyword
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
@@ -172,13 +172,13 @@
'first' Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
'finally' Keyword
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
@@ -190,7 +190,7 @@
'second' Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
'except' Keyword
@@ -201,7 +201,7 @@
' ' Text
'c' Name
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
@@ -209,10 +209,10 @@
'(' Punctuation
'c' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'...' Generic.Prompt
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
@@ -256,7 +256,7 @@
'x' Name
' ' Text
'=' Operator
-'\n' Text
+'\n' Text.Whitespace
'' Generic.Traceback
' File ' Text
@@ -290,7 +290,7 @@
'=' Operator
' ' Text
'3' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
'>>> ' Generic.Prompt
'with' Keyword
@@ -301,7 +301,7 @@
' ' Text
'y' Name
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'... ' Generic.Prompt
' ' Text
@@ -313,10 +313,10 @@
' ' Text
'y' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'...' Generic.Prompt
-'\n' Text
+'\n' Text.Whitespace
'8\n' Generic.Output
@@ -351,7 +351,7 @@
'detail' Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
@@ -379,7 +379,7 @@
'detail' Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
@@ -413,7 +413,7 @@
'detail' Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
@@ -448,7 +448,7 @@
'detail' Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
@@ -484,7 +484,7 @@
'detail' Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
@@ -507,7 +507,7 @@
'raise' Keyword
' ' Text
'Exception' Name.Exception
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
@@ -526,7 +526,7 @@
'import' Keyword.Namespace
' ' Text
'somemodule' Name.Namespace
-'\n' Text
+'\n' Text.Whitespace
'>>> ' Generic.Prompt
'somemodule' Name
@@ -534,7 +534,7 @@
'blah' Name
'(' Punctuation
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
diff --git a/tests/examplefiles/pycon/pycon_test.pycon.output b/tests/examplefiles/pycon/pycon_test.pycon.output
index 6fba6318..30946876 100644
--- a/tests/examplefiles/pycon/pycon_test.pycon.output
+++ b/tests/examplefiles/pycon/pycon_test.pycon.output
@@ -1,6 +1,6 @@
'>>> ' Generic.Prompt
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'' Generic.Traceback
' File ' Text
@@ -23,7 +23,7 @@
'\n' Text.Whitespace
'>>> ' Generic.Prompt
-'\n' Text
+'\n' Text.Whitespace
'KeyboardInterrupt\n' Name.Class
@@ -35,7 +35,7 @@
'1' Literal.Number.Integer
'/' Operator
'0' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
@@ -54,7 +54,7 @@
'0' Literal.Number.Integer
' ' Text
'# this used to swallow the traceback' Comment.Single
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
diff --git a/tests/examplefiles/pytb/database.pytb.output b/tests/examplefiles/pytb/database.pytb.output
index ceaed6a6..6ae72773 100644
--- a/tests/examplefiles/pytb/database.pytb.output
+++ b/tests/examplefiles/pytb/database.pytb.output
@@ -1,6 +1,6 @@
'Text before\n' Other
-'\n' Text
+'\n' Text.Whitespace
'Traceback (most recent call last):\n' Generic.Traceback
@@ -161,6 +161,6 @@
'database is locked' Name
'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'Text after\n' Other
diff --git a/tests/examplefiles/python/linecontinuation.py.output b/tests/examplefiles/python/linecontinuation.py.output
index 78680c3e..91d4157b 100644
--- a/tests/examplefiles/python/linecontinuation.py.output
+++ b/tests/examplefiles/python/linecontinuation.py.output
@@ -7,7 +7,7 @@
' ' Text
'y' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
'apple' Name
'.' Operator
@@ -21,9 +21,9 @@
' ' Text
'y' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'1' Literal.Number.Integer
' ' Text
@@ -36,9 +36,9 @@
' ' Text
'__str__' Name.Function.Magic
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'from' Keyword.Namespace
' ' Text
@@ -47,7 +47,7 @@
'import' Keyword.Namespace
' ' Text
'path' Name
-'\n' Text
+'\n' Text.Whitespace
'from' Keyword.Namespace
' \\\n ' Text
@@ -59,9 +59,9 @@
'import' Keyword.Namespace
' \\\n ' Text
'path' Name.Namespace
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'import' Keyword.Namespace
' ' Text
@@ -72,9 +72,9 @@
'as' Keyword
' ' Text
'something' Name.Namespace
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'import' Keyword.Namespace
' \\\n ' Text
@@ -91,21 +91,21 @@
' ' Text
'something' Name
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'class' Keyword
' \\\n ' Text
'Spam' Name.Class
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'class' Keyword
' ' Text
@@ -113,9 +113,9 @@
':' Punctuation
' ' Text
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'class' Keyword
' ' Text
@@ -124,13 +124,13 @@
'object' Name.Builtin
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'class' Keyword
' \\\n ' Text
@@ -140,11 +140,11 @@
' ' Text
'(' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'object' Name.Builtin
-'\n' Text
+'\n' Text.Whitespace
' ' Text
')' Punctuation
@@ -153,15 +153,15 @@
' ' Text
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'def' Keyword
' \\\n ' Text
@@ -186,4 +186,4 @@
' ' Text
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/examplefiles/python/py3_test.txt.output b/tests/examplefiles/python/py3_test.txt.output
index 785c1695..66a93d53 100644
--- a/tests/examplefiles/python/py3_test.txt.output
+++ b/tests/examplefiles/python/py3_test.txt.output
@@ -2,8 +2,8 @@
' ' Text
'Käse' Name.Class
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/examplefiles/python/switch_case.txt.output b/tests/examplefiles/python/switch_case.txt.output
index 2abf65a5..3c07db9c 100644
--- a/tests/examplefiles/python/switch_case.txt.output
+++ b/tests/examplefiles/python/switch_case.txt.output
@@ -6,7 +6,7 @@
'(' Punctuation
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'case' Keyword
@@ -30,13 +30,13 @@
'.' Operator
'route' Name
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'1' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'case' Keyword
@@ -51,13 +51,13 @@
'bar' Literal.String.Single
"'" Literal.String.Single
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'2' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'case' Keyword
@@ -70,17 +70,17 @@
' ' Text
'name' Name
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'3' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'case' Keyword
-' ' Text
+' ' Text.Whitespace
'[' Punctuation
"'" Literal.String.Single
'to' Literal.String.Single
@@ -90,41 +90,41 @@
'_' Keyword
']' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'4' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'case' Keyword
' ' Text
'else_bar' Name
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'5' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'case' Keyword
-' ' Text
+' ' Text.Whitespace
'_' Keyword
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'6' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'match' Keyword
' ' Text
@@ -134,7 +134,7 @@
'(' Punctuation
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'case' Keyword
@@ -143,46 +143,46 @@
'(' Punctuation
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'1' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'case' Keyword
-' ' Text
+' ' Text.Whitespace
'_' Keyword
' ' Text
'as' Keyword
' ' Text
'default' Name
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'return' Keyword
' ' Text
'2' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'case' Name
' ' Text
'=' Operator
' ' Text
'1' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
'match' Name
' ' Text
'=' Operator
' ' Text
'1' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
'match' Name
' ' Text
@@ -193,4 +193,4 @@
'else' Keyword
' ' Text
'bar' Name
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/examplefiles/python/unicodedoc.py.output b/tests/examplefiles/python/unicodedoc.py.output
index 0d40ef21..9fb70e7c 100644
--- a/tests/examplefiles/python/unicodedoc.py.output
+++ b/tests/examplefiles/python/unicodedoc.py.output
@@ -4,14 +4,14 @@
'(' Punctuation
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
-' ' Text
+' ' Text.Whitespace
'ur' Literal.String.Affix
'"""unicode-raw"""' Literal.String.Doc
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'def' Keyword
' ' Text
@@ -19,14 +19,14 @@
'(' Punctuation
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
-' ' Text
+' ' Text.Whitespace
'u' Literal.String.Affix
'"""unicode"""' Literal.String.Doc
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'def' Keyword
' ' Text
@@ -34,16 +34,16 @@
'(' Punctuation
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'r' Literal.String.Affix
"'" Literal.String.Single
'raw' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'def' Keyword
' ' Text
@@ -51,8 +51,8 @@
'(' Punctuation
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
-' ' Text
+' ' Text.Whitespace
'"""docstring"""' Literal.String.Doc
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/examplefiles/vim/vimrc.output b/tests/examplefiles/vim/vimrc.output
index 9c436ee9..e295489b 100644
--- a/tests/examplefiles/vim/vimrc.output
+++ b/tests/examplefiles/vim/vimrc.output
@@ -65,16 +65,16 @@
'python' Keyword
'<<' Operator
'E OF' Text
-'\n' Text
+'\n' Text.Whitespace
'print' Name.Builtin
' ' Text
'"""' Literal.String.Double
'my script' Literal.String.Double
'"""' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'def' Keyword
' ' Text
@@ -83,17 +83,17 @@
'str' Name.Builtin
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
-' ' Text
+' ' Text.Whitespace
'""" My Function """' Literal.String.Doc
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'print' Name.Builtin
' ' Text
'str' Name.Builtin
-'\n' Text
+'\n' Text.Whitespace
'E OF' Text
'\n' Text.Whitespace
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_filename.html
index e0d2e2e0..c4ea04de 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
-<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
-<a href="#-3"><span class="linenos">3</span></a><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-3"><span class="linenos">3</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_nofilename.html
index 4ecfa2de..6c0f9a10 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
-<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
-<a href="#-3"><span class="linenos">3</span></a><span class="c1"># c</span>
+<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-3"><span class="linenos">3</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_filename.html
index bfa915ce..1f796a89 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
-<span class="linenos">2</span><span class="c1"># b</span>
-<span class="linenos">3</span><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos">1</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos">2</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">3</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_nofilename.html
index 9ad5369d..95d30042 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_0_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<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>
+<div class="highlight"><pre><span></span><span class="linenos">1</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos">2</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">3</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_filename.html
index 09a39e8e..e9cbe9ee 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
-<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
-<a href="#-3"><span class="linenos special">3</span></a><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-3"><span class="linenos special">3</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_nofilename.html
index be1416be..79bfde03 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span>
-<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
-<a href="#-3"><span class="linenos special">3</span></a><span class="c1"># c</span>
+<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos">1</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-3"><span class="linenos special">3</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_filename.html
index eb0e0327..93da355a 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos">1</span><span class="c1"># a</span>
-<span class="linenos">2</span><span class="c1"># b</span>
-<span class="linenos special">3</span><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos">1</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos">2</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos special">3</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_nofilename.html
index c984c909..f70b8172 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_1_special_3_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<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>
+<div class="highlight"><pre><span></span><span class="linenos">1</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos">2</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos special">3</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_filename.html
index 1d4de974..c2a91f48 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
-<a href="#-9"><span class="linenos"> 9</span></a><span class="c1"># b</span>
-<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-9"><span class="linenos"> 9</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_nofilename.html
index 8b34749b..35ceae2c 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
-<a href="#-9"><span class="linenos"> 9</span></a><span class="c1"># b</span>
-<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
+<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-9"><span class="linenos"> 9</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_filename.html
index 0335a402..5f3a11be 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
-<span class="linenos"> 9</span><span class="c1"># b</span>
-<span class="linenos">10</span><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos"> 9</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">10</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_nofilename.html
index dd9874a3..e660e157 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_0_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<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>
+<div class="highlight"><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos"> 9</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">10</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_filename.html
index 1821406a..b307129d 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
-<a href="#-9"><span class="linenos special"> 9</span></a><span class="c1"># b</span>
-<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-9"><span class="linenos special"> 9</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_nofilename.html
index b403949d..75917fe9 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
-<a href="#-9"><span class="linenos special"> 9</span></a><span class="c1"># b</span>
-<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
+<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-9"><span class="linenos special"> 9</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_filename.html
index ec4a0da5..97dc90ea 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
-<span class="linenos special"> 9</span><span class="c1"># b</span>
-<span class="linenos">10</span><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos special"> 9</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">10</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_nofilename.html
index dd74c642..e1d03c17 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_1_start_8_special_3_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<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>
+<div class="highlight"><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos special"> 9</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">10</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_filename.html
index 41aa7bef..7220109d 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
-<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
-<a href="#-3"><span class="linenos"> </span></a><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-3"><span class="linenos"> </span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_nofilename.html
index 27865ccd..920d697c 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
-<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
-<a href="#-3"><span class="linenos"> </span></a><span class="c1"># c</span>
+<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-3"><span class="linenos"> </span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_filename.html
index 7fa5d08b..cbbab53a 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
-<span class="linenos">2</span><span class="c1"># b</span>
-<span class="linenos"> </span><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> </span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos">2</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos"> </span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_nofilename.html
index b68a33e5..742fec57 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_0_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<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>
+<div class="highlight"><pre><span></span><span class="linenos"> </span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos">2</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos"> </span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_filename.html
index 22d07f10..c4296adf 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
-<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
-<a href="#-3"><span class="linenos special"> </span></a><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-3"><span class="linenos special"> </span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_nofilename.html
index 4cfdd4cf..6f0eeca8 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span>
-<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span>
-<a href="#-3"><span class="linenos special"> </span></a><span class="c1"># c</span>
+<div class="highlight"><pre><span></span><a href="#-1"><span class="linenos"> </span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-2"><span class="linenos">2</span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-3"><span class="linenos special"> </span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_filename.html
index 0e977e42..97ba9de3 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> </span><span class="c1"># a</span>
-<span class="linenos">2</span><span class="c1"># b</span>
-<span class="linenos special"> </span><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> </span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos">2</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos special"> </span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_nofilename.html
index 63450206..b7e76fb5 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_1_special_3_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<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>
+<div class="highlight"><pre><span></span><span class="linenos"> </span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos">2</span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos special"> </span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_filename.html
index 50b491ae..e78daf8a 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
-<a href="#-9"><span class="linenos"> </span></a><span class="c1"># b</span>
-<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-9"><span class="linenos"> </span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_nofilename.html
index 561d47fa..6f77ec7b 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
-<a href="#-9"><span class="linenos"> </span></a><span class="c1"># b</span>
-<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
+<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-9"><span class="linenos"> </span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_filename.html
index fd7c0f08..f97f52c6 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
-<span class="linenos"> </span><span class="c1"># b</span>
-<span class="linenos">10</span><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos"> </span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">10</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_nofilename.html
index 12276e88..1a175b85 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_0_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<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>
+<div class="highlight"><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos"> </span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">10</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_filename.html
index 38662f9a..53ca9c6d 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
-<a href="#-9"><span class="linenos special"> </span></a><span class="c1"># b</span>
-<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-9"><span class="linenos special"> </span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_nofilename.html
index a07dfcc1..dbeb5b89 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span>
-<a href="#-9"><span class="linenos special"> </span></a><span class="c1"># b</span>
-<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span>
+<div class="highlight"><pre><span></span><a href="#-8"><span class="linenos"> 8</span></a><span class="c1"># a</span><span class="w"></span>
+<a href="#-9"><span class="linenos special"> </span></a><span class="c1"># b</span><span class="w"></span>
+<a href="#-10"><span class="linenos">10</span></a><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_filename.html
index 56bca93b..f2a20aa7 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span>
-<span class="linenos special"> </span><span class="c1"># b</span>
-<span class="linenos">10</span><span class="c1"># c</span>
+<div class="highlight"><span class="filename">testfilename</span><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos special"> </span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">10</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_nofilename.html
index 71548a13..09f0c170 100644
--- a/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_cls_step_2_start_8_special_3_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<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>
+<div class="highlight"><pre><span></span><span class="linenos"> 8</span><span class="c1"># a</span><span class="w"></span>
+<span class="linenos special"> </span><span class="c1"># b</span><span class="w"></span>
+<span class="linenos">10</span><span class="c1"># c</span><span class="w"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_filename.html
index d9eeca56..6ec55bd5 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_nofilename.html
index 0913e4f3..4cc90ab2 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_filename.html
index 31525d42..3dd0b311 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_nofilename.html
index e1722cf3..549b33b7 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_filename.html
index ee18c21b..a49d4cbe 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_nofilename.html
index 628a1df1..991eaae1 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_filename.html
index 633c3d54..25880bff 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_nofilename.html
index 2c705ada..57a3ec6e 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_filename.html
index 9c91cf47..5ce7a045 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_nofilename.html
index d39cb2c5..4251a897 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_filename.html
index d3e48180..6c74b97f 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_nofilename.html
index 12336741..cfe51df6 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_filename.html
index ef26126f..54160f7c 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_nofilename.html
index 8a641490..5220ad49 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_filename.html
index 3f08277b..901e57c2 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_nofilename.html
index f5ac0bce..2d36a1f5 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_filename.html
index 31533045..7ffa7a1d 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_nofilename.html
index 47c4a130..87af1a34 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-3"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_filename.html
index 28ab99cb..c9a8dbc5 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_nofilename.html
index eb6e8475..584b3fab 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_filename.html
index ec9d56f4..605d949c 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_nofilename.html
index 3121cd03..6dfe4dd9 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-1"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-2"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-3"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_filename.html
index c4c4c574..55c08312 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_nofilename.html
index f003b150..4cd4bd7c 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_filename.html
index 26a2dd4e..53161540 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_nofilename.html
index bb1be91f..55b9d1dd 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-9"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_filename.html
index c8c440d4..539c6e35 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_nofilename.html
index 9af57531..aef929c9 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_filename.html
index 76a4047f..113abb9e 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_nofilename.html
index aeb6b104..b8bd0f8d 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span>
-<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># b</span>
-<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><a href="#-8"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span></a><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<a href="#-9"><span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></a><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<a href="#-10"><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></a><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_filename.html
index cb5b02b5..880966d4 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_filename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><span class="filename">testfilename</span><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_nofilename.html
index 5e472a1f..8ce39f6a 100644
--- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor_nofilename.html
@@ -1,4 +1,4 @@
-<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span>
+<div class="highlight" style="background: #f8f8f8"><pre style="line-height: 125%;"><span></span><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span><span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span><span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_filename.html
index 861165cd..54164ac7 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
<span class="normal"><a href="#-2">2</a></span>
-<span class="normal"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_nofilename.html
index af31392b..2916648c 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
<span class="normal"><a href="#-2">2</a></span>
-<span class="normal"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_filename.html
index a27ddbae..a29dc51e 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
<span class="normal">2</span>
-<span class="normal">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_nofilename.html
index b3044e7b..89ddd27d 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_0_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
<span class="normal">2</span>
-<span class="normal">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_filename.html
index ee74013e..38f6b8da 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
<span class="normal"><a href="#-2">2</a></span>
-<span class="special"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="special"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_nofilename.html
index a4a3f8e6..5a381440 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-1">1</a></span>
<span class="normal"><a href="#-2">2</a></span>
-<span class="special"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="special"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_filename.html
index f9107825..c257319a 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
<span class="normal">2</span>
-<span class="special">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="special">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_nofilename.html
index e79e4368..8103b6b5 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_1_special_3_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal">1</span>
<span class="normal">2</span>
-<span class="special">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="special">3</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_filename.html
index 1a396a7f..0d18f4c7 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
<span class="normal"><a href="#-9"> 9</a></span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_nofilename.html
index 04f76cb1..f2fa1603 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
<span class="normal"><a href="#-9"> 9</a></span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_filename.html
index 99675f07..3b409f47 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
<span class="normal"> 9</span>
-<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_nofilename.html
index 1d69eaf3..45bdbc39 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_0_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
<span class="normal"> 9</span>
-<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_filename.html
index 9a47c603..0aa446be 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
<span class="special"><a href="#-9"> 9</a></span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_nofilename.html
index 03285e99..2a189922 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
<span class="special"><a href="#-9"> 9</a></span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_filename.html
index 0205691b..43253707 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
<span class="special"> 9</span>
-<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_nofilename.html
index b94db013..b2817889 100644
--- a/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_1_start_8_special_3_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
<span class="special"> 9</span>
-<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_filename.html
index bd13be4f..0ecb6696 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
<span class="normal"><a href="#-2">2</a></span>
-<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_nofilename.html
index fcacc18c..5013b836 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
<span class="normal"><a href="#-2">2</a></span>
-<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_filename.html
index 4a418e6e..6cc91a9b 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
<span class="normal">2</span>
-<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_nofilename.html
index 7128962d..043f1b06 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_0_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
<span class="normal">2</span>
-<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_filename.html
index 60cab0e8..e4772d6a 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
<span class="normal"><a href="#-2">2</a></span>
-<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_nofilename.html
index 848e666c..f83b2274 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
<span class="normal"><a href="#-2">2</a></span>
-<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_filename.html
index a690bd08..01540d7f 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
<span class="normal">2</span>
-<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_nofilename.html
index 31ceb56b..542f5161 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_1_special_3_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> </span>
<span class="normal">2</span>
-<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="special"> </span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_filename.html
index 3a750e9b..99665306 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
<span class="normal"> </span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_nofilename.html
index 68375638..72157599 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
<span class="normal"> </span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_filename.html
index bc0a078c..3c7ec394 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
<span class="normal"> </span>
-<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_nofilename.html
index a8125e8d..1fbbdaa4 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_0_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
<span class="normal"> </span>
-<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_filename.html
index 36a8e5f3..9f31c2f8 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
<span class="special"> </span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_nofilename.html
index 200fffef..67b1e29a 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#-8"> 8</a></span>
<span class="special"> </span>
-<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_filename.html
index f9efd122..00a83f05 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
<span class="special"> </span>
-<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_nofilename.html
index 2d9d86ea..53b7c825 100644
--- a/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_cls_step_2_start_8_special_3_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"> 8</span>
<span class="special"> </span>
-<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span>
-<span class="c1"># b</span>
-<span class="c1"># c</span>
+<span class="normal">10</span></pre></div></td><td class="code"><div><pre><span></span><span class="c1"># a</span><span class="w"></span>
+<span class="c1"># b</span><span class="w"></span>
+<span class="c1"># c</span><span class="w"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_filename.html
index 1cdc6bb5..96c21ca7 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_nofilename.html
index 6bad0df2..28951077 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_filename.html
index ffd88d40..447ddd42 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_nofilename.html
index 62c5a6ed..95828809 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_filename.html
index e719f8e4..6908daaf 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_nofilename.html
index e07cebe5..1dc7822e 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-1">1</a></span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-3">3</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_filename.html
index fbb6cde3..40e8b489 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_nofilename.html
index ce4bfa89..35268e99 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;">3</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_filename.html
index 3402b4c5..337c065e 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_nofilename.html
index 2eb3396c..2058a8a2 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_filename.html
index 51b2dba4..9a20c227 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_nofilename.html
index 91f66e15..83861cd6 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 9</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_filename.html
index 7e5aadf9..ecf4c6c3 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_nofilename.html
index b10fdcac..f8002a50 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"><a href="#-9"> 9</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_filename.html
index 8067f7e5..6343ebac 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_nofilename.html
index f3fde8b6..733761c5 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> 9</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_filename.html
index 8be13f0a..c4ac6dd5 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_nofilename.html
index f72b3260..9d67aeaa 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_filename.html
index 512db3bf..e671e75d 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_nofilename.html
index 26d6723f..37bc8f84 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_filename.html
index 0270512d..3a618273 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_nofilename.html
index d6f4d3ca..7cf9180a 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-2">2</a></span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_filename.html
index 1f6dc86a..6226a9c6 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_nofilename.html
index c606d01a..93d0da3e 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span>
-<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_filename.html
index b90f2b05..5524ae3b 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_nofilename.html
index 926dd8cb..b87ca8b1 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_filename.html
index 16232951..25370e7b 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_nofilename.html
index 0252dce5..1e80d78f 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_filename.html
index 791f6403..a642733d 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_nofilename.html
index bbc20f6d..ce3e2dec 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-8"> 8</a></span>
<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"><a href="#-10">10</a></span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_filename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_filename.html
index 5c04be38..3778e906 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_filename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_filename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><th class="filename" colspan="2"><span class="filename">testfilename</span></th></tr><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_nofilename.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_nofilename.html
index fc75b66d..05ffbdcc 100644
--- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_nofilename.html
+++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor_nofilename.html
@@ -1,6 +1,6 @@
<div class="highlight" style="background: #f8f8f8"><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;"> 8</span>
<span style="color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px;"> </span>
-<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span>
-<span style="color: #3D7B7B; font-style: italic"># b</span>
-<span style="color: #3D7B7B; font-style: italic"># c</span>
+<span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">10</span></pre></div></td><td class="code"><div><pre style="line-height: 125%;"><span></span><span style="color: #3D7B7B; font-style: italic"># a</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># b</span><span style="color: #bbbbbb"></span>
+<span style="color: #3D7B7B; font-style: italic"># c</span><span style="color: #bbbbbb"></span>
</pre></div></td></tr></table></div>
diff --git a/tests/snippets/md/test_code_block_with_language.txt b/tests/snippets/md/test_code_block_with_language.txt
index 088ae26c..41f2563f 100644
--- a/tests/snippets/md/test_code_block_with_language.txt
+++ b/tests/snippets/md/test_code_block_with_language.txt
@@ -11,6 +11,6 @@ import this
'import' Keyword.Namespace
' ' Text
'this' Name.Namespace
-'\n' Text
+'\n' Text.Whitespace
'```\n' Literal.String.Backtick
diff --git a/tests/snippets/python/test_bytes_escape_codes.txt b/tests/snippets/python/test_bytes_escape_codes.txt
index 19948d7e..c1a34437 100644
--- a/tests/snippets/python/test_bytes_escape_codes.txt
+++ b/tests/snippets/python/test_bytes_escape_codes.txt
@@ -21,4 +21,4 @@ b'\\ \n \x12 \777 \u1234 \U00010348 \N{Plus-Minus Sign}'
'{' Literal.String.Single
'Plus-Minus Sign}' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_floats.txt b/tests/snippets/python/test_floats.txt
index 20bb1d79..3ae9dc96 100644
--- a/tests/snippets/python/test_floats.txt
+++ b/tests/snippets/python/test_floats.txt
@@ -72,4 +72,4 @@
' ' Text
'5.67' Literal.Number.Float
'_' Name
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_01a.txt b/tests/snippets/python/test_fstring_01a.txt
index 406e2cc8..a3b29a35 100644
--- a/tests/snippets/python/test_fstring_01a.txt
+++ b/tests/snippets/python/test_fstring_01a.txt
@@ -22,4 +22,4 @@ f'My name is {name}, my age next year is {age+1}, my anniversary is {anniversary
'}' Literal.String.Interpol
'.' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_01b.txt b/tests/snippets/python/test_fstring_01b.txt
index 278258e2..0d2c3437 100644
--- a/tests/snippets/python/test_fstring_01b.txt
+++ b/tests/snippets/python/test_fstring_01b.txt
@@ -22,4 +22,4 @@ f"My name is {name}, my age next year is {age+1}, my anniversary is {anniversary
'}' Literal.String.Interpol
'.' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_02a.txt b/tests/snippets/python/test_fstring_02a.txt
index 359c13be..cfd41a97 100644
--- a/tests/snippets/python/test_fstring_02a.txt
+++ b/tests/snippets/python/test_fstring_02a.txt
@@ -10,4 +10,4 @@ f'He said his name is {name!r}.'
'!r}' Literal.String.Interpol
'.' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_02b.txt b/tests/snippets/python/test_fstring_02b.txt
index abef1600..c72a77b8 100644
--- a/tests/snippets/python/test_fstring_02b.txt
+++ b/tests/snippets/python/test_fstring_02b.txt
@@ -10,4 +10,4 @@ f"He said his name is {name!r}."
'!r}' Literal.String.Interpol
'.' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_03a.txt b/tests/snippets/python/test_fstring_03a.txt
index 3edee4cf..366e4951 100644
--- a/tests/snippets/python/test_fstring_03a.txt
+++ b/tests/snippets/python/test_fstring_03a.txt
@@ -11,4 +11,4 @@ f'input={value:#06x}'
'#06x' Literal.String.Single
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_03b.txt b/tests/snippets/python/test_fstring_03b.txt
index f7723898..260e56d1 100644
--- a/tests/snippets/python/test_fstring_03b.txt
+++ b/tests/snippets/python/test_fstring_03b.txt
@@ -11,4 +11,4 @@ f"input={value:#06x}"
'#06x' Literal.String.Double
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_04a.txt b/tests/snippets/python/test_fstring_04a.txt
index 85619ab8..58516c91 100644
--- a/tests/snippets/python/test_fstring_04a.txt
+++ b/tests/snippets/python/test_fstring_04a.txt
@@ -10,4 +10,4 @@ f'{"quoted string"}'
'"' Literal.String.Double
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_04b.txt b/tests/snippets/python/test_fstring_04b.txt
index bd6308c2..40e1ea08 100644
--- a/tests/snippets/python/test_fstring_04b.txt
+++ b/tests/snippets/python/test_fstring_04b.txt
@@ -10,4 +10,4 @@ f"{'quoted string'}"
"'" Literal.String.Single
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_05a.txt b/tests/snippets/python/test_fstring_05a.txt
index 18074571..77a5c10a 100644
--- a/tests/snippets/python/test_fstring_05a.txt
+++ b/tests/snippets/python/test_fstring_05a.txt
@@ -13,4 +13,4 @@ f'{f"{inner}"}'
'"' Literal.String.Double
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_05b.txt b/tests/snippets/python/test_fstring_05b.txt
index b0f3ebd8..9a0dc5af 100644
--- a/tests/snippets/python/test_fstring_05b.txt
+++ b/tests/snippets/python/test_fstring_05b.txt
@@ -13,4 +13,4 @@ f"{f'{inner}'}"
"'" Literal.String.Single
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_06a.txt b/tests/snippets/python/test_fstring_06a.txt
index 0ba0809a..b8b33c0a 100644
--- a/tests/snippets/python/test_fstring_06a.txt
+++ b/tests/snippets/python/test_fstring_06a.txt
@@ -13,4 +13,4 @@ f'{\'quoted string\'}'
"\\'" Literal.String.Escape
'}' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_06b.txt b/tests/snippets/python/test_fstring_06b.txt
index f98b3dc2..0712321b 100644
--- a/tests/snippets/python/test_fstring_06b.txt
+++ b/tests/snippets/python/test_fstring_06b.txt
@@ -13,4 +13,4 @@ f"{\"quoted string\"}"
'\\"' Literal.String.Escape
'}' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_07a.txt b/tests/snippets/python/test_fstring_07a.txt
index 63942200..c597ea97 100644
--- a/tests/snippets/python/test_fstring_07a.txt
+++ b/tests/snippets/python/test_fstring_07a.txt
@@ -14,4 +14,4 @@ f'{{ {4*10} }}'
' ' Literal.String.Single
'}}' Literal.String.Escape
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_07b.txt b/tests/snippets/python/test_fstring_07b.txt
index c7e87bc7..413c1585 100644
--- a/tests/snippets/python/test_fstring_07b.txt
+++ b/tests/snippets/python/test_fstring_07b.txt
@@ -14,4 +14,4 @@ f"{{ {4*10} }}"
' ' Literal.String.Double
'}}' Literal.String.Escape
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_08a.txt b/tests/snippets/python/test_fstring_08a.txt
index 61b6cc8f..39dd887b 100644
--- a/tests/snippets/python/test_fstring_08a.txt
+++ b/tests/snippets/python/test_fstring_08a.txt
@@ -12,4 +12,4 @@ f'{{{4*10}}}'
'}' Literal.String.Interpol
'}}' Literal.String.Escape
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_08b.txt b/tests/snippets/python/test_fstring_08b.txt
index 41eb13a4..458c6978 100644
--- a/tests/snippets/python/test_fstring_08b.txt
+++ b/tests/snippets/python/test_fstring_08b.txt
@@ -12,4 +12,4 @@ f"{{{4*10}}}"
'}' Literal.String.Interpol
'}}' Literal.String.Escape
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_09a.txt b/tests/snippets/python/test_fstring_09a.txt
index 3dcec51e..00f3e7f1 100644
--- a/tests/snippets/python/test_fstring_09a.txt
+++ b/tests/snippets/python/test_fstring_09a.txt
@@ -11,4 +11,4 @@ fr'x={4*10}'
'10' Literal.Number.Integer
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_09b.txt b/tests/snippets/python/test_fstring_09b.txt
index 72932b29..01d74e95 100644
--- a/tests/snippets/python/test_fstring_09b.txt
+++ b/tests/snippets/python/test_fstring_09b.txt
@@ -11,4 +11,4 @@ fr"x={4*10}"
'10' Literal.Number.Integer
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_10a.txt b/tests/snippets/python/test_fstring_10a.txt
index 02fba2b4..a2e11ba2 100644
--- a/tests/snippets/python/test_fstring_10a.txt
+++ b/tests/snippets/python/test_fstring_10a.txt
@@ -15,4 +15,4 @@ f'abc {a["x"]} def'
'}' Literal.String.Interpol
' def' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_10b.txt b/tests/snippets/python/test_fstring_10b.txt
index 46150935..21d116c7 100644
--- a/tests/snippets/python/test_fstring_10b.txt
+++ b/tests/snippets/python/test_fstring_10b.txt
@@ -15,4 +15,4 @@ f"abc {a['x']} def"
'}' Literal.String.Interpol
' def' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_11a.txt b/tests/snippets/python/test_fstring_11a.txt
index 6116c960..ce20e7b8 100644
--- a/tests/snippets/python/test_fstring_11a.txt
+++ b/tests/snippets/python/test_fstring_11a.txt
@@ -15,4 +15,4 @@ f'''abc {a['x']} def'''
'}' Literal.String.Interpol
' def' Literal.String.Single
"'''" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_11b.txt b/tests/snippets/python/test_fstring_11b.txt
index 77c3d6f8..baf13701 100644
--- a/tests/snippets/python/test_fstring_11b.txt
+++ b/tests/snippets/python/test_fstring_11b.txt
@@ -15,4 +15,4 @@ f"""abc {a["x"]} def"""
'}' Literal.String.Interpol
' def' Literal.String.Double
'"""' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_12a.txt b/tests/snippets/python/test_fstring_12a.txt
index cc8eeab4..99888040 100644
--- a/tests/snippets/python/test_fstring_12a.txt
+++ b/tests/snippets/python/test_fstring_12a.txt
@@ -7,10 +7,10 @@ f'''{x
"'''" Literal.String.Single
'{' Literal.String.Interpol
'x' Name
-'\n' Text
+'\n' Text.Whitespace
'+' Operator
'1' Literal.Number.Integer
'}' Literal.String.Interpol
"'''" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_12b.txt b/tests/snippets/python/test_fstring_12b.txt
index 160b2d91..878b7a0b 100644
--- a/tests/snippets/python/test_fstring_12b.txt
+++ b/tests/snippets/python/test_fstring_12b.txt
@@ -7,10 +7,10 @@ f"""{x
'"""' Literal.String.Double
'{' Literal.String.Interpol
'x' Name
-'\n' Text
+'\n' Text.Whitespace
'+' Operator
'1' Literal.Number.Integer
'}' Literal.String.Interpol
'"""' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_13a.txt b/tests/snippets/python/test_fstring_13a.txt
index b556a5b6..e6e97e86 100644
--- a/tests/snippets/python/test_fstring_13a.txt
+++ b/tests/snippets/python/test_fstring_13a.txt
@@ -9,9 +9,9 @@ f'''{d[0
'd' Name
'[' Punctuation
'0' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
']' Punctuation
'}' Literal.String.Interpol
"'''" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_13b.txt b/tests/snippets/python/test_fstring_13b.txt
index 1e9fd60d..0a3aa56d 100644
--- a/tests/snippets/python/test_fstring_13b.txt
+++ b/tests/snippets/python/test_fstring_13b.txt
@@ -9,9 +9,9 @@ f"""{d[0
'd' Name
'[' Punctuation
'0' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
']' Punctuation
'}' Literal.String.Interpol
'"""' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_14a.txt b/tests/snippets/python/test_fstring_14a.txt
index de202a21..a826835b 100644
--- a/tests/snippets/python/test_fstring_14a.txt
+++ b/tests/snippets/python/test_fstring_14a.txt
@@ -17,4 +17,4 @@ f'result: {value:{width}.{precision}}'
'}' Literal.String.Interpol
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_14b.txt b/tests/snippets/python/test_fstring_14b.txt
index 83aaad5e..31008833 100644
--- a/tests/snippets/python/test_fstring_14b.txt
+++ b/tests/snippets/python/test_fstring_14b.txt
@@ -17,4 +17,4 @@ f"result: {value:{width}.{precision}}"
'}' Literal.String.Interpol
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_15a.txt b/tests/snippets/python/test_fstring_15a.txt
index 635e8791..f8f62b82 100644
--- a/tests/snippets/python/test_fstring_15a.txt
+++ b/tests/snippets/python/test_fstring_15a.txt
@@ -39,4 +39,4 @@
"'" Literal.String.Single
'e' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_15b.txt b/tests/snippets/python/test_fstring_15b.txt
index 1a1ab251..7b5307c1 100644
--- a/tests/snippets/python/test_fstring_15b.txt
+++ b/tests/snippets/python/test_fstring_15b.txt
@@ -39,4 +39,4 @@
'"' Literal.String.Double
'e' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_16a.txt b/tests/snippets/python/test_fstring_16a.txt
index cbd4d14b..15b11e83 100644
--- a/tests/snippets/python/test_fstring_16a.txt
+++ b/tests/snippets/python/test_fstring_16a.txt
@@ -15,4 +15,4 @@ f'{i}:{d[i]}'
']' Punctuation
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_16b.txt b/tests/snippets/python/test_fstring_16b.txt
index 8ce173f0..e917516f 100644
--- a/tests/snippets/python/test_fstring_16b.txt
+++ b/tests/snippets/python/test_fstring_16b.txt
@@ -15,4 +15,4 @@ f"{i}:{d[i]}"
']' Punctuation
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_17a.txt b/tests/snippets/python/test_fstring_17a.txt
index a1b5b3a5..9eefd918 100644
--- a/tests/snippets/python/test_fstring_17a.txt
+++ b/tests/snippets/python/test_fstring_17a.txt
@@ -11,4 +11,4 @@ f'x = {x:+3}'
'+3' Literal.String.Single
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_17b.txt b/tests/snippets/python/test_fstring_17b.txt
index 5f34b174..2d264814 100644
--- a/tests/snippets/python/test_fstring_17b.txt
+++ b/tests/snippets/python/test_fstring_17b.txt
@@ -11,4 +11,4 @@ f"x = {x:+3}"
'+3' Literal.String.Double
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_18a.txt b/tests/snippets/python/test_fstring_18a.txt
index 60d05123..5455db73 100644
--- a/tests/snippets/python/test_fstring_18a.txt
+++ b/tests/snippets/python/test_fstring_18a.txt
@@ -22,4 +22,4 @@ f'{fn(lst,2)} {fn(lst,3)}'
')' Punctuation
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_18b.txt b/tests/snippets/python/test_fstring_18b.txt
index a189d00a..356cc3c7 100644
--- a/tests/snippets/python/test_fstring_18b.txt
+++ b/tests/snippets/python/test_fstring_18b.txt
@@ -22,4 +22,4 @@ f"{fn(lst,2)} {fn(lst,3)}"
')' Punctuation
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_19a.txt b/tests/snippets/python/test_fstring_19a.txt
index 6e412a38..7e7cde0d 100644
--- a/tests/snippets/python/test_fstring_19a.txt
+++ b/tests/snippets/python/test_fstring_19a.txt
@@ -6,41 +6,41 @@ f'mapping is { {a:b for (a, b) in ((1, 2), (3, 4))} }'
"'" Literal.String.Single
'mapping is ' Literal.String.Single
'{' Literal.String.Interpol
-' ' Text
+' ' Text.Whitespace
'{' Punctuation
'a' Name
':' Punctuation
'b' Name
-' ' Text
+' ' Text.Whitespace
'for' Keyword
-' ' Text
+' ' Text.Whitespace
'(' Punctuation
'a' Name
',' Punctuation
-' ' Text
+' ' Text.Whitespace
'b' Name
')' Punctuation
-' ' Text
+' ' Text.Whitespace
'in' Operator.Word
-' ' Text
+' ' Text.Whitespace
'(' Punctuation
'(' Punctuation
'1' Literal.Number.Integer
',' Punctuation
-' ' Text
+' ' Text.Whitespace
'2' Literal.Number.Integer
')' Punctuation
',' Punctuation
-' ' Text
+' ' Text.Whitespace
'(' Punctuation
'3' Literal.Number.Integer
',' Punctuation
-' ' Text
+' ' Text.Whitespace
'4' Literal.Number.Integer
')' Punctuation
')' Punctuation
'}' Punctuation
-' ' Text
+' ' Text.Whitespace
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_19b.txt b/tests/snippets/python/test_fstring_19b.txt
index 5c9d6f73..3ae438a0 100644
--- a/tests/snippets/python/test_fstring_19b.txt
+++ b/tests/snippets/python/test_fstring_19b.txt
@@ -6,41 +6,41 @@ f"mapping is { {a:b for (a, b) in ((1, 2), (3, 4))} }"
'"' Literal.String.Double
'mapping is ' Literal.String.Double
'{' Literal.String.Interpol
-' ' Text
+' ' Text.Whitespace
'{' Punctuation
'a' Name
':' Punctuation
'b' Name
-' ' Text
+' ' Text.Whitespace
'for' Keyword
-' ' Text
+' ' Text.Whitespace
'(' Punctuation
'a' Name
',' Punctuation
-' ' Text
+' ' Text.Whitespace
'b' Name
')' Punctuation
-' ' Text
+' ' Text.Whitespace
'in' Operator.Word
-' ' Text
+' ' Text.Whitespace
'(' Punctuation
'(' Punctuation
'1' Literal.Number.Integer
',' Punctuation
-' ' Text
+' ' Text.Whitespace
'2' Literal.Number.Integer
')' Punctuation
',' Punctuation
-' ' Text
+' ' Text.Whitespace
'(' Punctuation
'3' Literal.Number.Integer
',' Punctuation
-' ' Text
+' ' Text.Whitespace
'4' Literal.Number.Integer
')' Punctuation
')' Punctuation
'}' Punctuation
-' ' Text
+' ' Text.Whitespace
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_20a.txt b/tests/snippets/python/test_fstring_20a.txt
index a72a7a44..206e436f 100644
--- a/tests/snippets/python/test_fstring_20a.txt
+++ b/tests/snippets/python/test_fstring_20a.txt
@@ -14,4 +14,4 @@ f'a={d["a"]}'
']' Punctuation
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_20b.txt b/tests/snippets/python/test_fstring_20b.txt
index 556f7de8..fb3acc4f 100644
--- a/tests/snippets/python/test_fstring_20b.txt
+++ b/tests/snippets/python/test_fstring_20b.txt
@@ -14,4 +14,4 @@ f"a={d['a']}"
']' Punctuation
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_21a.txt b/tests/snippets/python/test_fstring_21a.txt
index 1a591003..0107431d 100644
--- a/tests/snippets/python/test_fstring_21a.txt
+++ b/tests/snippets/python/test_fstring_21a.txt
@@ -12,4 +12,4 @@ f'a={d[a]}'
']' Punctuation
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_21b.txt b/tests/snippets/python/test_fstring_21b.txt
index 7e3ed08a..f659d542 100644
--- a/tests/snippets/python/test_fstring_21b.txt
+++ b/tests/snippets/python/test_fstring_21b.txt
@@ -12,4 +12,4 @@ f"a={d[a]}"
']' Punctuation
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_22a.txt b/tests/snippets/python/test_fstring_22a.txt
index 6a3b792f..a1066e92 100644
--- a/tests/snippets/python/test_fstring_22a.txt
+++ b/tests/snippets/python/test_fstring_22a.txt
@@ -11,4 +11,4 @@ fr'{header}:\s+'
'\\' Literal.String.Single
's+' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_22b.txt b/tests/snippets/python/test_fstring_22b.txt
index 75a08aac..79cb6b42 100644
--- a/tests/snippets/python/test_fstring_22b.txt
+++ b/tests/snippets/python/test_fstring_22b.txt
@@ -11,4 +11,4 @@ fr"{header}:\s+"
'\\' Literal.String.Double
's+' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_23a.txt b/tests/snippets/python/test_fstring_23a.txt
index ae944ed2..ef5cbd43 100644
--- a/tests/snippets/python/test_fstring_23a.txt
+++ b/tests/snippets/python/test_fstring_23a.txt
@@ -8,4 +8,4 @@ f'{a!r}'
'a' Name
'!r}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_23b.txt b/tests/snippets/python/test_fstring_23b.txt
index 8038c8b4..572fe04d 100644
--- a/tests/snippets/python/test_fstring_23b.txt
+++ b/tests/snippets/python/test_fstring_23b.txt
@@ -8,4 +8,4 @@ f"{a!r}"
'a' Name
'!r}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_24a.txt b/tests/snippets/python/test_fstring_24a.txt
index 9dd1e94e..d45385b8 100644
--- a/tests/snippets/python/test_fstring_24a.txt
+++ b/tests/snippets/python/test_fstring_24a.txt
@@ -7,10 +7,10 @@ f'{(lambda x: x*2)(3)}'
'{' Literal.String.Interpol
'(' Punctuation
'lambda' Keyword
-' ' Text
+' ' Text.Whitespace
'x' Name
':' Punctuation
-' ' Text
+' ' Text.Whitespace
'x' Name
'*' Operator
'2' Literal.Number.Integer
@@ -20,4 +20,4 @@ f'{(lambda x: x*2)(3)}'
')' Punctuation
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_24b.txt b/tests/snippets/python/test_fstring_24b.txt
index 0ef51a52..5e83b19e 100644
--- a/tests/snippets/python/test_fstring_24b.txt
+++ b/tests/snippets/python/test_fstring_24b.txt
@@ -7,10 +7,10 @@ f"{(lambda x: x*2)(3)}"
'{' Literal.String.Interpol
'(' Punctuation
'lambda' Keyword
-' ' Text
+' ' Text.Whitespace
'x' Name
':' Punctuation
-' ' Text
+' ' Text.Whitespace
'x' Name
'*' Operator
'2' Literal.Number.Integer
@@ -20,4 +20,4 @@ f"{(lambda x: x*2)(3)}"
')' Punctuation
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_25a.txt b/tests/snippets/python/test_fstring_25a.txt
index e42453e5..470db36d 100644
--- a/tests/snippets/python/test_fstring_25a.txt
+++ b/tests/snippets/python/test_fstring_25a.txt
@@ -21,4 +21,4 @@ extra = f'{extra},waiters:{len(self._waiters)}'
')' Punctuation
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_25b.txt b/tests/snippets/python/test_fstring_25b.txt
index 2ba4b721..94893e51 100644
--- a/tests/snippets/python/test_fstring_25b.txt
+++ b/tests/snippets/python/test_fstring_25b.txt
@@ -21,4 +21,4 @@ extra = f"{extra},waiters:{len(self._waiters)}"
')' Punctuation
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_26a.txt b/tests/snippets/python/test_fstring_26a.txt
index c644d447..01a231d3 100644
--- a/tests/snippets/python/test_fstring_26a.txt
+++ b/tests/snippets/python/test_fstring_26a.txt
@@ -17,4 +17,4 @@ message.append(f" [line {lineno:2d}]")
']' Literal.String.Double
'"' Literal.String.Double
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_26b.txt b/tests/snippets/python/test_fstring_26b.txt
index 73964104..a8131499 100644
--- a/tests/snippets/python/test_fstring_26b.txt
+++ b/tests/snippets/python/test_fstring_26b.txt
@@ -17,4 +17,4 @@ message.append(f' [line {lineno:2d}]')
']' Literal.String.Single
"'" Literal.String.Single
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_27a.txt b/tests/snippets/python/test_fstring_27a.txt
index cd8bdbe2..75af0c10 100644
--- a/tests/snippets/python/test_fstring_27a.txt
+++ b/tests/snippets/python/test_fstring_27a.txt
@@ -8,4 +8,4 @@ f"{foo=}"
'foo' Name
'=}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_27b.txt b/tests/snippets/python/test_fstring_27b.txt
index 7773ab30..71e6e510 100644
--- a/tests/snippets/python/test_fstring_27b.txt
+++ b/tests/snippets/python/test_fstring_27b.txt
@@ -8,4 +8,4 @@ f'{foo=}'
'foo' Name
'=}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_28a.txt b/tests/snippets/python/test_fstring_28a.txt
index 6aca3216..cdc65db2 100644
--- a/tests/snippets/python/test_fstring_28a.txt
+++ b/tests/snippets/python/test_fstring_28a.txt
@@ -8,4 +8,4 @@ f'{foo=!s}'
'foo' Name
'=!s}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_28b.txt b/tests/snippets/python/test_fstring_28b.txt
index 14183eba..99cf4f30 100644
--- a/tests/snippets/python/test_fstring_28b.txt
+++ b/tests/snippets/python/test_fstring_28b.txt
@@ -8,4 +8,4 @@ f"{foo=!s}"
'foo' Name
'=!s}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_29a.txt b/tests/snippets/python/test_fstring_29a.txt
index 81715064..2100b3b8 100644
--- a/tests/snippets/python/test_fstring_29a.txt
+++ b/tests/snippets/python/test_fstring_29a.txt
@@ -12,4 +12,4 @@ f"{math.pi=!f:.2f}"
'.2f' Literal.String.Double
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_29b.txt b/tests/snippets/python/test_fstring_29b.txt
index de5b5083..4cc18dd0 100644
--- a/tests/snippets/python/test_fstring_29b.txt
+++ b/tests/snippets/python/test_fstring_29b.txt
@@ -12,4 +12,4 @@ f'{math.pi=!f:.2f}'
'.2f' Literal.String.Single
'}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_30a.txt b/tests/snippets/python/test_fstring_30a.txt
index f295cfe4..3db443e1 100644
--- a/tests/snippets/python/test_fstring_30a.txt
+++ b/tests/snippets/python/test_fstring_30a.txt
@@ -5,12 +5,12 @@ f"{ chr(65) =}"
'f' Literal.String.Affix
'"' Literal.String.Double
'{' Literal.String.Interpol
-' ' Text
+' ' Text.Whitespace
'chr' Name.Builtin
'(' Punctuation
'65' Literal.Number.Integer
')' Punctuation
-' ' Text
+' ' Text.Whitespace
'=}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_30b.txt b/tests/snippets/python/test_fstring_30b.txt
index 10a2af8e..5f082e53 100644
--- a/tests/snippets/python/test_fstring_30b.txt
+++ b/tests/snippets/python/test_fstring_30b.txt
@@ -5,12 +5,12 @@ f'{ chr(65) =}'
'f' Literal.String.Affix
"'" Literal.String.Single
'{' Literal.String.Interpol
-' ' Text
+' ' Text.Whitespace
'chr' Name.Builtin
'(' Punctuation
'65' Literal.Number.Integer
')' Punctuation
-' ' Text
+' ' Text.Whitespace
'=}' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_31a.txt b/tests/snippets/python/test_fstring_31a.txt
index eac01679..3e9c091a 100644
--- a/tests/snippets/python/test_fstring_31a.txt
+++ b/tests/snippets/python/test_fstring_31a.txt
@@ -9,7 +9,7 @@ f"{chr(65) = }"
'(' Punctuation
'65' Literal.Number.Integer
')' Punctuation
-' ' Text
+' ' Text.Whitespace
'= }' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_31b.txt b/tests/snippets/python/test_fstring_31b.txt
index 40702daa..37adb3ef 100644
--- a/tests/snippets/python/test_fstring_31b.txt
+++ b/tests/snippets/python/test_fstring_31b.txt
@@ -9,7 +9,7 @@ f'{chr(65) = }'
'(' Punctuation
'65' Literal.Number.Integer
')' Punctuation
-' ' Text
+' ' Text.Whitespace
'= }' Literal.String.Interpol
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_32a.txt b/tests/snippets/python/test_fstring_32a.txt
index 666134c6..dcfc39d1 100644
--- a/tests/snippets/python/test_fstring_32a.txt
+++ b/tests/snippets/python/test_fstring_32a.txt
@@ -12,4 +12,4 @@ f'*{n=:30}*'
'}' Literal.String.Interpol
'*' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_32b.txt b/tests/snippets/python/test_fstring_32b.txt
index 9e087252..1f8a4509 100644
--- a/tests/snippets/python/test_fstring_32b.txt
+++ b/tests/snippets/python/test_fstring_32b.txt
@@ -12,4 +12,4 @@ f"*{n=:30}*"
'}' Literal.String.Interpol
'*' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_33a.txt b/tests/snippets/python/test_fstring_33a.txt
index 232491b2..5318b552 100644
--- a/tests/snippets/python/test_fstring_33a.txt
+++ b/tests/snippets/python/test_fstring_33a.txt
@@ -12,4 +12,4 @@ f'*{n=!r:30}*'
'}' Literal.String.Interpol
'*' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_33b.txt b/tests/snippets/python/test_fstring_33b.txt
index 1481e811..a0211ddb 100644
--- a/tests/snippets/python/test_fstring_33b.txt
+++ b/tests/snippets/python/test_fstring_33b.txt
@@ -12,4 +12,4 @@ f"*{n=!r:30}*"
'}' Literal.String.Interpol
'*' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_34a.txt b/tests/snippets/python/test_fstring_34a.txt
index 6bd510a9..9b80cc9c 100644
--- a/tests/snippets/python/test_fstring_34a.txt
+++ b/tests/snippets/python/test_fstring_34a.txt
@@ -17,4 +17,4 @@ f"*{f'{n=}':30}*"
'}' Literal.String.Interpol
'*' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_34b.txt b/tests/snippets/python/test_fstring_34b.txt
index 4cb7e631..5abf37f0 100644
--- a/tests/snippets/python/test_fstring_34b.txt
+++ b/tests/snippets/python/test_fstring_34b.txt
@@ -17,4 +17,4 @@ f'*{f"{n=}":30}*'
'}' Literal.String.Interpol
'*' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_35a.txt b/tests/snippets/python/test_fstring_35a.txt
index f09edc18..b4e10417 100644
--- a/tests/snippets/python/test_fstring_35a.txt
+++ b/tests/snippets/python/test_fstring_35a.txt
@@ -12,4 +12,4 @@ f'*{n=:+<30}*'
'}' Literal.String.Interpol
'*' Literal.String.Single
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_35b.txt b/tests/snippets/python/test_fstring_35b.txt
index 794f7b69..773e7a40 100644
--- a/tests/snippets/python/test_fstring_35b.txt
+++ b/tests/snippets/python/test_fstring_35b.txt
@@ -12,4 +12,4 @@ f"*{n=:+<30}*"
'}' Literal.String.Interpol
'*' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_36a.txt b/tests/snippets/python/test_fstring_36a.txt
index 4b6ab230..773e38e6 100644
--- a/tests/snippets/python/test_fstring_36a.txt
+++ b/tests/snippets/python/test_fstring_36a.txt
@@ -8,9 +8,9 @@ f'''{foo
"'''" Literal.String.Single
'{' Literal.String.Interpol
'foo' Name
-'\n ' Text
+'\n ' Text.Whitespace
'= !s:' Literal.String.Interpol
'20' Literal.String.Single
'}' Literal.String.Interpol
"'''" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_fstring_36b.txt b/tests/snippets/python/test_fstring_36b.txt
index abc9cf3e..da79ce21 100644
--- a/tests/snippets/python/test_fstring_36b.txt
+++ b/tests/snippets/python/test_fstring_36b.txt
@@ -8,9 +8,9 @@ f"""{foo
'"""' Literal.String.Double
'{' Literal.String.Interpol
'foo' Name
-'\n ' Text
+'\n ' Text.Whitespace
'= !s:' Literal.String.Interpol
'20' Literal.String.Double
'}' Literal.String.Interpol
'"""' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_needs_name.txt b/tests/snippets/python/test_needs_name.txt
index 60c782c5..f121da03 100644
--- a/tests/snippets/python/test_needs_name.txt
+++ b/tests/snippets/python/test_needs_name.txt
@@ -52,4 +52,4 @@ S = (H @ beta - r).T @ inv(H @ V @ H.T) @ (H @ beta - r)
' ' Text
'r' Name
')' Punctuation
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_pep_515.txt b/tests/snippets/python/test_pep_515.txt
index a5f2f358..38fa6195 100644
--- a/tests/snippets/python/test_pep_515.txt
+++ b/tests/snippets/python/test_pep_515.txt
@@ -10,19 +10,19 @@
---tokens---
'1_000_000' Literal.Number.Integer
-'\n' Text
+'\n' Text.Whitespace
'1_000.000_001' Literal.Number.Float
-'\n' Text
+'\n' Text.Whitespace
'1_000e1_000j' Literal.Number.Float
-'\n' Text
+'\n' Text.Whitespace
'0xCAFE_F00D' Literal.Number.Hex
-'\n' Text
+'\n' Text.Whitespace
'0b_0011_1111_0100_1110' Literal.Number.Bin
-'\n' Text
+'\n' Text.Whitespace
'0o_777_123' Literal.Number.Oct
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_raw_fstring.txt b/tests/snippets/python/test_raw_fstring.txt
index 0dd51c1e..33810881 100644
--- a/tests/snippets/python/test_raw_fstring.txt
+++ b/tests/snippets/python/test_raw_fstring.txt
@@ -14,9 +14,9 @@ rf"m_{{\nu}} = {x}"
'\\' Literal.String.Double
'nu = x' Literal.String.Double
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'f' Literal.String.Affix
'"' Literal.String.Double
@@ -27,9 +27,9 @@ rf"m_{{\nu}} = {x}"
'x' Name
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
-'\n' Text
+'\n' Text.Whitespace
'rf' Literal.String.Affix
'"' Literal.String.Double
@@ -43,4 +43,4 @@ rf"m_{{\nu}} = {x}"
'x' Name
'}' Literal.String.Interpol
'"' Literal.String.Double
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_string_escape_codes.txt b/tests/snippets/python/test_string_escape_codes.txt
index 5b06329c..c02dc037 100644
--- a/tests/snippets/python/test_string_escape_codes.txt
+++ b/tests/snippets/python/test_string_escape_codes.txt
@@ -17,4 +17,4 @@
' ' Literal.String.Single
'\\N{Plus-Minus Sign}' Literal.String.Escape
"'" Literal.String.Single
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python/test_walrus_operator.txt b/tests/snippets/python/test_walrus_operator.txt
index 05935ec9..9bab89dc 100644
--- a/tests/snippets/python/test_walrus_operator.txt
+++ b/tests/snippets/python/test_walrus_operator.txt
@@ -18,4 +18,4 @@ if (a := 2) > 4:
' ' Text
'4' Literal.Number.Integer
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/snippets/python2/test_cls_builtin.txt b/tests/snippets/python2/test_cls_builtin.txt
index 333845d8..ff533c2c 100644
--- a/tests/snippets/python2/test_cls_builtin.txt
+++ b/tests/snippets/python2/test_cls_builtin.txt
@@ -13,11 +13,11 @@ class TestClass():
'(' Punctuation
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'@classmethod' Name.Decorator
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'def' Keyword
@@ -27,8 +27,8 @@ class TestClass():
'cls' Name.Builtin.Pseudo
')' Punctuation
':' Punctuation
-'\n' Text
+'\n' Text.Whitespace
' ' Text
'pass' Keyword
-'\n' Text
+'\n' Text.Whitespace
diff --git a/tests/test_latex_formatter.py b/tests/test_latex_formatter.py
index 967a9f19..42c5eda7 100644
--- a/tests/test_latex_formatter.py
+++ b/tests/test_latex_formatter.py
@@ -83,7 +83,7 @@ def test_embedded_lexer():
(Token.Operator, '='),
(Token.Text, ' '),
(Token.Literal.Number.Integer, '1'),
- (Token.Text, '\n'),
+ (Token.Text.Whitespace, '\n'),
(Token.Generic.Prompt, '>>> '),
(Token.Name, 'y'),
(Token.Text, ' '),
@@ -98,10 +98,10 @@ def test_embedded_lexer():
(Token.Punctuation, ')'),
(Token.Text, ' '),
(Token.Comment.Single, '# these |pipes| are untouched'), # note: not Token.Escape
- (Token.Text, '\n'),
+ (Token.Text.Whitespace, '\n'),
(Token.Generic.Prompt, '>>> '),
(Token.Name, 'y'),
- (Token.Text, '\n'),
+ (Token.Text.Whitespace, '\n'),
(Token.Escape, '$1 + z^2$'),
(Token.Generic.Output, '\n'),
]