From 4ed0c3c9877110380abc9655fc8990ff26e0325d Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub <guillaume.ayoub@kozea.fr>
Date: Sat, 25 Apr 2015 17:48:08 +0200
Subject: [PATCH] Test vertical-align property in tables (fix #31)

---
 weasyprint/layout/tables.py     |  1 -
 weasyprint/tests/test_layout.py | 70 +++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/weasyprint/layout/tables.py b/weasyprint/layout/tables.py
index 8f6eaa5c5..5ea665e7d 100644
--- a/weasyprint/layout/tables.py
+++ b/weasyprint/layout/tables.py
@@ -198,7 +198,6 @@ def group_layout(group, position_y, max_position_y,
                     elif cell.vertical_align == 'bottom':
                         vertical_align_shift = (
                             cell.computed_height - cell.content_height)
-                    # TODO: elif cell.vertical_align == 'baseline':
                     if vertical_align_shift > 0:
                         for child in cell.children:
                             child.translate(dy=vertical_align_shift)
diff --git a/weasyprint/tests/test_layout.py b/weasyprint/tests/test_layout.py
index 5de46a925..d4811d7bc 100644
--- a/weasyprint/tests/test_layout.py
+++ b/weasyprint/tests/test_layout.py
@@ -3278,6 +3278,76 @@ def test_table_row_height():
     row_group, = table.children
 
 
+@assert_no_logs
+def test_table_vertical_align():
+    from .test_draw import _, r, B, assert_pixels
+    assert_pixels('table_vertical_align', 40, 14, [
+        _+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_,
+        _+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+_,
+        _+B+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+B+_,
+        _+B+_+B+B+B+_+B+B+B+_+B+B+B+_+B+B+B+_+B+B+B+_+B+B+B+B+_+B+B+B+B+_+B+B+B+B+_+B+_,
+        _+B+_+B+r+B+_+B+_+B+_+B+_+B+_+B+_+B+_+B+_+B+_+B+r+r+B+_+B+r+r+B+_+B+_+_+B+_+B+_,
+        _+B+_+B+r+B+_+B+_+B+_+B+_+B+_+B+r+B+_+B+r+B+_+B+r+r+B+_+B+r+r+B+_+B+r+r+B+_+B+_,
+        _+B+_+B+_+B+_+B+r+B+_+B+_+B+_+B+r+B+_+B+r+B+_+B+r+r+B+_+B+r+r+B+_+B+r+r+B+_+B+_,
+        _+B+_+B+_+B+_+B+r+B+_+B+_+B+_+B+_+B+_+B+_+B+_+B+r+r+B+_+B+r+r+B+_+B+r+r+B+_+B+_,
+        _+B+_+B+_+B+_+B+_+B+_+B+r+B+_+B+_+B+_+B+_+B+_+B+_+_+B+_+B+_+_+B+_+B+r+r+B+_+B+_,
+        _+B+_+B+_+B+_+B+_+B+_+B+r+B+_+B+_+B+_+B+_+B+_+B+_+_+B+_+B+_+_+B+_+B+_+_+B+_+B+_,
+        _+B+_+B+B+B+_+B+B+B+_+B+B+B+_+B+B+B+_+B+B+B+_+B+B+B+B+_+B+B+B+B+_+B+B+B+B+_+B+_,
+        _+B+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+B+_,
+        _+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+B+_,
+        _+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+_,
+    ], '''
+      <style>
+        @page { size: 40px 14px }
+        html { background: #fff; font-size: 1px; color: red }
+        body { margin: 1px; width: 40px; height: 14px }
+        td {
+          width: 1em;
+          padding: 0 !important;
+          border: 1px solid blue;
+          line-height: 1em;
+          font-family: ahem;
+        }
+      </style>
+      <table style="border: 1px solid blue; border-spacing: 1px">
+        <tr>
+          <!-- Test vertical-align: top, auto height -->
+          <td style="vertical-align: top">o o</td>
+
+          <!-- Test vertical-align: middle, auto height -->
+          <td style="vertical-align: middle">o o</td>
+
+          <!-- Test vertical-align: bottom, fixed useless height -->
+          <td style="vertical-align: bottom; height: 2em">o o</td>
+
+          <!-- Test default vertical-align value (baseline),
+               fixed useless height -->
+          <td style="height: 5em">o o</td>
+
+          <!-- Test vertical-align: baseline with baseline set by next cell,
+               auto height -->
+          <td style="vertical-align: baseline">o o</td>
+
+          <!-- Set baseline height to 2px, auto height -->
+          <td style="vertical-align: baseline; font-size: 2em">o o</td>
+
+          <!-- Test padding-bottom, fixed useless height,
+               set the height of the cells to 2 lines * 2em + 2px = 6px -->
+          <td style="vertical-align: baseline; height: 1em;
+                     font-size: 2em; padding-bottom: 2px !important">
+            o o
+          </td>
+
+          <!-- Test padding-top, auto height -->
+          <td style="vertical-align: top; padding-top: 0.25em !important;
+                     font-size: 2em">
+            o o
+          </td>
+        </tr>
+      </table>
+    ''')
+
+
 @assert_no_logs
 def test_table_wrapper():
     page, = parse('''