parfmt: add ParagraphFormat.line_spacing setter

Steve Canny · Steve Canny · commit 3664bede2eb4 · 2015-02-08T00:01:43.000-08:00
diff --git a/docx/oxml/text/paragraph.py b/docx/oxml/text/paragraph.py
@@ -171,6 +171,12 @@ def spacing_line(self):
             return None
         return spacing.line
 
+    @spacing_line.setter
+    def spacing_line(self, value):
+        if value is None and self.spacing is None:
+            return
+        self.get_or_add_spacing().line = value
+
     @property
     def spacing_lineRule(self):
         """
@@ -188,6 +194,12 @@ def spacing_lineRule(self):
             return WD_LINE_SPACING.MULTIPLE
         return lineRule
 
+    @spacing_lineRule.setter
+    def spacing_lineRule(self, value):
+        if value is None and self.spacing is None:
+            return
+        self.get_or_add_spacing().lineRule = value
+
     @property
     def style(self):
         """
diff --git a/docx/text/paragraph.py b/docx/text/paragraph.py
@@ -11,7 +11,7 @@
 from ..enum.style import WD_STYLE_TYPE
 from ..enum.text import WD_LINE_SPACING
 from .run import Run
-from ..shared import ElementProxy, Parented, Pt, Twips
+from ..shared import ElementProxy, Emu, Length, Parented, Pt, Twips
 
 
 class Paragraph(Parented):
@@ -175,6 +175,20 @@ def line_spacing(self):
             return None
         return self._line_spacing(pPr.spacing_line, pPr.spacing_lineRule)
 
+    @line_spacing.setter
+    def line_spacing(self, value):
+        pPr = self._element.get_or_add_pPr()
+        if value is None:
+            pPr.spacing_line = None
+            pPr.spacing_lineRule = None
+        elif isinstance(value, Length):
+            pPr.spacing_line = value
+            if pPr.spacing_lineRule != WD_LINE_SPACING.AT_LEAST:
+                pPr.spacing_lineRule = WD_LINE_SPACING.EXACTLY
+        else:
+            pPr.spacing_line = Emu(value * Twips(240))
+            pPr.spacing_lineRule = WD_LINE_SPACING.MULTIPLE
+
     @property
     def line_spacing_rule(self):
         """
diff --git a/features/txt-parfmt-props.feature b/features/txt-parfmt-props.feature
@@ -66,7 +66,6 @@ Feature: Get or set paragraph formatting properties
       | double    | 2.0    | WD_LINE_SPACING.DOUBLE   |
 
 
-  @wip
   Scenario Outline: Set line spacing
     Given a paragraph format having <setting> line spacing
      When I assign <new-value> to paragraph_format.line_spacing
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
@@ -319,6 +319,11 @@ def it_knows_its_line_spacing(self, line_spacing_get_fixture):
         paragraph_format, expected_value = line_spacing_get_fixture
         assert paragraph_format.line_spacing == expected_value
 
+    def it_can_change_its_line_spacing(self, line_spacing_set_fixture):
+        paragraph_format, value, expected_xml = line_spacing_set_fixture
+        paragraph_format.line_spacing = value
+        assert paragraph_format._element.xml == expected_xml
+
     def it_knows_its_line_spacing_rule(self, line_spacing_rule_get_fixture):
         paragraph_format, expected_value = line_spacing_rule_get_fixture
         assert paragraph_format.line_spacing_rule == expected_value
@@ -366,6 +371,29 @@ def line_spacing_get_fixture(self, request):
         paragraph_format = ParagraphFormat(element(p_cxml))
         return paragraph_format, expected_value
 
+    @pytest.fixture(params=[
+        ('w:p', 1,      'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
+        ('w:p', 2.0,    'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
+        ('w:p', Pt(42), 'w:p/w:pPr/w:spacing{w:line=840,w:lineRule=exact}'),
+        ('w:p/w:pPr',                                          2,
+         'w:p/w:pPr/w:spacing{w:line=480,w:lineRule=auto}'),
+        ('w:p/w:pPr/w:spacing{w:line=360}',                    1,
+         'w:p/w:pPr/w:spacing{w:line=240,w:lineRule=auto}'),
+        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}',   1.75,
+         'w:p/w:pPr/w:spacing{w:line=420,w:lineRule=auto}'),
+        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=atLeast}', Pt(42),
+         'w:p/w:pPr/w:spacing{w:line=840,w:lineRule=atLeast}'),
+        ('w:p/w:pPr/w:spacing{w:line=240,w:lineRule=exact}',   None,
+         'w:p/w:pPr/w:spacing'),
+        ('w:p/w:pPr',                                          None,
+         'w:p/w:pPr'),
+    ])
+    def line_spacing_set_fixture(self, request):
+        p_cxml, value, expected_p_cxml = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        expected_xml = xml(expected_p_cxml)
+        return paragraph_format, value, expected_xml
+
     @pytest.fixture(params=[
         ('w:p',                             None),
         ('w:p/w:pPr',                       None),
