diff options
author | John MacFarlane <jgm@berkeley.edu> | 2015-04-02 21:04:43 -0700 |
---|---|---|
committer | mb21 <mb21@users.noreply.github.com> | 2015-08-05 16:08:46 +0200 |
commit | 12df4054ad550641abe9817421282f3f6079fbfe (patch) | |
tree | 3421c16baa87c5cee700d6aca048f3bfd7c71a83 /src | |
parent | 76f0708ef5bf06147b044f0b10eb50f43e042071 (diff) | |
download | pandoc-12df4054ad550641abe9817421282f3f6079fbfe.tar.gz |
PDF: Modified for new image size attributes parameter.
(mb21)
Diffstat (limited to 'src')
-rw-r--r-- | src/Text/Pandoc/PDF.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs index 8f92a3321..25a90f08f 100644 --- a/src/Text/Pandoc/PDF.hs +++ b/src/Text/Pandoc/PDF.hs @@ -84,10 +84,10 @@ handleImage' :: WriterOptions -> FilePath -> Inline -> IO Inline -handleImage' opts tmpdir (Image ils (src,tit)) = do +handleImage' opts tmpdir (Image attr ils (src,tit)) = do exists <- doesFileExist src if exists - then return $ Image ils (src,tit) + then return $ Image attr ils (src,tit) else do res <- fetchItem' (writerMediaBag opts) (writerSourceURL opts) src case res of @@ -97,20 +97,20 @@ handleImage' opts tmpdir (Image ils (src,tit)) = do let basename = showDigest $ sha1 $ BL.fromChunks [contents] let fname = tmpdir </> basename <.> ext BS.writeFile fname contents - return $ Image ils (fname,tit) + return $ Image attr ils (fname,tit) _ -> do warn $ "Could not find image `" ++ src ++ "', skipping..." - return $ Image ils (src,tit) + return $ Image attr ils (src,tit) handleImage' _ _ x = return x convertImages :: FilePath -> Inline -> IO Inline -convertImages tmpdir (Image ils (src, tit)) = do +convertImages tmpdir (Image attr ils (src, tit)) = do img <- convertImage tmpdir src newPath <- case img of Left e -> src <$ warn e Right fp -> return fp - return (Image ils (newPath, tit)) + return (Image attr ils (newPath, tit)) convertImages _ x = return x -- Convert formats which do not work well in pdf to png |