From a56d98f9c4b411d27e53feffe8e10a014f15ca2b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 23 Feb 2026 17:36:50 +0100 Subject: [PATCH] HTML styles template: avoid duplicate code selector. Consolidate two clauses. Closes #11484. --- data/templates/styles.html | 2 +- test/s5-basic.html | 1 - test/s5-fancy.html | 1 - test/s5-inserts.html | 1 - test/writer.html4 | 2 +- test/writer.html5 | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/data/templates/styles.html b/data/templates/styles.html index 800f63c7a..8238e8cbf 100644 --- a/data/templates/styles.html +++ b/data/templates/styles.html @@ -106,6 +106,7 @@ div.abstract-title { } $endif$ code { + white-space: pre-wrap; font-family: $if(monofont)$$monofont$$else$Menlo, Monaco, Consolas, 'Lucida Console', monospace$endif$; $if(monobackgroundcolor)$ background-color: $monobackgroundcolor$; @@ -183,7 +184,6 @@ header { text-decoration: none; } $endif$ -code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} div.columns{display: flex; gap: min(4vw, 1.5em);} div.column{flex: auto; overflow-x: auto;} diff --git a/test/s5-basic.html b/test/s5-basic.html index 4a0f297a8..2000dd305 100644 --- a/test/s5-basic.html +++ b/test/s5-basic.html @@ -14,7 +14,6 @@ /* Default styles provided by pandoc. ** See https://pandoc.org/MANUAL.html#variables-for-html for config info. */ - code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} div.columns{display: flex; gap: min(4vw, 1.5em);} div.column{flex: auto; overflow-x: auto;} diff --git a/test/s5-fancy.html b/test/s5-fancy.html index 89d3139d6..62f98db3d 100644 --- a/test/s5-fancy.html +++ b/test/s5-fancy.html @@ -14,7 +14,6 @@ /* Default styles provided by pandoc. ** See https://pandoc.org/MANUAL.html#variables-for-html for config info. */ - code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} div.columns{display: flex; gap: min(4vw, 1.5em);} div.column{flex: auto; overflow-x: auto;} diff --git a/test/s5-inserts.html b/test/s5-inserts.html index 3c851f1e8..9199b064a 100644 --- a/test/s5-inserts.html +++ b/test/s5-inserts.html @@ -12,7 +12,6 @@ /* Default styles provided by pandoc. ** See https://pandoc.org/MANUAL.html#variables-for-html for config info. */ - code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} div.columns{display: flex; gap: min(4vw, 1.5em);} div.column{flex: auto; overflow-x: auto;} diff --git a/test/writer.html4 b/test/writer.html4 index 5e54fd980..edb174d1f 100644 --- a/test/writer.html4 +++ b/test/writer.html4 @@ -94,6 +94,7 @@ color: #606060; } code { + white-space: pre-wrap; font-family: Menlo, Monaco, Consolas, 'Lucida Console', monospace; font-size: 85%; margin: 0; @@ -157,7 +158,6 @@ #TOC a:not(:hover) { text-decoration: none; } - code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} div.columns{display: flex; gap: min(4vw, 1.5em);} div.column{flex: auto; overflow-x: auto;} diff --git a/test/writer.html5 b/test/writer.html5 index a9da62179..e045156bc 100644 --- a/test/writer.html5 +++ b/test/writer.html5 @@ -94,6 +94,7 @@ color: #606060; } code { + white-space: pre-wrap; font-family: Menlo, Monaco, Consolas, 'Lucida Console', monospace; font-size: 85%; margin: 0; @@ -157,7 +158,6 @@ #TOC a:not(:hover) { text-decoration: none; } - code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} div.columns{display: flex; gap: min(4vw, 1.5em);} div.column{flex: auto; overflow-x: auto;}