Merge pull request #31 from june0cho/vertical_align

Add 'vertical-align'

Author: metajack

complete.rs

@@ -193,6 +193,10 @@ impl<'self> CompleteStyle<'self> {
         strip(self.inner.line_height())
     }
 
+    pub fn vertical_align(&self) -> CSSVerticalAlign {
+        strip(self.inner.vertical_align())
+    }
+
     // CSS 2.1, Section 11 - Visual effects
 
     // CSS 2.1, Section 12 - Generated content, automatic numbering, and lists

computed.rs

@@ -113,6 +113,10 @@ impl<'self> ComputedStyle<'self> {
         convert_net_line_height_value(self.inner.line_height())
     }
 
+    pub fn vertical_align(&self) -> CSSValue<CSSVerticalAlign> {
+        convert_net_vertical_align_value(self.inner.vertical_align())
+    }
+
     // CSS 2.1, Section 11 - Visual effects
 
     // CSS 2.1, Section 12 - Generated content, automatic numbering, and lists
@@ -395,6 +399,26 @@ fn convert_net_line_height_value(value: n::v::CssLineHeightValue) -> CSSValue<CS
     }
 }
 
+fn convert_net_vertical_align_value(value: n::v::CssVerticalAlignValue) -> CSSValue<CSSVerticalAlign> {
+    match value {
+        n::v::CssVerticalAlignInherit => Inherit,
+        n::v::CssVerticalAlignBaseline => Specified(CSSVerticalAlignBaseline),
+        n::v::CssVerticalAlignSub => Specified(CSSVerticalAlignSub),
+        n::v::CssVerticalAlignSuper => Specified(CSSVerticalAlignSuper),
+        n::v::CssVerticalAlignTop => Specified(CSSVerticalAlignTop),
+        n::v::CssVerticalAlignTextTop => Specified(CSSVerticalAlignTextTop),
+        n::v::CssVerticalAlignMiddle => Specified(CSSVerticalAlignMiddle),
+        n::v::CssVerticalAlignBottom => Specified(CSSVerticalAlignBottom),
+        n::v::CssVerticalAlignTextBottom => Specified(CSSVerticalAlignTextBottom),
+        n::v::CssVerticalAlignDimension(v) => {
+            match convert_net_unit_to_length_or_percent(v) {
+                Left(val) => Specified(CSSVerticalAlignLength(val)),
+                Right(val) => Specified(CSSVerticalAlignPercentage(val))
+            }
+        }
+    }
+}
+
 fn convert_net_unit_to_length(unit: n::t::CssUnit) -> Length {
     match convert_net_unit_to_length_or_percent(unit) {
         Left(v) => v,

test.rs

@@ -408,7 +408,17 @@ fn test_line_height() {
     }
 }
 
-
+#[test]
+fn test_vertical_align() {
+    let style = "div { vertical-align: 20%; }";
+    do single_div_test(style) |computed| {
+        assert!(computed.vertical_align() == Specified(CSSVerticalAlignPercentage(20.0)));
+    }
+    let style = "div { vertical-align: text-top; }";
+    do single_div_test(style) |computed| {
+        assert!(computed.vertical_align() == Specified(CSSVerticalAlignTextTop));
+    }
+}
 
 fn child_test(style: &str, f: &fn(&ComputedStyle)) {
     let sheet = Stylesheet::new(test_url(), style_stream(style));