git.iko.soy/typeable/pandoc
on master help sign in
Fix grouping of imports.
26c3705Jesse Rosenthal
src/Text/Pandoc/Readers/EPUB.hs+1−1
compare with master
unifiedsplit
@@ -17,7 +17,6 @@ import Text.Pandoc.Shared (escapeURI, collapseFilePath, addMetaField)
17import Network.URI (unEscapeString)
17import Network.URI (unEscapeString)
18import Text.Pandoc.MediaBag (MediaBag, insertMedia)
18import Text.Pandoc.MediaBag (MediaBag, insertMedia)
19import Text.Pandoc.Compat.Except (MonadError, throwError, runExcept, Except)
19import Text.Pandoc.Compat.Except (MonadError, throwError, runExcept, Except)
20−import Data.Monoid ((<>))
21import Text.Pandoc.MIME (MimeType)
20import Text.Pandoc.MIME (MimeType)
22import qualified Text.Pandoc.Builder as B
21import qualified Text.Pandoc.Builder as B
23import Codec.Archive.Zip ( Archive (..), toArchiveOrFail, fromEntry
22import Codec.Archive.Zip ( Archive (..), toArchiveOrFail, fromEntry
@@ -31,6 +30,7 @@ import Control.Monad (guard, liftM, when)
31import Data.List (isPrefixOf, isInfixOf)
30import Data.List (isPrefixOf, isInfixOf)
32import Data.Maybe (mapMaybe, fromMaybe)
31import Data.Maybe (mapMaybe, fromMaybe)
33import qualified Data.Map as M (Map, lookup, fromList, elems)
32import qualified Data.Map as M (Map, lookup, fromList, elems)
33+import Data.Monoid ((<>))
34import Control.DeepSeq (deepseq, NFData)
34import Control.DeepSeq (deepseq, NFData)
35
35
36import Debug.Trace (trace)
36import Debug.Trace (trace)
src/Text/Pandoc/Readers/Odt/Arrows/State.hs+1−1
@@ -45,8 +45,8 @@ import Control.Arrow
45import Control.Monad
45import Control.Monad
46
46
47import Data.Foldable
47import Data.Foldable
48−
49import Data.Monoid
48import Data.Monoid
49+
50import Text.Pandoc.Readers.Odt.Arrows.Utils
50import Text.Pandoc.Readers.Odt.Arrows.Utils
51import Text.Pandoc.Readers.Odt.Generic.Fallible
51import Text.Pandoc.Readers.Odt.Generic.Fallible
52
52
src/Text/Pandoc/Readers/Odt/Arrows/Utils.hs+1−1
@@ -43,10 +43,10 @@ import Control.Arrow
43import Control.Monad ( join, MonadPlus(..) )
43import Control.Monad ( join, MonadPlus(..) )
44
44
45import qualified Data.Foldable as F
45import qualified Data.Foldable as F
46+import Data.Monoid
46
47
47import Text.Pandoc.Readers.Odt.Generic.Fallible
48import Text.Pandoc.Readers.Odt.Generic.Fallible
48import Text.Pandoc.Readers.Odt.Generic.Utils
49import Text.Pandoc.Readers.Odt.Generic.Utils
49−import Data.Monoid
50
50
51and2 :: (Arrow a) => a b c -> a b c' -> a b (c,c')
51and2 :: (Arrow a) => a b c -> a b c' -> a b (c,c')
52and2 = (&&&)
52and2 = (&&&)
src/Text/Pandoc/Readers/Odt/Generic/Fallible.hs+2−1
@@ -41,8 +41,9 @@ module Text.Pandoc.Readers.Odt.Generic.Fallible where
41
41
42import Control.Applicative
42import Control.Applicative
43import Control.Monad
43import Control.Monad
44−import Data.Monoid ((<>))
44+
45import qualified Data.Foldable as F
45import qualified Data.Foldable as F
46+import Data.Monoid ((<>))
46
47
47-- | Default for now. Will probably become a class at some point.
48-- | Default for now. Will probably become a class at some point.
48type Failure = ()
49type Failure = ()
src/Text/Pandoc/Readers/Org/Blocks.hs+1−1
@@ -45,7 +45,6 @@ import Text.Pandoc.Readers.Org.Shared
45import qualified Text.Pandoc.Builder as B
45import qualified Text.Pandoc.Builder as B
46import Text.Pandoc.Builder ( Inlines, Blocks )
46import Text.Pandoc.Builder ( Inlines, Blocks )
47import Text.Pandoc.Definition
47import Text.Pandoc.Definition
48−import Data.Monoid ((<>))
49import Text.Pandoc.Options
48import Text.Pandoc.Options
50import Text.Pandoc.Shared ( compactify', compactify'DL )
49import Text.Pandoc.Shared ( compactify', compactify'DL )
51
50
@@ -53,6 +52,7 @@ import Control.Monad ( foldM, guard, mzero, void )
53import Data.Char ( isSpace, toLower, toUpper)
52import Data.Char ( isSpace, toLower, toUpper)
54import Data.List ( foldl', intersperse, isPrefixOf )
53import Data.List ( foldl', intersperse, isPrefixOf )
55import Data.Maybe ( fromMaybe, isNothing )
54import Data.Maybe ( fromMaybe, isNothing )
55+import Data.Monoid ((<>))
56
56
57--
57--
58-- Org headers
58-- Org headers
src/Text/Pandoc/Readers/Org/Inlines.hs+1−1
@@ -43,7 +43,6 @@ import Text.Pandoc.Readers.Org.Shared
43import qualified Text.Pandoc.Builder as B
43import qualified Text.Pandoc.Builder as B
44import Text.Pandoc.Builder ( Inlines )
44import Text.Pandoc.Builder ( Inlines )
45import Text.Pandoc.Definition
45import Text.Pandoc.Definition
46−import Data.Monoid ( (<>) )
47import Text.Pandoc.Options
46import Text.Pandoc.Options
48import Text.Pandoc.Readers.LaTeX ( inlineCommand, rawLaTeXInline )
47import Text.Pandoc.Readers.LaTeX ( inlineCommand, rawLaTeXInline )
49import Text.TeXMath ( readTeX, writePandoc, DisplayType(..) )
48import Text.TeXMath ( readTeX, writePandoc, DisplayType(..) )
@@ -55,6 +54,7 @@ import Data.Char ( isAlphaNum, isSpace )
55import Data.List ( intersperse )
54import Data.List ( intersperse )
56import Data.Maybe ( fromMaybe )
55import Data.Maybe ( fromMaybe )
57import qualified Data.Map as M
56import qualified Data.Map as M
57+import Data.Monoid ( (<>) )
58import Data.Traversable (sequence)
58import Data.Traversable (sequence)
59
59
60--
60--
src/Text/Pandoc/Readers/Org/Meta.hs+1−1
@@ -41,12 +41,12 @@ import Text.Pandoc.Readers.Org.Parsing
41import qualified Text.Pandoc.Builder as B
41import qualified Text.Pandoc.Builder as B
42import Text.Pandoc.Builder ( Blocks, Inlines )
42import Text.Pandoc.Builder ( Blocks, Inlines )
43import Text.Pandoc.Definition
43import Text.Pandoc.Definition
44−import Data.Monoid ((<>))
45
44
46import Control.Monad ( mzero )
45import Control.Monad ( mzero )
47import Data.Char ( toLower )
46import Data.Char ( toLower )
48import Data.List ( intersperse )
47import Data.List ( intersperse )
49import qualified Data.Map as M
48import qualified Data.Map as M
49+import Data.Monoid ((<>))
50import Network.HTTP ( urlEncode )
50import Network.HTTP ( urlEncode )
51
51
52-- | Returns the current meta, respecting export options.
52-- | Returns the current meta, respecting export options.