diff --git a/pandoc.cabal b/pandoc.cabal index a034a5ae9..e3d00e4fb 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -651,7 +651,7 @@ library Text.Pandoc.Filter.Path, Text.Pandoc.Parsing.Capabilities, Text.Pandoc.Parsing.Citations, - Text.Pandoc.Parsing.Combinators, + Text.Pandoc.Parsing.General, Text.Pandoc.Parsing.GridTable, Text.Pandoc.Parsing.Lists, Text.Pandoc.Parsing.Math, diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs index b6b7a58ce..ca2e86713 100644 --- a/src/Text/Pandoc/Parsing.hs +++ b/src/Text/Pandoc/Parsing.hs @@ -240,7 +240,7 @@ import Text.Pandoc.Parsing.Capabilities HasReaderOptions(..), QuoteContext(..) ) import Text.Pandoc.Parsing.Citations ( citeKey ) -import Text.Pandoc.Parsing.Combinators +import Text.Pandoc.Parsing.General ( readWithM, (<+?>), anyLine, @@ -299,8 +299,7 @@ import Text.Pandoc.Parsing.GridTable TableComponents(..), TableNormalization(..) ) import Text.Pandoc.Parsing.Lists - ( indentWith, - anyOrderedListMarker, + ( anyOrderedListMarker, decimal, lowerAlpha, lowerRoman, diff --git a/src/Text/Pandoc/Parsing/Citations.hs b/src/Text/Pandoc/Parsing/Citations.hs index 54cb2ee60..dfad454fd 100644 --- a/src/Text/Pandoc/Parsing/Citations.hs +++ b/src/Text/Pandoc/Parsing/Citations.hs @@ -27,7 +27,7 @@ import Text.Parsec , try ) import Text.Pandoc.Parsing.Capabilities (HasLastStrPosition, notAfterString) -import Text.Pandoc.Parsing.Combinators +import Text.Pandoc.Parsing.General import Text.Pandoc.Parsing.Types (ParserT) import qualified Data.Text as T diff --git a/src/Text/Pandoc/Parsing/Combinators.hs b/src/Text/Pandoc/Parsing/General.hs similarity index 99% rename from src/Text/Pandoc/Parsing/Combinators.hs rename to src/Text/Pandoc/Parsing/General.hs index cb18662e0..c03bda117 100644 --- a/src/Text/Pandoc/Parsing/Combinators.hs +++ b/src/Text/Pandoc/Parsing/General.hs @@ -1,7 +1,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE OverloadedStrings #-} {- | -Module : Text.Pandoc.Parsing.Combinators +Module : Text.Pandoc.Parsing.General Copyright : © 2006-2022 John MacFarlane License : GPL-2.0-or-later Maintainer : John MacFarlane <jgm@berkeley.edu> @@ -9,7 +9,7 @@ Maintainer : John MacFarlane <jgm@berkeley.edu> Parser combinators for pandoc format readers. -} -module Text.Pandoc.Parsing.Combinators +module Text.Pandoc.Parsing.General ( (<+?>) , anyLine , anyLineNewline diff --git a/src/Text/Pandoc/Parsing/GridTable.hs b/src/Text/Pandoc/Parsing/GridTable.hs index 1c029df8a..b8ae26140 100644 --- a/src/Text/Pandoc/Parsing/GridTable.hs +++ b/src/Text/Pandoc/Parsing/GridTable.hs @@ -30,7 +30,7 @@ import Text.Pandoc.Options (ReaderOptions (readerColumns)) import Text.Pandoc.Builder (Blocks) import Text.Pandoc.Definition import Text.Pandoc.Parsing.Capabilities -import Text.Pandoc.Parsing.Combinators +import Text.Pandoc.Parsing.General import Text.Pandoc.Parsing.Types import Text.Pandoc.Shared (compactify, splitTextByIndices, trim, trimr) import Text.Pandoc.Sources diff --git a/src/Text/Pandoc/Parsing/Lists.hs b/src/Text/Pandoc/Parsing/Lists.hs index 09a06e440..6f0c47ce2 100644 --- a/src/Text/Pandoc/Parsing/Lists.hs +++ b/src/Text/Pandoc/Parsing/Lists.hs @@ -12,7 +12,6 @@ Parsers for list markers. module Text.Pandoc.Parsing.Lists ( anyOrderedListMarker , decimal - , indentWith , lowerAlpha , lowerRoman , orderedListMarker @@ -48,7 +47,6 @@ import Text.Parsec , try , updateState ) -import Text.Pandoc.Parsing.Combinators import Text.Pandoc.Parsing.State import Text.Pandoc.Parsing.Types (ParserT) diff --git a/src/Text/Pandoc/Parsing/Math.hs b/src/Text/Pandoc/Parsing/Math.hs index f234f9123..a2cfa1a07 100644 --- a/src/Text/Pandoc/Parsing/Math.hs +++ b/src/Text/Pandoc/Parsing/Math.hs @@ -22,7 +22,7 @@ import Text.Pandoc.Options ( Extension(Ext_tex_math_dollars, Ext_tex_math_single_backslash, Ext_tex_math_double_backslash) ) import Text.Pandoc.Parsing.Capabilities (HasReaderOptions, guardEnabled) -import Text.Pandoc.Parsing.Combinators +import Text.Pandoc.Parsing.General import Text.Pandoc.Parsing.Types (ParserT) import Text.Pandoc.Shared (trimMath) import Text.Pandoc.Sources diff --git a/src/Text/Pandoc/Parsing/Smart.hs b/src/Text/Pandoc/Parsing/Smart.hs index 13cb18efe..52ad27119 100644 --- a/src/Text/Pandoc/Parsing/Smart.hs +++ b/src/Text/Pandoc/Parsing/Smart.hs @@ -1,7 +1,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE OverloadedStrings #-} {- | -Module : Text.Pandoc.Parsing.Combinators +Module : Text.Pandoc.Parsing.Smart Copyright : © 2006-2022 John MacFarlane License : GPL-2.0-or-later Maintainer : John MacFarlane <jgm@berkeley.edu> @@ -32,7 +32,7 @@ import Text.Pandoc.Options , ReaderOptions(readerExtensions) ) import Text.Pandoc.Sources import Text.Pandoc.Parsing.Capabilities -import Text.Pandoc.Parsing.Combinators +import Text.Pandoc.Parsing.General import Text.Pandoc.Parsing.Types (ParserT) import Text.Parsec ( (<|>)