Rename simpleFigure to simpleFigureWith.

Author: argent0

src/Text/Pandoc/Builder.hs

@@ -170,6 +170,7 @@ module Text.Pandoc.Builder ( module Text.Pandoc.Definition
                            , caption
                            , simpleCaption
                            , emptyCaption
+                           , simpleFigureWith
                            , simpleFigure
                            , divWith
                            -- * Table processing
@@ -567,10 +568,13 @@ simpleCaption = caption Nothing
 emptyCaption :: Caption
 emptyCaption = simpleCaption mempty
 
-simpleFigure :: Attr -> [Inline] -> Text -> Text -> Blocks
-simpleFigure attr figureCaption url title =
+simpleFigureWith :: Attr -> [Inline] -> Text -> Text -> Blocks
+simpleFigureWith attr figureCaption url title =
   singleton $ Para [Image attr figureCaption (url, "fig:" <> title)]
 
+simpleFigure :: [Inline] -> Text -> Text -> Blocks
+simpleFigure = simpleFigureWith nullAttr
+
 divWith :: Attr -> Blocks -> Blocks
 divWith attr = singleton . Div attr . toList
 

test/test-pandoc-types.hs

@@ -5,7 +5,7 @@ import Text.Pandoc.Definition
 import Text.Pandoc.Walk
 import Text.Pandoc.Builder (singleton, plain, text, simpleTable, table, emptyCell,
                             normalizeTableHead, normalizeTableBody, normalizeTableFoot,
-                            emptyCaption, simpleFigure)
+                            emptyCaption, simpleFigureWith)
 import qualified Text.Pandoc.Builder as Builder
 import Data.Generics
 import Data.List (tails)
@@ -645,7 +645,7 @@ t_tableNormExample = testCase "table normalization example" assertion
 
 p_figureRepresentation :: Property
 p_figureRepresentation = forAll (arbitrary :: Gen [Inline]) (\figureCaption ->
-  simpleFigure ("", [], []) figureCaption "url" "title" == Builder.fromList
+  simpleFigureWith ("", [], []) figureCaption "url" "title" == Builder.fromList
     [Para [Image ("", [], []) figureCaption ("url", "fig:title") ]]
   )