Merge pull request #7531 from quarto-dev/bugfix/7528

html, latex: fix fig-align regressions

src/resources/filters/layout/latex.lua

@@ -618,7 +618,9 @@ function latexImageFigure(image)
 
     -- get align
     local align = figAlignAttribute(image)
-
+    if align ~= nil then
+      image.attributes[kFigAlign] = nil
+    end
     -- insert the figure without the caption
     local figureContent = { pandoc.Para({
       pandoc.RawInline("latex", latexBeginAlign(align)),

src/resources/filters/quarto-post/html.lua

@@ -5,6 +5,21 @@ function render_html_fixups()
   if not _quarto.format.isHtmlOutput() then 
     return {} 
   end
+  local function needs_forward_align(source)
+    return attribute(source, kFigAlign, nil) or source.classes:find_if(function(c) return c:match("quarto%-figure.*") end)
+  end
+  local function forward_align(source, target)
+    local align = attribute(source, kFigAlign, nil)
+    if align ~= nil then
+      target.classes:insert("quarto-figure")
+      target.classes:insert("quarto-figure-" .. align)
+    end
+    for i, c in ipairs(source.classes) do
+      if c:match("quarto%-figure.*") then
+        target.classes:insert(c)
+      end
+    end
+  end
 
   return {
     Image = function(el)
@@ -14,6 +29,7 @@ function render_html_fixups()
       local align = attribute(el, kFigAlign, nil)
       if align ~= nil then
         el.attributes[kFigAlign] = nil
+        el.classes:insert("quarto-figure")
         el.classes:insert("quarto-figure-" .. align)
       end
       local alt_text = attribute(el, kFigAlt, nil)
@@ -23,6 +39,26 @@ function render_html_fixups()
       end
       return el
     end,
+    Para = function(para)
+      if #para.content ~= 1 then
+        return nil
+      end
+      local img = quarto.utils.match("Para/[1]/Image")(para)
+      if img == false then
+        return nil
+      end
+      if not needs_forward_align(img) then
+        return nil
+      end
+      local el = pandoc.Div({
+        pandoc.RawBlock("html", "<figure>"),
+        para,
+        pandoc.RawBlock("html", "</figure>")
+      })
+
+      forward_align(img, el)
+      return el
+    end,
     Div = function(div)
       -- this narrow fix prevents a 1.3 regression with knitr:
       -- https://github.com/quarto-dev/quarto-cli/issues/7516
@@ -50,15 +86,7 @@ function render_html_fixups()
           -- but I don't trust this order to be consistent, so here we check
           -- for both attribute and class
 
-          local align = attribute(img, kFigAlign, nil)
-          if align ~= nil then
-            el.classes:insert("quarto-figure-" .. align)
-          end
-          for i, c in ipairs(img.classes) do
-            if c:match("quarto%-figure%-.*") then
-              el.classes:insert(c)
-            end
-          end
+          forward_align(img, el)
           return div
         end
       end

src/resources/filters/quarto-post/latex.lua

@@ -261,6 +261,17 @@ function render_latex()
       if img.classes:includes("column-margin") then
         return column_margin(pandoc.Span(img, img.attr))
       end
+      local align = attribute(img, kFigAlign, nil) or attribute(img, kLayoutAlign, nil)
+      if align == nil then
+        return nil
+      end
+      img.attributes[kFigAlign] = nil
+      -- \\centering doesn't work consistently here...
+      return pandoc.Inlines({
+        pandoc.RawInline('latex', '\\begin{center}\n'),
+        img,
+        pandoc.RawInline('latex', '\n\\end{center}\n')
+      })
     end,
     Callout = function(node)
       -- read and clear attributes