Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Depend on highlighting-kate 0.5.

Browse source 
This uses styleToCss instead of styleToHtml.
This commit is contained in:
John MacFarlane 2012-01-25 11:29:42 -08:00
parent 31629cb992
commit 3a8afc119a
6 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandoc.cabal
View file

@ -215,7 +215,7 @@ Library
tagsoup >= 0.12.5 && < 0.13,
base64-bytestring >= 0.1 && < 0.2,
zlib >= 0.5 && <= 0.6,
highlighting-kate >= 0.4 && < 0.5,
highlighting-kate >= 0.5 && < 0.6,
temporary >= 1.1 && < 1.2
if impl(ghc >= 6.10)
Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4
@ -306,7 +306,7 @@ Executable pandoc
tagsoup >= 0.12.5 && < 0.13,
base64-bytestring >= 0.1 && < 0.2,
zlib >= 0.5 && <= 0.6,
highlighting-kate >= 0.4 && < 0.5,
highlighting-kate >= 0.5 && < 0.6,
temporary >= 1.1 && < 1.2
if impl(ghc >= 6.10)
Build-depends: base >= 4 && < 5, syb >= 0.1 && < 0.4

2
src/Text/Pandoc/Highlighting.hs
View file

@ -36,7 +36,7 @@ module Text.Pandoc.Highlighting ( languages
, styleToLaTeX
, formatHtmlInline
, formatHtmlBlock
, styleToHtml
, styleToCss
, pygments
, espresso
, tango

6
src/Text/Pandoc/Writers/HTML.hs
View file

@ -37,7 +37,7 @@ import Text.Pandoc.Templates
import Text.Pandoc.Generic
import Text.Pandoc.Readers.TeXMath
import Text.Pandoc.Slides
import Text.Pandoc.Highlighting ( highlight, styleToHtml,
import Text.Pandoc.Highlighting ( highlight, styleToCss,
formatHtmlInline, formatHtmlBlock )
import Text.Pandoc.XML (stripTags, escapeStringForXML)
import Network.HTTP ( urlEncode )
@ -153,8 +153,8 @@ pandocToHtml opts (Pandoc (Meta title' authors' date') blocks) = do
("/*<![CDATA[*/\n" ++ s ++ "/*]]>*/\n")
Nothing -> mempty
else mempty
let newvars = [("highlighting-css", renderHtml $ styleToHtml
$ writerHighlightStyle opts) |
let newvars = [("highlighting-css",
styleToCss $ writerHighlightStyle opts) |
stHighlighting st] ++
[("math", renderHtml math) | stMath st]
return (tit, auths, authsMeta, date, toc, thebody, newvars)

2
templates

@ -1 +1 @@
Subproject commit 83f2fdd9e27935430ef9146a337599f78ba3e3d6
Subproject commit dc936548c2b07617a799611b0968b503614be9f3

5
tests/lhs-test.html
View file

@ -5,7 +5,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="pandoc" />
<title></title>
<style type="text/css">table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
<style type="text/css">
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
table.sourceCode { }
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; color: #aaaaaa; border-right: 1px solid #aaaaaa; }
@ -22,7 +23,7 @@ code > span.ot { color: #007020; }
code > span.al { color: #ff0000; font-weight: bold; }
code > span.fu { color: #06287e; }
code > span.er { color: #ff0000; font-weight: bold; }
</style>
</style>
</head>
<body>
<h1 id="lhs-test">lhs test</h1>

5
tests/lhs-test.html+lhs
View file

@ -5,7 +5,8 @@
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="pandoc" />
<title></title>
<style type="text/css">table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
<style type="text/css">
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
margin: 0; padding: 0; vertical-align: baseline; border: none; }
table.sourceCode { }
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; color: #aaaaaa; border-right: 1px solid #aaaaaa; }
@ -22,7 +23,7 @@ code > span.ot { color: #007020; }
code > span.al { color: #ff0000; font-weight: bold; }
code > span.fu { color: #06287e; }
code > span.er { color: #ff0000; font-weight: bold; }
</style>
</style>
</head>
<body>
<h1 id="lhs-test">lhs test</h1>