git.iko.soy/typeable/pandoc
on master help sign in
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.

commit14b8aa8c93766f98a6e0bc9ff04f14962a888f4f authorJohn MacFarlane <jgm@berkeley.edu> dateSat 4 Mar 2017, 23:16 (10 years ago) parent0517cf0
16 files changed+77−28
compare with master
unifiedsplit
data/templates/default.dzslides+5−2 data/templates/default.epub2+7−1 data/templates/default.epub3+5−4 data/templates/default.html4+5−2 data/templates/default.html5+5−2 data/templates/default.revealjs+5−2 data/templates/default.s5+7−4 data/templates/default.slideous+5−2 data/templates/default.slidy+5−2 test/lhs-test.html+4−1 test/lhs-test.html+lhs+4−1 test/s5-basic.html+4−1 test/s5-fancy.html+4−1 test/s5-inserts.html+4−1 test/writer.html4+4−1 test/writer.html5+4−1
data/templates/default.dzslides+5−2
@@ -12,10 +12,13 @@ $if(keywords)$
1212 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$">
1313$endif$
1414 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
15− <style type="text/css">code{white-space: pre-wrap;} .smallcaps{font-variant: small-caps;}</style>
15+ <style type="text/css">
16+ code{white-space: pre-wrap;}
17+ .smallcaps{font-variant: small-caps;}
1618$if(quotes)$
17− <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
19+ q { quotes: "“" "”" "‘" "’"; }
1820$endif$
21+ </style>
1922$if(highlighting-css)$
2023 <style type="text/css">
2124$highlighting-css$
data/templates/default.epub2+7−1
@@ -6,7 +6,13 @@
66 <meta http-equiv="Content-Style-Type" content="text/css" />
77 <meta name="generator" content="pandoc" />
88 <title>$pagetitle$</title>
9− <style type="text/css">.smallcaps{font-variant: small-caps;}</style>
9+ <style type="text/css">
10+ code{white-space: pre-wrap;}
11+ .smallcaps{font-variant: small-caps;}
12+$if(quotes)$
13+ q { quotes: "“" "”" "‘" "’"; }
14+$endif$
15+ </style>
1016$if(highlighting-css)$
1117 <style type="text/css">
1218$highlighting-css$
data/templates/default.epub3+5−4
@@ -5,12 +5,13 @@
55 <meta charset="utf-8" />
66 <meta name="generator" content="pandoc" />
77 <title>$pagetitle$</title>
8− <style type="text/css">.smallcaps{font-variant: small-caps;}</style>
9−$if(quotes)$
108 <style type="text/css">
11− q { quotes: "“" "”" "‘" "’"; }
12− </style>
9+ code{white-space: pre-wrap;}
10+ .smallcaps{font-variant: small-caps;}
11+$if(quotes)$
12+ q { quotes: "“" "”" "‘" "’"; }
1313$endif$
14+ </style>
1415$if(highlighting-css)$
1516 <style type="text/css">
1617$highlighting-css$
data/templates/default.html4+5−2
@@ -14,10 +14,13 @@ $if(keywords)$
1414 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
1515$endif$
1616 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
17− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
17+ <style type="text/css">
18+ code{white-space: pre-wrap;}
19+ .smallcaps{font-variant: small-caps;}
1820$if(quotes)$
19− <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
21+ q { quotes: "“" "”" "‘" "’"; }
2022$endif$
23+ </style>
2124$if(highlighting-css)$
2225 <style type="text/css">
2326$highlighting-css$
data/templates/default.html5+5−2
@@ -14,10 +14,13 @@ $if(keywords)$
1414 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
1515$endif$
1616 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
17− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
17+ <style type="text/css">
18+ code{white-space: pre-wrap;}
19+ .smallcaps{font-variant: small-caps;}
1820$if(quotes)$
19− <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
21+ q { quotes: "“" "”" "‘" "’"; }
2022$endif$
23+ </style>
2124$if(highlighting-css)$
2225 <style type="text/css">
2326$highlighting-css$
data/templates/default.revealjs+5−2
@@ -17,10 +17,13 @@ $endif$
1717 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
1818 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
1919 <link rel="stylesheet" href="$revealjs-url$/css/reveal.css">
20− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
20+ <style type="text/css">
21+ code{white-space: pre-wrap;}
22+ .smallcaps{font-variant: small-caps;}
2123$if(quotes)$
22− <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
24+ q { quotes: "“" "”" "‘" "’"; }
2325$endif$
26+ </style>
2427$if(highlighting-css)$
2528 <style type="text/css">
2629$highlighting-css$
data/templates/default.s5+7−4
@@ -15,13 +15,16 @@ $if(keywords)$
1515 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
1616$endif$
1717 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
18− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
18+ <style type="text/css">
19+ code{white-space: pre-wrap;}
20+ .smallcaps{font-variant: small-caps;}
21+$if(quotes)$
22+ q { quotes: "“" "”" "‘" "’"; }
23+$endif$
24+ </style>
1925 <!-- configuration parameters -->
2026 <meta name="defaultView" content="slideshow" />
2127 <meta name="controlVis" content="hidden" />
22−$if(quotes)$
23− <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
24−$endif$
2528$if(highlighting-css)$
2629 <style type="text/css">
2730$highlighting-css$
data/templates/default.slideous+5−2
@@ -16,10 +16,13 @@ $if(keywords)$
1616 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
1717$endif$
1818 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
19− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
19+ <style type="text/css">
20+ code{white-space: pre-wrap;}
21+ .smallcaps{font-variant: small-caps;}
2022$if(quotes)$
21− <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
23+ q { quotes: "“" "”" "‘" "’"; }
2224$endif$
25+ </style>
2326$if(highlighting-css)$
2427 <style type="text/css">
2528$highlighting-css$
data/templates/default.slidy+5−2
@@ -16,10 +16,13 @@ $if(keywords)$
1616 <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" />
1717$endif$
1818 <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
19− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
19+ <style type="text/css">
20+ code{white-space: pre-wrap;}
21+ .smallcaps{font-variant: small-caps;}
2022$if(quotes)$
21− <style type="text/css">q { quotes: "“" "”" "‘" "’"; }</style>
23+ q { quotes: "“" "”" "‘" "’"; }
2224$endif$
25+ </style>
2326$if(highlighting-css)$
2427 <style type="text/css">
2528$highlighting-css$
test/lhs-test.html+4−1
@@ -5,7 +5,10 @@
55 <meta name="generator" content="pandoc" />
66 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
77 <title>Untitled</title>
8− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
8+ <style type="text/css">
9+ code{white-space: pre-wrap;}
10+ .smallcaps{font-variant: small-caps;}
11+ </style>
912 <style type="text/css">
1013div.sourceCode { overflow-x: auto; }
1114table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
test/lhs-test.html+lhs+4−1
@@ -5,7 +5,10 @@
55 <meta name="generator" content="pandoc" />
66 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
77 <title>Untitled</title>
8− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
8+ <style type="text/css">
9+ code{white-space: pre-wrap;}
10+ .smallcaps{font-variant: small-caps;}
11+ </style>
912 <style type="text/css">
1013div.sourceCode { overflow-x: auto; }
1114table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
test/s5-basic.html+4−1
@@ -10,7 +10,10 @@
1010 <meta name="author" content="Jen Jones" />
1111 <meta name="date" content="2006-07-15" />
1212 <title>My S5 Document</title>
13− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
13+ <style type="text/css">
14+ code{white-space: pre-wrap;}
15+ .smallcaps{font-variant: small-caps;}
16+ </style>
1417 <!-- configuration parameters -->
1518 <meta name="defaultView" content="slideshow" />
1619 <meta name="controlVis" content="hidden" />
test/s5-fancy.html+4−1
@@ -10,7 +10,10 @@
1010 <meta name="author" content="Jen Jones" />
1111 <meta name="date" content="2006-07-15" />
1212 <title>My S5 Document</title>
13− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
13+ <style type="text/css">
14+ code{white-space: pre-wrap;}
15+ .smallcaps{font-variant: small-caps;}
16+ </style>
1417 <!-- configuration parameters -->
1518 <meta name="defaultView" content="slideshow" />
1619 <meta name="controlVis" content="hidden" />
test/s5-inserts.html+4−1
@@ -8,7 +8,10 @@
88 <meta name="author" content="Jen Jones" />
99 <meta name="date" content="2006-07-15" />
1010 <title>My S5 Document</title>
11− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
11+ <style type="text/css">
12+ code{white-space: pre-wrap;}
13+ .smallcaps{font-variant: small-caps;}
14+ </style>
1215 <link rel="stylesheet" href="main.css" type="text/css" />
1316 STUFF INSERTED
1417</head>
test/writer.html4+4−1
@@ -8,7 +8,10 @@
88 <meta name="author" content="Anonymous" />
99 <meta name="date" content="2006-07-17" />
1010 <title>Pandoc Test Suite</title>
11− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
11+ <style type="text/css">
12+ code{white-space: pre-wrap;}
13+ .smallcaps{font-variant: small-caps;}
14+ </style>
1215</head>
1316<body>
1417<div id="header">
test/writer.html5+4−1
@@ -8,7 +8,10 @@
88 <meta name="author" content="Anonymous" />
99 <meta name="dcterms.date" content="2006-07-17" />
1010 <title>Pandoc Test Suite</title>
11− <style type="text/css">code{white-space: pre;} .smallcaps{font-variant: small-caps;}</style>
11+ <style type="text/css">
12+ code{white-space: pre-wrap;}
13+ .smallcaps{font-variant: small-caps;}
14+ </style>
1215 <!--[if lt IE 9]>
1316 <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
1417 <![endif]-->