New page margins API

5 files changed, 13 insertions, 14 deletions

diff --git a/tests/ref/layout/page.png b/tests/ref/layout/page.png
index 35716e4d..e0618e58 100644
--- a/tests/ref/layout/page.png
+++ b/tests/ref/layout/page.png
diff --git a/tests/typ/layout/page-margin.typ b/tests/typ/layout/page-margin.typ
index 44126d2d..e30518b0 100644
--- a/tests/typ/layout/page-margin.typ
+++ b/tests/typ/layout/page-margin.typ
@@ -11,10 +11,10 @@
 ---
 // Set individual margins.
 #set page(height: 40pt)
-[#set page(left: 0pt); #align(left)[Left]]
-[#set page(right: 0pt); #align(right)[Right]]
-[#set page(top: 0pt); #align(top)[Top]]
-[#set page(bottom: 0pt); #align(bottom)[Bottom]]
+[#set page(margins: (left: 0pt,)); #align(left)[Left]]
+[#set page(margins: (right: 0pt,)); #align(right)[Right]]
+[#set page(margins: (top: 0pt,)); #align(top)[Top]]
+[#set page(margins: (bottom: 0pt,)); #align(bottom)[Bottom]]
 
 // Ensure that specific margins override general margins.
-[#set page(margins: 0pt, left: 20pt); Overriden]
+[#set page(margins: (rest: 0pt, left: 20pt)); Overriden]
diff --git a/tests/typ/layout/page-marginals.typ b/tests/typ/layout/page-marginals.typ
index 9fd193c6..6e8e3d85 100644
--- a/tests/typ/layout/page-marginals.typ
+++ b/tests/typ/layout/page-marginals.typ
@@ -1,7 +1,6 @@
 #set page(
   paper: "a8",
-  margins: 30pt,
-  horizontal: 15pt,
+  margins: (x: 15pt, y: 30pt),
   header: align(horizon, {
     text(eastern)[*Typst*]
     h(1fr)
@@ -18,5 +17,5 @@ do wear it; cast it off. It is my lady, O, it is my love! O, that she knew she
 were! She speaks yet she says nothing: what of that? Her eye discourses; I will
 answer it.
 
-#set page(header: none, height: auto, top: 15pt, bottom: 25pt)
+#set page(header: none, height: auto, margins: (top: 15pt, bottom: 25pt))
 The END.
diff --git a/tests/typ/layout/page.typ b/tests/typ/layout/page.typ
index 89d0f2fb..3157ebf9 100644
--- a/tests/typ/layout/page.typ
+++ b/tests/typ/layout/page.typ
@@ -24,7 +24,7 @@
 // Test page fill.
 #set page(width: 80pt, height: 40pt, fill: eastern)
 #text(15pt, "Roboto", fill: white, smallcaps: true)[Typst]
-#page(width: 40pt, fill: none, margins: auto, top: 10pt)[Hi]
+#page(width: 40pt, fill: none, margins: (top: 10pt, rest: auto))[Hi]
 
 ---
 // Just page followed by pagebreak.
diff --git a/tests/typeset.rs b/tests/typeset.rs
index 9f84a733..d3f7844b 100644
--- a/tests/typeset.rs
+++ b/tests/typeset.rs
@@ -12,7 +12,7 @@ use walkdir::WalkDir;
 use typst::diag::Error;
 use typst::eval::{Smart, Value};
 use typst::frame::{Element, Frame};
-use typst::geom::{Length, RgbaColor};
+use typst::geom::{Length, RgbaColor, Sides};
 use typst::library::layout::PageNode;
 use typst::library::text::{TextNode, TextSize};
 use typst::loading::FsLoader;
@@ -64,10 +64,10 @@ fn main() {
     let mut styles = StyleMap::new();
     styles.set(PageNode::WIDTH, Smart::Custom(Length::pt(120.0).into()));
     styles.set(PageNode::HEIGHT, Smart::Auto);
-    styles.set(PageNode::LEFT, Smart::Custom(Length::pt(10.0).into()));
-    styles.set(PageNode::TOP, Smart::Custom(Length::pt(10.0).into()));
-    styles.set(PageNode::RIGHT, Smart::Custom(Length::pt(10.0).into()));
-    styles.set(PageNode::BOTTOM, Smart::Custom(Length::pt(10.0).into()));
+    styles.set(
+        PageNode::MARGINS,
+        Sides::splat(Smart::Custom(Length::pt(10.0).into())),
+    );
     styles.set(TextNode::SIZE, TextSize(Length::pt(10.0).into()));
 
     // Hook up an assert function into the global scope.