Merge pull request #471 from hojjatabdollahi/hojjat/fix-bidi-zw

Fix aggressive ellipsizing

tests/common/mod.rs

@@ -21,6 +21,9 @@ pub struct DrawTestCfg {
     name: String,
     /// The text to render to image
     text: String,
+    /// Optional rich text spans. When set, `set_rich_text` is used instead of `set_text`.
+    /// Each entry is `(text, attrs)` for one styled span.
+    rich_spans: Option<Vec<(String, AttrsOwned)>>,
     /// The name, details of the font to be used.
     /// Expected to be one of the fonts found under the `fonts` directory in this repository.
     font: AttrsOwned,
@@ -41,6 +44,7 @@ impl Default for DrawTestCfg {
             name: "default".into(),
             font: AttrsOwned::new(&font),
             text: "".into(),
+            rich_spans: None,
             font_size: 16.0,
             line_height: 20.0,
             canvas_width: 300,
@@ -65,6 +69,19 @@ impl DrawTestCfg {
         self
     }
 
+    pub fn rich_text(
+        mut self,
+        spans: impl IntoIterator<Item = (&'static str, Attrs<'static>)>,
+    ) -> Self {
+        self.rich_spans = Some(
+            spans
+                .into_iter()
+                .map(|(text, attrs)| (text.to_string(), AttrsOwned::new(&attrs)))
+                .collect(),
+        );
+        self
+    }
+
     pub fn font_attrs(mut self, attrs: Attrs) -> Self {
         self.font = AttrsOwned::new(&attrs);
         self
@@ -115,12 +132,23 @@ impl DrawTestCfg {
             Some((self.canvas_width - margins * 2) as f32),
             Some((self.canvas_height - margins * 2) as f32),
         );
-        buffer.set_text(
-            &self.text,
-            &self.font.as_attrs(),
-            Shaping::Advanced,
-            self.alignment,
-        );
+        if let Some(ref spans) = self.rich_spans {
+            buffer.set_rich_text(
+                spans
+                    .iter()
+                    .map(|(text, attrs)| (text.as_str(), attrs.as_attrs())),
+                &self.font.as_attrs(),
+                Shaping::Advanced,
+                self.alignment,
+            );
+        } else {
+            buffer.set_text(
+                &self.text,
+                &self.font.as_attrs(),
+                Shaping::Advanced,
+                self.alignment,
+            );
+        }
         buffer.shape_until_scroll(true);
 
         // Black

tests/ellipsize_rendering.rs

@@ -1,5 +1,10 @@
+use std::path::PathBuf;
+
 use common::DrawTestCfg;
-use cosmic_text::{Align, Attrs, Ellipsize, EllipsizeHeightLimit, Family, Wrap};
+use cosmic_text::{
+    fontdb::Database, Align, Attrs, Buffer, Ellipsize, EllipsizeHeightLimit, Family, FontSystem,
+    Metrics, Shaping, Wrap,
+};
 
 mod common;
 
@@ -159,3 +164,22 @@ fn test_ellipsize_mixed_ltr_rtl_ltr_middle_three_lines() {
         .canvas(200, 100)
         .validate_text_rendering();
 }
+
+/// Regression rendering test: Fluent's fl!() wraps interpolated values with BiDi
+/// isolation characters. With the bug, this rendered as "Workspace… 2"
+/// After the fix it must render the full "Workspace 2" without ellipsis.
+#[test]
+fn test_ellipsize_bidi_isolates_middle_bug() {
+    let attrs = Attrs::new().family(Family::Name("Inter"));
+    DrawTestCfg::new("ellipsize_bidi_isolates_middle_bug")
+        .font_size(20., 26.)
+        .font_attrs(attrs)
+        .rich_text([(
+            "\u{2068}Workspace\u{2069}\u{2068} \u{2069}\u{2068}2\u{2069}",
+            Attrs::new().family(Family::Name("Inter")),
+        )])
+        .wrap(Wrap::WordOrGlyph)
+        .ellipsize(Ellipsize::Middle(EllipsizeHeightLimit::Lines(1)))
+        .canvas(220, 50)
+        .validate_text_rendering();
+}

tests/images/ellipsize_bidi_isolates_middle_bug.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec1a2e5611f55301bb332c354eab1f342b0e40361ee19549360e2b1826425614
+size 5136