git.iko.soy/typeable/pandoc
on master help sign in
Export Text.Pandoc.Error in Text.Pandoc.

[API change]

commitd51e475badfcfb6e913ae4959cb1b400b4075446 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 24 Oct 2016, 22:31 (10 years ago) parent7b1a9d7
10 files changed+5−18
compare with master
unifiedsplit
pandoc.hs−1 src/Text/Pandoc.hs+2−1 src/Text/Pandoc/Readers/EPUB.hs+2−3 tests/Tests/Readers/HTML.hs−1 tests/Tests/Readers/LaTeX.hs−1 tests/Tests/Readers/Markdown.hs−2 tests/Tests/Readers/Odt.hs+1−6 tests/Tests/Readers/Org.hs−1 tests/Tests/Readers/RST.hs−1 tests/Tests/Readers/Txt2Tags.hs−1
pandoc.hs−1
@@ -73,7 +73,6 @@ import Control.Applicative ((<|>))
7373import Text.Pandoc.Readers.Txt2Tags (getT2TMeta)
7474import Paths_pandoc (getDataDir)
7575import Text.Printf (printf)
76−import Text.Pandoc.Error
7776#ifndef _WINDOWS
7877import System.Posix.Terminal (queryTerminal)
7978import System.Posix.IO (stdOutput)
src/Text/Pandoc.hs+2−1
@@ -37,7 +37,6 @@ inline links:
3737
3838> module Main where
3939> import Text.Pandoc
40−> import Text.Pandoc.Error (handleError)
4140>
4241> markdownToRST :: String -> String
4342> markdownToRST =
@@ -60,6 +59,8 @@ module Text.Pandoc
6059 , module Text.Pandoc.Generic
6160 -- * Options
6261 , module Text.Pandoc.Options
62+ -- * Error handling
63+ , module Text.Pandoc.Error
6364 -- * Lists of readers and writers
6465 , readers
6566 , writers
src/Text/Pandoc/Readers/EPUB.hs+2−3
@@ -10,8 +10,9 @@ module Text.Pandoc.Readers.EPUB
1010
1111import Text.XML.Light
1212import Text.Pandoc.Definition hiding (Attr)
13−import Text.Pandoc.Walk (walk, query)
1413import Text.Pandoc.Readers.HTML (readHtml)
14+import Text.Pandoc.Error
15+import Text.Pandoc.Walk (walk, query)
1516import Text.Pandoc.Options ( ReaderOptions(..), readerTrace)
1617import Text.Pandoc.Shared (escapeURI, collapseFilePath, addMetaField)
1718import Network.URI (unEscapeString)
@@ -35,8 +36,6 @@ import Control.DeepSeq (deepseq, NFData)
3536
3637import Debug.Trace (trace)
3738
38−import Text.Pandoc.Error
39−
4039type Items = M.Map String (FilePath, MimeType)
4140
4241readEPUB :: ReaderOptions -> BL.ByteString -> Either PandocError (Pandoc, MediaBag)
tests/Tests/Readers/HTML.hs−1
@@ -7,7 +7,6 @@ import Tests.Helpers
77import Text.Pandoc.Arbitrary()
88import Text.Pandoc.Builder
99import Text.Pandoc
10−import Text.Pandoc.Error
1110
1211html :: String -> Pandoc
1312html = handleError . readHtml def
tests/Tests/Readers/LaTeX.hs−1
@@ -7,7 +7,6 @@ import Tests.Helpers
77import Text.Pandoc.Arbitrary()
88import Text.Pandoc.Builder
99import Text.Pandoc
10−import Text.Pandoc.Error
1110
1211latex :: String -> Pandoc
1312latex = handleError . readLaTeX def
tests/Tests/Readers/Markdown.hs−2
@@ -7,9 +7,7 @@ import Tests.Helpers
77import Text.Pandoc.Arbitrary()
88import Text.Pandoc.Builder
99import qualified Data.Set as Set
10−-- import Text.Pandoc.Shared ( normalize )
1110import Text.Pandoc
12−import Text.Pandoc.Error
1311
1412markdown :: String -> Pandoc
1513markdown = handleError . readMarkdown def
tests/Tests/Readers/Odt.hs+1−6
@@ -5,18 +5,13 @@ import Text.Pandoc.Options
55import Text.Pandoc.Readers.Native
66import Text.Pandoc.Readers.Markdown
77import Text.Pandoc.Definition
8−import Text.Pandoc.Error
98import Tests.Helpers
109import Test.Framework
11−--import Test.HUnit (assertBool)
12−--import Test.Framework.Providers.HUnit
1310import qualified Data.ByteString.Lazy as B
1411import Text.Pandoc.Readers.Odt
1512import Text.Pandoc.Writers.Native (writeNative)
1613import qualified Data.Map as M
17−--import Text.Pandoc.MediaBag (MediaBag, lookupMedia, mediaDirectory)
18−--import Codec.Archive.Zip
19−
14+import Text.Pandoc.Error
2015
2116tests :: [Test]
2217tests = testsComparingToMarkdown ++ testsComparingToNative
tests/Tests/Readers/Org.hs−1
@@ -7,7 +7,6 @@ import Tests.Helpers
77import Text.Pandoc.Builder
88import Text.Pandoc
99import Data.List (intersperse)
10−import Text.Pandoc.Error
1110
1211org :: String -> Pandoc
1312org = handleError . readOrg def
tests/Tests/Readers/RST.hs−1
@@ -7,7 +7,6 @@ import Tests.Helpers
77import Text.Pandoc.Arbitrary()
88import Text.Pandoc.Builder
99import Text.Pandoc
10−import Text.Pandoc.Error
1110
1211rst :: String -> Pandoc
1312rst = handleError . readRST def{ readerStandalone = True }
tests/Tests/Readers/Txt2Tags.hs−1
@@ -7,7 +7,6 @@ import Tests.Helpers
77import Text.Pandoc.Arbitrary()
88import Text.Pandoc.Builder
99import Text.Pandoc
10−import Text.Pandoc.Error
1110import Data.List (intersperse)
1211import Text.Pandoc.Readers.Txt2Tags
1312