Implement figure numbering for HTML output

pandoc.hs

@@ -140,7 +140,8 @@ data Opt = Opt
     , optVariables         :: [(String,String)] -- ^ Template variables to set
     , optMetadata          :: M.Map String MetaValue -- ^ Metadata fields to set
     , optOutputFile        :: String  -- ^ Name of output file
-    , optNumberSections    :: Bool    -- ^ Number sections in LaTeX
+    , optNumberFigures     :: Bool    -- ^ Number figures in LaTeX and HTML output
+    , optNumberSections    :: Bool    -- ^ Number sections in LaTeX and HTML output
     , optNumberOffset      :: [Int]   -- ^ Starting number for sections
     , optSectionDivs       :: Bool    -- ^ Put sections in div tags in HTML
     , optIncremental       :: Bool    -- ^ Use incremental lists in Slidy/Slideous/S5
@@ -196,6 +197,7 @@ defaultOpts = Opt
     , optVariables             = []
     , optMetadata              = M.empty
     , optOutputFile            = "-"    -- "-" means stdout
+    , optNumberFigures         = False
     , optNumberSections        = False
     , optNumberOffset          = [0,0,0,0,0,0]
     , optSectionDivs           = False
@@ -524,10 +526,15 @@ options =
                   (\opt -> return opt { optChapters = True }))
                  "" -- "Use chapter for top-level sections in LaTeX, DocBook"
 
+    , Option ""  ["number-figures"]
+                 (NoArg
+                  (\opt -> return opt { optNumberFigures = True }))
+                 "" -- "Number figures in LaTeX and HTML"
+
     , Option "N" ["number-sections"]
                  (NoArg
                   (\opt -> return opt { optNumberSections = True }))
-                 "" -- "Number sections in LaTeX"
+                 "" -- "Number sections in LaTeX and HTML"
 
     , Option "" ["number-offset"]
                  (ReqArg
@@ -938,8 +945,9 @@ main = do
               , optTransforms            = transforms
               , optTemplate              = templatePath
               , optOutputFile            = outputFile
+              , optNumberFigures         = numberFigures
               , optNumberSections        = numberSections
-              , optNumberOffset            = numberFrom
+              , optNumberOffset          = numberFrom
               , optSectionDivs           = sectionDivs
               , optIncremental           = incremental
               , optSelfContained         = selfContained
@@ -1112,6 +1120,7 @@ main = do
                             writerIncremental      = incremental,
                             writerCiteMethod       = citeMethod,
                             writerIgnoreNotes      = False,
+                            writerNumberFigures    = numberFigures,
                             writerNumberSections   = numberSections,
                             writerNumberOffset     = numberFrom,
                             writerSectionDivs      = sectionDivs,

src/Text/Pandoc/Options.hs

@@ -275,7 +275,8 @@ data WriterOptions = WriterOptions
   , writerIncremental      :: Bool   -- ^ True if lists should be incremental
   , writerHTMLMathMethod   :: HTMLMathMethod  -- ^ How to print math in HTML
   , writerIgnoreNotes      :: Bool   -- ^ Ignore footnotes (used in making toc)
-  , writerNumberSections   :: Bool   -- ^ Number sections in LaTeX
+  , writerNumberFigures    :: Bool   -- ^ Number figures in LaTeX and HTML
+  , writerNumberSections   :: Bool   -- ^ Number sections in LaTeX and HTML
   , writerNumberOffset     :: [Int]  -- ^ Starting number for section, subsection, ...
   , writerSectionDivs      :: Bool   -- ^ Put sections in div tags in HTML
   , writerExtensions       :: Set Extension -- ^ Markdown extensions that can be used
@@ -318,6 +319,7 @@ instance Default WriterOptions where
                       , writerIncremental      = False
                       , writerHTMLMathMethod   = PlainMath
                       , writerIgnoreNotes      = False
+                      , writerNumberFigures    = False
                       , writerNumberSections   = False
                       , writerNumberOffset     = [0,0,0,0,0,0]
                       , writerSectionDivs      = False

src/Text/Pandoc/Writers/HTML.hs

@@ -70,11 +70,12 @@ data WriterState = WriterState
     , stQuotes           :: Bool    -- ^ <q> tag is used
     , stHighlighting     :: Bool    -- ^ Syntax highlighting is used
     , stSecNum           :: [Int]   -- ^ Number of current section
+    , stFigNum           :: Int     -- ^ Number of current figure
     }
 
 defaultWriterState :: WriterState
 defaultWriterState = WriterState {stNotes= [], stMath = False, stQuotes = False,
-                                  stHighlighting = False, stSecNum = []}
+                                  stHighlighting = False, stSecNum = [], stFigNum = 1}
 
 -- Helpers to render HTML with the appropriate function.
 
@@ -410,12 +411,18 @@ blockToHtml opts (Plain lst) = inlineListToHtml opts lst
 -- title beginning with fig: indicates that the image is a figure
 blockToHtml opts (Para [Image txt (s,'f':'i':'g':':':tit)]) = do
   img <- inlineToHtml opts (Image txt (s,tit))
+  num <- stFigNum `liftM` get
+  modify $ \st -> st{stFigNum = num+1}  -- update figure number
+  let label = if writerNumberFigures opts
+                 then H.span ! A.class_ "figure-number" $ (toHtml $ "Figure "++show num)
+                 else mempty
   let tocapt = if writerHtml5 opts
                   then H5.figcaption
                   else H.p ! A.class_ "caption"
-  capt <- if null txt
-             then return mempty
-             else tocapt `fmap` inlineListToHtml opts txt
+  capt <- case () of
+            _ | writerNumberFigures opts -> (tocapt . (label >>)) `fmap` (inlineListToHtml opts txt)
+            _ | null txt   -> return mempty
+            _ | otherwise  -> tocapt `fmap` (inlineListToHtml opts txt)
   return $ if writerHtml5 opts
               then H5.figure $ mconcat
                     [nl opts, img, capt, nl opts]