tabs: add TabStop.alignment

DKWoods · Steve Canny · commit 48a7e3189f32 · 2016-05-27T12:47:19.000-07:00
diff --git a/docx/oxml/text/parfmt.py b/docx/oxml/text/parfmt.py
@@ -4,7 +4,9 @@
 Custom element classes related to paragraph properties (CT_PPr).
 """
 
-from ...enum.text import WD_ALIGN_PARAGRAPH, WD_LINE_SPACING
+from ...enum.text import (
+    WD_ALIGN_PARAGRAPH, WD_LINE_SPACING, WD_TAB_ALIGNMENT
+)
 from ...shared import Length
 from ..simpletypes import ST_SignedTwipsMeasure, ST_TwipsMeasure
 from ..xmlchemy import (
@@ -319,6 +321,7 @@ class CT_TabStop(BaseOxmlElement):
     """
     ``<w:tab>`` element, representing an individual tab stop.
     """
+    val = RequiredAttribute('w:val', WD_TAB_ALIGNMENT)
     pos = RequiredAttribute('w:pos', ST_SignedTwipsMeasure)
 
 
diff --git a/docx/text/tabstops.py b/docx/text/tabstops.py
@@ -64,6 +64,14 @@ def __init__(self, element):
         super(TabStop, self).__init__(element, None)
         self._tab = element
 
+    @property
+    def alignment(self):
+        """
+        A member of :ref:`WdTabAlignment` specifying the alignment setting
+        for this tab stop.
+        """
+        return self._tab.val
+
     @property
     def position(self):
         """
diff --git a/features/tab-tabstop-props.feature b/features/tab-tabstop-props.feature
@@ -14,7 +14,6 @@ Feature: Tab stop properties
       |    out    | -457200  |
 
 
-  @wip
   Scenario Outline: Get TabStop.alignment
     Given a tab stop having <alignment> alignment
      Then tab_stop.alignment is <alignment>
diff --git a/tests/text/test_tabstops.py b/tests/text/test_tabstops.py
@@ -9,6 +9,7 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from docx.enum.text import WD_TAB_ALIGNMENT
 from docx.shared import Twips
 from docx.text.tabstops import TabStop, TabStops
 
@@ -24,8 +25,22 @@ def it_knows_its_position(self, position_get_fixture):
         tab_stop, expected_value = position_get_fixture
         assert tab_stop.position == expected_value
 
+    def it_knows_its_alignment(self, alignment_get_fixture):
+        tab_stop, expected_value = alignment_get_fixture
+        assert tab_stop.alignment == expected_value
+
     # fixture --------------------------------------------------------
 
+    @pytest.fixture(params=[
+        ('w:tab{w:val=left}',  'LEFT'),
+        ('w:tab{w:val=right}', 'RIGHT'),
+    ])
+    def alignment_get_fixture(self, request):
+        tab_stop_cxml, member = request.param
+        tab_stop = TabStop(element(tab_stop_cxml))
+        expected_value = getattr(WD_TAB_ALIGNMENT, member)
+        return tab_stop, expected_value
+
     @pytest.fixture
     def position_get_fixture(self, request):
         tab_stop = TabStop(element('w:tab{w:pos=720}'))
