Use simpleFigureWith in DokuWiki reader

Author: argent0

src/Text/Pandoc/Readers/DokuWiki.hs

@@ -505,12 +505,16 @@ blockFile :: PandocMonad m => DWParser m B.Blocks
 blockFile = codeTag B.codeBlockWith "file"
 
 para :: PandocMonad m => DWParser m B.Blocks
-para = result . mconcat <$> many1Till inline endOfParaElement
+para = do
+  result . B.trimInlines . mconcat <$> many1Till inline endOfParaElement
  where
    endOfParaElement = lookAhead $ endOfInput <|> endOfPara <|> newBlockElement
    endOfInput       = try $ skipMany blankline >> skipSpaces >> eof
    endOfPara        = try $ blankline >> skipMany1 blankline
    newBlockElement  = try $ blankline >> void blockElements
    result content   = if F.all (==Space) content
                       then mempty
-                      else B.para $ B.trimInlines content
+                      else case B.toList content of
+                          [Image attr figureCaption (src, _)] ->
+                             B.simpleFigureWith attr figureCaption src ""
+                          _ -> B.para content

test/Tests/Readers/DokuWiki.hs

@@ -20,6 +20,7 @@ import Tests.Helpers
 import Text.Pandoc
 import Text.Pandoc.Arbitrary ()
 import Text.Pandoc.Builder
+import Data.List (intersperse)
 
 dokuwiki :: Text -> Pandoc
 dokuwiki = purely $ readDokuWiki def{ readerStandalone = True }
@@ -144,31 +145,31 @@ tests = [ testGroup "inlines"
           , testGroup "Images"
             [ "Image" =:
               "{{image.jpg}}" =?>
-              para (image "image.jpg" "" (str "image.jpg"))
+              simpleFigure [Str "image.jpg"] "image.jpg" ""
             , "Image with caption" =:
               "{{image.png|This is the caption}}" =?>
-              para (image "image.png" "" "This is the caption")
+              simpleFigure (intersperse Space $ Str <$> T.words  "This is the caption") "image.png" ""
             , "Image with } in caption" =:
-              "{{image.png|There is an } in the caption}}" =?>
-              para (image "image.png" "" "There is an } in the caption")
+              "{{image.png|There is a } in the caption}}" =?>
+              simpleFigure (intersperse Space $ Str <$> T.words "There is a } in the caption") "image.png" ""
             , "Wiki namespace starting with dot" =:
               "{{.wiki:image.jpg}}" =?>
-              para (image "wiki/image.jpg" "" (str "image.jpg"))
+              simpleFigure [Str "image.jpg"] "wiki/image.jpg" ""
             , "Left aligned image" =:
               "{{wiki:dokuwiki-128.png }}" =?>
-              para (imageWith ("", ["align-left"], []) "/wiki/dokuwiki-128.png" "" (str "dokuwiki-128.png"))
+              simpleFigureWith ("", ["align-left"], []) [Str "dokuwiki-128.png"] "/wiki/dokuwiki-128.png" ""
             , "Right aligned image" =:
               "{{ wiki:dokuwiki-128.png}}" =?>
-              para (imageWith ("", ["align-right"], []) "/wiki/dokuwiki-128.png" "" (str "dokuwiki-128.png"))
+              simpleFigureWith ("", ["align-right"], []) [Str "dokuwiki-128.png"] "/wiki/dokuwiki-128.png" ""
             , "Centered image" =:
               "{{ wiki:dokuwiki-128.png }}" =?>
-              para (imageWith ("", ["align-center"], []) "/wiki/dokuwiki-128.png" "" (str "dokuwiki-128.png"))
+              simpleFigureWith ("", ["align-center"], []) [Str "dokuwiki-128.png"] "/wiki/dokuwiki-128.png" ""
             , "Image with width" =:
               "{{wiki:dokuwiki-128.png?50}}" =?>
-              para (imageWith ("", [], [("width", "50")]) "/wiki/dokuwiki-128.png" "" (str "dokuwiki-128.png"))
+              simpleFigureWith ("", [], [("width","50")]) [Str "dokuwiki-128.png"] "/wiki/dokuwiki-128.png" ""
             , "Image with width and height" =:
               "{{wiki:dokuwiki-128.png?nocache&50x100}}" =?>
-              para (imageWith ("", [], [("width", "50"), ("height", "100")]) "/wiki/dokuwiki-128.png" "" (str "dokuwiki-128.png"))
+              simpleFigureWith ("", [], [("width","50"), ("height", "100")]) [Str "dokuwiki-128.png"] "/wiki/dokuwiki-128.png" ""
             , "Linkonly" =:
               "{{wiki:dokuwiki-128.png?linkonly}}" =?>
               para (link "/wiki/dokuwiki-128.png" "" (str "dokuwiki-128.png"))