diff options
| -rw-r--r-- | src/Text/Pandoc/Readers/MediaWiki.hs | 10 | ||||
| -rw-r--r-- | tests/mediawiki-reader.native | 1 | ||||
| -rw-r--r-- | tests/mediawiki-reader.wiki | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/Text/Pandoc/Readers/MediaWiki.hs b/src/Text/Pandoc/Readers/MediaWiki.hs index 8b436c89f..136701bd0 100644 --- a/src/Text/Pandoc/Readers/MediaWiki.hs +++ b/src/Text/Pandoc/Readers/MediaWiki.hs @@ -43,7 +43,7 @@ import Text.Pandoc.Readers.HTML ( htmlTag, isBlockTag, isCommentTag ) import Text.Pandoc.XML ( fromEntities ) import Text.Pandoc.Parsing hiding ( nested ) import Text.Pandoc.Walk ( walk ) -import Text.Pandoc.Shared ( stripTrailingNewlines, safeRead, stringify ) +import Text.Pandoc.Shared ( stripTrailingNewlines, safeRead, stringify, trim ) import Data.Monoid (mconcat, mempty) import Control.Applicative ((<$>), (<*), (*>), (<$)) import Control.Monad @@ -475,10 +475,10 @@ str :: MWParser Inlines str = B.str <$> many1 (noneOf $ specialChars ++ spaceChars) math :: MWParser Inlines -math = (B.displayMath <$> try (char ':' >> charsInTags "math")) - <|> (B.math <$> charsInTags "math") - <|> (B.displayMath <$> try (dmStart *> manyTill anyChar dmEnd)) - <|> (B.math <$> try (mStart *> manyTill (satisfy (/='\n')) mEnd)) +math = (B.displayMath . trim <$> try (char ':' >> charsInTags "math")) + <|> (B.math . trim <$> charsInTags "math") + <|> (B.displayMath . trim <$> try (dmStart *> manyTill anyChar dmEnd)) + <|> (B.math . trim <$> try (mStart *> manyTill (satisfy (/='\n')) mEnd)) where dmStart = string "\\[" dmEnd = try (string "\\]") mStart = string "\\(" diff --git a/tests/mediawiki-reader.native b/tests/mediawiki-reader.native index 5ddbd309f..0ab51a3aa 100644 --- a/tests/mediawiki-reader.native +++ b/tests/mediawiki-reader.native @@ -163,6 +163,7 @@ Pandoc (Meta {unMeta = fromList []}) ,[Plain [Str "The",Space,Str "Hague"]]] ,Header 2 ("",[],[]) [Str "math"] ,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Math InlineMath "x=\\frac{y^\\pi}{z}",Str "."] +,Para [Str "With",Space,Str "spaces:",Space,Math InlineMath "x=\\frac{y^\\pi}{z}",Str "."] ,Header 2 ("",[],[]) [Str "preformatted",Space,Str "blocks"] ,Para [Code ("",[],[]) "Start\160each\160line\160with\160a\160space.",LineBreak,Code ("",[],[]) "Text\160is\160",Strong [Code ("",[],[]) "preformatted"],Code ("",[],[]) "\160and",LineBreak,Emph [Code ("",[],[]) "markups"],Code ("",[],[]) "\160",Strong [Emph [Code ("",[],[]) "can"]],Code ("",[],[]) "\160be\160done."] ,Para [Code ("",[],[]) "\160hell\160\160\160\160\160\160yeah"] diff --git a/tests/mediawiki-reader.wiki b/tests/mediawiki-reader.wiki index 1e885daf0..26f4ef164 100644 --- a/tests/mediawiki-reader.wiki +++ b/tests/mediawiki-reader.wiki @@ -248,6 +248,8 @@ ends the list. Here is some <math>x=\frac{y^\pi}{z}</math>. +With spaces: <math> x=\frac{y^\pi}{z} </math>. + == preformatted blocks == Start each line with a space. |