diff --git a/crates/typst/src/lib.rs b/crates/typst/src/lib.rs index bae1e4b4f..a3f7191ec 100644 --- a/crates/typst/src/lib.rs +++ b/crates/typst/src/lib.rs @@ -86,7 +86,7 @@ pub fn compile(world: &dyn World, tracer: &mut Tracer) -> SourceResult ); // Try to typeset it. - let res = module.and_then(|module| model::typeset(world, tracer, &module.content())); + let res = module.and_then(|module| model::layout(world, tracer, &module.content())); // Deduplicate errors. res.map_err(|err| { diff --git a/crates/typst/src/model/mod.rs b/crates/typst/src/model/mod.rs index de50f24ab..11f95eebd 100644 --- a/crates/typst/src/model/mod.rs +++ b/crates/typst/src/model/mod.rs @@ -37,10 +37,10 @@ use crate::eval::Tracer; use crate::syntax::Span; use crate::World; -/// Typeset content into a fully layouted document. +/// Layout content. #[comemo::memoize] #[tracing::instrument(skip(world, tracer, content))] -pub fn typeset( +pub fn layout( world: Tracked, mut tracer: TrackedMut, content: &Content, diff --git a/tests/src/benches.rs b/tests/src/benches.rs index 666bb8a01..8ef173530 100644 --- a/tests/src/benches.rs +++ b/tests/src/benches.rs @@ -17,7 +17,7 @@ main!( bench_parse, bench_edit, bench_eval, - bench_typeset, + bench_layout, bench_compile, bench_render, ); @@ -65,7 +65,7 @@ fn bench_eval(iai: &mut Iai) { }); } -fn bench_typeset(iai: &mut Iai) { +fn bench_layout(iai: &mut Iai) { let world = BenchWorld::new(); let route = typst::eval::Route::default(); let mut tracer = typst::eval::Tracer::new(); @@ -77,7 +77,7 @@ fn bench_typeset(iai: &mut Iai) { ) .unwrap(); let content = module.content(); - iai.run(|| typst::model::typeset(world.track(), tracer.track_mut(), &content)); + iai.run(|| typst::model::layout(world.track(), tracer.track_mut(), &content)); } fn bench_compile(iai: &mut Iai) {