git.iko.soy/typeable/pandoc
on master help sign in
Fix rebasing errors.
c4c56b8Jesse Rosenthal
src/Text/Pandoc/Writers/FB2.hs+1−1
compare with master
unifiedsplit
@@ -85,7 +85,7 @@ pandocToFB2 :: PandocMonad m
85 -> Pandoc
85 -> Pandoc
86 -> FBM m String
86 -> FBM m String
87pandocToFB2 opts (Pandoc meta blocks) = do
87pandocToFB2 opts (Pandoc meta blocks) = do
88− modify (\s -> s { writerOptions = opts { writerOptions = opts } })
88+ modify (\s -> s { writerOptions = opts })
89 desc <- description meta
89 desc <- description meta
90 fp <- frontpage meta
90 fp <- frontpage meta
91 secs <- renderSections 1 blocks
91 secs <- renderSections 1 blocks
src/Text/Pandoc/Writers/HTML.hs+1−1
@@ -115,7 +115,7 @@ writeHtml :: PandocMonad m => WriterOptions -> Pandoc -> m Html
115writeHtml opts d = do
115writeHtml opts d = do
116 (body, context) <- evalStateT (pandocToHtml opts d) defaultWriterState
116 (body, context) <- evalStateT (pandocToHtml opts d) defaultWriterState
117 return $ case writerTemplate opts of
117 return $ case writerTemplate opts of
118− Nothing -> renderHtml body
118+ Nothing -> body
119 Just tpl -> renderTemplate' tpl $
119 Just tpl -> renderTemplate' tpl $
120 defField "body" (renderHtml body) context
120 defField "body" (renderHtml body) context
121
121