fixup! refactor(svgToPng): introduce PandocMonad.svgToPng

Author: edwintorok

src/Text/Pandoc/Class/IO.hs

@@ -174,8 +174,8 @@ readStdinStrict = liftIOError (const B.getContents) "stdin"
 
 -- | Runs an image conversion step, returning an error on failure.
 -- Not available when sandboxed.
-svgToPng :: (PandocMonad m, MonadIO m) => (Int, Maybe Double, Maybe Double, BL.ByteString) -> m (Either T.Text BL.ByteString)
-svgToPng (dpi, xPt, yPt, bs) = svgToPngIO dpi xPt yPt bs
+svgToPng :: (PandocMonad m, MonadIO m) => Int -> Maybe Double -> Maybe Double -> BL.ByteString -> m (Either T.Text BL.ByteString)
+svgToPng = svgToPngIO
 
 -- | Return a list of paths that match a glob, relative to the working
 -- directory. See 'System.FilePath.Glob' for the glob syntax.

src/Text/Pandoc/Class/PandocMonad.hs

@@ -118,7 +118,7 @@ class (Functor m, Applicative m, Monad m, MonadError PandocError m)
   readStdinStrict :: m B.ByteString
   -- | Converts an SVG to a PNG (dpiX, widthPoints, heightPoints, svgBlob)
   -- Not called when sandboxed.
-  svgToPng :: (Int, Maybe Double, Maybe Double, BL.ByteString) -> m (Either T.Text BL.ByteString)
+  svgToPng :: Int -> Maybe Double -> Maybe Double -> BL.ByteString -> m (Either T.Text BL.ByteString)
   -- | Return a list of paths that match a glob, relative to
   -- the working directory.  See 'System.FilePath.Glob' for
   -- the glob syntax.
@@ -508,7 +508,7 @@ instance (MonadTrans t, PandocMonad m, Functor (t m),
   readFileLazy = lift . readFileLazy
   readFileStrict = lift . readFileStrict
   readStdinStrict = lift readStdinStrict
-  svgToPng = lift . svgToPng
+  svgToPng dpi width height bs = lift $ svgToPng dpi width height bs
   glob = lift . glob
   fileExists = lift . fileExists
   getDataFileName = lift . getDataFileName
@@ -527,7 +527,7 @@ instance {-# OVERLAPS #-} PandocMonad m => PandocMonad (ParsecT s st m) where
   readFileLazy = lift . readFileLazy
   readFileStrict = lift . readFileStrict
   readStdinStrict = lift readStdinStrict
-  svgToPng = lift . svgToPng
+  svgToPng dpi width height bs = lift $ svgToPng dpi width height bs
   glob = lift . glob
   fileExists = lift . fileExists
   getDataFileName = lift . getDataFileName

src/Text/Pandoc/Class/PandocPure.hs

@@ -206,7 +206,7 @@ instance PandocMonad PandocPure where
 
   readStdinStrict = getsPureState stStdin
 
-  svgToPng _ = return $ Left "SVG conversion not available in PandocPure"
+  svgToPng _ _ _ _ = return $ Left "SVG conversion not available in PandocPure"
 
   glob s = do
     FileTree ftmap <- getsPureState stFiles