X/Y abstractions

1 files changed, 12 insertions, 9 deletions

diff --git a/src/library/mod.rs b/src/library/mod.rs
index 4d730a7e..c953a76e 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -144,15 +144,6 @@ dynamic! {
 }
 
 dynamic! {
-    Spec<Option<Align>>: "2d alignment",
-    @align: Align => {
-        let mut aligns = Spec::default();
-        aligns.set(align.axis(), Some(*align));
-        aligns
-    },
-}
-
-dynamic! {
     FontFamily: "font family",
     Value::Str(string) => Self::Named(string.to_lowercase()),
 }
@@ -162,3 +153,15 @@ castable! {
     Expected: "color",
     Value::Color(color) => Paint::Solid(color),
 }
+
+castable! {
+    Spec<Option<Align>>,
+    Expected: "1d or 2d alignment",
+    @align: Align => {
+        let mut aligns = Spec::default();
+        aligns.set(align.axis(), Some(*align));
+        aligns
+    },
+    @aligns: Spec<Align> => aligns.map(Some),
+
+}