Start & end alignment

1 files changed, 27 insertions, 6 deletions

diff --git a/src/library/mod.rs b/src/library/mod.rs
index 7c5a519f..358c2204 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -113,12 +113,14 @@ pub fn new() -> Scope {
     std.def_const("rtl", Dir::RTL);
     std.def_const("ttb", Dir::TTB);
     std.def_const("btt", Dir::BTT);
-    std.def_const("left", Align::Left);
-    std.def_const("center", Align::Center);
-    std.def_const("right", Align::Right);
-    std.def_const("top", Align::Top);
-    std.def_const("horizon", Align::Horizon);
-    std.def_const("bottom", Align::Bottom);
+    std.def_const("start", RawAlign::Start);
+    std.def_const("end", RawAlign::End);
+    std.def_const("left", RawAlign::Specific(Align::Left));
+    std.def_const("center", RawAlign::Specific(Align::Center));
+    std.def_const("right", RawAlign::Specific(Align::Right));
+    std.def_const("top", RawAlign::Specific(Align::Top));
+    std.def_const("horizon", RawAlign::Specific(Align::Horizon));
+    std.def_const("bottom", RawAlign::Specific(Align::Bottom));
 
     std
 }
@@ -127,6 +129,25 @@ dynamic! {
     Dir: "direction",
 }
 
+dynamic! {
+    RawAlign: "alignment",
+}
+
+dynamic! {
+    Spec<RawAlign>: "2d alignment",
+}
+
+castable! {
+    Spec<Option<RawAlign>>,
+    Expected: "1d or 2d alignment",
+    @align: RawAlign => {
+        let mut aligns = Spec::default();
+        aligns.set(align.axis(), Some(*align));
+        aligns
+    },
+    @aligns: Spec<RawAlign> => aligns.map(Some),
+}
+
 castable! {
     usize,
     Expected: "non-negative integer",