caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Format code

Browse Source
This commit is contained in:
Laurenz 2023-04-04 14:36:25 +02:00
parent 8271ba5a52
commit c2d88989a7
3 changed files with 53 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/src/compute/data.rs
View File

@ -275,9 +275,9 @@ fn convert_yaml(value: serde_yaml::Value) -> Value {
serde_yaml::Value::Mapping(v) => Value::Dict( serde_yaml::Value::Mapping(v) => Value::Dict(
v.into_iter() v.into_iter()
.map(|(key, value)| (convert_yaml_key(key), convert_yaml(value))) .map(|(key, value)| (convert_yaml_key(key), convert_yaml(value)))
.filter_map(|(key, value)| key.map(|key|(key, value))) .filter_map(|(key, value)| key.map(|key| (key, value)))
.collect(), .collect(),
) ),
} }
} }

4
library/src/meta/numbering.rs
View File

@ -363,7 +363,7 @@ impl NumberingKind {
let symbol = SYMBOLS[(n - 1) % SYMBOLS.len()]; let symbol = SYMBOLS[(n - 1) % SYMBOLS.len()];
let amount = ((n - 1) / SYMBOLS.len()) + 1; let amount = ((n - 1) / SYMBOLS.len()) + 1;
std::iter::repeat(symbol).take(amount).collect() std::iter::repeat(symbol).take(amount).collect()
}, }
Self::Hebrew => { Self::Hebrew => {
if n == 0 { if n == 0 {
return '-'.into(); return '-'.into();
@ -410,7 +410,7 @@ impl NumberingKind {
n -= value; n -= value;
continue; continue;
}, }
} }
break 'outer; break 'outer;
} }

42
src/export/render.rs
View File

@ -193,12 +193,20 @@ fn render_svg_glyph(
// be on the safe size. We also compute the intersection // be on the safe size. We also compute the intersection
// with the canvas rectangle // with the canvas rectangle
let svg_ts = usvg::Transform::new( let svg_ts = usvg::Transform::new(
ts.sx.into(), ts.kx.into(), ts.sx.into(),
ts.ky.into(), ts.sy.into(), ts.kx.into(),
ts.tx.into(), ts.ty.into()); ts.ky.into(),
let bbox = bbox.transform(&svg_ts)? ts.sy.into(),
.to_screen_rect(); ts.tx.into(),
let bbox = usvg::ScreenRect::new(bbox.left()-5, bbox.y()-5, bbox.width()+10, bbox.height()+10)? ts.ty.into(),
);
let bbox = bbox.transform(&svg_ts)?.to_screen_rect();
let bbox = usvg::ScreenRect::new(
bbox.left() - 5,
bbox.y() - 5,
bbox.width() + 10,
bbox.height() + 10,
)?
.fit_to_rect(canvas_rect); .fit_to_rect(canvas_rect);
let mut pixmap = sk::Pixmap::new(bbox.width(), bbox.height())?; let mut pixmap = sk::Pixmap::new(bbox.width(), bbox.height())?;
@ -207,7 +215,14 @@ fn render_svg_glyph(
let ts = ts.post_translate(-bbox.left() as f32, -bbox.top() as f32); let ts = ts.post_translate(-bbox.left() as f32, -bbox.top() as f32);
resvg::render(&tree, FitTo::Original, ts, pixmap.as_mut())?; resvg::render(&tree, FitTo::Original, ts, pixmap.as_mut())?;
canvas.draw_pixmap(bbox.left(), bbox.top(), pixmap.as_ref(), &sk::PixmapPaint::default(), sk::Transform::identity(), mask) canvas.draw_pixmap(
bbox.left(),
bbox.top(),
pixmap.as_ref(),
&sk::PixmapPaint::default(),
sk::Transform::identity(),
mask,
)
} }
/// Render a bitmap glyph into the canvas. /// Render a bitmap glyph into the canvas.
@ -282,19 +297,26 @@ fn render_outline_glyph(
// Pad the pixmap with 1 pixel in each dimension so that we do // Pad the pixmap with 1 pixel in each dimension so that we do
// not get any problem with floating point errors along ther border // not get any problem with floating point errors along ther border
let mut pixmap = sk::Pixmap::new(mw+2, mh+2)?; let mut pixmap = sk::Pixmap::new(mw + 2, mh + 2)?;
for x in 0..mw { for x in 0..mw {
for y in 0..mh { for y in 0..mh {
let alpha = bitmap.coverage[(y * mw + x) as usize]; let alpha = bitmap.coverage[(y * mw + x) as usize];
let color = sk::ColorU8::from_rgba(c.r, c.g, c.b, alpha).premultiply(); let color = sk::ColorU8::from_rgba(c.r, c.g, c.b, alpha).premultiply();
pixmap.pixels_mut()[((y+1) * (mw+2) + (x+1)) as usize] = color; pixmap.pixels_mut()[((y + 1) * (mw + 2) + (x + 1)) as usize] = color;
} }
} }
let left = bitmap.left; let left = bitmap.left;
let top = bitmap.top; let top = bitmap.top;
canvas.draw_pixmap(left-1, top-1, pixmap.as_ref(), &sk::PixmapPaint::default(), sk::Transform::identity(), mask) canvas.draw_pixmap(
left - 1,
top - 1,
pixmap.as_ref(),
&sk::PixmapPaint::default(),
sk::Transform::identity(),
mask,
)
} else { } else {
let cw = canvas.width() as i32; let cw = canvas.width() as i32;
let ch = canvas.height() as i32; let ch = canvas.height() as i32;