@@ -433,7 +433,7 @@ pandocToEPUB version opts doc@(Pandoc meta _) = do
433433 -- handle pictures
434434 -- mediaRef <- P.newIORef []
435435 Pandoc _ blocks <- walkM (transformInline opts') doc >>=
436− walkM (transformBlock opts')
436+ walkM transformBlock
437437 picEntries <- (catMaybes . map (snd . snd)) <$> (gets stMediaPaths)
438438 -- handle fonts
439439 let matchingGlob f = do
@@ -891,29 +891,26 @@ showDateTimeISO8601 :: UTCTime -> String
891891showDateTimeISO8601 = formatTime defaultTimeLocale "%FT%TZ"
892892
893893transformTag :: PandocMonad m
894− => WriterOptions
895− -- -> IORef [(FilePath, (FilePath, Maybe Entry))] -- ^ (oldpath, newpath, entry) media
896− -> Tag String
894+ => Tag String
897895 -> E m (Tag String)
898−transformTag opts tag@(TagOpen name attr)
896+transformTag tag@(TagOpen name attr)
899897 | name `elem` ["video", "source", "img", "audio"] &&
900898 lookup "data-external" attr == Nothing = do
901899 let src = fromAttrib "src" tag
902900 let poster = fromAttrib "poster" tag
903− newsrc <- modifyMediaRef opts src
904− newposter <- modifyMediaRef opts poster
901+ newsrc <- modifyMediaRef src
902+ newposter <- modifyMediaRef poster
905903 let attr' = filter (\(x,_) -> x /= "src" && x /= "poster") attr ++
906904 [("src", newsrc) | not (null newsrc)] ++
907905 [("poster", newposter) | not (null newposter)]
908906 return $ TagOpen name attr'
909−transformTag _ tag = return tag
907+transformTag tag = return tag
910908
911909modifyMediaRef :: PandocMonad m
912− => WriterOptions
913− -> FilePath
910+ => FilePath
914911 -> E m FilePath
915−modifyMediaRef _ "" = return ""
916−modifyMediaRef opts oldsrc = do
912+modifyMediaRef "" = return ""
913+modifyMediaRef oldsrc = do
917914 media <- gets stMediaPaths
918915 case lookup oldsrc media of
919916 Just (n,_) -> return n
@@ -932,35 +929,32 @@ modifyMediaRef opts oldsrc = do
932929 return oldsrc)
933930
934931transformBlock :: PandocMonad m
935− => WriterOptions
936− -- -> IORef [(FilePath, (FilePath, Maybe Entry))] -- ^ (oldpath, newpath, entry) media
937− -> Block
932+ => Block
938933 -> E m Block
939−transformBlock opts (RawBlock fmt raw)
934+transformBlock (RawBlock fmt raw)
940935 | fmt == Format "html" = do
941936 let tags = parseTags raw
942− tags' <- mapM (transformTag opts) tags
937+ tags' <- mapM transformTag tags
943938 return $ RawBlock fmt (renderTags' tags')
944−transformBlock _ b = return b
939+transformBlock b = return b
945940
946941transformInline :: PandocMonad m
947942 => WriterOptions
948− -- -> IORef [(FilePath, (FilePath, Maybe Entry))] -- ^ (oldpath, newpath) media
949943 -> Inline
950944 -> E m Inline
951−transformInline opts (Image attr lab (src,tit)) = do
952− newsrc <- modifyMediaRef opts src
945+transformInline _opts (Image attr lab (src,tit)) = do
946+ newsrc <- modifyMediaRef src
953947 return $ Image attr lab ("../" ++ newsrc, tit)
954948transformInline opts (x@(Math t m))
955949 | WebTeX url <- writerHTMLMathMethod opts = do
956− newsrc <- modifyMediaRef opts (url ++ urlEncode m)
950+ newsrc <- modifyMediaRef (url ++ urlEncode m)
957951 let mathclass = if t == DisplayMath then "display" else "inline"
958952 return $ Span ("",["math",mathclass],[])
959953 [Image nullAttr [x] ("../" ++ newsrc, "")]
960−transformInline opts (RawInline fmt raw)
954+transformInline _opts (RawInline fmt raw)
961955 | fmt == Format "html" = do
962956 let tags = parseTags raw
963− tags' <- mapM (transformTag opts) tags
957+ tags' <- mapM transformTag tags
964958 return $ RawInline fmt (renderTags' tags')
965959transformInline _ x = return x
966960