802dc9a · typeable/pandoc

git.iko.soy/typeable/pandoc

Added Text.Pandoc.Compat.Monoid.

This allows pandoc to compile with base < 4.5, where Data.Monoid doesn't export `<>`. Thanks to Dirk Ullirch for the patch.

commit802dc9a8b9f206eb3be592ab19067f637eb2a3ee authorJohn MacFarlane <jgm@berkeley.edu> dateThu 8 Aug 2013, 10:41 (13 years ago) parentbb61624

4 files changed+19−2

compare with master

unifiedsplit

pandoc.cabal+1 src/Text/Pandoc/Compat/Monoid.hs+16 src/Text/Pandoc/Templates.hs+1−1 src/Text/Pandoc/Writers/Docx.hs+1−1

pandoc.cabal+1

@@ -335,6 +335,7 @@ Library

335335 Text.Pandoc.ImageSize,

336336 Text.Pandoc.Slides,

337337 Text.Pandoc.Highlighting,

338+ Text.Pandoc.Compat.Monoid,

338339 Paths_pandoc

339340

340341 Buildable: True

src/Text/Pandoc/Compat/Monoid.hsnew file+16

@@ -0,0 +1,16 @@

1+{-# LANGUAGE CPP #-}

2+module Text.Pandoc.Compat.Monoid ( Monoid(..)

3+ , (<>)

4+ ) where

6+#if MIN_VERSION_base(4,5,0)

7+import Data.Monoid ((<>), Monoid(..))

8+#else

9+import Data.Monoid (mappend, Monoid(..))

10+#endif

11+

12+#if MIN_VERSION_base(4,5,0)

13+#else

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

15+(<>) = mappend

16+#endif

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

@@ -102,7 +102,7 @@ import Control.Applicative

102102import qualified Data.Text as T

103103import Data.Text (Text)

104104import Data.Text.Encoding (encodeUtf8)

105−import Data.Monoid ((<>), Monoid(..))

105+import Text.Pandoc.Compat.Monoid ((<>), Monoid(..))

106106import Data.List (intersperse, nub)

107107import System.FilePath ((</>), (<.>))

108108import qualified Data.Map as M

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

@@ -35,7 +35,7 @@ import qualified Data.ByteString.Lazy as BL

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

3636import qualified Data.Map as M

3737import qualified Text.Pandoc.UTF8 as UTF8

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

38+import Text.Pandoc.Compat.Monoid ((<>))

3939import Codec.Archive.Zip

4040import Data.Time.Clock.POSIX

4141import Text.Pandoc.Definition