9cf5f74 · typeable/pandoc

git.iko.soy/typeable/pandoc

PDF writer: Fixed treatment of data uris for images.

Closes #1062.

commit9cf5f74e8fad9c7b898553724a37035bfc46f268 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 28 May 2014, 10:40 (12 years ago) parent63865e4

2 files changed+4−3

unifiedsplit

pandoc.cabal+2−1

@@ -237,7 +237,8 @@ Library

237237 scientific >= 0.2 && < 0.4,

238238 vector >= 0.10 && < 0.11,

239239 hslua >= 0.3 && < 0.4,

240− binary >= 0.5 && < 0.8

240+ binary >= 0.5 && < 0.8,

241+ SHA >= 1.6 && < 1.7

241242 Build-Tools: alex, happy

242243 if flag(https)

243244 Build-Depends: http-client >= 0.3.2 && < 0.4,

src/Text/Pandoc/PDF.hs+2−2

@@ -38,11 +38,11 @@ import qualified Data.ByteString as BS

3838import System.Exit (ExitCode (..))

3939import System.FilePath

4040import System.Directory

41+import Data.Digest.Pure.SHA (showDigest, sha1)

4142import System.Environment

4243import Control.Monad (unless)

4344import Data.List (isInfixOf)

4445import Data.Maybe (fromMaybe)

45−import qualified Data.ByteString.Base64 as B64

4646import qualified Text.Pandoc.UTF8 as UTF8

4747import Text.Pandoc.Definition

4848import Text.Pandoc.Walk (walkM)

@@ -98,7 +98,7 @@ handleImage' baseURL tmpdir (Image ils (src,tit)) = do

9898 Right (contents, Just mime) -> do

9999 let ext = fromMaybe (takeExtension src) $

100100 extensionFromMimeType mime

101− let basename = UTF8.toString $ B64.encode $ UTF8.fromString src

101+ let basename = showDigest $ sha1 $ BL.fromChunks [contents]

102102 let fname = tmpdir </> basename <.> ext

103103 BS.writeFile fname contents

104104 return $ Image ils (fname,tit)