26ce0d0 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Fixed S5.

26ce0d0fiddlosopher17 years ago

src/Text/Pandoc/DefaultHeaders.hs+2−1

compare with master

unifiedsplit

@@ -37,6 +37,7 @@ module Text.Pandoc.DefaultHeaders (

37 defaultRTFHeader

38 ) where

39import Text.Pandoc.Writers.S5

40+import Text.Pandoc.Shared

40import System.FilePath ( (</>) )

41import System.FilePath ( (</>) )

41import Text.Pandoc.TH ( contentsOf )

42import Text.Pandoc.TH ( contentsOf )

@@ -61,7 +62,7 @@ defaultOpenDocumentHeader = $(contentsOf $ "data" </> "headers" </> "OpenDocume

61#endif

62#endif

63defaultS5Header :: String

64defaultS5Header :: String

64−defaultS5Header = s5Meta ++ s5CSS ++ s5Javascript

65+defaultS5Header = substitute "$" "$$" $ s5Meta ++ s5CSS ++ s5Javascript

66defaultRTFHeader :: String

67defaultRTFHeader :: String

67#ifndef __HADDOCK__

68#ifndef __HADDOCK__

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

@@ -33,6 +33,7 @@ import Text.Pandoc.Definition

33import Text.Pandoc.LaTeXMathML

34import Text.Pandoc.CharacterReferences ( decodeCharacterReferences )

35import Text.Pandoc.Shared

36+import Text.Pandoc.Templates

36import Text.Pandoc.Readers.TeXMath

37import Text.Pandoc.Readers.TeXMath

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

38import Text.Pandoc.Highlighting ( highlightHtml, defaultHighlightingCss )

38import Text.Pandoc.XML (stripTags)

39import Text.Pandoc.XML (stripTags)

@@ -135,7 +136,7 @@ writeHtml opts (Pandoc (Meta tit authors date) blocks) =

135 _ -> noHtml

136 _ -> noHtml

136 else noHtml

137 else noHtml

137 head' = header $ metadata +++ math +++ css +++

138 head' = header $ metadata +++ math +++ css +++

138− primHtml (writerHeader opts)

139+ primHtml (renderTemplate [] $ writerHeader opts)

139 notes = reverse (stNotes st')

140 notes = reverse (stNotes st')

140 before = primHtml $ writerIncludeBefore opts

141 before = primHtml $ writerIncludeBefore opts

141 after = primHtml $ writerIncludeAfter opts

142 after = primHtml $ writerIncludeAfter opts