diff options
author | John MacFarlane <jgm@berkeley.edu> | 2010-07-11 22:47:52 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2010-07-11 22:47:52 -0700 |
commit | 0181e66250302516863eaa4e25bb5b4b10807e2b (patch) | |
tree | 39671e549071f33df58d642e784a4063b7c283f0 /src/Text/Pandoc/Writers/Markdown.hs | |
parent | cfb27ece34405833592697147276f5bf6418224c (diff) | |
parent | 6972c0b5b040f3de998d936e6ddf8580ecfa7b30 (diff) | |
download | pandoc-0181e66250302516863eaa4e25bb5b4b10807e2b.tar.gz |
Merge branch 'atlists'. Added auto-numbered example lists.
Diffstat (limited to 'src/Text/Pandoc/Writers/Markdown.hs')
-rw-r--r-- | src/Text/Pandoc/Writers/Markdown.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index d72fb5eb5..d6cd2a296 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -35,7 +35,7 @@ import Text.Pandoc.Templates (renderTemplate) import Text.Pandoc.Shared import Text.Pandoc.Parsing import Text.Pandoc.Blocks -import Text.ParserCombinators.Parsec ( parse, GenParser ) +import Text.ParserCombinators.Parsec ( runParser, GenParser ) import Data.List ( group, isPrefixOf, find, intersperse, transpose ) import Text.PrettyPrint.HughesPJ hiding ( Str ) import Control.Monad.State @@ -159,7 +159,7 @@ elementToListItem (Sec _ _ _ headerText subsecs) = [Plain headerText] ++ else [BulletList $ map elementToListItem subsecs] -- | Ordered list start parser for use in Para below. -olMarker :: GenParser Char st Char +olMarker :: GenParser Char ParserState Char olMarker = do (start, style', delim) <- anyOrderedListMarker if delim == Period && (style' == UpperAlpha || (style' == UpperRoman && @@ -170,7 +170,7 @@ olMarker = do (start, style', delim) <- anyOrderedListMarker -- | True if string begins with an ordered list marker beginsWithOrderedListMarker :: String -> Bool beginsWithOrderedListMarker str = - case parse olMarker "para start" str of + case runParser olMarker defaultParserState "para start" str of Left _ -> False Right _ -> True |