Bump deps

typst · May 3, 2024 · 277f3f7 · 277f3f7
1 parent 147b4c2
commit 277f3f7
Show file tree

Hide file tree

Showing 24 changed files with 680 additions and 266 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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"] }

diff --git a/src/render/text.rs b/src/render/text.rs
@@ -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());
                         }
                     }
                 }

diff --git a/tests/ref/resvg/text/alignment-baseline/hanging-on-vertical.png b/tests/ref/resvg/text/alignment-baseline/hanging-on-vertical.png
diff --git a/tests/ref/resvg/text/direction/rtl-with-vertical-writing-mode.png b/tests/ref/resvg/text/direction/rtl-with-vertical-writing-mode.png
diff --git a/tests/ref/resvg/text/glyph-orientation-vertical/simple-case.png b/tests/ref/resvg/text/glyph-orientation-vertical/simple-case.png
diff --git a/tests/ref/resvg/text/lengthAdjust/vertical.png b/tests/ref/resvg/text/lengthAdjust/vertical.png
diff --git a/tests/ref/resvg/text/textPath/complex.png b/tests/ref/resvg/text/textPath/complex.png
diff --git a/tests/ref/resvg/text/textPath/writing-mode=tb.png b/tests/ref/resvg/text/textPath/writing-mode=tb.png
diff --git a/tests/ref/resvg/text/writing-mode/inheritance.png b/tests/ref/resvg/text/writing-mode/inheritance.png
diff --git a/tests/ref/resvg/text/writing-mode/japanese-with-tb.png b/tests/ref/resvg/text/writing-mode/japanese-with-tb.png
diff --git a/tests/ref/resvg/text/writing-mode/mixed-languages-with-tb-and-underline.png b/tests/ref/resvg/text/writing-mode/mixed-languages-with-tb-and-underline.png
diff --git a/tests/ref/resvg/text/writing-mode/mixed-languages-with-tb.png b/tests/ref/resvg/text/writing-mode/mixed-languages-with-tb.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-and-punctuation.png b/tests/ref/resvg/text/writing-mode/tb-and-punctuation.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-rl.png b/tests/ref/resvg/text/writing-mode/tb-rl.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-with-alignment.png b/tests/ref/resvg/text/writing-mode/tb-with-alignment.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-with-dx-on-second-tspan.png b/tests/ref/resvg/text/writing-mode/tb-with-dx-on-second-tspan.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-with-dx-on-tspan.png b/tests/ref/resvg/text/writing-mode/tb-with-dx-on-tspan.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-with-dy-on-second-tspan.png b/tests/ref/resvg/text/writing-mode/tb-with-dy-on-second-tspan.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-with-rotate-and-underline.png b/tests/ref/resvg/text/writing-mode/tb-with-rotate-and-underline.png
diff --git a/tests/ref/resvg/text/writing-mode/tb-with-rotate.png b/tests/ref/resvg/text/writing-mode/tb-with-rotate.png
diff --git a/tests/ref/resvg/text/writing-mode/tb.png b/tests/ref/resvg/text/writing-mode/tb.png
diff --git a/tests/ref/resvg/text/writing-mode/vertical-lr.png b/tests/ref/resvg/text/writing-mode/vertical-lr.png
diff --git a/tests/ref/resvg/text/writing-mode/vertical-rl.png b/tests/ref/resvg/text/writing-mode/vertical-rl.png