aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pandoc.cabal3
-rw-r--r--src/Text/Pandoc/PDF.hs32
2 files changed, 31 insertions, 4 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index 587258dc2..45b490772 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -253,7 +253,8 @@ Library
SHA >= 1.6 && < 1.7,
haddock-library >= 1.1 && < 1.2,
old-time,
- deepseq-generics >= 0.1 && < 0.2
+ deepseq-generics >= 0.1 && < 0.2,
+ JuicyPixels >= 3.1.6.1 && < 3.2
if flag(https)
Build-Depends: http-client >= 0.3.2 && < 0.4,
http-client-tls >= 0.2 && < 0.3,
diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs
index 35554637a..83371a6ff 100644
--- a/src/Text/Pandoc/PDF.hs
+++ b/src/Text/Pandoc/PDF.hs
@@ -39,7 +39,8 @@ import System.FilePath
import System.Directory
import Data.Digest.Pure.SHA (showDigest, sha1)
import System.Environment
-import Control.Monad (unless)
+import Control.Monad (unless, (<=<))
+import Control.Applicative ((<$>), (<$))
import Data.List (isInfixOf)
import Data.Maybe (fromMaybe)
import qualified Text.Pandoc.UTF8 as UTF8
@@ -47,9 +48,10 @@ import Text.Pandoc.Definition
import Text.Pandoc.Walk (walkM)
import Text.Pandoc.Shared (fetchItem', warn, withTempDir)
import Text.Pandoc.Options (WriterOptions(..))
-import Text.Pandoc.MIME (extensionFromMimeType)
+import Text.Pandoc.MIME (extensionFromMimeType, getMimeType)
import Text.Pandoc.Process (pipeProcess)
import qualified Data.ByteString.Lazy as BL
+import qualified Codec.Picture as JP
#ifdef _WINDOWS
import Data.List (intercalate)
#endif
@@ -73,7 +75,7 @@ handleImages :: WriterOptions
-> FilePath -- ^ temp dir to store images
-> Pandoc -- ^ document
-> IO Pandoc
-handleImages opts tmpdir = walkM (handleImage' opts tmpdir)
+handleImages opts tmpdir = walkM (convertImages tmpdir) <=< walkM (handleImage' opts tmpdir)
handleImage' :: WriterOptions
-> FilePath
@@ -98,6 +100,30 @@ handleImage' opts tmpdir (Image ils (src,tit)) = do
return $ Image ils (src,tit)
handleImage' _ _ x = return x
+convertImages :: FilePath -> Inline -> IO Inline
+convertImages tmpdir (Image ils (src, tit)) = do
+ img <- convertImage tmpdir src
+ newPath <-
+ case img of
+ Left _ -> src <$ (warn $ "Unable to convert image `" ++ src ++ "'")
+ Right (fp, action) -> fp <$ action
+ return (Image ils (newPath, tit))
+convertImages _ x = return x
+
+-- Convert formats which do not work well in pdf to png
+convertImage :: FilePath -> FilePath -> IO (Either String ((FilePath, IO ())))
+convertImage tmpdir fname =
+ case mime of
+ Just "image/png" -> doNothing
+ Just "image/jpeg" -> doNothing
+ Just "application/pdf" -> doNothing
+ _ -> savePng <$> JP.readImage fname
+ where
+ fileOut = replaceDirectory (replaceExtension fname (".png")) tmpdir
+ savePng = fmap (\x -> (fileOut, JP.savePngImage fileOut x))
+ mime = getMimeType fname
+ doNothing = return (Right $ (fname, return ()))
+
tex2pdf' :: FilePath -- ^ temp directory for output
-> String -- ^ tex program
-> String -- ^ tex source