git.iko.soy/typeable/pandoc
on master help sign in
PDF: Got --resource-path working with pdf output.
6a7f980John MacFarlane
src/Text/Pandoc/PDF.hs+7−4
compare with master
unifiedsplit
@@ -63,8 +63,8 @@ import Text.Pandoc.Writers.Shared (getField, metaToJSON)
63import Data.List (intercalate)
63import Data.List (intercalate)
64#endif
64#endif
65import Text.Pandoc.Class (PandocIO, report, runIO, runIOorExplode,
65import Text.Pandoc.Class (PandocIO, report, runIO, runIOorExplode,
66− setMediaBag, setVerbosity,
66+ setMediaBag, setVerbosity, getResourcePath,
67− fillMediaBag, extractMedia)
67+ setResourcePath, fillMediaBag, extractMedia)
68import Text.Pandoc.Logging
68import Text.Pandoc.Logging
69
69
70#ifdef _WINDOWS
70#ifdef _WINDOWS
@@ -112,8 +112,9 @@ makePDF program writer opts verbosity mediabag doc = do
112 let withTemp = if takeBaseName program == "context"
112 let withTemp = if takeBaseName program == "context"
113 then withTempDirectory "."
113 then withTempDirectory "."
114 else withTempDir
114 else withTempDir
115+ resourcePath <- getResourcePath
115 liftIO $ withTemp "tex2pdf." $ \tmpdir -> do
116 liftIO $ withTemp "tex2pdf." $ \tmpdir -> do
116− doc' <- handleImages verbosity opts mediabag tmpdir doc
117+ doc' <- handleImages verbosity opts resourcePath mediabag tmpdir doc
117 source <- runIOorExplode $ do
118 source <- runIOorExplode $ do
118 setVerbosity verbosity
119 setVerbosity verbosity
119 writer opts doc'
120 writer opts doc'
@@ -126,13 +127,15 @@ makePDF program writer opts verbosity mediabag doc = do
126
127
127handleImages :: Verbosity
128handleImages :: Verbosity
128 -> WriterOptions
129 -> WriterOptions
130+ -> [FilePath]
129 -> MediaBag
131 -> MediaBag
130 -> FilePath -- ^ temp dir to store images
132 -> FilePath -- ^ temp dir to store images
131 -> Pandoc -- ^ document
133 -> Pandoc -- ^ document
132 -> IO Pandoc
134 -> IO Pandoc
133−handleImages verbosity opts mediabag tmpdir doc = do
135+handleImages verbosity opts resourcePath mediabag tmpdir doc = do
134 doc' <- runIOorExplode $ do
136 doc' <- runIOorExplode $ do
135 setVerbosity verbosity
137 setVerbosity verbosity
138+ setResourcePath resourcePath
136 setMediaBag mediabag
139 setMediaBag mediabag
137 fillMediaBag (writerSourceURL opts) doc >>=
140 fillMediaBag (writerSourceURL opts) doc >>=
138 extractMedia tmpdir
141 extractMedia tmpdir