85f8c51 · typeable/pandoc

git.iko.soy/typeable/pandoc

Use default highlighting CSS rather than embedding CSS in templates.

commit85f8c51b640a127f77067903cdbddec05bd3a77b authorJohn MacFarlane <jgm@berkeley.edu> dateFri 16 Jul 2010, 00:23 (16 years ago) parent3adacdb

5 files changed+31−66

compare with master

unifiedsplit

src/Text/Pandoc/Writers/HTML.hs+3−2 templates/html.template+2−19 templates/slidy.template+2−19 tests/lhs-test.html+12−13 tests/lhs-test.html+lhs+12−13

src/Text/Pandoc/Writers/HTML.hs+3−2

@@ -34,7 +34,7 @@ import Text.Pandoc.CharacterReferences ( decodeCharacterReferences )

3434import Text.Pandoc.Shared

3535import Text.Pandoc.Templates

3636import Text.Pandoc.Readers.TeXMath

37−import Text.Pandoc.Highlighting ( highlightHtml )

37+import Text.Pandoc.Highlighting ( highlightHtml, defaultHighlightingCss )

3838import Text.Pandoc.XML (stripTags, escapeStringForXML)

3939import Network.HTTP ( urlEncode )

4040import Numeric ( showHex )

@@ -136,7 +136,8 @@ pandocToHtml opts (Pandoc (Meta title' authors' date') blocks) = do

136136 primHtml s

137137 Nothing -> noHtml

138138 else noHtml

139− let newvars = [("highlighting","yes") | stHighlighting st] ++

139+ let newvars = [("highlighting-css", defaultHighlightingCss) |

140+ stHighlighting st] ++

140141 [("math", renderHtmlFragment math) | stMath st]

141142 return (tit, auths, date, toc, thebody, newvars)

142143

templates/html.template+2−19

@@ -10,26 +10,9 @@ $endfor$

1010$if(date)$

1111 <meta name="date" content="$date$" />

1212$endif$

13−$if(highlighting)$

13+$if(highlighting-css)$

1414 <style type="text/css">

15−table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre

16− { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }

17−td.lineNumbers { text-align: right; background-color: #EBEBEB; color: black; padding-right: 5px; padding-left: 5px; }

18−td.sourceCode { padding-left: 5px; }

19−pre.sourceCode { }

20−pre.sourceCode span.kw { font-weight: bold; }

21−pre.sourceCode span.dt { color: #800000; }

22−pre.sourceCode span.dv { color: #0000FF; }

23−pre.sourceCode span.bn { color: #0000FF; }

24−pre.sourceCode span.fl { color: #800080; }

25−pre.sourceCode span.ch { color: #FF00FF; }

26−pre.sourceCode span.st { color: #DD0000; }

27−pre.sourceCode span.co { color: #808080; font-style: italic; }

28−pre.sourceCode span.ot { }

29−pre.sourceCode span.al { color: green; font-weight: bold; }

30−pre.sourceCode span.fu { color: #000080; }

31−pre.sourceCode span.re { }

32−pre.sourceCode span.er { color: red; font-weight: bold; }

15+$highlighting-css$

3316 </style>

3417$endif$

3518$for(css)$

templates/slidy.template+2−19

@@ -12,26 +12,9 @@ $endfor$

1212$if(date)$

1313 <meta name="date" content="$date$" />

1414$endif$

15−$if(highlighting)$

15+$if(highlighting-css)$

1616 <style type="text/css">

17−table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre

18− { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }

19−td.lineNumbers { text-align: right; background-color: #EBEBEB; color: black; padding-right: 5px; padding-left: 5px; }

20−td.sourceCode { padding-left: 5px; }

21−pre.sourceCode { }

22−pre.sourceCode span.kw { font-weight: bold; }

23−pre.sourceCode span.dt { color: #800000; }

24−pre.sourceCode span.dv { color: #0000FF; }

25−pre.sourceCode span.bn { color: #0000FF; }

26−pre.sourceCode span.fl { color: #800080; }

27−pre.sourceCode span.ch { color: #FF00FF; }

28−pre.sourceCode span.st { color: #DD0000; }

29−pre.sourceCode span.co { color: #808080; font-style: italic; }

30−pre.sourceCode span.ot { }

31−pre.sourceCode span.al { color: green; font-weight: bold; }

32−pre.sourceCode span.fu { color: #000080; }

33−pre.sourceCode span.re { }

34−pre.sourceCode span.er { color: red; font-weight: bold; }

17+$highlighting-css$

3518 </style>

3619$endif$

3720$for(css)$

tests/lhs-test.html+12−13

@@ -7,20 +7,19 @@

77 <style type="text/css">

88table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode, table.sourceCode pre

99 { margin: 0; padding: 0; border: 0; vertical-align: baseline; border: none; }

10−td.lineNumbers { text-align: right; background-color: #EBEBEB; color: black; padding-right: 5px; padding-left: 5px; }

10+td.lineNumbers { border-right: 1px solid #AAAAAA; text-align: right; color: #AAAAAA; padding-right: 5px; padding-left: 5px; }

1111td.sourceCode { padding-left: 5px; }

12−pre.sourceCode { }

13−pre.sourceCode span.kw { font-weight: bold; }

14−pre.sourceCode span.dt { color: #800000; }

15−pre.sourceCode span.dv { color: #0000FF; }

16−pre.sourceCode span.bn { color: #0000FF; }

17−pre.sourceCode span.fl { color: #800080; }

18−pre.sourceCode span.ch { color: #FF00FF; }

19−pre.sourceCode span.st { color: #DD0000; }

20−pre.sourceCode span.co { color: #808080; font-style: italic; }

21−pre.sourceCode span.ot { }

22−pre.sourceCode span.al { color: green; font-weight: bold; }

23−pre.sourceCode span.fu { color: #000080; }

12+pre.sourceCode span.kw { color: #007020; font-weight: bold; }

13+pre.sourceCode span.dt { color: #902000; }

14+pre.sourceCode span.dv { color: #40a070; }

15+pre.sourceCode span.bn { color: #40a070; }

16+pre.sourceCode span.fl { color: #40a070; }

17+pre.sourceCode span.ch { color: #4070a0; }

18+pre.sourceCode span.st { color: #4070a0; }

19+pre.sourceCode span.co { color: #60a0b0; font-style: italic; }

20+pre.sourceCode span.ot { color: #007020; }

21+pre.sourceCode span.al { color: red; font-weight: bold; }

22+pre.sourceCode span.fu { color: #06287e; }

2423pre.sourceCode span.re { }

2524pre.sourceCode span.er { color: red; font-weight: bold; }

2625 </style>

tests/lhs-test.html+lhs+12−13