From b51608299700e7be401d3f85bcdf6b6eb71633e8 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Fri, 27 Jul 2012 15:45:47 -0700
Subject: [PATCH] Markdown reader: Check fancy_lists and startnum extensions.
---
src/Text/Pandoc/Readers/Markdown.hs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 8b34b9b4a..7f4ed6d3e 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -44,7 +44,7 @@ import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXBlock )
import Text.Pandoc.Readers.HTML ( htmlTag, htmlInBalanced, isInlineTag, isBlockTag,
isTextTag, isCommentTag )
import Text.Pandoc.XML ( fromEntities )
-import Control.Monad (when, liftM, guard, mzero)
+import Control.Monad (when, liftM, guard, mzero, unless )
import Text.HTML.TagSoup
import Text.HTML.TagSoup.Match (tagOpen)
@@ -592,11 +592,15 @@ listItem start = try $ do
orderedList :: Parser [Char] ParserState Block
orderedList = try $ do
(start, style, delim) <- lookAhead anyOrderedListStart
+ unless ((style == DefaultStyle || style == Decimal) &&
+ (delim == DefaultDelim || delim == Period)) $
+ guardEnabled Ext_fancy_lists
items <- many1 $ listItem $ try $
do optional newline -- if preceded by a Plain block in a list context
skipNonindentSpaces
orderedListMarker style delim
- return $ OrderedList (start, style, delim) $ compactify items
+ start' <- option 1 $ guardEnabled Ext_startnum >> return start
+ return $ OrderedList (start', style, delim) $ compactify items
bulletList :: Parser [Char] ParserState Block
bulletList =