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.
This commit is contained in:
John MacFarlane 2017-03-04 23:16:42 +01:00
parent 0517cf0bc0
commit 14b8aa8c93
16 changed files with 77 additions and 28 deletions

View file

@ -12,10 +12,13 @@ $if(keywords)$
<meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$"> <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
$endif$ $endif$
<title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</title> <title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</title>
<style type="text/css">code{white-space: pre-wrap;} .smallcaps{font-variant: small-caps;}</style> <style type="text/css">
code{white-space: pre-wrap;}
.smallcaps{font-variant: small-caps;}
$if(quotes)$ $if(quotes)$
<style type="text/css">q { quotes: "“" "”" "" ""; }</style> q { quotes: "“" "”" "" ""; }
$endif$ $endif$
</style>
$if(highlighting-css)$ $if(highlighting-css)$
<style type="text/css"> <style type="text/css">
$highlighting-css$ $highlighting-css$

View file

@ -6,7 +6,13 @@
<meta http-equiv="Content-Style-Type" content="text/css" /> <meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="pandoc" /> <meta name="generator" content="pandoc" />
<title>$pagetitle$</title> <title>$pagetitle$</title>
<style type="text/css">.smallcaps{font-variant: small-caps;}</style> <style type="text/css">
code{white-space: pre-wrap;}
.smallcaps{font-variant: small-caps;}
$if(quotes)$
q { quotes: "“" "”" "" ""; }
$endif$
</style>
$if(highlighting-css)$ $if(highlighting-css)$
<style type="text/css"> <style type="text/css">
$highlighting-css$ $highlighting-css$

View file

@ -5,12 +5,13 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="generator" content="pandoc" /> <meta name="generator" content="pandoc" />
<title>$pagetitle$</title> <title>$pagetitle$</title>
<style type="text/css">.smallcaps{font-variant: small-caps;}</style>
$if(quotes)$
<style type="text/css"> <style type="text/css">
q { quotes: "“" "”" "" ""; } code{white-space: pre-wrap;}
</style> .smallcaps{font-variant: small-caps;}
$if(quotes)$
q { quotes: "“" "”" "" ""; }
$endif$ $endif$
</style>
$if(highlighting-css)$ $if(highlighting-css)$
<style type="text/css"> <style type="text/css">
$highlighting-css$ $highlighting-css$

View file

@ -14,10 +14,13 @@ $if(keywords)$
<meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
$endif$ $endif$
<title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</title> <title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</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;}
$if(quotes)$ $if(quotes)$
<style type="text/css">q { quotes: "“" "”" "" ""; }</style> q { quotes: "“" "”" "" ""; }
$endif$ $endif$
</style>
$if(highlighting-css)$ $if(highlighting-css)$
<style type="text/css"> <style type="text/css">
$highlighting-css$ $highlighting-css$

View file

@ -14,10 +14,13 @@ $if(keywords)$
<meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
$endif$ $endif$
<title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</title> <title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</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;}
$if(quotes)$ $if(quotes)$
<style type="text/css">q { quotes: "“" "”" "" ""; }</style> q { quotes: "“" "”" "" ""; }
$endif$ $endif$
</style>
$if(highlighting-css)$ $if(highlighting-css)$
<style type="text/css"> <style type="text/css">
$highlighting-css$ $highlighting-css$

View file

@ -17,10 +17,13 @@ $endif$
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
<link rel="stylesheet" href="$revealjs-url$/css/reveal.css"> <link rel="stylesheet" href="$revealjs-url$/css/reveal.css">
<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;}
$if(quotes)$ $if(quotes)$
<style type="text/css">q { quotes: "“" "”" "" ""; }</style> q { quotes: "“" "”" "" ""; }
$endif$ $endif$
</style>
$if(highlighting-css)$ $if(highlighting-css)$
<style type="text/css"> <style type="text/css">
$highlighting-css$ $highlighting-css$

View file

@ -15,13 +15,16 @@ $if(keywords)$
<meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
$endif$ $endif$
<title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</title> <title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</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;}
$if(quotes)$
q { quotes: "“" "”" "" ""; }
$endif$
</style>
<!-- configuration parameters --> <!-- configuration parameters -->
<meta name="defaultView" content="slideshow" /> <meta name="defaultView" content="slideshow" />
<meta name="controlVis" content="hidden" /> <meta name="controlVis" content="hidden" />
$if(quotes)$
<style type="text/css">q { quotes: "“" "”" "" ""; }</style>
$endif$
$if(highlighting-css)$ $if(highlighting-css)$
<style type="text/css"> <style type="text/css">
$highlighting-css$ $highlighting-css$

View file

@ -16,10 +16,13 @@ $if(keywords)$
<meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
$endif$ $endif$
<title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</title> <title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</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;}
$if(quotes)$ $if(quotes)$
<style type="text/css">q { quotes: "“" "”" "" ""; }</style> q { quotes: "“" "”" "" ""; }
$endif$ $endif$
</style>
$if(highlighting-css)$ $if(highlighting-css)$
<style type="text/css"> <style type="text/css">
$highlighting-css$ $highlighting-css$

View file

@ -16,10 +16,13 @@ $if(keywords)$
<meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
$endif$ $endif$
<title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</title> <title>$if(title-prefix)$$title-prefix$ $endif$$pagetitle$</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;}
$if(quotes)$ $if(quotes)$
<style type="text/css">q { quotes: "“" "”" "" ""; }</style> q { quotes: "“" "”" "" ""; }
$endif$ $endif$
</style>
$if(highlighting-css)$ $if(highlighting-css)$
<style type="text/css"> <style type="text/css">
$highlighting-css$ $highlighting-css$

View file

@ -5,7 +5,10 @@
<meta name="generator" content="pandoc" /> <meta name="generator" content="pandoc" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
<title>Untitled</title> <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"> <style type="text/css">
div.sourceCode { overflow-x: auto; } div.sourceCode { overflow-x: auto; }
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode { table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {

View file

@ -5,7 +5,10 @@
<meta name="generator" content="pandoc" /> <meta name="generator" content="pandoc" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
<title>Untitled</title> <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"> <style type="text/css">
div.sourceCode { overflow-x: auto; } div.sourceCode { overflow-x: auto; }
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode { table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {

View file

@ -10,7 +10,10 @@
<meta name="author" content="Jen Jones" /> <meta name="author" content="Jen Jones" />
<meta name="date" content="2006-07-15" /> <meta name="date" content="2006-07-15" />
<title>My S5 Document</title> <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 --> <!-- configuration parameters -->
<meta name="defaultView" content="slideshow" /> <meta name="defaultView" content="slideshow" />
<meta name="controlVis" content="hidden" /> <meta name="controlVis" content="hidden" />

View file

@ -10,7 +10,10 @@
<meta name="author" content="Jen Jones" /> <meta name="author" content="Jen Jones" />
<meta name="date" content="2006-07-15" /> <meta name="date" content="2006-07-15" />
<title>My S5 Document</title> <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 --> <!-- configuration parameters -->
<meta name="defaultView" content="slideshow" /> <meta name="defaultView" content="slideshow" />
<meta name="controlVis" content="hidden" /> <meta name="controlVis" content="hidden" />

View file

@ -8,7 +8,10 @@
<meta name="author" content="Jen Jones" /> <meta name="author" content="Jen Jones" />
<meta name="date" content="2006-07-15" /> <meta name="date" content="2006-07-15" />
<title>My S5 Document</title> <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" /> <link rel="stylesheet" href="main.css" type="text/css" />
STUFF INSERTED STUFF INSERTED
</head> </head>

View file

@ -8,7 +8,10 @@
<meta name="author" content="Anonymous" /> <meta name="author" content="Anonymous" />
<meta name="date" content="2006-07-17" /> <meta name="date" content="2006-07-17" />
<title>Pandoc Test Suite</title> <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> </head>
<body> <body>
<div id="header"> <div id="header">

View file

@ -8,7 +8,10 @@
<meta name="author" content="Anonymous" /> <meta name="author" content="Anonymous" />
<meta name="dcterms.date" content="2006-07-17" /> <meta name="dcterms.date" content="2006-07-17" />
<title>Pandoc Test Suite</title> <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]> <!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
<![endif]--> <![endif]-->