From 92586d3e6895f0895fb2c88abcdd5e7160482a5b Mon Sep 17 00:00:00 2001 From: Laurenz Date: Tue, 10 Dec 2019 11:37:12 +0100 Subject: =?UTF-8?q?Progressing=20stack=20layouter=20=F0=9F=9A=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index f2ebd572..368d0cda 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -27,7 +27,7 @@ use toddle::Error as FontError; use crate::func::Scope; use crate::layout::{layout_tree, MultiLayout, LayoutContext}; use crate::layout::{LayoutAxes, LayoutAlignment, Axis, Alignment}; -use crate::layout::{LayoutResult, LayoutSpace}; +use crate::layout::{LayoutResult, LayoutSpace, LayoutExpansion}; use crate::syntax::{parse, SyntaxTree, ParseContext, Span, ParseResult}; use crate::style::{LayoutStyle, PageStyle, TextStyle}; @@ -98,11 +98,11 @@ impl<'p> Typesetter<'p> { style: &self.style, spaces: smallvec![LayoutSpace { dimensions: self.style.page.dimensions, - expand: (true, true), + expand: LayoutExpansion::new(true, true), padding: self.style.page.margins, }], - axes: LayoutAxes::new(Axis::LeftToRight, Axis::TopToBottom), - alignment: LayoutAlignment::new(Alignment::Origin, Alignment::Origin), + axes: LayoutAxes::default(), + alignment: LayoutAlignment::default(), }, )?) } -- cgit v1.2.3