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

Fix rebasing errors.

Browse source
This commit is contained in:
Jesse Rosenthal 2016-12-02 07:27:42 -05:00 • committed by John MacFarlane
parent d5051ae101
commit c4c56b8c04
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Text/Pandoc/Writers/FB2.hs
View file

@ -85,7 +85,7 @@ pandocToFB2 :: PandocMonad m
-> Pandoc -> Pandoc
-> FBM m String -> FBM m String
pandocToFB2 opts (Pandoc meta blocks) = do pandocToFB2 opts (Pandoc meta blocks) = do
modify (\s -> s { writerOptions = opts { writerOptions = opts } }) modify (\s -> s { writerOptions = opts })
desc <- description meta desc <- description meta
fp <- frontpage meta fp <- frontpage meta
secs <- renderSections 1 blocks secs <- renderSections 1 blocks

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

@ -115,7 +115,7 @@ writeHtml :: PandocMonad m => WriterOptions -> Pandoc -> m Html
writeHtml opts d = do writeHtml opts d = do
(body, context) <- evalStateT (pandocToHtml opts d) defaultWriterState (body, context) <- evalStateT (pandocToHtml opts d) defaultWriterState
return $ case writerTemplate opts of return $ case writerTemplate opts of
Nothing -> renderHtml body Nothing -> body
Just tpl -> renderTemplate' tpl $ Just tpl -> renderTemplate' tpl $
defField "body" (renderHtml body) context defField "body" (renderHtml body) context