summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-10-24 22:31:36 +0200
committerJohn MacFarlane <jgm@berkeley.edu>2016-10-24 22:31:36 +0200
commitd51e475badfcfb6e913ae4959cb1b400b4075446 (patch)
tree4941b2e6bbb9a898d429e634b1830e08c508fce5 /src
parent7b1a9d7aca1737e197609bd17dcbdc1e8c9d9bf6 (diff)
Export Text.Pandoc.Error in Text.Pandoc.
[API change]
Diffstat (limited to 'src')
-rw-r--r--src/Text/Pandoc.hs3
-rw-r--r--src/Text/Pandoc/Readers/EPUB.hs5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs
index 826862dee..4731fdb85 100644
--- a/src/Text/Pandoc.hs
+++ b/src/Text/Pandoc.hs
@@ -37,7 +37,6 @@ inline links:
> module Main where
> import Text.Pandoc
-> import Text.Pandoc.Error (handleError)
>
> markdownToRST :: String -> String
> markdownToRST =
@@ -60,6 +59,8 @@ module Text.Pandoc
, module Text.Pandoc.Generic
-- * Options
, module Text.Pandoc.Options
+ -- * Error handling
+ , module Text.Pandoc.Error
-- * Lists of readers and writers
, readers
, writers
diff --git a/src/Text/Pandoc/Readers/EPUB.hs b/src/Text/Pandoc/Readers/EPUB.hs
index 7b1546939..4c31bf1ae 100644
--- a/src/Text/Pandoc/Readers/EPUB.hs
+++ b/src/Text/Pandoc/Readers/EPUB.hs
@@ -10,8 +10,9 @@ module Text.Pandoc.Readers.EPUB
import Text.XML.Light
import Text.Pandoc.Definition hiding (Attr)
-import Text.Pandoc.Walk (walk, query)
import Text.Pandoc.Readers.HTML (readHtml)
+import Text.Pandoc.Error
+import Text.Pandoc.Walk (walk, query)
import Text.Pandoc.Options ( ReaderOptions(..), readerTrace)
import Text.Pandoc.Shared (escapeURI, collapseFilePath, addMetaField)
import Network.URI (unEscapeString)
@@ -35,8 +36,6 @@ import Control.DeepSeq (deepseq, NFData)
import Debug.Trace (trace)
-import Text.Pandoc.Error
-
type Items = M.Map String (FilePath, MimeType)
readEPUB :: ReaderOptions -> BL.ByteString -> Either PandocError (Pandoc, MediaBag)