summaryrefslogtreecommitdiff
path: root/tests/typ/layout
diff options
context:
space:
mode:
Diffstat (limited to 'tests/typ/layout')
-rw-r--r--tests/typ/layout/grid-1.typ2
-rw-r--r--tests/typ/layout/grid-4.typ2
-rw-r--r--tests/typ/layout/page-margin.typ12
-rw-r--r--tests/typ/layout/page-marginals.typ4
-rw-r--r--tests/typ/layout/page.typ2
-rw-r--r--tests/typ/layout/stack-1.typ8
6 files changed, 15 insertions, 15 deletions
diff --git a/tests/typ/layout/grid-1.typ b/tests/typ/layout/grid-1.typ
index a6596c98..dcc9b474 100644
--- a/tests/typ/layout/grid-1.typ
+++ b/tests/typ/layout/grid-1.typ
@@ -31,7 +31,7 @@
)
---
-#set page(height: 3cm, margins: 0pt)
+#set page(height: 3cm, margin: 0pt)
#grid(
columns: (1fr,),
rows: (1fr, auto, 2fr),
diff --git a/tests/typ/layout/grid-4.typ b/tests/typ/layout/grid-4.typ
index fec25105..c7ae7649 100644
--- a/tests/typ/layout/grid-4.typ
+++ b/tests/typ/layout/grid-4.typ
@@ -23,7 +23,7 @@
---
// Test that all three kinds of rows use the correct bases.
-#set page(height: 4cm, margins: 0cm)
+#set page(height: 4cm, margin: 0cm)
#grid(
rows: (1cm, 1fr, 1fr, auto),
rect(height: 50%, width: 100%, fill: conifer),
diff --git a/tests/typ/layout/page-margin.typ b/tests/typ/layout/page-margin.typ
index 290c4081..9be2484f 100644
--- a/tests/typ/layout/page-margin.typ
+++ b/tests/typ/layout/page-margin.typ
@@ -3,7 +3,7 @@
---
// Set all margins at once.
[
- #set page(height: 20pt, margins: 5pt)
+ #set page(height: 20pt, margin: 5pt)
#place(top + left)[TL]
#place(bottom + right)[BR]
]
@@ -11,10 +11,10 @@
---
// Set individual margins.
#set page(height: 40pt)
-[#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]]
+[#set page(margin: (left: 0pt)); #align(left)[Left]]
+[#set page(margin: (right: 0pt)); #align(right)[Right]]
+[#set page(margin: (top: 0pt)); #align(top)[Top]]
+[#set page(margin: (bottom: 0pt)); #align(bottom)[Bottom]]
// Ensure that specific margins override general margins.
-[#set page(margins: (rest: 0pt, left: 20pt)); Overriden]
+[#set page(margin: (rest: 0pt, left: 20pt)); Overriden]
diff --git a/tests/typ/layout/page-marginals.typ b/tests/typ/layout/page-marginals.typ
index 9b323692..30bd39c1 100644
--- a/tests/typ/layout/page-marginals.typ
+++ b/tests/typ/layout/page-marginals.typ
@@ -1,6 +1,6 @@
#set page(
paper: "a8",
- margins: (x: 15pt, y: 30pt),
+ margin: (x: 15pt, y: 30pt),
header: align(horizon, {
text(eastern)[*Typst*]
h(1fr)
@@ -20,5 +20,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, margins: (top: 15pt, bottom: 25pt))
+#set page(header: none, height: auto, margin: (top: 15pt, bottom: 25pt))
The END.
diff --git a/tests/typ/layout/page.typ b/tests/typ/layout/page.typ
index 918f674b..50b6a394 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[Typst])
-#page(width: 40pt, fill: none, margins: (top: 10pt, rest: auto))[Hi]
+#page(width: 40pt, fill: none, margin: (top: 10pt, rest: auto))[Hi]
---
// Just page followed by pagebreak.
diff --git a/tests/typ/layout/stack-1.typ b/tests/typ/layout/stack-1.typ
index 6a884667..864a06df 100644
--- a/tests/typ/layout/stack-1.typ
+++ b/tests/typ/layout/stack-1.typ
@@ -16,12 +16,12 @@
(align(right, shaded(i, w)),)
}
-#set page(width: 50pt, margins: 0pt)
+#set page(width: 50pt, margin: 0pt)
#stack(dir: btt, ..items)
---
// Test spacing.
-#set page(width: 50pt, margins: 0pt)
+#set page(width: 50pt, margin: 0pt)
#let x = square(size: 10pt, fill: eastern)
#stack(
@@ -33,7 +33,7 @@
---
// Test overflow.
-#set page(width: 50pt, height: 30pt, margins: 0pt)
+#set page(width: 50pt, height: 30pt, margin: 0pt)
#box(stack(
rect(width: 40pt, height: 20pt, fill: conifer),
rect(width: 30pt, height: 13pt, fill: forest),
@@ -41,7 +41,7 @@
---
// Test aligning things in RTL stack with align function & fr units.
-#set page(width: 50pt, margins: 5pt)
+#set page(width: 50pt, margin: 5pt)
#set block(spacing: 5pt)
#set text(8pt)
#stack(dir: rtl, 1fr, [A], 1fr, [B], [C])