45c7108 · typeable/pandoc

git.iko.soy/typeable/pandoc

Remove Compat.Monoid

This was only necessary for GHC versions with base below 4.5 (i.e., ghc < 7.4).

commit45c7108b4f8dbaf616bb9b9442f4d16892d4440f authorJesse Rosenthal <jrosenthal@jhu.edu> dateTue 30 Aug 2016, 13:43 (10 years ago) parentb0013bf

23 files changed+21−39

compare with master

unifiedsplit

pandoc.cabal−1

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

418418 Text.Pandoc.Compat.Except,

419419 Text.Pandoc.Compat.TagSoupEntity,

420420 Text.Pandoc.Compat.Directory,

421− Text.Pandoc.Compat.Monoid,

422421 Paths_pandoc

423422

424423 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)

3434import qualified Data.ByteString.Lazy as B

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

3636import qualified Data.ByteString as BS

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

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

3838import System.Exit (ExitCode (..))

3939import System.FilePath

4040import System.IO (stderr, stdout)

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

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

186186 parseMacroDefinitions)

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

188188import Text.Pandoc.Asciify (toAsciiChar)

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

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

190190import Data.Default

191191import qualified Data.Set as Set

192192import Control.Monad.Reader

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

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

8080import Data.String

8181import Control.Monad.State

8282import Data.Char (isSpace)

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

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

8484

8585data RenderState a = RenderState{

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

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

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

1717import Network.URI (unEscapeString)

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

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

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

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

2121import Text.Pandoc.MIME (MimeType)

2222import qualified Text.Pandoc.Builder as B

2323import 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)

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

6767import Text.Pandoc.Error

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

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

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

7070import Text.Parsec.Error

7171import qualified Data.Set as Set

7272

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

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

1616

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

1818import qualified Text.Pandoc.Builder as B

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

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

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

2121import Data.List (intersperse, stripPrefix)

2222import Data.Maybe (fromMaybe)

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

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

6464import qualified Data.Set as Set

6565import Text.Printf (printf)

6666import Debug.Trace (trace)

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

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

6868import Text.Pandoc.Error

6969

7070type MarkdownParser = Parser [Char] ParserState

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

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

3939import Text.Pandoc.Definition

4040import qualified Text.Pandoc.Builder as B

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

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

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

4343import Text.Pandoc.Options

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

4545import Text.Pandoc.XML ( fromEntities )

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

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

4646

4747import Data.Foldable

4848

49−import Text.Pandoc.Compat.Monoid

49+import Data.Monoid

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

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

5252

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

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

4646

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

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

49−import Text.Pandoc.Compat.Monoid

49+import Data.Monoid

5050

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

5252and2 = (&&&)

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

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

4141

4242import Control.Applicative

4343import Control.Monad

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

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

4545import qualified Data.Foldable as F

4646

4747-- | 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

4545import qualified Text.Pandoc.Builder as B

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

4747import Text.Pandoc.Definition

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

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

4949import Text.Pandoc.Options

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

5151

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

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

4343import qualified Text.Pandoc.Builder as B

4444import Text.Pandoc.Builder ( Inlines )

4545import Text.Pandoc.Definition

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

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

4747import Text.Pandoc.Options

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

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

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

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

4141import qualified Text.Pandoc.Builder as B

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

4343import Text.Pandoc.Definition

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

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

4545

4646import Control.Monad ( mzero )

4747import Data.Char ( toLower )

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

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

4848import qualified Text.Pandoc.Builder as B

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

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

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

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

5252import Text.Pandoc.Error

5353

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

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

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

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

6666import Data.Char ( digitToInt, isUpper )

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

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

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

6969import Text.Printf

7070import Debug.Trace (trace)

7171import Text.Pandoc.Error

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

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

3434

3535import qualified Text.Pandoc.Builder as B

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

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

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

3838import Text.Pandoc.Definition

3939import Text.Pandoc.Options

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

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

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

132132import System.IO.Temp

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

134134 renderOptions)

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

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

136136import qualified Data.ByteString as BS

137137import qualified Data.ByteString.Char8 as B8

138138import Data.ByteString.Base64 (decodeLenient)

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

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

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

9999import qualified Text.Parsec as P

100100import Text.Parsec.Text (Parser)

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

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

102102import qualified Data.Text as T

103103import Data.Text (Text)

104104import Data.Text.Encoding (encodeUtf8)

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

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

6060import System.Random (randomRIO)

6161import Text.Printf (printf)

6262import qualified Control.Exception as E

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

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

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

6565 extensionFromMimeType)

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

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

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

3131-}

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

3333import Text.Pandoc.Definition

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

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

3535import Text.Pandoc.Shared

3636import Text.Pandoc.Writers.Shared

3737import Text.Pandoc.Options