Merge branch 'advanced-text' into incremental-rendering

tiny_skia/Cargo.toml

@@ -12,6 +12,7 @@ geometry = ["iced_graphics/geometry"]
 raw-window-handle = "0.5"
 softbuffer = "0.2"
 tiny-skia = "0.8"
+cosmic-text = "0.8"
 bytemuck = "1"
 rustc-hash = "1.1"
 kurbo = "0.9"
@@ -22,11 +23,6 @@ version = "0.7"
 path = "../graphics"
 features = ["tiny-skia"]
 
-[dependencies.cosmic-text]
-features = ["std", "swash"]
-git = "https://github.com/pop-os/cosmic-text"
-rev = "e788c175ec31094b04dcacbc0537dba4433afcfc"
-
 [dependencies.twox-hash]
 version = "1.6"
 default-features = false

tiny_skia/src/text.rs

@@ -389,14 +389,7 @@ impl Cache {
                 cosmic_text::Attrs::new()
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
-                    .stretch(to_stretch(key.font.stretch))
-                    .monospaced(
-                        key.font.monospaced
-                            || matches!(
-                                key.font.family,
-                                font::Family::Monospace
-                            ),
-                    ),
+                    .stretch(to_stretch(key.font.stretch)),
             );
 
             let _ = entry.insert(buffer);