26ce0d0 · typeable/pandoc

git.iko.soy/typeable/pandoc

Fixed S5.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1674 788f1e2b-df1e-0410-8736-df70ead52e1b

commit26ce0d04ec461f10c92597bb054763b3820a125a authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateThu 31 Dec 2009, 01:08 (17 years ago) parenta42bae6

2 files changed+4−2

compare with master

unifiedsplit

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

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

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

3737 defaultRTFHeader

3838 ) where

3939import Text.Pandoc.Writers.S5

40+import Text.Pandoc.Shared

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

4142import Text.Pandoc.TH ( contentsOf )

4243

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

6162#endif

6263

6364defaultS5Header :: String

64−defaultS5Header = s5Meta ++ s5CSS ++ s5Javascript

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

6566

6667defaultRTFHeader :: String

6768#ifndef __HADDOCK__

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

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

3333import Text.Pandoc.LaTeXMathML

3434import Text.Pandoc.CharacterReferences ( decodeCharacterReferences )

3535import Text.Pandoc.Shared

36+import Text.Pandoc.Templates

3637import Text.Pandoc.Readers.TeXMath

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

3839import Text.Pandoc.XML (stripTags)

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

135136 _ -> noHtml

136137 else noHtml

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

138− primHtml (writerHeader opts)

139+ primHtml (renderTemplate [] $ writerHeader opts)

139140 notes = reverse (stNotes st')

140141 before = primHtml $ writerIncludeBefore opts

141142 after = primHtml $ writerIncludeAfter opts