diff options
| author | Laurenz <laurmaedje@gmail.com> | 2022-09-19 17:44:40 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2022-09-19 17:44:40 +0200 |
| commit | e29f55bb294cc298daad97accf6d8a76976b409c (patch) | |
| tree | cc4db3b61fa23e13f781e992c63427d36e77ef8c /tests/typeset.rs | |
| parent | 59f67b79c7ff50f0bc9a27373d0fa36d1523e08a (diff) | |
Remove font store
Diffstat (limited to 'tests/typeset.rs')
| -rw-r--r-- | tests/typeset.rs | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/tests/typeset.rs b/tests/typeset.rs index f66e22fc..4b25e176 100644 --- a/tests/typeset.rs +++ b/tests/typeset.rs @@ -234,7 +234,7 @@ fn test( if compare_ever { if let Some(pdf_path) = pdf_path { - let pdf_data = typst::export::pdf(ctx, &frames); + let pdf_data = typst::export::pdf(&frames); fs::create_dir_all(&pdf_path.parent().unwrap()).unwrap(); fs::write(pdf_path, pdf_data).unwrap(); } @@ -245,7 +245,7 @@ fn test( } } - let canvas = render(ctx, &frames); + let canvas = render(&frames); fs::create_dir_all(&png_path.parent().unwrap()).unwrap(); canvas.save_png(png_path).unwrap(); @@ -532,7 +532,7 @@ fn test_spans_impl(node: &SyntaxNode, within: Range<u64>) -> bool { } /// Draw all frames into one image with padding in between. -fn render(ctx: &mut Context, frames: &[Frame]) -> sk::Pixmap { +fn render(frames: &[Frame]) -> sk::Pixmap { let pixel_per_pt = 2.0; let pixmaps: Vec<_> = frames .iter() @@ -541,7 +541,7 @@ fn render(ctx: &mut Context, frames: &[Frame]) -> sk::Pixmap { if frame.width() > limit || frame.height() > limit { panic!("overlarge frame: {:?}", frame.size()); } - typst::export::render(ctx, frame, pixel_per_pt) + typst::export::render(frame, pixel_per_pt) }) .collect(); @@ -555,7 +555,7 @@ fn render(ctx: &mut Context, frames: &[Frame]) -> sk::Pixmap { let [x, mut y] = [pad; 2]; for (frame, mut pixmap) in frames.iter().zip(pixmaps) { let ts = sk::Transform::from_scale(pixel_per_pt, pixel_per_pt); - render_links(&mut pixmap, ts, ctx, frame); + render_links(&mut pixmap, ts, frame); canvas.draw_pixmap( x as i32, @@ -573,18 +573,13 @@ fn render(ctx: &mut Context, frames: &[Frame]) -> sk::Pixmap { } /// Draw extra boxes for links so we can see whether they are there. -fn render_links( - canvas: &mut sk::Pixmap, - ts: sk::Transform, - ctx: &Context, - frame: &Frame, -) { +fn render_links(canvas: &mut sk::Pixmap, ts: sk::Transform, frame: &Frame) { for (pos, element) in frame.elements() { let ts = ts.pre_translate(pos.x.to_pt() as f32, pos.y.to_pt() as f32); match *element { Element::Group(ref group) => { let ts = ts.pre_concat(group.transform.into()); - render_links(canvas, ts, ctx, &group.frame); + render_links(canvas, ts, &group.frame); } Element::Link(_, size) => { let w = size.x.to_pt() as f32; |
