Use icu_properties::props::Script

Author: dhardy

Cargo.toml

@@ -51,7 +51,7 @@ log = "0.4"
 serde = { version = "1.0.123", features = ["derive"], optional = true }
 ab_glyph = { version = "0.2.10", optional = true }
 swash = "0.2.4"
-fontique = "0.7.0"
+fontique = { version = "0.7.0", features = ["icu_properties"] }
 icu_properties = "2.1.1"
 icu_segmenter = "2.1.2"
 

src/display/text_runs.rs

@@ -12,7 +12,8 @@ use crate::conv::{to_u32, to_usize};
 use crate::fonts::{self, FontSelector, NoFontMatch};
 use crate::format::FormattableText;
 use crate::util::ends_with_hard_break;
-use crate::{Direction, Range, script_to_fontique, shaper};
+use crate::{Direction, Range, shaper};
+use icu_properties::{CodePointMapData, props::Script};
 use icu_segmenter::LineSegmenter;
 use unicode_bidi::{BidiInfo, LTR_LEVEL, RTL_LEVEL};
 
@@ -195,7 +196,7 @@ impl TextDisplay {
             text,
             dpem,
             level: levels.first().cloned().unwrap_or(LTR_LEVEL),
-            script: UNKNOWN_SCRIPT,
+            script: Script::Unknown.into(),
         };
 
         let mut start = 0;
@@ -206,7 +207,6 @@ impl TextDisplay {
         let mut break_iter = segmenter.segment_str(text);
         let mut next_break = break_iter.next();
 
-        let mut analyzer = swash::text::analyze(text.chars());
         let mut first_real = None;
 
         let mut last_is_control = false;
@@ -222,7 +222,7 @@ impl TextDisplay {
             let is_htab = c == '\t';
             let control_break = is_htab || (last_is_control && !is_control);
 
-            let (props, _) = analyzer.next().unwrap();
+            let script = CodePointMapData::<Script>::new().get(c);
 
             // Is wrapping allowed at this position?
             let is_break = next_break == Some(index);
@@ -244,14 +244,12 @@ impl TextDisplay {
             }
 
             let mut new_script = None;
-            if props.script().is_real() {
+            if !matches!(script, Script::Common | Script::Unknown | Script::Inherited) {
                 if first_real.is_none() && !c.is_control() {
                     first_real = Some(c);
                 }
-                let script = script_to_fontique(props.script());
-                if input.script == UNKNOWN_SCRIPT {
-                    input.script = script;
-                } else if script != UNKNOWN_SCRIPT && script != input.script {
+                let script = script.into();
+                if script != input.script {
                     new_script = Some(script);
                 }
             }
@@ -271,7 +269,7 @@ impl TextDisplay {
                 start = index;
                 non_control_end = index;
                 input.level = levels[index];
-                input.script = UNKNOWN_SCRIPT;
+                input.script = Script::Unknown.into();
                 breaks = Default::default();
             } else if is_break && !is_control {
                 // We do break runs when hitting control chars, but only when
@@ -287,7 +285,6 @@ impl TextDisplay {
             }
         }
 
-        debug_assert!(analyzer.next().is_none());
         let is_break = next_break == Some(text.len());
         let hard_break = is_break && ends_with_hard_break(&text);
 
@@ -345,16 +342,3 @@ impl TextDisplay {
         Ok(())
     }
 }
-
-trait ScriptExt {
-    #[allow(clippy::wrong_self_convention)]
-    fn is_real(self) -> bool;
-}
-impl ScriptExt for swash::text::Script {
-    fn is_real(self) -> bool {
-        use swash::text::Script::*;
-        !matches!(self, Common | Unknown | Inherited)
-    }
-}
-
-pub(crate) const UNKNOWN_SCRIPT: fontique::Script = fontique::Script(*b"Zzzz");

src/lib.rs

@@ -29,9 +29,6 @@ pub use display::*;
 pub mod fonts;
 pub mod format;
 
-mod swash_convert;
-pub(crate) use swash_convert::script_to_fontique;
-
 mod text;
 pub use text::*;