Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Integration: #1027 composite-font scales are checked after the percent conversion

aiongg4aeda523b6b4
diff --git a/crates/idml/src/import.rs b/crates/idml/src/import.rs
index fc17dd282..078e3ed13 100644
--- a/crates/idml/src/import.rs
+++ b/crates/idml/src/import.rs
@@ -631,9 +631,9 @@ impl<'r> Importer<'r> {
style: c.get("FontStyle").unwrap_or("Regular").trim_start_matches("$ID/").into(),
// A metric `Document::check` refuses would make the whole file fail to
// open, so one that is unusable here falls back to full size / no shift.
- relative_size: c.num("RelativeSize").filter(|v| v.is_finite() && *v > 0.0).unwrap_or(100.0) / 100.0,
- horizontal_scale: c.num("HorizontalScale").filter(|v| v.is_finite() && *v > 0.0).unwrap_or(100.0) / 100.0,
- vertical_scale: c.num("VerticalScale").filter(|v| v.is_finite() && *v > 0.0).unwrap_or(100.0) / 100.0,
+ relative_size: c.num("RelativeSize").map(|v| v / 100.0).filter(|v| v.is_finite() && *v > 0.0).unwrap_or(1.0),
+ horizontal_scale: c.num("HorizontalScale").map(|v| v / 100.0).filter(|v| v.is_finite() && *v > 0.0).unwrap_or(1.0),
+ vertical_scale: c.num("VerticalScale").map(|v| v / 100.0).filter(|v| v.is_finite() && *v > 0.0).unwrap_or(1.0),
baseline_shift: c.num("BaselineShift").filter(|v| v.is_finite()).unwrap_or(0.0) / 100.0,
scale_option: c.boolean("ScaleOption").unwrap_or(true),
})
diff --git a/crates/idml/src/tests.rs b/crates/idml/src/tests.rs
index b76233d22..dd64b1aa4 100644
--- a/crates/idml/src/tests.rs
+++ b/crates/idml/src/tests.rs
@@ -4017,6 +4017,7 @@ fn unusable_cjk_metrics_do_not_refuse_the_whole_file() {
<CompositeFont Self="cf" Name="Rubies">
<CompositeFontEntry Self="e1" Name="Dot" AppliedFont="Myriad Pro" RelativeSize="0"/>
<CompositeFontEntry Self="e2" Name="Bar" AppliedFont="Myriad Pro" BaselineShift="NaN"/>
+ <CompositeFontEntry Self="e3" Name="Tiny" AppliedFont="Myriad Pro" RelativeSize="5e-324" HorizontalScale="5e-324" VerticalScale="5e-324"/>
</CompositeFont>
<idPkg:Spread src="Spreads/Spread_s.xml"/>
</Document>"#;
@@ -4027,6 +4028,8 @@ fn unusable_cjk_metrics_do_not_refuse_the_whole_file() {
let entries = &d.styles.composite_fonts[0].entries;
assert_eq!(entries[0].relative_size, 1.0, "an unusable relative size falls back to full size");
assert_eq!(entries[1].baseline_shift, 0.0, "an unusable shift falls back to none");
+ // Positive in the file but zero once read as a fraction.
+ assert_eq!((entries[2].relative_size, entries[2].horizontal_scale, entries[2].vertical_scale), (1.0, 1.0, 1.0));
}
mod liquid_page_rules {