diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-09-30 16:07:47 -0500 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-09-30 16:11:20 -0500 |
| commit | f3a80034fff41a8b0c13519fa13bed794db1b8d2 (patch) | |
| tree | 8355bd3c88b87b960171a65aad05b36e6822e8a4 /src/Text/Pandoc/PDF.hs | |
| parent | 9b7d652ab7a0f4cdd86efd92f43f1b20724e8982 (diff) | |
Removed writerSourceURL, add source URL to common state.
Removed `writerSourceURL` from `WriterOptions` (API change).
Added `stSourceURL` to `CommonState`.
It is set automatically by `setInputFiles`.
Text.Pandoc.Class now exports `setInputFiles`, `setOutputFile`.
The type of `getInputFiles` has changed; it now returns `[FilePath]`
instead of `Maybe [FilePath]`.
Functions in Class that formerly took the source URL as a parameter
now have one fewer parameter (`fetchItem`, `downloadOrRead`,
`setMediaResource`, `fillMediaBag`).
Removed `WriterOptions` parameter from `makeSelfContained` in
`SelfContained`.
Diffstat (limited to 'src/Text/Pandoc/PDF.hs')
| -rw-r--r-- | src/Text/Pandoc/PDF.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs index b2b7da54f..26f831c6d 100644 --- a/src/Text/Pandoc/PDF.hs +++ b/src/Text/Pandoc/PDF.hs @@ -129,7 +129,7 @@ makePDF program writer opts verbosity mediabag doc = do else withTempDir resourcePath <- getResourcePath liftIO $ withTemp "tex2pdf." $ \tmpdir -> do - doc' <- handleImages verbosity opts resourcePath mediabag tmpdir doc + doc' <- handleImages verbosity resourcePath mediabag tmpdir doc source <- runIOorExplode $ do setVerbosity verbosity writer opts doc' @@ -141,18 +141,17 @@ makePDF program writer opts verbosity mediabag doc = do _ -> return $ Left $ UTF8.fromStringLazy $ "Unknown program " ++ program handleImages :: Verbosity - -> WriterOptions -> [FilePath] -> MediaBag -> FilePath -- ^ temp dir to store images -> Pandoc -- ^ document -> IO Pandoc -handleImages verbosity opts resourcePath mediabag tmpdir doc = do +handleImages verbosity resourcePath mediabag tmpdir doc = do doc' <- runIOorExplode $ do setVerbosity verbosity setResourcePath resourcePath setMediaBag mediabag - fillMediaBag (writerSourceURL opts) doc >>= + fillMediaBag doc >>= extractMedia tmpdir walkM (convertImages verbosity tmpdir) doc' |