From 35610a8c6a1721010b933324dacfe2c4d58761a3 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Thu, 17 Feb 2022 17:25:57 +0100 Subject: Fallible layout --- src/eval/show.rs | 8 ++++-- src/eval/template.rs | 36 ++++++++++++++--------- src/layout/mod.rs | 33 ++++++++++----------- src/lib.rs | 4 +-- src/library/align.rs | 6 ++-- src/library/columns.rs | 6 ++-- src/library/deco.rs | 6 ++-- src/library/flow.rs | 21 +++++++++----- src/library/grid.rs | 74 +++++++++++++++++++++++++++--------------------- src/library/heading.rs | 6 ++-- src/library/hide.rs | 6 ++-- src/library/image.rs | 4 +-- src/library/link.rs | 4 +-- src/library/list.rs | 6 ++-- src/library/math.rs | 4 +-- src/library/pad.rs | 6 ++-- src/library/page.rs | 8 +++--- src/library/par.rs | 12 ++++---- src/library/place.rs | 6 ++-- src/library/raw.rs | 4 +-- src/library/shape.rs | 8 +++--- src/library/stack.rs | 17 +++++++---- src/library/table.rs | 6 ++-- src/library/text.rs | 8 +++--- src/library/transform.rs | 6 ++-- 25 files changed, 170 insertions(+), 135 deletions(-) (limited to 'src') diff --git a/src/eval/show.rs b/src/eval/show.rs index 6157485d..a6a48e6f 100644 --- a/src/eval/show.rs +++ b/src/eval/show.rs @@ -4,12 +4,14 @@ use std::hash::{Hash, Hasher}; use std::sync::Arc; use super::{StyleChain, Template}; +use crate::diag::TypResult; use crate::util::Prehashed; +use crate::Vm; /// A node that can be realized given some styles. pub trait Show { /// Realize the template in the given styles. - fn show(&self, styles: StyleChain) -> Template; + fn show(&self, vm: &mut Vm, styles: StyleChain) -> TypResult