git.iko.soy/typeable/pandoc
on master help sign in
PDF: Got --resource-path working with pdf output.

See #852.

commit6a7f980247bd2e3fcb7b977edbbcd1fc17758074 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 20 May 2017, 23:46 (9 years ago) parentd109c8b
1 file changed+7−4
src/Text/Pandoc/PDF.hs+7−4
src/Text/Pandoc/PDF.hs+7−4
@@ -63,8 +63,8 @@ import Text.Pandoc.Writers.Shared (getField, metaToJSON)
6363import Data.List (intercalate)
6464#endif
6565import Text.Pandoc.Class (PandocIO, report, runIO, runIOorExplode,
66− setMediaBag, setVerbosity,
67− fillMediaBag, extractMedia)
66+ setMediaBag, setVerbosity, getResourcePath,
67+ setResourcePath, fillMediaBag, extractMedia)
6868import Text.Pandoc.Logging
6969
7070#ifdef _WINDOWS
@@ -112,8 +112,9 @@ makePDF program writer opts verbosity mediabag doc = do
112112 let withTemp = if takeBaseName program == "context"
113113 then withTempDirectory "."
114114 else withTempDir
115+ resourcePath <- getResourcePath
115116 liftIO $ withTemp "tex2pdf." $ \tmpdir -> do
116− doc' <- handleImages verbosity opts mediabag tmpdir doc
117+ doc' <- handleImages verbosity opts resourcePath mediabag tmpdir doc
117118 source <- runIOorExplode $ do
118119 setVerbosity verbosity
119120 writer opts doc'
@@ -126,13 +127,15 @@ makePDF program writer opts verbosity mediabag doc = do
126127
127128handleImages :: Verbosity
128129 -> WriterOptions
130+ -> [FilePath]
129131 -> MediaBag
130132 -> FilePath -- ^ temp dir to store images
131133 -> Pandoc -- ^ document
132134 -> IO Pandoc
133−handleImages verbosity opts mediabag tmpdir doc = do
135+handleImages verbosity opts resourcePath mediabag tmpdir doc = do
134136 doc' <- runIOorExplode $ do
135137 setVerbosity verbosity
138+ setResourcePath resourcePath
136139 setMediaBag mediabag
137140 fillMediaBag (writerSourceURL opts) doc >>=
138141 extractMedia tmpdir