konevsa/typst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak usvg options (#4163)

Browse Source
This commit is contained in:
Laurenz 2024-05-17 11:27:05 +02:00
parent f56408a73c
commit 24ed6d5935
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/typst/src/visualize/image/svg.rs
View File

@ -4,8 +4,9 @@ use std::sync::Arc;
use comemo::Tracked;
use ecow::EcoString;
use once_cell::sync::Lazy;
use siphasher::sip128::Hasher128;
use usvg::{Node, PostProcessingSteps, TreeParsing, TreePostProc};
use usvg::{ImageHrefResolver, Node, PostProcessingSteps, TreeParsing, TreePostProc};
use crate::diag::{format_xml_like_error, StrResult};
use crate::foundations::Bytes;
@ -30,7 +31,7 @@ impl SvgImage {
/// Decode an SVG image without fonts.
#[comemo::memoize]
pub fn new(data: Bytes) -> StrResult<SvgImage> {
let tree = usvg::Tree::from_data(&data, &options()).map_err(format_usvg_error)?;
let tree = usvg::Tree::from_data(&data, &OPTIONS).map_err(format_usvg_error)?;
Ok(Self(Arc::new(Repr {
data,
size: tree_size(&tree),
@ -48,7 +49,7 @@ impl SvgImage {
families: &[String],
) -> StrResult<SvgImage> {
let mut tree =
usvg::Tree::from_data(&data, &options()).map_err(format_usvg_error)?;
usvg::Tree::from_data(&data, &OPTIONS).map_err(format_usvg_error)?;
let mut font_hash = 0;
if tree.has_text_nodes() {
let (fontdb, hash) = load_svg_fonts(world, &mut tree, families);
@ -122,20 +123,27 @@ impl Hash for Repr {
}
/// The conversion options.
fn options() -> usvg::Options {
static OPTIONS: Lazy<usvg::Options> = Lazy::new(|| usvg::Options {
// Disable usvg's default to "Times New Roman". Instead, we default to
// the empty family and later, when we traverse the SVG, we check for
// empty and non-existing family names and replace them with the true
// fallback family. This way, we can memoize SVG decoding with and without
// fonts if the SVG does not contain text.
usvg::Options {
font_family: String::new(),
// We override the DPI here so that we get the correct the size when
// scaling the image to its natural size.
dpi: Image::DEFAULT_DPI as f32,
..Default::default()
}
}
// fallback family. This way, we can memoize SVG decoding with and
// without fonts if the SVG does not contain text.
font_family: String::new(),
// We override the DPI here so that we get the correct the size when
// scaling the image to its natural size.
dpi: Image::DEFAULT_DPI as f32,
// Override usvg's resource loading defaults.
resources_dir: None,
image_href_resolver: ImageHrefResolver {
resolve_data: ImageHrefResolver::default_data_resolver(),
resolve_string: Box::new(|_, _| None),
},
..Default::default()
});
/// Discover and load the fonts referenced by an SVG.
fn load_svg_fonts(