caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-15 01:25:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename typeset function to layout

Browse Source
This commit is contained in:
Laurenz 2023-11-19 18:17:06 +01:00
parent c97a01616a
commit 35d6a891bc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/typst/src/lib.rs
View File

@ -86,7 +86,7 @@ pub fn compile(world: &dyn World, tracer: &mut Tracer) -> SourceResult<Document>
); );
// Try to typeset it. // 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. // Deduplicate errors.
res.map_err(|err| { res.map_err(|err| {

4
crates/typst/src/model/mod.rs
View File

@ -37,10 +37,10 @@ use crate::eval::Tracer;
use crate::syntax::Span; use crate::syntax::Span;
use crate::World; use crate::World;
/// Typeset content into a fully layouted document. /// Layout content.
#[comemo::memoize] #[comemo::memoize]
#[tracing::instrument(skip(world, tracer, content))] #[tracing::instrument(skip(world, tracer, content))]
pub fn typeset( pub fn layout(
world: Tracked<dyn World + '_>, world: Tracked<dyn World + '_>,
mut tracer: TrackedMut<Tracer>, mut tracer: TrackedMut<Tracer>,
content: &Content, content: &Content,

6
tests/src/benches.rs
View File

@ -17,7 +17,7 @@ main!(
bench_parse, bench_parse,
bench_edit, bench_edit,
bench_eval, bench_eval,
bench_typeset, bench_layout,
bench_compile, bench_compile,
bench_render, 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 world = BenchWorld::new();
let route = typst::eval::Route::default(); let route = typst::eval::Route::default();
let mut tracer = typst::eval::Tracer::new(); let mut tracer = typst::eval::Tracer::new();
@ -77,7 +77,7 @@ fn bench_typeset(iai: &mut Iai) {
) )
.unwrap(); .unwrap();
let content = module.content(); 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) { fn bench_compile(iai: &mut Iai) {