4ee92dc · typeable/pandoc

git.iko.soy/typeable/pandoc

MediaWiki reader: Fixed bug in certain nested lists.

The bug: If a level 2 list was followed by a level 1 list, the first item of the level 1 list would be lost. Closes #1213.

commit4ee92dce0ce624db2d02c60ae2856a70cfeb6c42 authorJohn MacFarlane <fiddlosopher@gmail.com> dateTue 1 Apr 2014, 10:36 (13 years ago) parent976f4f2

3 files changed+9−1

unifiedsplit

src/Text/Pandoc/Readers/MediaWiki.hs+2−1

@@ -438,7 +438,8 @@ listItem c = try $ do

438438 skipMany spaceChar

439439 first <- concat <$> manyTill listChunk newline

440440 rest <- many

441− (try $ string extras *> (concat <$> manyTill listChunk newline))

441+ (try $ string extras *> lookAhead listStartChar *>

442+ (concat <$> manyTill listChunk newline))

442443 contents <- parseFromString (many1 $ listItem' c)

443444 (unlines (first : rest))

444445 case c of

tests/mediawiki-reader.native+4

@@ -102,6 +102,10 @@ Pandoc (Meta {unMeta = fromList []})

102102 [[BulletList

103103 [[Plain [Str "But",Space,Str "jumping",Space,Str "levels",Space,Str "creates",Space,Str "empty",Space,Str "space."]]]]]]]

104104,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "ends",Space,Str "the",Space,Str "list."]

105+,BulletList

106+ [[BulletList

107+ [[Plain [Str "two"]]]]

108+ ,[Plain [Str "one"]]]

105109,OrderedList (1,DefaultStyle,DefaultDelim)

106110 [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]

107111 ,[Plain [Str "with",Space,Str "a",Space,Str "number",Space,Str "sign",Space,Str "(#)."]

tests/mediawiki-reader.wiki+3

@@ -185,6 +185,9 @@ http://johnmacfarlane.net/pandoc/

185185*** But jumping levels creates empty space.

186186Any other start ends the list.

187187

188+** two

189+* one

190+

188191# Start each line

189192# with a number sign (#).

190193## More number signs gives deeper