@@ -79,16 +79,20 @@ makePDF "wkhtmltopdf" writer opts doc@(Pandoc meta _) = do
79 "--window-status", "mathjax_loaded"]
79 "--window-status", "mathjax_loaded"]
81 meta' <- metaToJSON opts (return . stringify) (return . stringify) meta
81 meta' <- metaToJSON opts (return . stringify) (return . stringify) meta
82− let toArgs (f, d) = maybe (maybe [] (\x -> ['-':'-':f, x]) d)
82+ let toArgs (f, mbd) = maybe [] (\d -> ['-':'-':f, d]) mbd
83− (\x -> ['-':'-':f, x]) $ getField f meta'
84 let args = mathArgs ++
83 let args = mathArgs ++
85− concatMap toArgs [("page-size", Just "letter")
84+ concatMap toArgs
86− ,("title", Nothing)
85+ [("page-size", getField "papersize" meta')
86+ ,("title", getField "title" meta')
87− ,("margin-bottom", Just "1in")
87+ ,("margin-bottom", fromMaybe (Just "1.2in")
88+ (getField "margin-bottom" meta'))
88− ,("margin-top", Just "1in")
89+ ,("margin-top", fromMaybe (Just "1.25in")
90+ (getField "margin-top" meta'))
89− ,("margin-left", Just "1in")
91+ ,("margin-right", fromMaybe (Just "1.25in")
92+ (getField "margin-right" meta'))
90− ,("margin-right", Just "1in")
93+ ,("margin-left", fromMaybe (Just "1.25in")
94+ (getField "margin-left" meta'))
92 let source = writer opts doc
96 let source = writer opts doc
93 html2pdf (writerVerbose opts) args source
97 html2pdf (writerVerbose opts) args source
94makePDF program writer opts doc = withTempDir "tex2pdf." $ \tmpdir -> do
98makePDF program writer opts doc = withTempDir "tex2pdf." $ \tmpdir -> do