parfmt: add ParagraphFormat.right_indent getter

Steve Canny · Steve Canny · commit 4e5f72815a46 · 2015-02-08T00:01:44.000-08:00
diff --git a/docx/oxml/text/paragraph.py b/docx/oxml/text/paragraph.py
@@ -19,6 +19,7 @@ class CT_Ind(BaseOxmlElement):
     ``<w:ind>`` element, specifying paragraph indentation.
     """
     left = OptionalAttribute('w:left', ST_SignedTwipsMeasure)
+    right = OptionalAttribute('w:right', ST_SignedTwipsMeasure)
     firstLine = OptionalAttribute('w:firstLine', ST_TwipsMeasure)
     hanging = OptionalAttribute('w:hanging', ST_TwipsMeasure)
 
@@ -151,6 +152,16 @@ def ind_left(self):
             return None
         return ind.left
 
+    @property
+    def ind_right(self):
+        """
+        The value of `w:ind/@w:right` or |None| if not present.
+        """
+        ind = self.ind
+        if ind is None:
+            return None
+        return ind.right
+
     @property
     def jc_val(self):
         """
diff --git a/docx/text/paragraph.py b/docx/text/paragraph.py
@@ -247,6 +247,19 @@ def line_spacing_rule(self, value):
         else:
             pPr.spacing_lineRule = value
 
+    @property
+    def right_indent(self):
+        """
+        |Length| value specifying the space between the right margin and the
+        right side of the paragraph. |None| indicates the right indent value
+        is inherited from the style hierarchy. Use a |Cm| value object as
+        a convenient way to apply indentation in units of centimeters.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.ind_right
+
     @property
     def space_after(self):
         """
diff --git a/features/txt-parfmt-props.feature b/features/txt-parfmt-props.feature
@@ -95,7 +95,6 @@ Feature: Get or set paragraph formatting properties
       | 14 pt   | None                     | 1.1666 | WD_LINE_SPACING.MULTIPLE |
 
 
-  @wip
   Scenario Outline: Get paragraph indents
     Given a paragraph format having <type> indent of <setting>
      Then paragraph_format.<type>_indent is <value>
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
@@ -342,6 +342,10 @@ def it_knows_its_left_indent(self, left_indent_get_fixture):
         paragraph_format, expected_value = left_indent_get_fixture
         assert paragraph_format.left_indent == expected_value
 
+    def it_knows_its_right_indent(self, right_indent_get_fixture):
+        paragraph_format, expected_value = right_indent_get_fixture
+        assert paragraph_format.right_indent == expected_value
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -473,6 +477,18 @@ def line_spacing_rule_set_fixture(self, request):
         expected_xml = xml(expected_p_cxml)
         return paragraph_format, value, expected_xml
 
+    @pytest.fixture(params=[
+        ('w:p',                             None),
+        ('w:p/w:pPr',                       None),
+        ('w:p/w:pPr/w:ind',                 None),
+        ('w:p/w:pPr/w:ind{w:right=160}',    Pt(8)),
+        ('w:p/w:pPr/w:ind{w:right=-4.2pt}', Pt(-4.2)),
+    ])
+    def right_indent_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),
