From 1d0c44fb255f5fbf5a03e7c737e40ab66d39de9e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 2 Feb 2023 01:24:27 +0100
Subject: Implement basic text caching in `iced_wgpu`

---
 core/src/font.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'core')

diff --git a/core/src/font.rs b/core/src/font.rs
index 3f9ad2b5..130e378e 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -1,3 +1,5 @@
+use std::hash::{Hash, Hasher};
+
 /// A font.
 #[derive(Debug, Clone, Copy)]
 pub enum Font {
@@ -22,3 +24,17 @@ impl Default for Font {
         Font::Default
     }
 }
+
+impl Hash for Font {
+    fn hash<H: Hasher>(&self, hasher: &mut H) {
+        match self {
+            Self::Default => {
+                0.hash(hasher);
+            }
+            Self::External { name, .. } => {
+                1.hash(hasher);
+                name.hash(hasher);
+            }
+        }
+    }
+}
-- 
cgit 


From b29de28d1f0f608f8029c93d154cfd1b0f8b8cbb Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 4 Feb 2023 07:33:33 +0100
Subject: Overhaul `Font` type to allow font family selection

---
 core/src/font.rs | 53 +++++++++++++++++++++--------------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

(limited to 'core')

diff --git a/core/src/font.rs b/core/src/font.rs
index 130e378e..1f774a70 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -1,40 +1,29 @@
-use std::hash::{Hash, Hasher};
+use std::hash::Hash;
 
 /// A font.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum Font {
-    /// The default font.
-    ///
-    /// This is normally a font configured in a renderer or loaded from the
-    /// system.
-    Default,
+    /// The name of a font family of choice.
+    Name(&'static str),
 
-    /// An external font.
-    External {
-        /// The name of the external font
-        name: &'static str,
+    /// Serif fonts represent the formal text style for a script.
+    Serif,
 
-        /// The bytes of the external font
-        bytes: &'static [u8],
-    },
-}
+    /// Glyphs in sans-serif fonts, as the term is used in CSS, are generally low
+    /// contrast and have stroke endings that are plain — without any flaring,
+    /// cross stroke, or other ornamentation.
+    SansSerif,
 
-impl Default for Font {
-    fn default() -> Font {
-        Font::Default
-    }
-}
+    /// Glyphs in cursive fonts generally use a more informal script style, and
+    /// the result looks more like handwritten pen or brush writing than printed
+    /// letterwork.
+    Cursive,
+
+    /// Fantasy fonts are primarily decorative or expressive fonts that contain
+    /// decorative or expressive representations of characters.
+    Fantasy,
 
-impl Hash for Font {
-    fn hash<H: Hasher>(&self, hasher: &mut H) {
-        match self {
-            Self::Default => {
-                0.hash(hasher);
-            }
-            Self::External { name, .. } => {
-                1.hash(hasher);
-                name.hash(hasher);
-            }
-        }
-    }
+    /// The sole criterion of a monospace font is that all glyphs have the same
+    /// fixed width.
+    Monospace,
 }
-- 
cgit 


From 32309f0140efb4ea92e3e35e3adc5c740909f196 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 5 Feb 2023 18:26:09 +0100
Subject: Introduce `Weight` enum to `font`

---
 core/src/font.rs | 16 ++++++++++++++++
 core/src/lib.rs  |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/src/font.rs b/core/src/font.rs
index 1f774a70..b67c08af 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -1,3 +1,4 @@
+//! Load and use fonts.
 use std::hash::Hash;
 
 /// A font.
@@ -27,3 +28,18 @@ pub enum Font {
     /// fixed width.
     Monospace,
 }
+
+/// The weight of some text.
+#[allow(missing_docs)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Weight {
+    Thin,
+    ExtraLight,
+    Light,
+    Normal,
+    Medium,
+    Semibold,
+    Bold,
+    ExtraBold,
+    Black,
+}
diff --git a/core/src/lib.rs b/core/src/lib.rs
index d3596b4d..d7314851 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -25,6 +25,7 @@
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
 pub mod alignment;
+pub mod font;
 pub mod keyboard;
 pub mod mouse;
 pub mod time;
@@ -32,7 +33,6 @@ pub mod time;
 mod background;
 mod color;
 mod content_fit;
-mod font;
 mod length;
 mod padding;
 mod pixels;
-- 
cgit