Move around library types 🚚

1 files changed, 23 insertions, 9 deletions

diff --git a/src/library/mod.rs b/src/library/mod.rs
index d34b338c..f846e6ee 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -3,20 +3,30 @@
 //! Call [`new`] to obtain a [`Scope`] containing all standard library
 //! definitions.
 
-mod extend;
-mod insert;
-mod layout;
-mod style;
+mod align;
+mod base;
+mod font;
+mod image;
+mod page;
+mod shapes;
+mod spacing;
 
-pub use extend::*;
-pub use insert::*;
-pub use layout::*;
-pub use style::*;
+pub use self::image::*;
+pub use align::*;
+pub use base::*;
+pub use font::*;
+pub use page::*;
+pub use shapes::*;
+pub use spacing::*;
+
+use std::fmt::{self, Display, Formatter};
 
 use fontdock::{FontStretch, FontStyle, FontWeight};
 
 use crate::eval::{Scope, ValueAny, ValueFunc};
-use crate::geom::Dir;
+use crate::exec::Softness;
+use crate::layout::*;
+use crate::prelude::*;
 
 /// Construct a scope containing all standard library definitions.
 pub fn new() -> Scope {
@@ -80,3 +90,7 @@ pub fn new() -> Scope {
 
     std
 }
+
+typify! {
+    Dir: "direction"
+}