From 0fc25d732d7cbc37cf801645849d1060f2cec4a3 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sat, 3 Oct 2020 13:23:59 +0200
Subject: =?UTF-8?q?Port=20to=20kurbo=20=F0=9F=8E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/lib.rs')

diff --git a/src/lib.rs b/src/lib.rs
index 8bf5398d..3be97873 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -93,17 +93,17 @@ impl Typesetter {
 
     /// Layout a syntax tree and return the produced layout.
     pub async fn layout(&self, tree: &SynTree) -> Pass<MultiLayout> {
-        let margins = self.style.page.margins();
+        let space = LayoutSpace {
+            size: self.style.page.size,
+            insets: self.style.page.insets(),
+            expansion: LayoutExpansion::new(true, true),
+        };
         layout(&tree, LayoutContext {
             loader: &self.loader,
             scope: &self.std,
             style: &self.style,
-            base: self.style.page.size.unpadded(margins),
-            spaces: vec![LayoutSpace {
-                size: self.style.page.size,
-                padding: margins,
-                expansion: LayoutExpansion::new(true, true),
-            }],
+            base: space.usable(),
+            spaces: vec![space],
             repeat: true,
             sys: LayoutSystem::new(Dir::LTR, Dir::TTB),
             align: LayoutAlign::new(GenAlign::Start, GenAlign::Start),
-- 
cgit v1.2.3