Merge pull request #1507 from mpickering/master

Images are now relative to manifest file.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/Text/Pandoc/Readers/EPUB.hs b/src/Text/Pandoc/Readers/EPUB.hs
index b6b271488..fd5980f0a 100644
--- a/src/Text/Pandoc/Readers/EPUB.hs
+++ b/src/Text/Pandoc/Readers/EPUB.hs
@@ -55,7 +55,7 @@ archiveToEPUB os archive = do
   meta  <- parseMeta content
   (cover, items) <- parseManifest content
   -- No need to collapse here as the image path is from the manifest file
-  let coverDoc = fromMaybe mempty (imageToPandoc . (root </>) <$> cover)
+  let coverDoc = fromMaybe mempty (imageToPandoc <$> cover)
   spine <- parseSpine items content
   let escapedSpine = map (escapeURI . takeFileName . fst) spine
   Pandoc _ bs <-
@@ -69,17 +69,17 @@ archiveToEPUB os archive = do
     parseSpineElem :: MonadError String m => FilePath -> (FilePath, MIME) -> m Pandoc
     parseSpineElem (normalise -> r) (normalise -> path, mime) = do
       when (readerTrace os) (traceM path)
-      doc <- mimeToReader mime (r </> path)
+      doc <- mimeToReader mime r path
       let docSpan = B.doc $ B.para $ B.spanWith (takeFileName path, [], []) mempty
       return $ docSpan <> doc
-    mimeToReader :: MonadError String m => MIME -> FilePath ->  m Pandoc
-    mimeToReader "application/xhtml+xml" (normalise -> path) = do
-      fname <- findEntryByPathE path archive
+    mimeToReader :: MonadError String m => MIME -> FilePath -> FilePath ->  m Pandoc
+    mimeToReader "application/xhtml+xml" (normalise -> root) (normalise -> path) = do
+      fname <- findEntryByPathE (root </> path) archive
       return $ fixInternalReferences path .
                 readHtml os' .
                   UTF8.toStringLazy $
                     fromEntry fname
-    mimeToReader s path
+    mimeToReader s _ path
       | s `elem` imageMimes = return $ imageToPandoc path
       | otherwise = return $ mempty