Update dependencies.

linebender · Jan 18, 2020 · 2094b27 · 2094b27
1 parent 8661862
commit 2094b27
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,7 +40,7 @@ cairo-rs = { version = "0.8.0", default-features = false, features = ["png"], op
 resvg-qt = { path = "bindings/resvg-qt", version = "0.8", optional = true }
 
 # raqote backend
-raqote = { git = "https://github.com/jrmuizel/raqote", rev = "146bd17", default-features = false, optional = true }
+raqote = { version = "0.7.8", default-features = false, optional = true }
 
 # skia backend
 resvg-skia = { path = "bindings/resvg-skia", version = "0.8", optional = true }

diff --git a/testing-tools/regression/allow-raqote.txt b/testing-tools/regression/allow-raqote.txt
@@ -0,0 +1,11 @@
+a-fill-opacity-006.svg
+a-stroke-opacity-006.svg
+a-text-decoration-001.svg
+a-text-decoration-002.svg
+a-text-decoration-003.svg
+a-text-decoration-004.svg
+a-text-decoration-005.svg
+a-text-decoration-006.svg
+a-text-decoration-007.svg
+a-text-decoration-008.svg
+a-text-decoration-011.svg
diff --git a/usvg/Cargo.toml b/usvg/Cargo.toml
@@ -26,17 +26,17 @@ rctree = "0.3"
 xmlwriter = "0.1"
 
 # for svgtree
-roxmltree = "0.8"
+roxmltree = "0.9"
 simplecss = "0.2"
 siphasher = "0.2.3"
 svgtypes = "0.5"
 
 # for text to path
 harfbuzz_rs = { version = "1.0.1", optional = true }
-memmap2 = { git = "https://github.com/RazrFalcon/memmap2-rs", rev = "49e8c1d", optional = true }
+memmap2 = { version = "0.1", optional = true }
 ttf-parser = { version = "0.3.0", optional = true }
 unicode-bidi = { version = "0.3", optional = true }
-unicode-script = { version = "0.3", optional = true }
+unicode-script = { version = "0.5", optional = true }
 unicode-vo = { version = "0.1", optional = true }
 
 [features]

diff --git a/usvg/src/convert/text/shaper.rs b/usvg/src/convert/text/shaper.rs
@@ -5,6 +5,7 @@
 use kurbo::{ParamCurveArclen, ParamCurve, ParamCurveDeriv};
 use harfbuzz_rs as harfbuzz;
 use unicode_vo::Orientation as CharOrientation;
+use unicode_script::UnicodeScript;
 use ttf_parser::GlyphId;
 
 use crate::{tree, fontdb, convert::prelude::*};
@@ -709,7 +710,7 @@ pub fn apply_letter_spacing(
         // Spacing must be applied only to characters that belongs to the script
         // that supports spacing.
         // We are checking only the first code point, since it should be enough.
-        let script = unicode_script::get_script(cluster.codepoint);
+        let script = cluster.codepoint.script();
         if script_supports_letter_spacing(script) {
             if let Some(span) = chunk.span_at(cluster.byte_idx) {
                 // Technically, we should ignore spacing on the last character,