7f676b5 · typeable/pandoc

pandoc.cabal−1

compare with master

unifiedsplit

@@ -415,7 +415,6 @@ Library

415 Text.Pandoc.Slides,

416 Text.Pandoc.Highlighting,

417 Text.Pandoc.Compat.Time,

418− Text.Pandoc.Compat.Except,

419 Text.Pandoc.Compat.TagSoupEntity,

418 Text.Pandoc.Compat.TagSoupEntity,

420 Text.Pandoc.Compat.Directory,

419 Text.Pandoc.Compat.Directory,

421 Paths_pandoc

420 Paths_pandoc

src/Text/Pandoc/Error.hs−5

@@ -33,7 +33,6 @@ module Text.Pandoc.Error (PandocError(..), handleError) where

33

34import Text.Parsec.Error

35import Text.Parsec.Pos hiding (Line)

36−import Text.Pandoc.Compat.Except

37import GHC.Generics (Generic)

36import GHC.Generics (Generic)

38import Data.Generics (Typeable)

37import Data.Generics (Typeable)

39import Control.Exception (Exception)

38import Control.Exception (Exception)

@@ -48,10 +47,6 @@ data PandocError = -- | Generic parse failure

48

47

49instance Exception PandocError

48instance Exception PandocError

50

49

51−instance Error PandocError where

52− strMsg = ParseFailure

53−

54−

55-- | An unsafe method to handle `PandocError`s.

50-- | An unsafe method to handle `PandocError`s.

56handleError :: Either PandocError a -> a

51handleError :: Either PandocError a -> a

57handleError (Right r) = r

52handleError (Right r) = r

src/Text/Pandoc/ImageSize.hs+1−2

@@ -59,8 +59,7 @@ import Numeric (showFFloat)

59import Text.Pandoc.Definition

60import Text.Pandoc.Options

61import qualified Data.Map as M

62−import Text.Pandoc.Compat.Except

63−import Control.Monad.Trans

62+import Control.Monad.Except

64import Data.Maybe (fromMaybe)

63import Data.Maybe (fromMaybe)

65

64

66-- quick and dirty functions to get image sizes

65-- quick and dirty functions to get image sizes

src/Text/Pandoc/Readers/DocBook.hs+1−1

@@ -14,7 +14,7 @@ import Data.List (intersperse)

14import Data.Maybe (fromMaybe)

15import Text.TeXMath (readMathML, writeTeX)

16import Text.Pandoc.Error (PandocError)

17−import Text.Pandoc.Compat.Except

17+import Control.Monad.Except

18import Data.Default

19import Data.Foldable (asum)

20

src/Text/Pandoc/Readers/Docx.hs+1−1

@@ -98,7 +98,7 @@ import Data.Traversable (traverse)

98#endif

99

100import Text.Pandoc.Error

101−import Text.Pandoc.Compat.Except

101+import Control.Monad.Except

102

103readDocxWithWarnings :: ReaderOptions

104 -> B.ByteString

src/Text/Pandoc/Readers/Docx/Parse.hs+1−4

@@ -64,7 +64,7 @@ import Control.Monad.Reader

64import Control.Monad.State

65import Control.Applicative ((<|>))

66import qualified Data.Map as M

67−import Text.Pandoc.Compat.Except

67+import Control.Monad.Except

68import Text.Pandoc.Shared (safeRead)

69import Text.TeXMath.Readers.OMML (readOMML)

70import Text.Pandoc.Readers.Docx.Fonts (getUnicode, Font(..))

@@ -91,9 +91,6 @@ data ReaderState = ReaderState { stateWarnings :: [String] }

91data DocxError = DocxError | WrongElem

92 deriving Show

93

94−instance Error DocxError where

95− noMsg = WrongElem

96−

97type D = ExceptT DocxError (ReaderT ReaderEnv (State ReaderState))

94type D = ExceptT DocxError (ReaderT ReaderEnv (State ReaderState))

98

95

99runD :: D a -> ReaderEnv -> ReaderState -> (Either DocxError a, ReaderState)

96runD :: D a -> ReaderEnv -> ReaderState -> (Either DocxError a, ReaderState)

src/Text/Pandoc/Readers/EPUB.hs+1−1

@@ -16,7 +16,7 @@ import Text.Pandoc.Options ( ReaderOptions(..), readerTrace)

16import Text.Pandoc.Shared (escapeURI, collapseFilePath, addMetaField)

17import Network.URI (unEscapeString)

18import Text.Pandoc.MediaBag (MediaBag, insertMedia)

19−import Text.Pandoc.Compat.Except (MonadError, throwError, runExcept, Except)

19+import Control.Monad.Except (MonadError, throwError, runExcept, Except)

20import Text.Pandoc.MIME (MimeType)

21import qualified Text.Pandoc.Builder as B

22import Codec.Archive.Zip ( Archive (..), toArchiveOrFail, fromEntry

src/Text/Pandoc/Readers/OPML.hs+1−1

@@ -11,7 +11,7 @@ import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)

11import Data.Generics

12import Control.Monad.State

13import Data.Default

14−import Text.Pandoc.Compat.Except

14+import Control.Monad.Except

15import Text.Pandoc.Error

16

17type OPML = ExceptT PandocError (State OPMLState)