parfmt: add ParagraphFormat.space_after getter

Steve Canny · Steve Canny · commit ee719a9a1902 · 2015-02-08T00:01:43.000-08:00
diff --git a/docx/oxml/text/paragraph.py b/docx/oxml/text/paragraph.py
@@ -129,10 +129,20 @@ def jc_val(self, value):
             return
         self.get_or_add_jc().val = value
 
+    @property
+    def spacing_after(self):
+        """
+        The value of `w:spacing/@w:after` or |None| if not present.
+        """
+        spacing = self.spacing
+        if spacing is None:
+            return None
+        return spacing.after
+
     @property
     def spacing_before(self):
         """
-        The value of `w:spacing@w:before` or |None| if not present.
+        The value of `w:spacing/@w:before` or |None| if not present.
         """
         spacing = self.spacing
         if spacing is None:
@@ -169,4 +179,5 @@ class CT_Spacing(BaseOxmlElement):
     ``<w:spacing>`` element, specifying paragraph spacing attributes such as
     space before and line spacing.
     """
+    after = OptionalAttribute('w:after', ST_TwipsMeasure)
     before = OptionalAttribute('w:before', ST_TwipsMeasure)
diff --git a/docx/text/paragraph.py b/docx/text/paragraph.py
@@ -155,6 +155,21 @@ def alignment(self, value):
         pPr = self._element.get_or_add_pPr()
         pPr.jc_val = value
 
+    @property
+    def space_after(self):
+        """
+        |Length| value specifying the spacing to appear between this
+        paragraph and the subsequent paragraph. |None| indicates this value
+        is inherited from the style hierarchy. |Length| objects provide
+        convenience properties, such as :attr:`~.Length.pt` and
+        :attr:`~.Length.inches`, that allow easy conversion to various length
+        units.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.spacing_after
+
     @property
     def space_before(self):
         """
diff --git a/features/txt-parfmt-props.feature b/features/txt-parfmt-props.feature
@@ -27,7 +27,6 @@ Feature: Get or set paragraph formatting properties
       | right      | None                      | None                      |
 
 
-  @wip
   Scenario Outline: Get paragraph spacing
     Given a paragraph format having <setting> space <side>
      Then paragraph_format.space_<side> is <value>
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
@@ -301,6 +301,10 @@ def it_knows_its_space_before(self, space_before_get_fixture):
         paragraph_format, expected_value = space_before_get_fixture
         assert paragraph_format.space_before == expected_value
 
+    def it_knows_its_space_after(self, space_after_get_fixture):
+        paragraph_format, expected_value = space_after_get_fixture
+        assert paragraph_format.space_after == expected_value
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -331,11 +335,22 @@ def alignment_set_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return paragraph_format, value, expected_xml
 
+    @pytest.fixture(params=[
+        ('w:p',                              None),
+        ('w:p/w:pPr',                        None),
+        ('w:p/w:pPr/w:spacing',              None),
+        ('w:p/w:pPr/w:spacing{w:after=240}', Pt(12)),
+    ])
+    def space_after_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
+
     @pytest.fixture(params=[
         ('w:p',                               None),
         ('w:p/w:pPr',                         None),
         ('w:p/w:pPr/w:spacing',               None),
-        ('w:p/w:pPr/w:spacing{w:before=240}', Pt(12)),
+        ('w:p/w:pPr/w:spacing{w:before=420}', Pt(21)),
     ])
     def space_before_get_fixture(self, request):
         p_cxml, expected_value = request.param
