@@ -44,7 +44,7 @@ import Text.Pandoc.Readers.LaTeX ( rawLaTeXInline, rawLaTeXBlock )
44import Text.Pandoc.Readers.HTML ( htmlTag, htmlInBalanced, isInlineTag, isBlockTag,
44import Text.Pandoc.Readers.HTML ( htmlTag, htmlInBalanced, isInlineTag, isBlockTag,
45 isTextTag, isCommentTag )
45 isTextTag, isCommentTag )
46import Text.Pandoc.XML ( fromEntities )
46import Text.Pandoc.XML ( fromEntities )
47−import Control.Monad (when, liftM, guard, mzero)
47+import Control.Monad (when, liftM, guard, mzero, unless )
48import Text.HTML.TagSoup
48import Text.HTML.TagSoup
49import Text.HTML.TagSoup.Match (tagOpen)
49import Text.HTML.TagSoup.Match (tagOpen)
@@ -592,11 +592,15 @@ listItem start = try $ do
592orderedList :: Parser [Char] ParserState Block
592orderedList :: Parser [Char] ParserState Block
593orderedList = try $ do
593orderedList = try $ do
594 (start, style, delim) <- lookAhead anyOrderedListStart
594 (start, style, delim) <- lookAhead anyOrderedListStart
595+ unless ((style == DefaultStyle || style == Decimal) &&
596+ (delim == DefaultDelim || delim == Period)) $
597+ guardEnabled Ext_fancy_lists
595 items <- many1 $ listItem $ try $
598 items <- many1 $ listItem $ try $
596 do optional newline -- if preceded by a Plain block in a list context
599 do optional newline -- if preceded by a Plain block in a list context
597 skipNonindentSpaces
600 skipNonindentSpaces
598 orderedListMarker style delim
601 orderedListMarker style delim
602+ start' <- option 1 $ guardEnabled Ext_startnum >> return start
599− return $ OrderedList (start, style, delim) $ compactify items
603+ return $ OrderedList (start', style, delim) $ compactify items
601bulletList :: Parser [Char] ParserState Block
605bulletList :: Parser [Char] ParserState Block
602bulletList =
606bulletList =