git.iko.soy/typeable/pandoc
on master help sign in
Mediawiki: Parse an image + caption in a para by itself as a figure.
commit71841de0f3d02fc2c88d61ab5d29b7022090f5f1 authorJohn MacFarlane <fiddlosopher@gmail.com> dateWed 11 Sep 2013, 09:31 (13 years ago) parentd47eada
2 files changed+6−6
compare with master
unifiedsplit
src/Text/Pandoc/Readers/MediaWiki.hs+2−2 tests/mediawiki-reader.native+4−4
src/Text/Pandoc/Readers/MediaWiki.hs+2−2
@@ -43,7 +43,7 @@ import Text.Pandoc.Readers.HTML ( htmlTag, isBlockTag, isCommentTag )
4343import Text.Pandoc.XML ( fromEntities )
4444import Text.Pandoc.Parsing hiding ( nested )
4545import Text.Pandoc.Walk ( walk )
46−import Text.Pandoc.Shared ( stripTrailingNewlines, safeRead )
46+import Text.Pandoc.Shared ( stripTrailingNewlines, safeRead, stringify )
4747import Data.Monoid (mconcat, mempty)
4848import Control.Applicative ((<$>), (<*), (*>), (<$))
4949import Control.Monad
@@ -539,7 +539,7 @@ image = try $ do
539539 _ <- many (try $ char '|' *> imageOption)
540540 caption <- (B.str fname <$ sym "]]")
541541 <|> try (char '|' *> (mconcat <$> manyTill inline (sym "]]")))
542− return $ B.image fname "image" caption
542+ return $ B.image fname ("fig:" ++ stringify caption) caption
543543
544544imageOption :: MWParser String
545545imageOption =
tests/mediawiki-reader.native+4−4
@@ -84,10 +84,10 @@ Pandoc (Meta {unMeta = fromList []})
8484,Para [Link [Str "#My",Space,Str "anchor"] ("#My_anchor","wikilink")]
8585,Para [Link [Str "and",Space,Str "text"] ("Page#with_anchor","wikilink")]
8686,Header 2 ("",[],[]) [Str "images"]
87−,Para [Image [Str "caption"] ("example.jpg","image")]
88−,Para [Image [Str "the",Space,Emph [Str "caption"],Space,Str "with",Space,Link [Str "external",Space,Str "link"] ("http://google.com","")] ("example.jpg","image")]
89−,Para [Image [Str "caption"] ("example.jpg","image")]
90−,Para [Image [Str "example.jpg"] ("example.jpg","image")]
87+,Para [Image [Str "caption"] ("example.jpg","fig:caption")]
88+,Para [Image [Str "the",Space,Emph [Str "caption"],Space,Str "with",Space,Link [Str "external",Space,Str "link"] ("http://google.com","")] ("example.jpg","fig:the caption with external link")]
89+,Para [Image [Str "caption"] ("example.jpg","fig:caption")]
90+,Para [Image [Str "example.jpg"] ("example.jpg","fig:example.jpg")]
9191,Header 2 ("",[],[]) [Str "lists"]
9292,BulletList
9393 [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]