From ebbee6274cafa6865a0d9123b78cae305c3c12aa Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sun, 12 Feb 2023 16:38:14 +0100
Subject: [PATCH] Fix square base

---
 library/src/layout/grid.rs           |   2 +-
 library/src/visualize/shape.rs       |   6 +++---
 tests/ref/bugs/square-base.png       | Bin 0 -> 150 bytes
 tests/ref/visualize/shape-square.png | Bin 18061 -> 18059 bytes
 tests/typ/bugs/square-base.typ       |   5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 tests/ref/bugs/square-base.png
 create mode 100644 tests/typ/bugs/square-base.typ

diff --git a/library/src/layout/grid.rs b/library/src/layout/grid.rs
index d488430f2..da8c4fcad 100644
--- a/library/src/layout/grid.rs
+++ b/library/src/layout/grid.rs
@@ -321,7 +321,7 @@ impl<'a, 'v> GridLayouter<'a, 'v> {
         let rcols = vec![Abs::zero(); cols.len()];
         let lrows = vec![];
 
-        // We use the regions for auto row measurement. Since at that moment,
+        // We use these regions for auto row measurement. Since at that moment,
         // columns are already sized, we can enable horizontal expansion.
         let mut regions = regions.clone();
         regions.expand = Axes::new(true, false);
diff --git a/library/src/visualize/shape.rs b/library/src/visualize/shape.rs
index e6cb55f50..c0c81bf5f 100644
--- a/library/src/visualize/shape.rs
+++ b/library/src/visualize/shape.rs
@@ -556,7 +556,7 @@ fn layout(
         // Pad the child.
         let child = child.clone().padded(inset.map(|side| side.map(Length::from)));
 
-        let mut pod = Regions::one(regions.first, regions.base, regions.expand);
+        let pod = Regions::one(regions.first, regions.base, regions.expand);
         frame = child.layout(vt, styles, pod)?.into_frame();
 
         // Relayout with full expansion into square region to make sure
@@ -571,8 +571,8 @@ fn layout(
                 desired.min(regions.first.x).min(regions.first.y)
             };
 
-            pod.first = Size::splat(length);
-            pod.expand = Axes::splat(true);
+            let size = Size::splat(length);
+            let pod = Regions::one(size, size, Axes::splat(true));
             frame = child.layout(vt, styles, pod)?.into_frame();
         }
     } else {
diff --git a/tests/ref/bugs/square-base.png b/tests/ref/bugs/square-base.png
new file mode 100644
index 0000000000000000000000000000000000000000..290ee54e5fa164773550720fbccae238a8600cb4
GIT binary patch
literal 150
zcmeAS@N?(olHy`uVBq!ia0y~yU}OQZw=e<;hNyG-X+SF0)5S5QV$R!ZhFlE>JPsGF
zDs}pwUER|gzM*@fo~(6-K<oGI2WERIYP$Z^HOx}(2tRVM{z*yn6}#|7otyVw`xCH6
zaHBAbqkzl1x|ha|HQ_0DmM`XLQs8L%(H~GI&de5^%KEYJEXYDnS3j3^P6<r_VJ<dY

literal 0
HcmV?d00001

diff --git a/tests/ref/visualize/shape-square.png b/tests/ref/visualize/shape-square.png
index 3d81f2ed7c6855c5b71d051d24d34a8d7278511e..e8433a568d5817f58a9fac0f8e4ea4de2e1a0f3a 100644
GIT binary patch
delta 237
zcmeC}W$f-{oS?!Ov{7|4x9F_A#r)q`*jOYQ7%S5ZP4extHz$crmeZBVday*=Z<pc$
z2A&h#?Tq5DKr9Y}1&qvK%)o3wJv2E`S7frLuA!O~&`=P@k0!6<QkmS%D#!9kB*9_w
hLoSicR=oC>A{+Of-;g0IJcj`YJYD@<);T3K0RYFKE@c1!

delta 193
zcmeC~W$f)`oS?!OvQc$2x8S^gY&-`TK#0Hl;m_OLOq2JsDhjgADLL$Ep1{BcL@_Jc
zxxY@H$Ra-ZEero-K5m}L3B0V61-QA;Xckspi3UdA$s1X0CLdrCf~sbhpODVL+=LrV
xe#<Sx$G~i$zyU@c#mNqnA99Iow&1n56zQ{(I=xY{l$iktJYD@<);T3K0RT?SG&ukO

diff --git a/tests/typ/bugs/square-base.typ b/tests/typ/bugs/square-base.typ
new file mode 100644
index 000000000..d8339c1ac
--- /dev/null
+++ b/tests/typ/bugs/square-base.typ
@@ -0,0 +1,5 @@
+// Test that square sets correct base for its content.
+
+---
+#set page(height: 80pt)
+#square(width: 40%, rect(width: 60%, height: 80%))