45c7108 · typeable/pandoc

pandoc.cabal−1

compare with master

unifiedsplit

@@ -418,7 +418,6 @@ Library

418 Text.Pandoc.Compat.Except,

419 Text.Pandoc.Compat.TagSoupEntity,

420 Text.Pandoc.Compat.Directory,

421− Text.Pandoc.Compat.Monoid,

422 Paths_pandoc

421 Paths_pandoc

423

422

424 Buildable: True

423 Buildable: True

src/Text/Pandoc/Compat/Monoid.hsdeleted−17

@@ -1,17 +0,0 @@

1−{-# LANGUAGE CPP #-}

2−module Text.Pandoc.Compat.Monoid ( (<>) )

3− where

4−

5−#if MIN_VERSION_base(4,5,0)

6−import Data.Monoid ((<>))

7−

8−#else

9−import Data.Monoid

10−

11−infixr 6 <>

12−

13−--- | An infix synonym for 'mappend'.

14−(<>) :: Monoid m => m -> m -> m

15−(<>) = mappend

16−{-# INLINE (<>) #-}

17−#endif

src/Text/Pandoc/PDF.hs+1−1

@@ -34,7 +34,7 @@ import Data.ByteString.Lazy (ByteString)

34import qualified Data.ByteString.Lazy as B

35import qualified Data.ByteString.Lazy.Char8 as BC

36import qualified Data.ByteString as BS

37−import Text.Pandoc.Compat.Monoid ((<>))

37+import Data.Monoid ((<>))

38import System.Exit (ExitCode (..))

39import System.FilePath

40import System.IO (stderr, stdout)

src/Text/Pandoc/Parsing.hs+1−1

@@ -186,7 +186,7 @@ import Text.TeXMath.Readers.TeX.Macros (applyMacros, Macro,

186 parseMacroDefinitions)

187import Text.Pandoc.Compat.TagSoupEntity ( lookupEntity )

188import Text.Pandoc.Asciify (toAsciiChar)

189−import Text.Pandoc.Compat.Monoid ((<>))

189+import Data.Monoid ((<>))

190import Data.Default

191import qualified Data.Set as Set

192import Control.Monad.Reader

src/Text/Pandoc/Pretty.hs+1−1

@@ -80,7 +80,7 @@ import Data.List (intercalate)

80import Data.String

81import Control.Monad.State

82import Data.Char (isSpace)

83−import Text.Pandoc.Compat.Monoid ((<>))

83+import Data.Monoid ((<>))

84

85data RenderState a = RenderState{

86 output :: [a] -- ^ In reverse order

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

@@ -17,7 +17,7 @@ import Text.Pandoc.Shared (escapeURI, collapseFilePath, addMetaField)

17import Network.URI (unEscapeString)

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

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

20−import Text.Pandoc.Compat.Monoid ((<>))

20+import Data.Monoid ((<>))

21import Text.Pandoc.MIME (MimeType)

22import qualified Text.Pandoc.Builder as B

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

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

@@ -66,7 +66,7 @@ import Control.Monad.Reader (Reader,ask, asks, local, runReader)

66import Network.URI (URI, parseURIReference, nonStrictRelativeTo)

67import Text.Pandoc.Error

68import Text.Pandoc.CSS (foldOrElse, pickStyleAttrProps)

69−import Text.Pandoc.Compat.Monoid ((<>))

69+import Data.Monoid ((<>))

70import Text.Parsec.Error

71import qualified Data.Set as Set

72

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

@@ -16,7 +16,7 @@ module Text.Pandoc.Readers.Haddock

16

17import Text.Pandoc.Builder (Blocks, Inlines)

18import qualified Text.Pandoc.Builder as B

19−import Text.Pandoc.Compat.Monoid ((<>))

19+import Data.Monoid ((<>))

20import Text.Pandoc.Shared (trim, splitBy)

21import Data.List (intersperse, stripPrefix)

22import Data.Maybe (fromMaybe)

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

@@ -64,7 +64,7 @@ import Text.HTML.TagSoup

64import qualified Data.Set as Set

65import Text.Printf (printf)

66import Debug.Trace (trace)

67−import Text.Pandoc.Compat.Monoid ((<>))

67+import Data.Monoid ((<>))

68import Text.Pandoc.Error

69

70type MarkdownParser = Parser [Char] ParserState

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

@@ -39,7 +39,7 @@ module Text.Pandoc.Readers.MediaWiki ( readMediaWiki ) where

39import Text.Pandoc.Definition

40import qualified Text.Pandoc.Builder as B

41import Text.Pandoc.Builder (Inlines, Blocks, trimInlines)

42−import Text.Pandoc.Compat.Monoid ((<>))

42+import Data.Monoid ((<>))

43import Text.Pandoc.Options

44import Text.Pandoc.Readers.HTML ( htmlTag, isBlockTag, isCommentTag )

45import Text.Pandoc.XML ( fromEntities )

src/Text/Pandoc/Readers/Odt/Arrows/State.hs+1−1

@@ -46,7 +46,7 @@ import Control.Monad

46

47import Data.Foldable

48

49−import Text.Pandoc.Compat.Monoid

49+import Data.Monoid

50import Text.Pandoc.Readers.Odt.Arrows.Utils

51import Text.Pandoc.Readers.Odt.Generic.Fallible

52

src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs+1−1

@@ -46,7 +46,7 @@ import qualified Data.Foldable as F

46

47import Text.Pandoc.Readers.Odt.Generic.Fallible

48import Text.Pandoc.Readers.Odt.Generic.Utils

49−import Text.Pandoc.Compat.Monoid

49+import Data.Monoid

50

51and2 :: (Arrow a) => a b c -> a b c' -> a b (c,c')

52and2 = (&&&)

src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs+1−1

@@ -41,7 +41,7 @@ module Text.Pandoc.Readers.Odt.Generic.Fallible where

41

42import Control.Applicative

43import Control.Monad

44−import Text.Pandoc.Compat.Monoid ((<>))

44+import Data.Monoid ((<>))

45import qualified Data.Foldable as F

46

47-- | Default for now. Will probably become a class at some point.

src/Text/Pandoc/Readers/Org/Blocks.hs+1−1

@@ -45,7 +45,7 @@ import Text.Pandoc.Readers.Org.Shared

45import qualified Text.Pandoc.Builder as B

46import Text.Pandoc.Builder ( Inlines, Blocks )

47import Text.Pandoc.Definition

48−import Text.Pandoc.Compat.Monoid ((<>))

48+import Data.Monoid ((<>))

49import Text.Pandoc.Options

50import Text.Pandoc.Shared ( compactify', compactify'DL )

51

src/Text/Pandoc/Readers/Org/Inlines.hs+1−1

@@ -43,7 +43,7 @@ import Text.Pandoc.Readers.Org.Shared

43import qualified Text.Pandoc.Builder as B

44import Text.Pandoc.Builder ( Inlines )

45import Text.Pandoc.Definition

46−import Text.Pandoc.Compat.Monoid ( (<>) )

46+import Data.Monoid ( (<>) )

47import Text.Pandoc.Options

48import Text.Pandoc.Readers.LaTeX ( inlineCommand, rawLaTeXInline )

49import Text.TeXMath ( readTeX, writePandoc, DisplayType(..) )

src/Text/Pandoc/Readers/Org/Meta.hs+1−1

@@ -41,7 +41,7 @@ import Text.Pandoc.Readers.Org.Parsing

41import qualified Text.Pandoc.Builder as B

42import Text.Pandoc.Builder ( Blocks, Inlines )

43import Text.Pandoc.Definition

44−import Text.Pandoc.Compat.Monoid ((<>))

44+import Data.Monoid ((<>))

45

46import Control.Monad ( mzero )

47import Data.Char ( toLower )

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

@@ -48,7 +48,7 @@ import Text.Pandoc.Builder (Inlines, Blocks, trimInlines)

48import qualified Text.Pandoc.Builder as B

49import Data.Sequence (viewr, ViewR(..))

50import Data.Char (toLower, isHexDigit, isSpace)

51−import Text.Pandoc.Compat.Monoid ((<>))

51+import Data.Monoid ((<>))

52import Text.Pandoc.Error

53

54-- | Parse reStructuredText string and return Pandoc document.

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

@@ -65,7 +65,7 @@ import Text.HTML.TagSoup.Match

65import Data.List ( intercalate, transpose, intersperse )

66import Data.Char ( digitToInt, isUpper )

67import Control.Monad ( guard, liftM, when )

68−import Text.Pandoc.Compat.Monoid ((<>))

68+import Data.Monoid ((<>))

69import Text.Printf

70import Debug.Trace (trace)

71import Text.Pandoc.Error

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

@@ -34,7 +34,7 @@ module Text.Pandoc.Readers.Txt2Tags ( readTxt2Tags

34

35import qualified Text.Pandoc.Builder as B

36import Text.Pandoc.Builder ( Inlines, Blocks, trimInlines )

37−import Text.Pandoc.Compat.Monoid ((<>))

37+import Data.Monoid ((<>))

38import Text.Pandoc.Definition

39import Text.Pandoc.Options

40import Text.Pandoc.Shared (escapeURI,compactify', compactify'DL)

src/Text/Pandoc/Shared.hs+1−1

@@ -132,7 +132,7 @@ import System.IO (stderr)

132import System.IO.Temp

133import Text.HTML.TagSoup (renderTagsOptions, RenderOptions(..), Tag(..),

134 renderOptions)

135−import Text.Pandoc.Compat.Monoid ((<>))

135+import Data.Monoid ((<>))

136import qualified Data.ByteString as BS

137import qualified Data.ByteString.Char8 as B8

138import Data.ByteString.Base64 (decodeLenient)

src/Text/Pandoc/Templates.hs+1−1

@@ -98,7 +98,7 @@ import Control.Monad (guard, when)

98import Data.Aeson (ToJSON(..), Value(..))

99import qualified Text.Parsec as P

100import Text.Parsec.Text (Parser)

101−import Text.Pandoc.Compat.Monoid ((<>))

101+import Data.Monoid ((<>))

102import qualified Data.Text as T

103import Data.Text (Text)

104import Data.Text.Encoding (encodeUtf8)

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

@@ -60,7 +60,7 @@ import Data.Unique (hashUnique, newUnique)

60import System.Random (randomRIO)

61import Text.Printf (printf)

62import qualified Control.Exception as E

63−import Text.Pandoc.Compat.Monoid ((<>))

63+import Data.Monoid ((<>))

64import Text.Pandoc.MIME (MimeType, getMimeType, getMimeTypeDef,

65 extensionFromMimeType)

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

src/Text/Pandoc/Writers/HTML.hs+1−1

@@ -31,7 +31,7 @@ Conversion of 'Pandoc' documents to HTML.

31-}

32module Text.Pandoc.Writers.HTML ( writeHtml , writeHtmlString ) where

33import Text.Pandoc.Definition

34−import Text.Pandoc.Compat.Monoid ((<>))

34+import Data.Monoid ((<>))

35import Text.Pandoc.Shared

36import Text.Pandoc.Writers.Shared

37import Text.Pandoc.Options