Merge pull request #699 from kas-gui/push-oxuvxkspzwuy

Update kas-text

Author: dhardy

Cargo.toml

@@ -175,7 +175,7 @@ resolver = "2"
 
 [patch.crates-io.kas-text]
 git = "https://github.com/kas-gui/kas-text.git"
-rev = "9797e78ad4664ae5055e8dab6067e40b215f6b3e"
+rev = "efe15a6040edde83b64cb668c64da63b164abfd7"
 
 [patch.crates-io.impl-tools-lib]
 git = "https://github.com/kas-gui/impl-tools.git"

crates/kas-core/src/draw/draw.rs

@@ -9,7 +9,7 @@ use super::{AnimationState, color::Rgba};
 #[allow(unused)] use super::{DrawRounded, DrawRoundedImpl};
 use super::{DrawShared, DrawSharedImpl, ImageId, PassId, PassType, SharedState, WindowCommon};
 use crate::geom::{Offset, Quad, Rect, Vec2};
-use crate::text::{TextDisplay, format};
+use crate::text::{Forme, format};
 use crate::theme::ColorsLinear;
 use std::any::Any;
 use std::time::Instant;
@@ -132,7 +132,7 @@ impl<'a, DS: DrawSharedImpl> DrawIface<'a, DS> {
         &mut self,
         pos: Vec2,
         bounding_box: Quad,
-        text: &TextDisplay,
+        text: &Forme,
         theme: &ColorsLinear,
         col: Rgba,
     ) {
@@ -268,7 +268,7 @@ pub trait Draw {
         &mut self,
         pos: Vec2,
         bounding_box: Quad,
-        text: &TextDisplay,
+        text: &Forme,
         theme: &ColorsLinear,
         tokens: &[(u32, format::Colors)],
     ) {
@@ -285,7 +285,7 @@ pub trait Draw {
         &mut self,
         pos: Vec2,
         bounding_box: Quad,
-        text: &TextDisplay,
+        text: &Forme,
         theme: &ColorsLinear,
         decorations: &[(u32, format::Decoration)],
     ) {

crates/kas-core/src/draw/draw_shared.rs

@@ -9,7 +9,7 @@ use super::{DrawImpl, PassId};
 use crate::ActionRedraw;
 use crate::config::RasterConfig;
 use crate::geom::{Quad, Size, Vec2};
-use crate::text::{TextDisplay, format};
+use crate::text::{Forme, format};
 use crate::theme::ColorsLinear;
 use std::any::Any;
 use std::num::NonZeroU32;
@@ -200,7 +200,7 @@ pub trait DrawSharedImpl: Any {
         pass: PassId,
         pos: Vec2,
         bounding_box: Quad,
-        text: &TextDisplay,
+        text: &Forme,
         theme: &ColorsLinear,
         tokens: &[(u32, format::Colors)],
     );
@@ -215,7 +215,7 @@ pub trait DrawSharedImpl: Any {
         pass: PassId,
         pos: Vec2,
         bounding_box: Quad,
-        text: &TextDisplay,
+        text: &Forme,
         theme: &ColorsLinear,
         decorations: &[(u32, format::Decoration)],
     );

crates/kas-core/src/text/format.rs

@@ -10,7 +10,7 @@ use std::num::NonZeroU32;
 use super::fonts::FontSelector;
 use crate::draw::color::{Rgba, Rgba8Srgb};
 use crate::theme::ColorsLinear;
-pub use kas_text::format::FontToken;
+pub use kas_text::FontToken;
 
 #[cfg(feature = "markdown")] mod markdown;
 #[cfg(feature = "markdown")] pub use markdown::Markdown;
@@ -171,7 +171,7 @@ pub trait FormattableText: std::cmp::PartialEq {
     ///
     /// These tokens are used to select the font and font size.
     /// Each text object has a configured
-    /// [font size][super::ConfiguredDisplay::set_font_size] and [`FontSelector`]; these
+    /// [font size][super::ConfiguredForme::set_font_size] and [`FontSelector`]; these
     /// values are passed as a reference (`dpem` and `font`).
     ///
     /// The iterator is expected to yield a stream of tokens such that