From 0d28e2b7a20ec2bf0025115844647c8e5b88e70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matth=C3=A4us=20G=2E=20Chajdas?= Date: Thu, 22 Oct 2020 17:40:30 +0200 Subject: Speculative fix for #1579. This removes the top/bottom padding changes, and only keeps left/right padding, in the hope that this does not break all Sphinx themes. --- pygments/formatters/html.py | 4 ++-- .../inline_nocls_step_1_start_1_special_0_anchor.html | 6 +++--- .../inline_nocls_step_1_start_1_special_0_noanchor.html | 6 +++--- .../inline_nocls_step_1_start_1_special_3_anchor.html | 6 +++--- .../inline_nocls_step_1_start_1_special_3_noanchor.html | 6 +++--- .../inline_nocls_step_1_start_8_special_0_anchor.html | 6 +++--- .../inline_nocls_step_1_start_8_special_0_noanchor.html | 6 +++--- .../inline_nocls_step_1_start_8_special_3_anchor.html | 6 +++--- .../inline_nocls_step_1_start_8_special_3_noanchor.html | 6 +++--- .../inline_nocls_step_2_start_1_special_0_anchor.html | 6 +++--- .../inline_nocls_step_2_start_1_special_0_noanchor.html | 6 +++--- .../inline_nocls_step_2_start_1_special_3_anchor.html | 6 +++--- .../inline_nocls_step_2_start_1_special_3_noanchor.html | 6 +++--- .../inline_nocls_step_2_start_8_special_0_anchor.html | 6 +++--- .../inline_nocls_step_2_start_8_special_0_noanchor.html | 6 +++--- .../inline_nocls_step_2_start_8_special_3_anchor.html | 6 +++--- .../inline_nocls_step_2_start_8_special_3_noanchor.html | 6 +++--- .../table_nocls_step_1_start_1_special_0_anchor.html | 6 +++--- .../table_nocls_step_1_start_1_special_0_noanchor.html | 6 +++--- .../table_nocls_step_1_start_1_special_3_anchor.html | 6 +++--- .../table_nocls_step_1_start_1_special_3_noanchor.html | 6 +++--- .../table_nocls_step_1_start_8_special_0_anchor.html | 6 +++--- .../table_nocls_step_1_start_8_special_0_noanchor.html | 6 +++--- .../table_nocls_step_1_start_8_special_3_anchor.html | 6 +++--- .../table_nocls_step_1_start_8_special_3_noanchor.html | 6 +++--- .../table_nocls_step_2_start_1_special_0_anchor.html | 6 +++--- .../table_nocls_step_2_start_1_special_0_noanchor.html | 6 +++--- .../table_nocls_step_2_start_1_special_3_anchor.html | 6 +++--- .../table_nocls_step_2_start_1_special_3_noanchor.html | 6 +++--- .../table_nocls_step_2_start_8_special_0_anchor.html | 6 +++--- .../table_nocls_step_2_start_8_special_0_noanchor.html | 6 +++--- .../table_nocls_step_2_start_8_special_3_anchor.html | 6 +++--- .../table_nocls_step_2_start_8_special_3_noanchor.html | 6 +++--- tests/test_html_formatter.py | 12 ++++++------ 34 files changed, 104 insertions(+), 104 deletions(-) diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py index 29cc9fb8..97c67cd3 100644 --- a/pygments/formatters/html.py +++ b/pygments/formatters/html.py @@ -576,14 +576,14 @@ class HtmlFormatter(Formatter): @property def _linenos_style(self): - return 'color: %s; background-color: %s; padding: 0 5px 0 5px;' % ( + return 'color: %s; background-color: %s; padding-left: 5px; padding-right: 5px;' % ( self.style.line_number_color, self.style.line_number_background_color ) @property def _linenos_special_style(self): - return 'color: %s; background-color: %s; padding: 0 5px 0 5px;' % ( + return 'color: %s; background-color: %s; padding-left: 5px; padding-right: 5px;' % ( self.style.line_number_special_color, self.style.line_number_special_background_color ) diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor.html index 24fcc2f6..d0b25e79 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_anchor.html @@ -1,6 +1,6 @@
- 
1# a
-2# b
-3# c
+ 
1# a
+2# b
+3# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor.html index 24fcc2f6..d0b25e79 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_0_noanchor.html @@ -1,6 +1,6 @@
- 
1# a
-2# b
-3# c
+ 
1# a
+2# b
+3# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor.html index b6245f11..9a0ae65c 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_anchor.html @@ -1,6 +1,6 @@
- 
1# a
-2# b
-3# c
+ 
1# a
+2# b
+3# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor.html index b6245f11..9a0ae65c 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_1_special_3_noanchor.html @@ -1,6 +1,6 @@
- 
1# a
-2# b
-3# c
+ 
1# a
+2# b
+3# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor.html index d38e2bab..d7417f90 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_anchor.html @@ -1,6 +1,6 @@
- 
 8# a
- 9# b
-10# c
+ 
 8# a
+ 9# b
+10# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor.html index d38e2bab..d7417f90 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_0_noanchor.html @@ -1,6 +1,6 @@
- 
 8# a
- 9# b
-10# c
+ 
 8# a
+ 9# b
+10# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor.html index 332f729f..02033946 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_anchor.html @@ -1,6 +1,6 @@
- 
 8# a
- 9# b
-10# c
+ 
 8# a
+ 9# b
+10# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor.html index 332f729f..02033946 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_1_start_8_special_3_noanchor.html @@ -1,6 +1,6 @@
- 
 8# a
- 9# b
-10# c
+ 
 8# a
+ 9# b
+10# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor.html index 9367b9c0..68b376aa 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_anchor.html @@ -1,6 +1,6 @@
- 
 # a
-2# b
- # c
+ 
 # a
+2# b
+ # c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor.html index 9367b9c0..68b376aa 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_0_noanchor.html @@ -1,6 +1,6 @@
- 
 # a
-2# b
- # c
+ 
 # a
+2# b
+ # c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor.html index 6843e0f7..67dc22cb 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_anchor.html @@ -1,6 +1,6 @@
- 
 # a
-2# b
- # c
+ 
 # a
+2# b
+ # c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor.html index 6843e0f7..67dc22cb 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_1_special_3_noanchor.html @@ -1,6 +1,6 @@
- 
 # a
-2# b
- # c
+ 
 # a
+2# b
+ # c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor.html index 09bf305b..718b019f 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_anchor.html @@ -1,6 +1,6 @@
- 
 8# a
-  # b
-10# c
+ 
 8# a
+  # b
+10# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor.html index 09bf305b..718b019f 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_0_noanchor.html @@ -1,6 +1,6 @@
- 
 8# a
-  # b
-10# c
+ 
 8# a
+  # b
+10# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor.html index 39d7fc06..2884e978 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_anchor.html @@ -1,6 +1,6 @@
- 
 8# a
-  # b
-10# c
+ 
 8# a
+  # b
+10# c
diff --git a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor.html index 39d7fc06..2884e978 100644 --- a/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor.html +++ b/tests/html_linenos_expected_output/inline_nocls_step_2_start_8_special_3_noanchor.html @@ -1,6 +1,6 @@
- 
 8# a
-  # b
-10# c
+ 
 8# a
+  # b
+10# c
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor.html index 92e4e413..b672790d 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_anchor.html @@ -2,9 +2,9 @@
- 
1
-2
-3
+ 
1
+2
+3
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor.html index 196033a1..5f56da29 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_0_noanchor.html @@ -2,9 +2,9 @@
- 
1
-2
-3
+ 
1
+2
+3
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor.html index afa6152a..8ac4aedf 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_anchor.html @@ -2,9 +2,9 @@
- 
1
-2
-3
+ 
1
+2
+3
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor.html index a72788df..5ae241df 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_1_special_3_noanchor.html @@ -2,9 +2,9 @@
- 
1
-2
-3
+ 
1
+2
+3
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor.html index 23ed43af..4684afd1 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_anchor.html @@ -2,9 +2,9 @@
- 
 8
- 9
-10
+ 
 8
+ 9
+10
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor.html index 3248ba3a..9a83ccc9 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_0_noanchor.html @@ -2,9 +2,9 @@
- 
 8
- 9
-10
+ 
 8
+ 9
+10
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor.html index 276b76d5..106b9c10 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_anchor.html @@ -2,9 +2,9 @@
- 
 8
- 9
-10
+ 
 8
+ 9
+10
diff --git a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor.html index 4298ac69..3b5ff80b 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_1_start_8_special_3_noanchor.html @@ -2,9 +2,9 @@
- 
 8
- 9
-10
+ 
 8
+ 9
+10
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor.html index 15c4975e..1928bf33 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_anchor.html @@ -2,9 +2,9 @@
- 
 
-2
-
+ 
 
+2
+
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor.html index 987bd12d..ec766bca 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_0_noanchor.html @@ -2,9 +2,9 @@
- 
 
-2
-
+ 
 
+2
+
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor.html index da570378..1f30d5ce 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_anchor.html @@ -2,9 +2,9 @@
- 
 
-2
-
+ 
 
+2
+
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor.html index 0f502688..3e5af045 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_1_special_3_noanchor.html @@ -2,9 +2,9 @@
- 
 
-2
-
+ 
 
+2
+
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor.html index d0bef32d..cb8a88d0 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_anchor.html @@ -2,9 +2,9 @@
- 
 8
-  
-10
+ 
 8
+  
+10
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor.html index 98b94471..758a577c 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_0_noanchor.html @@ -2,9 +2,9 @@
- 
 8
-  
-10
+ 
 8
+  
+10
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor.html index baa70130..28b947c9 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_anchor.html @@ -2,9 +2,9 @@
- 
 8
-  
-10
+ 
 8
+  
+10
diff --git a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor.html b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor.html index 6ba03c4f..bd9056e6 100644 --- a/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor.html +++ b/tests/html_linenos_expected_output/table_nocls_step_2_start_8_special_3_noanchor.html @@ -2,9 +2,9 @@
- 
 8
-  
-10
+ 
 8
+  
+10
diff --git a/tests/test_html_formatter.py b/tests/test_html_formatter.py index 7a1c563c..37556777 100644 --- a/tests/test_html_formatter.py +++ b/tests/test_html_formatter.py @@ -150,11 +150,11 @@ def test_get_style_defs_contains_default_line_numbers_styles(): assert style_defs[1] == ( 'td.linenos pre ' - '{ color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }' + '{ color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }' ) assert style_defs[2] == ( 'span.linenos ' - '{ color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }' + '{ color: #000000; background-color: #f0f0f0; padding-left: 5px; padding-right: 5px; }' ) @@ -169,19 +169,19 @@ def test_get_style_defs_contains_style_specific_line_numbers_styles(): assert style_defs[1] == ( 'td.linenos pre ' - '{ color: #ff0000; background-color: #0000ff; padding: 0 5px 0 5px; }' + '{ color: #ff0000; background-color: #0000ff; padding-left: 5px; padding-right: 5px; }' ) assert style_defs[2] == ( 'span.linenos ' - '{ color: #ff0000; background-color: #0000ff; padding: 0 5px 0 5px; }' + '{ color: #ff0000; background-color: #0000ff; padding-left: 5px; padding-right: 5px; }' ) assert style_defs[3] == ( 'td.linenos pre.special ' - '{ color: #00ff00; background-color: #ffffff; padding: 0 5px 0 5px; }' + '{ color: #00ff00; background-color: #ffffff; padding-left: 5px; padding-right: 5px; }' ) assert style_defs[4] == ( 'span.linenos.special ' - '{ color: #00ff00; background-color: #ffffff; padding: 0 5px 0 5px; }' + '{ color: #00ff00; background-color: #ffffff; padding-left: 5px; padding-right: 5px; }' ) -- cgit v1.2.1