diff options
| -rw-r--r-- | src/Text/Pandoc/Readers/DokuWiki.hs | 4 | ||||
| -rw-r--r-- | test/Tests/Readers/DokuWiki.hs | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/DokuWiki.hs b/src/Text/Pandoc/Readers/DokuWiki.hs index 3a92cfa19..da6e7df64 100644 --- a/src/Text/Pandoc/Readers/DokuWiki.hs +++ b/src/Text/Pandoc/Readers/DokuWiki.hs @@ -31,7 +31,7 @@ import Text.Pandoc.Definition import Text.Pandoc.Error (PandocError (PandocParsecError)) import Text.Pandoc.Options import Text.Pandoc.Parsing hiding (enclosed, nested) -import Text.Pandoc.Shared (crFilter, trim, underlineSpan, tshow) +import Text.Pandoc.Shared (crFilter, trim, underlineSpan, stringify, tshow) -- | Read DokuWiki from an input string and return a Pandoc document. readDokuWiki :: PandocMonad m @@ -179,7 +179,7 @@ nestedText end = innerSpace <|> countChar 1 nonspaceChar innerSpace = try $ many1Char spaceChar <* notFollowedBy end monospaced :: PandocMonad m => DWParser m B.Inlines -monospaced = try $ B.code <$> enclosed (string "''") nestedText +monospaced = try $ B.code . (T.concat . map stringify . B.toList) <$> enclosed (string "''") nestedInlines subscript :: PandocMonad m => DWParser m B.Inlines subscript = try $ B.subscript <$> between (string "<sub>") (try $ string "</sub>") nestedInlines diff --git a/test/Tests/Readers/DokuWiki.hs b/test/Tests/Readers/DokuWiki.hs index b8cd83c3c..f79b8b4a2 100644 --- a/test/Tests/Readers/DokuWiki.hs +++ b/test/Tests/Readers/DokuWiki.hs @@ -46,6 +46,9 @@ tests = [ testGroup "inlines" , "Monospaced" =: "''monospaced''" =?> para (code "monospaced") + , "Monospaced with nowiki" =: + "''%%monospaced%%''" =?> + para (code "monospaced") , "Combined" =: "**__//''combine''//__**" =?> para (strong $ underlineSpan $ emph $ code "combine") |