Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

iup_delta_optimize: fix interpretation of contour_ends #565

Merged
merged 4 commits into from
Aug 10, 2023
Merged

iup_delta_optimize: fix interpretation of contour_ends #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35d6d13
add pretty_assertions to write-fonts' dev-dependencies
anthrotype Aug 9, 2023
8f3cc9b
iup: add failing test case for Oswald glyph 'two'
anthrotype Aug 9, 2023
1fce739
iup_delta_optimize: contour_ends contains endpoint indices, not conto…
anthrotype Aug 10, 2023
36a8929
iup: when all deltas equal (0,0) return all Nones
anthrotype Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,9 @@ members = [
"skrifa",
]

[workspace.dependencies]
# dev dependencies
pretty_assertions = "1.3.0"

[workspace.metadata.release]
allow-branch = ["main"]
1 change: 1 addition & 0 deletions write-fonts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ font-test-data = { path = "../font-test-data" }
read-fonts = { version = "0.10.0", path = "../read-fonts", features = [ "codegen_test"] }
env_logger = "0.10.0"
rstest = "0.18.0"
pretty_assertions.workspace = true
141 changes: 139 additions & 2 deletions write-fonts/src/tables/variations/iup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub fn iup_delta_optimize(
let expected_num_coords = contour_ends
.last()
.copied()
//.map(|v| v + 1)
.map(|v| v + 1)
.unwrap_or_default()
+ NUM_PHANTOM_POINTS;
if num_coords != expected_num_coords {
Expand Down Expand Up @@ -427,7 +427,9 @@ fn iup_contour_optimize(
};
if deltas.iter().all(|d| d == first_delta) {
let mut result = vec![None; n];
result[0] = Some(*first_delta);
if first_delta.x != 0.0 || first_delta.y != 0.0 {
result[0] = Some(*first_delta);
}
return Ok(result);
}

Expand Down Expand Up @@ -551,6 +553,7 @@ fn iup_contour_optimize(
#[cfg(test)]
mod tests {
use super::*;
use pretty_assertions::assert_eq;

struct IupScenario {
deltas: Vec<Vec2>,
Expand Down Expand Up @@ -958,4 +961,138 @@ mod tests {
fn iup_test_scenario08_optimize_contour() {
iup_scenario8().assert_optimize_contour();
}

#[test]
fn iup_delta_optimize_oswald_glyph_two() {
// https://github.com/googlefonts/fontations/issues/564
let deltas: Vec<_> = vec![
(0.0, 0.0),
(41.0, 0.0),
(41.0, 41.0),
(60.0, 41.0),
(22.0, -22.0),
(27.0, -15.0),
(38.0, -4.0),
(44.0, 2.0),
(44.0, -1.0),
(44.0, 2.0),
(29.0, 4.0),
(18.0, 4.0),
(9.0, 4.0),
(-4.0, -4.0),
(-11.0, -12.0),
(-11.0, -10.0),
(-11.0, -25.0),
(44.0, -25.0),
(44.0, -12.0),
(44.0, -20.0),
(39.0, -38.0),
(26.0, -50.0),
(16.0, -50.0),
(-5.0, -50.0),
(-13.0, -21.0),
(-13.0, 1.0),
(-13.0, 11.0),
(-13.0, 16.0),
(-13.0, 16.0),
(-12.0, 19.0),
(0.0, 42.0),
(0.0, 0.0),
(36.0, 0.0),
(0.0, 0.0),
(0.0, 0.0),
]
.into_iter()
.map(|c| c.into())
.collect();
let coords: Vec<_> = vec![
(41.0, 0.0),
(423.0, 0.0),
(423.0, 90.0),
(167.0, 90.0),
(353.0, 374.0),
(377.0, 410.0),
(417.0, 478.0),
(442.0, 556.0),
(442.0, 608.0),
(442.0, 706.0),
(346.0, 817.0),
(248.0, 817.0),
(176.0, 817.0),
(89.0, 759.0),
(50.0, 654.0),
(50.0, 581.0),
(50.0, 553.0),
(157.0, 553.0),
(157.0, 580.0),
(157.0, 619.0),
(173.0, 687.0),
(215.0, 729.0),
(253.0, 729.0),
(298.0, 729.0),
(334.0, 665.0),
(334.0, 609.0),
(334.0, 564.0),
(309.0, 495.0),
(270.0, 433.0),
(247.0, 397.0),
(41.0, 76.0),
(0.0, 0.0),
(478.0, 0.0),
(0.0, 0.0),
(0.0, 0.0),
]
.into_iter()
.map(|c| c.into())
.collect();

// using fonttools varLib's default tolerance
let tolerance = 0.5;
// a single contour, minus the phantom points
let contour_ends = vec![coords.len() - 1 - 4];

let result = iup_delta_optimize(deltas, coords, tolerance, &contour_ends).unwrap();

assert_eq!(
result.into_iter().enumerate().collect::<Vec<_>>(),
// this is what fonttools iup_delta_optimize returns and what we want to match
vec![
(0, None),
(1, Some(Vec2 { x: 41.0, y: 0.0 })),
(2, None),
(3, Some(Vec2 { x: 60.0, y: 41.0 })),
(4, Some(Vec2 { x: 22.0, y: -22.0 })),
(5, Some(Vec2 { x: 27.0, y: -15.0 })),
(6, Some(Vec2 { x: 38.0, y: -4.0 })),
(7, Some(Vec2 { x: 44.0, y: 2.0 })),
(8, Some(Vec2 { x: 44.0, y: -1.0 })),
(9, Some(Vec2 { x: 44.0, y: 2.0 })),
(10, Some(Vec2 { x: 29.0, y: 4.0 })),
(11, Some(Vec2 { x: 18.0, y: 4.0 })),
(12, Some(Vec2 { x: 9.0, y: 4.0 })),
(13, Some(Vec2 { x: -4.0, y: -4.0 })),
(14, Some(Vec2 { x: -11.0, y: -12.0 })),
(15, Some(Vec2 { x: -11.0, y: -10.0 })),
(16, None),
(17, Some(Vec2 { x: 44.0, y: -25.0 })),
(18, Some(Vec2 { x: 44.0, y: -12.0 })),
(19, Some(Vec2 { x: 44.0, y: -20.0 })),
(20, Some(Vec2 { x: 39.0, y: -38.0 })),
(21, Some(Vec2 { x: 26.0, y: -50.0 })),
(22, Some(Vec2 { x: 16.0, y: -50.0 })),
(23, Some(Vec2 { x: -5.0, y: -50.0 })),
(24, Some(Vec2 { x: -13.0, y: -21.0 })),
(25, Some(Vec2 { x: -13.0, y: 1.0 })),
(26, Some(Vec2 { x: -13.0, y: 11.0 })),
(27, Some(Vec2 { x: -13.0, y: 16.0 })),
(28, Some(Vec2 { x: -13.0, y: 16.0 })),
(29, None),
(30, Some(Vec2 { x: 0.0, y: 42.0 })),
(31, None),
(32, Some(Vec2 { x: 36.0, y: 0.0 })),
(33, None),
(34, None),
]
)
}
}