diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2012-01-25 11:29:42 -0800 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2012-01-25 11:29:42 -0800 |
| commit | 3a8afc119a4c9da8b0f5275013bd60f9d848a37e (patch) | |
| tree | a4ab5c5783f9ded1b8c942fffc24f9ad10974cef /src/Text/Pandoc | |
| parent | 31629cb992763940bdfc332e1b256aca570d70cd (diff) | |
| download | pandoc-3a8afc119a4c9da8b0f5275013bd60f9d848a37e.tar.gz | |
Depend on highlighting-kate 0.5.
This uses styleToCss instead of styleToHtml.
Diffstat (limited to 'src/Text/Pandoc')
| -rw-r--r-- | src/Text/Pandoc/Highlighting.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/HTML.hs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Highlighting.hs b/src/Text/Pandoc/Highlighting.hs index a40bab66a..4fb799cf1 100644 --- a/src/Text/Pandoc/Highlighting.hs +++ b/src/Text/Pandoc/Highlighting.hs @@ -36,7 +36,7 @@ module Text.Pandoc.Highlighting ( languages , styleToLaTeX , formatHtmlInline , formatHtmlBlock - , styleToHtml + , styleToCss , pygments , espresso , tango diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 9953cc7b7..99aa8653c 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -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) |