typst
diff --git a/‎Cargo.lock
+676-262 b/‎Cargo.lock
+676-262
diff --git a/‎Cargo.toml
+1-1 b/‎Cargo.toml
+1-1
diff --git a/‎src/render/text.rs
+3-3 b/‎src/render/text.rs
+3-3
diff --git a/‎tests/ref/resvg/text/alignment-baseline/hanging-on-vertical.png
-23 Bytes b/‎tests/ref/resvg/text/alignment-baseline/hanging-on-vertical.png
-23 Bytes
diff --git a/‎tests/ref/resvg/text/direction/rtl-with-vertical-writing-mode.png
19 Bytes b/‎tests/ref/resvg/text/direction/rtl-with-vertical-writing-mode.png
19 Bytes
diff --git a/‎tests/ref/resvg/text/glyph-orientation-vertical/simple-case.png
33 Bytes b/‎tests/ref/resvg/text/glyph-orientation-vertical/simple-case.png
33 Bytes
diff --git a/‎tests/ref/resvg/text/lengthAdjust/vertical.png
-39 Bytes b/‎tests/ref/resvg/text/lengthAdjust/vertical.png
-39 Bytes
diff --git a/‎tests/ref/resvg/text/textPath/complex.png
-54 Bytes b/‎tests/ref/resvg/text/textPath/complex.png
-54 Bytes
diff --git a/‎tests/ref/resvg/text/textPath/writing-mode=tb.png
-2 Bytes b/‎tests/ref/resvg/text/textPath/writing-mode=tb.png
-2 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/inheritance.png
-452 Bytes b/‎tests/ref/resvg/text/writing-mode/inheritance.png
-452 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/japanese-with-tb.png
-65 Bytes b/‎tests/ref/resvg/text/writing-mode/japanese-with-tb.png
-65 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/mixed-languages-with-tb-and-underline.png
56 Bytes b/‎tests/ref/resvg/text/writing-mode/mixed-languages-with-tb-and-underline.png
56 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/mixed-languages-with-tb.png
21 Bytes b/‎tests/ref/resvg/text/writing-mode/mixed-languages-with-tb.png
21 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/tb-and-punctuation.png
-2 Bytes b/‎tests/ref/resvg/text/writing-mode/tb-and-punctuation.png
-2 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/tb-rl.png
-452 Bytes b/‎tests/ref/resvg/text/writing-mode/tb-rl.png
-452 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/tb-with-alignment.png
78 Bytes b/‎tests/ref/resvg/text/writing-mode/tb-with-alignment.png
78 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/tb-with-dx-on-second-tspan.png
-52 Bytes b/‎tests/ref/resvg/text/writing-mode/tb-with-dx-on-second-tspan.png
-52 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/tb-with-dx-on-tspan.png
-19 Bytes b/‎tests/ref/resvg/text/writing-mode/tb-with-dx-on-tspan.png
-19 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/tb-with-dy-on-second-tspan.png
-61 Bytes b/‎tests/ref/resvg/text/writing-mode/tb-with-dy-on-second-tspan.png
-61 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/tb-with-rotate-and-underline.png
-5 Bytes b/‎tests/ref/resvg/text/writing-mode/tb-with-rotate-and-underline.png
-5 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/tb-with-rotate.png
-1 Bytes b/‎tests/ref/resvg/text/writing-mode/tb-with-rotate.png
-1 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/tb.png
-452 Bytes b/‎tests/ref/resvg/text/writing-mode/tb.png
-452 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/vertical-lr.png
-452 Bytes b/‎tests/ref/resvg/text/writing-mode/vertical-lr.png
-452 Bytes
diff --git a/‎tests/ref/resvg/text/writing-mode/vertical-rl.png
-452 Bytes b/‎tests/ref/resvg/text/writing-mode/vertical-rl.png
-452 Bytes
@@ -18,7 +18,7 @@ clap = { version = "4.4.2", features = ["derive"] }
 clap_complete = "4.4.3"
 clap_mangen = "0.2.14"
 fontdb = "0.16.1"
-image = { version = "0.24", default-features = false, features = ["jpeg", "png", "gif"] }
+image = { version = "0.25.1", default-features = false, features = ["jpeg", "png", "gif"] }
 miniz_oxide = "0.7"
 once_cell = "1.18.0"
 oxipng = { version = "9", default-features = false, features = ["filetime", "parallel", "zopfli"] }
 
@@ -245,9 +245,9 @@ pub fn render(
 
                 let name = font_names.get(&font.reference).unwrap();
 
-                let gid = glyph.glyph_id.0;
+                let gid = glyph.id.0;
                 let ts = glyph
-                    .transform
+                    .outline_transform()
                     .pre_scale(font.units_per_em as f32, font.units_per_em as f32)
                     // The glyphs in usvg are already scaled according the font size, but
                     // we want to leverage the native PDF font size feature instead, so we downscale
@@ -517,7 +517,7 @@ pub fn fill_fonts(group: &Group, ctx: &mut Context, fontdb: &fontdb::Database) {
                         });
 
                         if let Some(ref mut font) = font {
-                            font.glyph_set.insert(g.glyph_id.0, g.text.clone());
+                            font.glyph_set.insert(g.id.0, g.text.clone());
                         }
                     }
                 }
Original file line number	Diff line number	Diff line change
`@@ -245,9 +245,9 @@ pub fn render(`
`245`	`245`
`246`	`246`	`let name = font_names.get(&font.reference).unwrap();`
`247`	`247`
`248`		`- let gid = glyph.glyph_id.0;`
	`248`	`+ let gid = glyph.id.0;`
`249`	`249`	`let ts = glyph`
`250`		`- .transform`
	`250`	`+ .outline_transform()`
`251`	`251`	`.pre_scale(font.units_per_em as f32, font.units_per_em as f32)`
`252`	`252`	`// The glyphs in usvg are already scaled according the font size, but`
`253`	`253`	`// we want to leverage the native PDF font size feature instead, so we downscale`
`@@ -517,7 +517,7 @@ pub fn fill_fonts(group: &Group, ctx: &mut Context, fontdb: &fontdb::Database) {`
`517`	`517`	`});`
`518`	`518`
`519`	`519`	`if let Some(ref mut font) = font {`
`520`		`- font.glyph_set.insert(g.glyph_id.0, g.text.clone());`
	`520`	`+ font.glyph_set.insert(g.id.0, g.text.clone());`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`	`}`