Merge branch 'main' into skrifa-no-std

fauntlet/Cargo.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 publish = false
 
 [dependencies]
-skrifa = { version = "0.16.0", path = "../skrifa" }
+skrifa = { version = "0.17.0", path = "../skrifa" }
 freetype-rs = "0.32.0"
 memmap2 = "0.5.10"
 rayon = "1.8.0"

font-test-data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "font-test-data"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT/Apache-2.0"
 description = "Test data for the fontations crates"

font-test-data/src/lib.rs

@@ -49,6 +49,12 @@ pub static COLRV0V1_VARIABLE: &[u8] =
 
 pub static CVAR: &[u8] = include_bytes!("../test_data/ttf/cvar.ttf");
 
+pub static STARTING_OFF_CURVE: &[u8] = include_bytes!("../test_data/ttf/starts_off_curve.ttf");
+
+pub static MOSTLY_OFF_CURVE: &[u8] = include_bytes!("../test_data/ttf/mostly_off_curve.ttf");
+
+pub static INTERPOLATE_THIS: &[u8] = include_bytes!("../test_data/ttf/interpolate_this.ttf");
+
 pub mod closure {
     pub static SIMPLE: &[u8] = include_bytes!("../test_data/ttf/simple_closure.ttf");
     pub static SIMPLE_GLYPHS: &str = include_str!("../test_data/fea/simple_closure_glyphs.txt");

font-test-data/test_data/extracted/interpolate_this-glyphs.txt

@@ -0,0 +1,120 @@
+glyph 0 0 none
+contours 3 7
+points 51,-250 51,950 461,950 461,-250 102,-199 410,-199 410,899 102,899
+tags 1 1 1 1 1 1 1 1
+m  51,-250
+l  51,950
+l  461,950
+l  461,-250
+l  51,-250
+m  102,-199
+l  410,-199
+l  410,899
+l  102,899
+l  102,-199
+-
+glyph 0 16 none
+contours 3 7
+points 51,-250 51,950 461,950 461,-250 102,-199 410,-199 410,899 102,899
+tags 1 1 1 1 1 1 1 1
+m  0.796875,-3.90625
+l  0.796875,14.84375
+l  7.203125,14.84375
+l  7.203125,-3.90625
+l  0.796875,-3.90625
+m  1.59375,-3.109375
+l  6.40625,-3.109375
+l  6.40625,14.046875
+l  1.59375,14.046875
+l  1.59375,-3.109375
+-
+glyph 0 50 none
+contours 3 7
+points 159,-781 159,2969 1441,2969 1441,-781 319,-622 1281,-622 1281,2809 319,2809
+tags 1 1 1 1 1 1 1 1
+m  2.484375,-12.203125
+l  2.484375,46.390625
+l  22.515625,46.390625
+l  22.515625,-12.203125
+l  2.484375,-12.203125
+m  4.984375,-9.71875
+l  20.015625,-9.71875
+l  20.015625,43.890625
+l  4.984375,43.890625
+l  4.984375,-9.71875
+-
+glyph 1 0 none
+contours
+points
+tags
+-
+glyph 1 16 none
+contours
+points
+tags
+-
+glyph 1 50 none
+contours
+points
+tags
+-
+glyph 2 0 none
+contours 3
+points 278,470 278,710 998,470 998,470
+tags 1 1 1 1
+m  278,470
+l  278,710
+l  998,470
+l  998,470
+l  278,470
+-
+glyph 2 16 none
+contours 3
+points 278,470 278,710 998,470 998,470
+tags 1 1 1 1
+m  4.34375,7.34375
+l  4.34375,11.09375
+l  15.59375,7.34375
+l  15.59375,7.34375
+l  4.34375,7.34375
+-
+glyph 2 50 none
+contours 3
+points 869,1469 869,2219 3119,1469 3119,1469
+tags 1 1 1 1
+m  13.578125,22.953125
+l  13.578125,34.671875
+l  48.734375,22.953125
+l  48.734375,22.953125
+l  13.578125,22.953125
+-
+glyph 3 0 none
+contours 3
+points 278,470 278,710 998,710 278,470
+tags 1 1 1 1
+m  278,470
+l  278,710
+l  998,710
+l  278,470
+l  278,470
+-
+glyph 3 16 none
+contours 3
+points 278,470 278,710 998,710 278,470
+tags 1 1 1 1
+m  4.34375,7.34375
+l  4.34375,11.09375
+l  15.59375,11.09375
+l  4.34375,7.34375
+l  4.34375,7.34375
+-
+glyph 3 50 none
+contours 3
+points 869,1469 869,2219 3119,2219 869,1469
+tags 1 1 1 1
+m  13.578125,22.953125
+l  13.578125,34.671875
+l  48.734375,34.671875
+l  13.578125,22.953125
+l  13.578125,22.953125
+-

font-test-data/test_data/extracted/mostly_off_curve-glyphs.txt

@@ -0,0 +1,90 @@
+glyph 0 0 none
+contours 3 7
+points 51,-250 51,950 461,950 461,-250 102,-199 410,-199 410,899 102,899
+tags 1 1 1 1 1 1 1 1
+m  51,-250
+l  51,950
+l  461,950
+l  461,-250
+l  51,-250
+m  102,-199
+l  410,-199
+l  410,899
+l  102,899
+l  102,-199
+-
+glyph 0 16 none
+contours 3 7
+points 51,-250 51,950 461,950 461,-250 102,-199 410,-199 410,899 102,899
+tags 1 1 1 1 1 1 1 1
+m  0.796875,-3.90625
+l  0.796875,14.84375
+l  7.203125,14.84375
+l  7.203125,-3.90625
+l  0.796875,-3.90625
+m  1.59375,-3.109375
+l  6.40625,-3.109375
+l  6.40625,14.046875
+l  1.59375,14.046875
+l  1.59375,-3.109375
+-
+glyph 0 50 none
+contours 3 7
+points 159,-781 159,2969 1441,2969 1441,-781 319,-622 1281,-622 1281,2809 319,2809
+tags 1 1 1 1 1 1 1 1
+m  2.484375,-12.203125
+l  2.484375,46.390625
+l  22.515625,46.390625
+l  22.515625,-12.203125
+l  2.484375,-12.203125
+m  4.984375,-9.71875
+l  20.015625,-9.71875
+l  20.015625,43.890625
+l  4.984375,43.890625
+l  4.984375,-9.71875
+-
+glyph 1 0 none
+contours
+points
+tags
+-
+glyph 1 16 none
+contours
+points
+tags
+-
+glyph 1 50 none
+contours
+points
+tags
+-
+glyph 2 0 none
+contours 4
+points 278,710 278,470 998,470 998,710 750,500
+tags 0 0 1 0 0
+m  514,605
+q  278,710 278,590
+q  278,470 998,470
+q  998,710 874,605
+q  750,500 514,605
+-
+glyph 2 16 none
+contours 4
+points 278,710 278,470 998,470 998,710 750,500
+tags 0 0 1 0 0
+m  8.03125,9.453125
+q  4.34375,11.09375 4.34375,9.21875
+q  4.34375,7.34375 15.59375,7.34375
+q  15.59375,11.09375 13.65625,9.453125
+q  11.71875,7.8125 8.03125,9.453125
+-
+glyph 2 50 none
+contours 4
+points 869,2219 869,1469 3119,1469 3119,2219 2344,1563
+tags 0 0 1 0 0
+m  25.09375,29.546875
+q  13.578125,34.671875 13.578125,28.8125
+q  13.578125,22.953125 48.734375,22.953125
+q  48.734375,34.671875 42.671875,29.546875
+q  36.625,24.421875 25.09375,29.546875
+-

font-test-data/test_data/extracted/starts_off_curve-glyphs.txt

@@ -0,0 +1,87 @@
+glyph 0 0 none
+contours 3 7
+points 51,-250 51,950 461,950 461,-250 102,-199 410,-199 410,899 102,899
+tags 1 1 1 1 1 1 1 1
+m  51,-250
+l  51,950
+l  461,950
+l  461,-250
+l  51,-250
+m  102,-199
+l  410,-199
+l  410,899
+l  102,899
+l  102,-199
+-
+glyph 0 16 none
+contours 3 7
+points 51,-250 51,950 461,950 461,-250 102,-199 410,-199 410,899 102,899
+tags 1 1 1 1 1 1 1 1
+m  0.796875,-3.90625
+l  0.796875,14.84375
+l  7.203125,14.84375
+l  7.203125,-3.90625
+l  0.796875,-3.90625
+m  1.59375,-3.109375
+l  6.40625,-3.109375
+l  6.40625,14.046875
+l  1.59375,14.046875
+l  1.59375,-3.109375
+-
+glyph 0 50 none
+contours 3 7
+points 159,-781 159,2969 1441,2969 1441,-781 319,-622 1281,-622 1281,2809 319,2809
+tags 1 1 1 1 1 1 1 1
+m  2.484375,-12.203125
+l  2.484375,46.390625
+l  22.515625,46.390625
+l  22.515625,-12.203125
+l  2.484375,-12.203125
+m  4.984375,-9.71875
+l  20.015625,-9.71875
+l  20.015625,43.890625
+l  4.984375,43.890625
+l  4.984375,-9.71875
+-
+glyph 1 0 none
+contours
+points
+tags
+-
+glyph 1 16 none
+contours
+points
+tags
+-
+glyph 1 50 none
+contours
+points
+tags
+-
+glyph 2 0 none
+contours 3
+points 278,710 278,470 998,470 998,710
+tags 0 1 1 1
+m  998,710
+q  278,710 278,470
+l  998,470
+l  998,710
+-
+glyph 2 16 none
+contours 3
+points 278,710 278,470 998,470 998,710
+tags 0 1 1 1
+m  15.59375,11.09375
+q  4.34375,11.09375 4.34375,7.34375
+l  15.59375,7.34375
+l  15.59375,11.09375
+-
+glyph 2 50 none
+contours 3
+points 869,2219 869,1469 3119,1469 3119,2219
+tags 0 1 1 1
+m  48.734375,34.671875
+q  13.578125,34.671875 13.578125,22.953125
+l  48.734375,22.953125
+l  48.734375,34.671875
+-