From 14b8aa8c93766f98a6e0bc9ff04f14962a888f4f Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 4 Mar 2017 23:16:42 +0100
Subject: Regularized CSS in html/epub/html slide templates.

All templates now include `code{white-space: pre-wrap}`
and CSS for `q` if `--html-q-tags` is used.

Previously some templates had `pre` and others `pre-wrap`;
the `q` styles were only sometimes included.

See #3485.
---
 test/lhs-test.html     | 5 ++++-
 test/lhs-test.html+lhs | 5 ++++-
 test/s5-basic.html     | 5 ++++-
 test/s5-fancy.html     | 5 ++++-
 test/s5-inserts.html   | 5 ++++-
 test/writer.html4      | 5 ++++-
 test/writer.html5      | 5 ++++-
 7 files changed, 28 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/lhs-test.html b/test/lhs-test.html
index 24ba03db6..330122666 100644
--- a/test/lhs-test.html
+++ b/test/lhs-test.html
@@ -5,7 +5,10 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Untitled</title>
-  <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      .smallcaps{font-variant: small-caps;}
+  </style>
   <style type="text/css">
 div.sourceCode { overflow-x: auto; }
 table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
index 17f547df4..7ce9a83c7 100644
--- a/test/lhs-test.html+lhs
+++ b/test/lhs-test.html+lhs
@@ -5,7 +5,10 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Untitled</title>
-  <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      .smallcaps{font-variant: small-caps;}
+  </style>
   <style type="text/css">
 div.sourceCode { overflow-x: auto; }
 table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
diff --git a/test/s5-basic.html b/test/s5-basic.html
index 1945c14c2..4757910b9 100644
--- a/test/s5-basic.html
+++ b/test/s5-basic.html
@@ -10,7 +10,10 @@
   <meta name="author" content="Jen Jones" />
   <meta name="date" content="2006-07-15" />
   <title>My S5 Document</title>
-  <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      .smallcaps{font-variant: small-caps;}
+  </style>
   <!-- configuration parameters -->
   <meta name="defaultView" content="slideshow" />
   <meta name="controlVis" content="hidden" />
diff --git a/test/s5-fancy.html b/test/s5-fancy.html
index 01c5b43cc..f80d321fb 100644
--- a/test/s5-fancy.html
+++ b/test/s5-fancy.html
@@ -10,7 +10,10 @@
   <meta name="author" content="Jen Jones" />
   <meta name="date" content="2006-07-15" />
   <title>My S5 Document</title>
-  <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      .smallcaps{font-variant: small-caps;}
+  </style>
   <!-- configuration parameters -->
   <meta name="defaultView" content="slideshow" />
   <meta name="controlVis" content="hidden" />
diff --git a/test/s5-inserts.html b/test/s5-inserts.html
index 70d3418f3..b84d2360e 100644
--- a/test/s5-inserts.html
+++ b/test/s5-inserts.html
@@ -8,7 +8,10 @@
   <meta name="author" content="Jen Jones" />
   <meta name="date" content="2006-07-15" />
   <title>My S5 Document</title>
-  <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      .smallcaps{font-variant: small-caps;}
+  </style>
   <link rel="stylesheet" href="main.css" type="text/css" />
   STUFF INSERTED
 </head>
diff --git a/test/writer.html4 b/test/writer.html4
index d26d9e67d..81cacde6a 100644
--- a/test/writer.html4
+++ b/test/writer.html4
@@ -8,7 +8,10 @@
   <meta name="author" content="Anonymous" />
   <meta name="date" content="2006-07-17" />
   <title>Pandoc Test Suite</title>
-  <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      .smallcaps{font-variant: small-caps;}
+  </style>
 </head>
 <body>
 <div id="header">
diff --git a/test/writer.html5 b/test/writer.html5
index 46aa27ae3..068628a69 100644
--- a/test/writer.html5
+++ b/test/writer.html5
@@ -8,7 +8,10 @@
   <meta name="author" content="Anonymous" />
   <meta name="dcterms.date" content="2006-07-17" />
   <title>Pandoc Test Suite</title>
-  <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      .smallcaps{font-variant: small-caps;}
+  </style>
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
-- 
cgit v1.2.3