@@ -11,7 +11,6 @@ module Text.Pandoc.Readers.EPUB
11import Text.XML.Light
11import Text.XML.Light
12import Text.Pandoc.Definition hiding (Attr)
12import Text.Pandoc.Definition hiding (Attr)
13import Text.Pandoc.Walk (walk, query)
13import Text.Pandoc.Walk (walk, query)
14−import Text.Pandoc.Generic(bottomUp)
15import Text.Pandoc.Readers.HTML (readHtml)
14import Text.Pandoc.Readers.HTML (readHtml)
16import Text.Pandoc.Options ( ReaderOptions(..), readerTrace)
15import Text.Pandoc.Options ( ReaderOptions(..), readerTrace)
17import Text.Pandoc.Shared (escapeURI, collapseFilePath, addMetaField)
16import Text.Pandoc.Shared (escapeURI, collapseFilePath, addMetaField)
@@ -59,7 +58,7 @@ archiveToEPUB os archive = do
59 spine <- parseSpine items content
58 spine <- parseSpine items content
60 let escapedSpine = map (escapeURI . takeFileName . fst) spine
59 let escapedSpine = map (escapeURI . takeFileName . fst) spine
61 Pandoc _ bs <-
60 Pandoc _ bs <-
62− foldM' (\a b -> ((a <>) . bottomUp (prependHash escapedSpine))
61+ foldM' (\a b -> ((a <>) . walk (prependHash escapedSpine))
63 `liftM` parseSpineElem root b) mempty spine
62 `liftM` parseSpineElem root b) mempty spine
64 let ast = coverDoc <> (Pandoc meta bs)
63 let ast = coverDoc <> (Pandoc meta bs)
65 let mediaBag = fetchImages (M.elems items) root archive ast
64 let mediaBag = fetchImages (M.elems items) root archive ast