base: Remove ucd dependency (#32424)

Remove the `ucd` dependency which has not been updated in 8 years. In
addition, replace it with a generated UnicodeBlock enum which reflects
the modern Unicode standard. This is generated via a Python script which
is included in the repository. The generation is not part of the build
process, because the Unicode database is hosted on the web and it does
not change the frequently.

This is done instead of bringing in the more up-to-date `unicode_blocks`
dependency. `unicode_blocks` defines each block as constant, which means
that they cannot be used in match statements -- which we do in Servo.

Co-authored-by: Lauryn Menard <lauryn.menard@gmail.com>

components/gfx/Cargo.toml

@@ -16,6 +16,7 @@ doctest = false
 [dependencies]
 app_units = { workspace = true }
 atomic_refcell = { workspace = true }
+base = { workspace = true }
 bitflags = { workspace = true }
 cssparser = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -40,7 +41,6 @@ servo_url = { path = "../url" }
 smallvec = { workspace = true, features = ["union"] }
 surfman = { workspace = true }
 style = { workspace = true }
-ucd = "0.1.1"
 unicode-bidi = { workspace = true, features = ["with_serde"] }
 unicode-properties = { workspace = true }
 unicode-script = { workspace = true }

components/gfx/platform/freetype/android/font_list.rs

@@ -6,6 +6,7 @@ use std::fs::File;
 use std::io::Read;
 use std::path::Path;
 
+use base::text::{is_cjk, UnicodeBlock, UnicodeBlockMethod};
 use log::warn;
 use malloc_size_of_derive::MallocSizeOf;
 use serde::{Deserialize, Serialize};
@@ -13,11 +14,9 @@ use style::values::computed::{
     FontStretch as StyleFontStretch, FontStyle as StyleFontStyle, FontWeight as StyleFontWeight,
 };
 use style::Atom;
-use ucd::{Codepoint, UnicodeBlock};
 
 use super::xml::{Attribute, Node};
 use crate::font_template::{FontTemplate, FontTemplateDescriptor};
-use crate::text::util::is_cjk;
 use crate::text::FallbackFontSelectionOptions;
 
 lazy_static::lazy_static! {

components/gfx/platform/freetype/font_list.rs

@@ -9,6 +9,7 @@ use std::io::Read;
 use std::path::Path;
 use std::ptr;
 
+use base::text::{UnicodeBlock, UnicodeBlockMethod};
 use fontconfig_sys::constants::{
     FC_FAMILY, FC_FILE, FC_FONTFORMAT, FC_INDEX, FC_SLANT, FC_SLANT_ITALIC, FC_SLANT_OBLIQUE,
     FC_WEIGHT, FC_WEIGHT_BOLD, FC_WEIGHT_EXTRABLACK, FC_WEIGHT_REGULAR, FC_WIDTH,
@@ -28,7 +29,6 @@ use malloc_size_of_derive::MallocSizeOf;
 use serde::{Deserialize, Serialize};
 use style::values::computed::{FontStretch, FontStyle, FontWeight};
 use style::Atom;
-use ucd::{Codepoint, UnicodeBlock};
 use unicode_script::Script;
 
 use super::c_str_to_string;

components/gfx/platform/freetype/ohos/font_list.rs

@@ -6,17 +6,16 @@ use std::fs::File;
 use std::io::Read;
 use std::path::{Path, PathBuf};
 
+use base::text::{is_cjk, UnicodeBlock, UnicodeBlockMethod};
 use log::warn;
 use serde::{Deserialize, Serialize};
 use style::values::computed::{
     FontStretch as StyleFontStretch, FontStyle as StyleFontStyle, FontWeight as StyleFontWeight,
 };
 use style::Atom;
-use ucd::{Codepoint, UnicodeBlock};
 use webrender_api::NativeFontHandle;
 
 use crate::font_template::{FontTemplate, FontTemplateDescriptor};
-use crate::text::util::is_cjk;
 use crate::text::FallbackFontSelectionOptions;
 
 lazy_static::lazy_static! {

components/gfx/platform/macos/font_list.rs

@@ -6,17 +6,16 @@ use std::fs::File;
 use std::io::Read;
 use std::path::Path;
 
+use base::text::{unicode_plane, UnicodeBlock, UnicodeBlockMethod};
 use log::debug;
 use malloc_size_of_derive::MallocSizeOf;
 use serde::{Deserialize, Serialize};
 use style::Atom;
-use ucd::{Codepoint, UnicodeBlock};
 use unicode_script::Script;
 use webrender_api::NativeFontHandle;
 
 use crate::font_template::{FontTemplate, FontTemplateDescriptor};
 use crate::platform::font::CoreTextFontTraitsMapping;
-use crate::text::util::unicode_plane;
 use crate::text::FallbackFontSelectionOptions;
 
 /// An identifier for a local font on a MacOS system. These values comes from the CoreText

components/gfx/platform/windows/font_list.rs

@@ -5,15 +5,14 @@
 use std::hash::Hash;
 use std::sync::Arc;
 
+use base::text::{unicode_plane, UnicodeBlock, UnicodeBlockMethod};
 use dwrote::{Font, FontCollection, FontDescriptor, FontStretch, FontStyle};
 use malloc_size_of_derive::MallocSizeOf;
 use serde::{Deserialize, Serialize};
 use style::values::computed::{FontStyle as StyleFontStyle, FontWeight as StyleFontWeight};
 use style::values::specified::font::FontStretchKeyword;
-use ucd::{Codepoint, UnicodeBlock};
 
 use crate::font_template::{FontTemplate, FontTemplateDescriptor};
-use crate::text::util::unicode_plane;
 use crate::text::FallbackFontSelectionOptions;
 
 pub static SANS_SERIF_FONT_FAMILY: &str = "Arial";

components/gfx/tests/text_util.rs

@@ -1,24 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-use gfx::text::util::is_cjk;
-
-#[test]
-fn test_is_cjk() {
-    // Test characters from different CJK blocks
-    assert_eq!(is_cjk('〇'), true);
-    assert_eq!(is_cjk('㐀'), true);
-    assert_eq!(is_cjk('あ'), true);
-    assert_eq!(is_cjk('ア'), true);
-    assert_eq!(is_cjk('㆒'), true);
-    assert_eq!(is_cjk('ㆣ'), true);
-    assert_eq!(is_cjk('龥'), true);
-    assert_eq!(is_cjk('𰾑'), true);
-    assert_eq!(is_cjk('𰻝'), true);
-
-    // Test characters from outside CJK blocks
-    assert_eq!(is_cjk('a'), false);
-    assert_eq!(is_cjk('🙂'), false);
-    assert_eq!(is_cjk('©'), false);
-}

components/gfx/text/shaping/harfbuzz.rs

@@ -8,6 +8,7 @@ use std::os::raw::{c_char, c_int, c_uint, c_void};
 use std::{char, cmp, ptr};
 
 use app_units::Au;
+use base::text::is_bidi_control;
 use euclid::default::Point2D;
 // Eventually we would like the shaper to be pluggable, as many operating systems have their own
 // shapers. For now, however, HarfBuzz is a hard dependency.
@@ -29,7 +30,7 @@ use crate::ot_tag;
 use crate::platform::font::FontTable;
 use crate::text::glyph::{ByteIndex, GlyphData, GlyphId, GlyphStore};
 use crate::text::shaping::ShaperMethods;
-use crate::text::util::{fixed_to_float, float_to_fixed, is_bidi_control};
+use crate::text::util::{fixed_to_float, float_to_fixed};
 
 const NO_GLYPH: i32 = -1;
 const LIGA: u32 = ot_tag!('l', 'i', 'g', 'a');

components/gfx/text/util.rs

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use ucd::{Codepoint, UnicodeBlock};
-
 pub fn float_to_fixed(before: usize, f: f64) -> i32 {
     ((1i32 << before) as f64 * f) as i32
 }
@@ -11,44 +9,3 @@ pub fn float_to_fixed(before: usize, f: f64) -> i32 {
 pub fn fixed_to_float(before: usize, f: i32) -> f64 {
     f as f64 * 1.0f64 / ((1i32 << before) as f64)
 }
-
-pub fn is_bidi_control(c: char) -> bool {
-    matches!(c, '\u{202A}'..='\u{202E}' | '\u{2066}'..='\u{2069}' | '\u{200E}' | '\u{200F}' | '\u{061C}')
-}
-
-pub fn unicode_plane(codepoint: char) -> u32 {
-    (codepoint as u32) >> 16
-}
-
-pub fn is_cjk(codepoint: char) -> bool {
-    if let Some(block) = codepoint.block() {
-        match block {
-            UnicodeBlock::CJKRadicalsSupplement |
-            UnicodeBlock::KangxiRadicals |
-            UnicodeBlock::IdeographicDescriptionCharacters |
-            UnicodeBlock::CJKSymbolsandPunctuation |
-            UnicodeBlock::Hiragana |
-            UnicodeBlock::Katakana |
-            UnicodeBlock::Bopomofo |
-            UnicodeBlock::HangulCompatibilityJamo |
-            UnicodeBlock::Kanbun |
-            UnicodeBlock::BopomofoExtended |
-            UnicodeBlock::CJKStrokes |
-            UnicodeBlock::KatakanaPhoneticExtensions |
-            UnicodeBlock::EnclosedCJKLettersandMonths |
-            UnicodeBlock::CJKCompatibility |
-            UnicodeBlock::CJKUnifiedIdeographsExtensionA |
-            UnicodeBlock::YijingHexagramSymbols |
-            UnicodeBlock::CJKUnifiedIdeographs |
-            UnicodeBlock::CJKCompatibilityIdeographs |
-            UnicodeBlock::CJKCompatibilityForms |
-            UnicodeBlock::HalfwidthandFullwidthForms => return true,
-
-            _ => {},
-        }
-    }
-
-    // https://en.wikipedia.org/wiki/Plane_(Unicode)#Supplementary_Ideographic_Plane
-    // https://en.wikipedia.org/wiki/Plane_(Unicode)#Tertiary_Ideographic_Plane
-    unicode_plane(codepoint) == 2 || unicode_plane(codepoint) == 3
-}