Add best-effort support for COLRv1.

linebender · May 13, 2024 · 4b4e897 · 4b4e897
1 parent 4daa53a
commit 4b4e897
Show file tree

Hide file tree

Showing 12 changed files with 450 additions and 93 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/resvg/tests/fonts/NotoColorEmojiCOLR.subset.ttf b/crates/resvg/tests/fonts/NotoColorEmojiCOLR.subset.ttf
diff --git a/crates/resvg/tests/fonts/README.md b/crates/resvg/tests/fonts/README.md
@@ -6,4 +6,12 @@ Twitter Color Emoji
 
 Noto Color Emoji (CBDT)
 1. Download: https://github.com/googlefonts/noto-emoji/blob/main/fonts/NotoColorEmoji.ttf
-2. Run `fonttools subset NotoColorEmoji.ttf --unicodes="U+1F600" --output-file=NotoColorEmojiCBDT.subset.ttf`
+2. Run `fonttools subset NotoColorEmoji.ttf --unicodes="U+1F600" --output-file=NotoColorEmojiCBDT.subset.ttf`
+
+Noto COLOR Emoji (COLRv1)
+1. Download: https://fonts.google.com/noto/specimen/Noto+Color+Emoji
+2. Run `fonttools subset NotoColorEmoji-Regular.ttf --unicodes="U+1F436,U+1F41D,U+1F313,U+1F973" --output-file=NotoColorEmojiCOLR.subset.ttf`
+3. Run `fonttools ttx NotoColorEmojiCOLR.subset.ttf`
+4. Go to the <name> section and rename all instances of "Noto Color Emoji" to "Noto Color Emoji COLR" (so that
+we can distinguish them from CBDT in tests).
+5. Run `fonttools ttx -f NotoColorEmojiCOLR.subset.ttx`
diff --git a/crates/resvg/tests/integration/render.rs b/crates/resvg/tests/integration/render.rs
@@ -1363,6 +1363,7 @@ use crate::render;
 #[test] fn text_baseline_shift_with_rotate() { assert_eq!(render("tests/text/baseline-shift/with-rotate"), 0); }
 #[test] fn text_color_font_cbdt() { assert_eq!(render("tests/text/color-font/cbdt"), 0); }
 #[test] fn text_color_font_colrv0() { assert_eq!(render("tests/text/color-font/colrv0"), 0); }
+#[test] fn text_color_font_colrv1() { assert_eq!(render("tests/text/color-font/colrv1"), 0); }
 #[test] fn text_color_font_compound_emojis_and_coordinates_list() { assert_eq!(render("tests/text/color-font/compound-emojis-and-coordinates-list"), 0); }
 #[test] fn text_color_font_compound_emojis() { assert_eq!(render("tests/text/color-font/compound-emojis"), 0); }
 #[test] fn text_color_font_mixed_text_rtl() { assert_eq!(render("tests/text/color-font/mixed-text-rtl"), 0); }

diff --git a/crates/resvg/tests/tests/text/color-font/colrv1.png b/crates/resvg/tests/tests/text/color-font/colrv1.png
diff --git a/crates/resvg/tests/tests/text/color-font/colrv1.svg b/crates/resvg/tests/tests/text/color-font/colrv1.svg
diff --git a/crates/usvg/Cargo.toml b/crates/usvg/Cargo.toml
@@ -36,8 +36,8 @@ simplecss = "0.2"
 siphasher = "1.0" # perfect hash implementation
 
 # text
-fontdb = { version = "0.16.1", default-features = false, optional = true }
-rustybuzz = { version = "0.13", optional = true }
+fontdb = { version = "0.17.0", default-features = false, optional = true }
+rustybuzz = { version = "0.14.0", optional = true }
 unicode-bidi = { version = "0.3", optional = true }
 unicode-script = { version = "0.5", optional = true }
 unicode-vo = { version = "0.1", optional = true }