summaryrefslogtreecommitdiff
path: root/library/src/layout
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2022-11-22 20:52:58 +0100
committerLaurenz <laurmaedje@gmail.com>2022-11-22 21:09:20 +0100
commitc2749f761591b462ceeccf4a42b9ac75d8addf85 (patch)
treea2c51175fa996f5e59666da762b2e7d9e25b43e3 /library/src/layout
parentea2a1525f0fc461ec9a5dc1839aec9b66c4e1ecc (diff)
More sensible `LayoutRoot`
Diffstat (limited to 'library/src/layout')
-rw-r--r--library/src/layout/mod.rs17
1 files changed, 11 insertions, 6 deletions
diff --git a/library/src/layout/mod.rs b/library/src/layout/mod.rs
index b05da901..fdf02c93 100644
--- a/library/src/layout/mod.rs
+++ b/library/src/layout/mod.rs
@@ -49,20 +49,25 @@ use crate::text::{
#[capability]
pub trait LayoutRoot {
/// Layout into one frame per page.
- fn layout_root(&self, world: Tracked<dyn World>) -> SourceResult<Vec<Frame>>;
+ fn layout_root(
+ &self,
+ world: Tracked<dyn World>,
+ styles: StyleChain,
+ ) -> SourceResult<Vec<Frame>>;
}
impl LayoutRoot for Content {
#[comemo::memoize]
- fn layout_root(&self, world: Tracked<dyn World>) -> SourceResult<Vec<Frame>> {
- let styles = StyleChain::with_root(&world.config().styles);
+ fn layout_root(
+ &self,
+ world: Tracked<dyn World>,
+ styles: StyleChain,
+ ) -> SourceResult<Vec<Frame>> {
let scratch = Scratch::default();
-
let mut builder = Builder::new(world, &scratch, true);
builder.accept(self, styles)?;
-
let (doc, shared) = builder.into_doc(styles)?;
- doc.layout(world, shared)
+ doc.layout_root(world, shared)
}
}