Move font family and refactor alignment

1 files changed, 3 insertions, 22 deletions

diff --git a/src/exec/state.rs b/src/exec/state.rs
index 0145f60f..51bbe395 100644
--- a/src/exec/state.rs
+++ b/src/exec/state.rs
@@ -1,8 +1,9 @@
-use std::fmt::{self, Display, Formatter};
 use std::rc::Rc;
 
 use crate::color::{Color, RgbaColor};
-use crate::font::{FontStretch, FontStyle, FontVariant, FontWeight, VerticalFontMetric};
+use crate::font::{
+    FontFamily, FontStretch, FontStyle, FontVariant, FontWeight, VerticalFontMetric,
+};
 use crate::geom::*;
 use crate::layout::Paint;
 use crate::paper::{PaperClass, PAPER_A4};
@@ -236,26 +237,6 @@ impl Default for FamilyList {
     }
 }
 
-/// A generic or named font family.
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub enum FontFamily {
-    Serif,
-    SansSerif,
-    Monospace,
-    Named(String),
-}
-
-impl Display for FontFamily {
-    fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        f.pad(match self {
-            Self::Serif => "serif",
-            Self::SansSerif => "sans-serif",
-            Self::Monospace => "monospace",
-            Self::Named(s) => s,
-        })
-    }
-}
-
 /// Describes a line that is positioned over, under or on top of text.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub struct LineState {