26c3705 · typeable/pandoc

git.iko.soy/typeable/pandoc

Fix grouping of imports.

Some source files keep imports in tidy groups. Changing `Text.Pandoc.Compat.Monoid` to `Data.Monoid` could upset that. This restores tidiness.

commit26c3705da4207af2af4dfc35737d44a18ee400e5 authorJesse Rosenthal <jrosenthal@jhu.edu> dateWed 31 Aug 2016, 16:53 (10 years ago) parent1cdebe1

7 files changed+8−7

compare with master

unifiedsplit

src/Text/Pandoc/Readers/EPUB.hs+1−1 src/Text/Pandoc/Readers/Odt/Arrows/State.hs+1−1 src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs+1−1 src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs+2−1 src/Text/Pandoc/Readers/Org/Blocks.hs+1−1 src/Text/Pandoc/Readers/Org/Inlines.hs+1−1 src/Text/Pandoc/Readers/Org/Meta.hs+1−1

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

@@ -17,7 +17,6 @@ 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 Data.Monoid ((<>))

2120import Text.Pandoc.MIME (MimeType)

2221import qualified Text.Pandoc.Builder as B

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

@@ -31,6 +30,7 @@ import Control.Monad (guard, liftM, when)

3130import Data.List (isPrefixOf, isInfixOf)

3231import Data.Maybe (mapMaybe, fromMaybe)

3332import qualified Data.Map as M (Map, lookup, fromList, elems)

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

3434import Control.DeepSeq (deepseq, NFData)

3535

3636import Debug.Trace (trace)

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

@@ -45,8 +45,8 @@ import Control.Arrow

4545import Control.Monad

4646

4747import Data.Foldable

48−

4948import Data.Monoid

49+

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

@@ -43,10 +43,10 @@ import Control.Arrow

4343import Control.Monad ( join, MonadPlus(..) )

4444

4545import qualified Data.Foldable as F

46+import Data.Monoid

4647

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

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

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+2−1

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

4141

4242import Control.Applicative

4343import Control.Monad

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

44+

4545import qualified Data.Foldable as F

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

4647

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

4849type Failure = ()

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

@@ -45,7 +45,6 @@ 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 Data.Monoid ((<>))

4948import Text.Pandoc.Options

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

5150

@@ -53,6 +52,7 @@ import Control.Monad ( foldM, guard, mzero, void )

5352import Data.Char ( isSpace, toLower, toUpper)

5453import Data.List ( foldl', intersperse, isPrefixOf )

5554import Data.Maybe ( fromMaybe, isNothing )

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

5656

5757--

5858-- Org headers

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

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

4343import qualified Text.Pandoc.Builder as B

4444import Text.Pandoc.Builder ( Inlines )

4545import Text.Pandoc.Definition

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

4746import Text.Pandoc.Options

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

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

@@ -55,6 +54,7 @@ import Data.Char ( isAlphaNum, isSpace )

5554import Data.List ( intersperse )

5655import Data.Maybe ( fromMaybe )

5756import qualified Data.Map as M

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

5858import Data.Traversable (sequence)

5959

6060--

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

@@ -41,12 +41,12 @@ 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 Data.Monoid ((<>))

4544

4645import Control.Monad ( mzero )

4746import Data.Char ( toLower )

4847import Data.List ( intersperse )

4948import qualified Data.Map as M

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

5050import Network.HTTP ( urlEncode )

5151

5252-- | Returns the current meta, respecting export options.