git.iko.soy/typeable/pandoc
on master help sign in
PDF via wkhtmltopdf: put user-specified options last.
43711adJohn MacFarlane
src/Text/Pandoc/PDF.hs+2−2
compare with master
unifiedsplit
@@ -142,7 +142,7 @@ makeWithWkhtmltopdf program pdfargs writer opts doc@(Pandoc meta _) = do
142 (return . literal . stringify)
142 (return . literal . stringify)
143 meta
143 meta
144 let toArgs (f, mbd) = maybe [] (\d -> ["--" <> f, T.unpack d]) mbd
144 let toArgs (f, mbd) = maybe [] (\d -> ["--" <> f, T.unpack d]) mbd
145− let args = pdfargs ++ mathArgs ++ concatMap toArgs
145+ let args = mathArgs ++ concatMap toArgs
146 [("page-size", getField "papersize" meta')
146 [("page-size", getField "papersize" meta')
147 ,("title", getField "title" meta')
147 ,("title", getField "title" meta')
148 ,("margin-bottom", Just $ fromMaybe "1.2in"
148 ,("margin-bottom", Just $ fromMaybe "1.2in"
@@ -155,7 +155,7 @@ makeWithWkhtmltopdf program pdfargs writer opts doc@(Pandoc meta _) = do
155 (getField "margin-left" meta'))
155 (getField "margin-left" meta'))
156 ,("footer-html", getField "footer-html" meta')
156 ,("footer-html", getField "footer-html" meta')
157 ,("header-html", getField "header-html" meta')
157 ,("header-html", getField "header-html" meta')
158− ]
158+ ] ++ pdfargs
159 source <- writer opts doc
159 source <- writer opts doc
160 verbosity <- getVerbosity
160 verbosity <- getVerbosity
161 liftIO $ html2pdf verbosity program args source
161 liftIO $ html2pdf verbosity program args source