2403ca8 · typeable/pandoc

git.iko.soy/typeable/pandoc

Markdown reader: Import <> from Text.Pandoc.Builder.

This way the module will work with versions of Data.Monoid that don't export <>.

commit2403ca86f937dd591a302b41c5d974f9228b2809 authorJohn MacFarlane <jgm@berkeley.edu> dateThu 2 Aug 2012, 17:25 (14 years ago) parent33fd791

1 file changed+2−2

unifiedsplit

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

@@ -39,7 +39,7 @@ import Data.Char ( isAlphaNum )

3939import Data.Maybe

4040import Text.Pandoc.Definition

4141import qualified Text.Pandoc.Builder as B

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

42+import Text.Pandoc.Builder (Inlines(..), Blocks, trimInlines, (<>))

4343import Text.Pandoc.Options

4444import Text.Pandoc.Shared hiding (compactify)

4545import Text.Pandoc.Parsing hiding (tableWith)

@@ -47,7 +47,7 @@ import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXBlock )

4747import Text.Pandoc.Readers.HTML ( htmlTag, htmlInBalanced, isInlineTag, isBlockTag,

4848 isTextTag, isCommentTag )

4949import Text.Pandoc.XML ( fromEntities )

50−import Data.Monoid

50+import Data.Monoid hiding ((<>))

5151import qualified Data.Sequence as Seq -- TODO leaky abstraction, need better isNull in Builder

5252import Control.Applicative ((<$>), (<*), (*>), (<$))

5353import Control.Monad