aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pandoc.cabal14
-rw-r--r--src/Text/Pandoc/ParserCombinators.hs (renamed from src/Text/ParserCombinators/Pandoc.hs)7
-rw-r--r--src/Text/Pandoc/Readers/HTML.hs2
-rw-r--r--src/Text/Pandoc/Readers/LaTeX.hs2
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs2
-rw-r--r--src/Text/Pandoc/Readers/RST.hs2
6 files changed, 14 insertions, 15 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index c49e9df5c..ee0ba1023 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -15,27 +15,27 @@ Description: Haskell utilities for translating between markdown, HTML,
reStructuredText, LaTeX, DocBook, groff man, and RTF
Build-Depends: base, parsec, xhtml, mtl, regex-compat
Hs-Source-Dirs: src
-Exposed-Modules: Text.ParserCombinators.Pandoc,
- Text.Pandoc,
+Exposed-Modules: Text.Pandoc,
Text.Pandoc.ASCIIMathML,
+ Text.Pandoc.Blocks,
Text.Pandoc.Definition,
Text.Pandoc.Entities,
+ Text.Pandoc.ParserCombinators,
Text.Pandoc.Shared,
Text.Pandoc.UTF8,
- Text.Pandoc.Blocks,
Text.Pandoc.Writers.DefaultHeaders,
Text.Pandoc.Writers.Docbook,
Text.Pandoc.Writers.HTML,
+ Text.Pandoc.Writers.LaTeX,
Text.Pandoc.Writers.Man,
Text.Pandoc.Writers.Markdown,
- Text.Pandoc.Writers.LaTeX,
Text.Pandoc.Writers.RST,
- Text.Pandoc.Writers.S5,
Text.Pandoc.Writers.RTF,
+ Text.Pandoc.Writers.S5,
Text.Pandoc.Readers.HTML,
+ Text.Pandoc.Readers.LaTeX,
Text.Pandoc.Readers.Markdown,
- Text.Pandoc.Readers.RST,
- Text.Pandoc.Readers.LaTeX
+ Text.Pandoc.Readers.RST
Ghc-Options: -O0
Executable: pandoc
diff --git a/src/Text/ParserCombinators/Pandoc.hs b/src/Text/Pandoc/ParserCombinators.hs
index 64c846f60..7a129b6be 100644
--- a/src/Text/ParserCombinators/Pandoc.hs
+++ b/src/Text/Pandoc/ParserCombinators.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : Text.ParserCombinators.Pandoc
+ Module : Text.Pandoc.ParserCombinators
Copyright : Copyright (C) 2006-7 John MacFarlane
License : GNU GPL, version 2 or above
@@ -25,9 +25,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Stability : alpha
Portability : portable
-Special parser combinators for Pandoc readers.
+Parser combinators used in Pandoc readers.
-}
-module Text.ParserCombinators.Pandoc (
+module Text.Pandoc.ParserCombinators (
anyLine,
many1Till,
notFollowedBy',
@@ -122,4 +122,3 @@ lineClump = do
blanks <- blanklines <|> (do{eof; return "\n"})
return ((unlines lines) ++ blanks)
-
diff --git a/src/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs
index 8ff211360..2ed0319e7 100644
--- a/src/Text/Pandoc/Readers/HTML.hs
+++ b/src/Text/Pandoc/Readers/HTML.hs
@@ -41,7 +41,7 @@ module Text.Pandoc.Readers.HTML (
) where
import Text.ParserCombinators.Parsec
-import Text.ParserCombinators.Pandoc
+import Text.Pandoc.ParserCombinators
import Text.Pandoc.Definition
import Text.Pandoc.Shared
import Text.Pandoc.Entities ( characterEntity, decodeEntities )
diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs
index 3b764584f..610b28167 100644
--- a/src/Text/Pandoc/Readers/LaTeX.hs
+++ b/src/Text/Pandoc/Readers/LaTeX.hs
@@ -34,7 +34,7 @@ module Text.Pandoc.Readers.LaTeX (
) where
import Text.ParserCombinators.Parsec
-import Text.ParserCombinators.Pandoc
+import Text.Pandoc.ParserCombinators
import Text.Pandoc.Definition
import Text.Pandoc.Shared
import Data.Maybe ( fromMaybe )
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 8ac99acb2..36bb3f760 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -33,7 +33,7 @@ module Text.Pandoc.Readers.Markdown (
import Data.List ( findIndex, sortBy, transpose, isSuffixOf, intersect, lookup )
import Data.Char ( isAlphaNum )
-import Text.ParserCombinators.Pandoc
+import Text.Pandoc.ParserCombinators
import Text.Pandoc.Definition
import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXEnvironment )
import Text.Pandoc.Shared
diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs
index 0f7d7ac1c..24a460b71 100644
--- a/src/Text/Pandoc/Readers/RST.hs
+++ b/src/Text/Pandoc/Readers/RST.hs
@@ -31,7 +31,7 @@ module Text.Pandoc.Readers.RST (
readRST
) where
import Text.Pandoc.Definition
-import Text.ParserCombinators.Pandoc
+import Text.Pandoc.ParserCombinators
import Text.Pandoc.Shared
import Text.Pandoc.Readers.HTML ( anyHtmlBlockTag, anyHtmlInlineTag )
import Text.Regex ( matchRegex, mkRegex )