655363d · typeable/pandoc

git.iko.soy/typeable/pandoc

Moved Text.ParserCombinators.Pandoc ->

Text.Pandoc.ParserCombinators. This way, all the Pandoc modules are in one place. git-svn-id: https://pandoc.googlecode.com/svn/trunk@663 788f1e2b-df1e-0410-8736-df70ead52e1b

commit655363da5147b3b1483dc9ccd7c8b50f865815e2 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateMon 9 Jul 2007, 03:39 (19 years ago) parent622d4e5

6 files changed+14−15

compare with master

unifiedsplit

pandoc.cabal+7−7 src/Text/ParserCombinators/Pandoc.hs → src/Text/Pandoc/ParserCombinators.hs+3−4 src/Text/Pandoc/Readers/HTML.hs+1−1 src/Text/Pandoc/Readers/LaTeX.hs+1−1 src/Text/Pandoc/Readers/Markdown.hs+1−1 src/Text/Pandoc/Readers/RST.hs+1−1

pandoc.cabal+7−7

@@ -15,27 +15,27 @@ Description: Haskell utilities for translating between markdown, HTML,

1515 reStructuredText, LaTeX, DocBook, groff man, and RTF

1616Build-Depends: base, parsec, xhtml, mtl, regex-compat

1717Hs-Source-Dirs: src

18−Exposed-Modules: Text.ParserCombinators.Pandoc,

19− Text.Pandoc,

18+Exposed-Modules: Text.Pandoc,

2019 Text.Pandoc.ASCIIMathML,

20+ Text.Pandoc.Blocks,

2121 Text.Pandoc.Definition,

2222 Text.Pandoc.Entities,

23+ Text.Pandoc.ParserCombinators,

2324 Text.Pandoc.Shared,

2425 Text.Pandoc.UTF8,

25− Text.Pandoc.Blocks,

2626 Text.Pandoc.Writers.DefaultHeaders,

2727 Text.Pandoc.Writers.Docbook,

2828 Text.Pandoc.Writers.HTML,

29+ Text.Pandoc.Writers.LaTeX,

2930 Text.Pandoc.Writers.Man,

3031 Text.Pandoc.Writers.Markdown,

31− Text.Pandoc.Writers.LaTeX,

3232 Text.Pandoc.Writers.RST,

33− Text.Pandoc.Writers.S5,

3433 Text.Pandoc.Writers.RTF,

34+ Text.Pandoc.Writers.S5,

3535 Text.Pandoc.Readers.HTML,

36+ Text.Pandoc.Readers.LaTeX,

3637 Text.Pandoc.Readers.Markdown,

37− Text.Pandoc.Readers.RST,

38− Text.Pandoc.Readers.LaTeX

38+ Text.Pandoc.Readers.RST

3939Ghc-Options: -O0

4040

4141Executable: pandoc

src/Text/ParserCombinators/Pandoc.hs → src/Text/Pandoc/ParserCombinators.hsrenamed+3−4

@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

1717-}

1818

1919{- |

20− Module : Text.ParserCombinators.Pandoc

20+ Module : Text.Pandoc.ParserCombinators

2222 License : GNU GPL, version 2 or above

2323

@@ -25,9 +25,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

2525 Stability : alpha

2626 Portability : portable

2727

28−Special parser combinators for Pandoc readers.

28+Parser combinators used in Pandoc readers.

2929-}

30−module Text.ParserCombinators.Pandoc (

30+module Text.Pandoc.ParserCombinators (

3131 anyLine,

3232 many1Till,

3333 notFollowedBy',

@@ -122,4 +122,3 @@ lineClump = do

122122 blanks <- blanklines <|> (do{eof; return "\n"})

123123 return ((unlines lines) ++ blanks)

124124

125−

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

@@ -41,7 +41,7 @@ module Text.Pandoc.Readers.HTML (

4141 ) where

4242

4343import Text.ParserCombinators.Parsec

44−import Text.ParserCombinators.Pandoc

44+import Text.Pandoc.ParserCombinators

4545import Text.Pandoc.Definition

4646import Text.Pandoc.Shared

4747import Text.Pandoc.Entities ( characterEntity, decodeEntities )

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

@@ -34,7 +34,7 @@ module Text.Pandoc.Readers.LaTeX (

3434 ) where

3535

3636import Text.ParserCombinators.Parsec

37−import Text.ParserCombinators.Pandoc

37+import Text.Pandoc.ParserCombinators

3838import Text.Pandoc.Definition

3939import Text.Pandoc.Shared

4040import Data.Maybe ( fromMaybe )

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

@@ -33,7 +33,7 @@ module Text.Pandoc.Readers.Markdown (

3333

3434import Data.List ( findIndex, sortBy, transpose, isSuffixOf, intersect, lookup )

3535import Data.Char ( isAlphaNum )

36−import Text.ParserCombinators.Pandoc

36+import Text.Pandoc.ParserCombinators

3737import Text.Pandoc.Definition

3838import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXEnvironment )

3939import Text.Pandoc.Shared

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

@@ -31,7 +31,7 @@ module Text.Pandoc.Readers.RST (

3131 readRST

3232 ) where

3333import Text.Pandoc.Definition

34−import Text.ParserCombinators.Pandoc

34+import Text.Pandoc.ParserCombinators

3535import Text.Pandoc.Shared

3636import Text.Pandoc.Readers.HTML ( anyHtmlBlockTag, anyHtmlInlineTag )

3737import Text.Regex ( matchRegex, mkRegex )