From e6739ecc2f78f023b7b6b1729983af30f657e6dd Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Wed, 29 May 2024 15:17:05 +0200
Subject: [PATCH] Fix figure centering (#4276)

Co-authored-by: PgBiel <9021226+PgBiel@users.noreply.github.com>
---
 crates/typst/src/model/figure.rs |  15 +++++++--------
 tests/ref/figure-align.png       | Bin 0 -> 926 bytes
 tests/suite/model/figure.typ     |   8 ++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 tests/ref/figure-align.png

diff --git a/crates/typst/src/model/figure.rs b/crates/typst/src/model/figure.rs
index 30708711c..a21e5af5e 100644
--- a/crates/typst/src/model/figure.rs
+++ b/crates/typst/src/model/figure.rs
@@ -14,8 +14,8 @@ use crate::introspection::{
     Count, Counter, CounterKey, CounterUpdate, Locatable, Location,
 };
 use crate::layout::{
-    Alignment, BlockElem, Em, HAlignment, Length, OuterVAlignment, PlaceElem, VAlignment,
-    VElem,
+    AlignElem, Alignment, BlockElem, Em, HAlignment, Length, OuterVAlignment, PlaceElem,
+    VAlignment, VElem,
 };
 use crate::model::{Numbering, NumberingPattern, Outlinable, Refable, Supplement};
 use crate::text::{Lang, Region, TextElem};
@@ -317,11 +317,7 @@ impl Show for Packed<FigureElem> {
         }
 
         // Wrap the contents in a block.
-        realized = BlockElem::new()
-            .with_body(Some(realized))
-            .pack()
-            .spanned(self.span())
-            .aligned(Alignment::CENTER);
+        realized = BlockElem::new().with_body(Some(realized)).pack().spanned(self.span());
 
         // Wrap in a float.
         if let Some(align) = self.placement(styles) {
@@ -340,7 +336,10 @@ impl ShowSet for Packed<FigureElem> {
     fn show_set(&self, _: StyleChain) -> Styles {
         // Still allows breakable figures with
         // `show figure: set block(breakable: true)`.
-        BlockElem::set_breakable(false).wrap().into()
+        let mut map = Styles::new();
+        map.set(BlockElem::set_breakable(false));
+        map.set(AlignElem::set_alignment(Alignment::CENTER));
+        map
     }
 }
 
diff --git a/tests/ref/figure-align.png b/tests/ref/figure-align.png
new file mode 100644
index 0000000000000000000000000000000000000000..be287161998589e585f6a04526021dba5ba3174f
GIT binary patch
literal 926
zcmV;P17ZA$P)<h;3K|Lk000e1NJLTq004LZ002J-000004pLLv000AJNkl<Zc-rmQ
z|4-C)9Kdn^iGFf5W-Do~*>nxs(xtVsRzP5YZCRveLriKyAlz{f4U;WOuDc`ekm$Z~
zU~+Y$;9)HF%n-f9g6IZ%w1lhkAf<!5<L;jE!)^T_+lQg|ak|g*r_bl7$KLPl{d#Zj
z72Km%NU#J;@Ph<bFCkwN;Ogg;g5_^X2CPIdTc!lxW%!!-@arFM+tRf68Gy#00D$&R
z5#ZAp<jijXh>$267XgO08lumdclOP^+lNMDh3MXPT8=b{0<Q`V79c<2do|()w7TfV
zpj#Ap1Kw@aoTO=eKcLsqv93Gmu)dT~IwM(>AL|=;$pDpV=;B|mBpd#ts_e@5#bf4u
z1N-Yn4ys2Xs8n99{mLaxE(yM0;lD2d!0eB6;==Y#0I<ht35p8;`vL$wkNZ8b;px_f
z$+M3(D>iqE4CnUic9YIP5hBAY-L7%*;i-*0b%6kDxGal{2^+T$4#^tF`to~c-?2)Q
zOM>qXd~{{1U@0FZ0p_<Q6p~&9B>3LISHmn)%p(9BUQ<=7Cl0ZA^F9Cw>CMFu2NM1N
z>3!TAt>CsUrwG8LfHmr6(SCl>1ORF~$7jz~0f{yPiE^$p%I&2K!Kt|CEMGElOnvaI
zeDq2wCc}YCH%!_HfZ9Ub1+-`RL6LDXYS;Th^4?O{s^%$R%HBN7*6XLMn6YWpT?cxb
zlo8IGy9jGPOBI42`8wm)P#$m2v^G=d<Vk)_9r0)XS>Fhtu`pc;pj-1nyj#f`=U_RX
z6#haQ`2CTVNrQO-j;y0*puYrDUU=7;;bLEUplB?<R(QoXW7qO28B_hhhv!LS;U}=#
z(KDKW6UDN=U4Z9|x=b3{AdOoJ#qf=mD#Zd!8u~7WhR%9wyS^xL^vpeh@K!$zc(zh^
zY6L1z#8-zsIYb_sA_&mXN~i;<i&Jr~r-Is^i45wEupWRnCcEWidRdF=)Bv>Cp|n|Z
zn4f=oIQp0XY}j-Z4&``0E!?r6;X>7R<LB8f>~Cqu0Z+jmf3O8OQvOXF6S+1=d0Xy9
z+57)cS$z}G)gRvJ%vRf8x?m}g?Vj1UE3l(1T2f|;Idipnwk4h8ND(yt&a#t%<GbYy
zkl4#sTL;VU?Zd~7;pM;(;EtM(Ntc8KOR%W@2QCj6xjAF{aR2}S07*qoM6N<$g6`$Y
AX#fBK

literal 0
HcmV?d00001

diff --git a/tests/suite/model/figure.typ b/tests/suite/model/figure.typ
index 6846760f1..13e944811 100644
--- a/tests/suite/model/figure.typ
+++ b/tests/suite/model/figure.typ
@@ -23,6 +23,13 @@ We can clearly see that @fig-cylinder and
   caption: [The complex table.],
 ) <tab-complex>
 
+--- figure-align ---
+#show figure: set align(start)
+#figure(
+  rect[This is \ left],
+  caption: [Start-aligned]
+)
+
 --- figure-table ---
 // Testing figures with tables.
 #figure(
@@ -37,6 +44,7 @@ We can clearly see that @fig-cylinder and
 --- figure-theorem ---
 // Testing show rules with figures with a simple theorem display
 #show figure.where(kind: "theorem"): it => {
+  set align(start)
   let name = none
   if not it.caption == none {
     name = [ #emph(it.caption.body)]