HTML line block: Use class instead of style attribute.

We now issue `<div class="line-block">` and include a default definition for `line-block` in the default templates, instead of hard-coding a `style` on the div. Closes #1623.
jgm · Apr 25, 2017 · 66b0839 · 66b0839
1 parent ee160d7
commit 66b0839
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 1 deletion.
diff --git a/data/templates/default.epub2 b/data/templates/default.epub2
@@ -9,6 +9,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$

diff --git a/data/templates/default.epub3 b/data/templates/default.epub3
@@ -8,6 +8,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$

diff --git a/data/templates/default.html4 b/data/templates/default.html4
@@ -17,6 +17,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$

diff --git a/data/templates/default.html5 b/data/templates/default.html5
@@ -17,6 +17,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$

diff --git a/data/templates/default.revealjs b/data/templates/default.revealjs
@@ -20,6 +20,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$

diff --git a/data/templates/default.s5 b/data/templates/default.s5
@@ -18,6 +18,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$

diff --git a/data/templates/default.slideous b/data/templates/default.slideous
@@ -19,6 +19,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$

diff --git a/data/templates/default.slidy b/data/templates/default.slidy
@@ -19,6 +19,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$

diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
@@ -600,7 +600,7 @@ blockToHtml opts (LineBlock lns) =
   else do
     let lf = preEscapedString "\n"
     htmlLines <- mconcat . intersperse lf <$> mapM (inlineListToHtml opts) lns
-    return $ H.div ! A.style "white-space: pre-line;" $ htmlLines
+    return $ H.div ! A.class_ "line-block" $ htmlLines
 blockToHtml opts (Div attr@(ident, classes, kvs) bs) = do
   html5 <- gets stHtml5
   let speakerNotes = "notes" `elem` classes

diff --git a/test/lhs-test.html b/test/lhs-test.html
@@ -8,6 +8,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <style type="text/css">
 div.sourceCode { overflow-x: auto; }

diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
@@ -8,6 +8,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <style type="text/css">
 div.sourceCode { overflow-x: auto; }

diff --git a/test/s5-basic.html b/test/s5-basic.html
@@ -13,6 +13,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <!-- configuration parameters -->
   <meta name="defaultView" content="slideshow" />

diff --git a/test/s5-fancy.html b/test/s5-fancy.html
@@ -13,6 +13,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <!-- configuration parameters -->
   <meta name="defaultView" content="slideshow" />

diff --git a/test/s5-inserts.html b/test/s5-inserts.html
@@ -11,6 +11,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <link rel="stylesheet" href="main.css" type="text/css" />
   STUFF INSERTED

diff --git a/test/writer.html4 b/test/writer.html4
@@ -11,6 +11,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
 </head>
 <body>

diff --git a/test/writer.html5 b/test/writer.html5
@@ -11,6 +11,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>