dml: add ColorFormat.theme_color setter

Steve Canny · Steve Canny · commit a51022b4c28a · 2015-02-19T21:40:57.000-08:00
diff --git a/docx/dml/color.py b/docx/dml/color.py
@@ -79,6 +79,14 @@ def theme_color(self):
             return None
         return color.themeColor
 
+    @theme_color.setter
+    def theme_color(self, value):
+        if value is None:
+            if self._color is not None:
+                self._element.rPr._remove_color()
+            return
+        self._element.get_or_add_rPr().get_or_add_color().themeColor = value
+
     @property
     def type(self):
         """
diff --git a/docx/oxml/text/font.py b/docx/oxml/text/font.py
@@ -4,9 +4,10 @@
 Custom element classes related to run properties (font).
 """
 
+from .. import parse_xml
 from ...enum.dml import MSO_THEME_COLOR
 from ...enum.text import WD_UNDERLINE
-from ..ns import qn
+from ..ns import nsdecls, qn
 from ..simpletypes import (
     ST_HexColor, ST_HpsMeasure, ST_String, ST_VerticalAlignRun
 )
@@ -82,6 +83,13 @@ class CT_RPr(BaseOxmlElement):
     oMath = ZeroOrOne('w:oMath', successors=_tag_seq[39:])
     del _tag_seq
 
+    def _new_color(self):
+        """
+        Override metaclass method to set `w:color/@val` to RGB black on
+        create.
+        """
+        return parse_xml('<w:color %s w:val="000000"/>' % nsdecls('w'))
+
     @property
     def rFonts_ascii(self):
         """
diff --git a/features/txt-font-color.feature b/features/txt-font-color.feature
@@ -56,7 +56,6 @@ Feature: Get and set font color
       | a theme | ACCENT_1 |
 
 
-  @wip
   Scenario Outline: Set font theme color
     Given a font having <type> color
      When I assign <value> to font.color.theme_color
diff --git a/tests/dml/test_color.py b/tests/dml/test_color.py
@@ -36,6 +36,11 @@ def it_knows_its_theme_color(self, theme_color_get_fixture):
         color_format, expected_value = theme_color_get_fixture
         assert color_format.theme_color == expected_value
 
+    def it_can_change_its_theme_color(self, theme_color_set_fixture):
+        color_format, new_value, expected_xml = theme_color_set_fixture
+        color_format.theme_color = new_value
+        assert color_format._element.xml == expected_xml
+
     # fixtures ---------------------------------------------
 
     @pytest.fixture(params=[
@@ -87,6 +92,28 @@ def theme_color_get_fixture(self, request):
         )
         return color_format, expected_value
 
+    @pytest.fixture(params=[
+        ('w:r', 'ACCENT_1',
+         'w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent1}'),
+        ('w:r/w:rPr', 'ACCENT_2',
+         'w:r/w:rPr/w:color{w:val=000000,w:themeColor=accent2}'),
+        ('w:r/w:rPr/w:color{w:val=101112}', 'ACCENT_3',
+         'w:r/w:rPr/w:color{w:val=101112,w:themeColor=accent3}'),
+        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}', 'LIGHT_2',
+         'w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=light2}'),
+        ('w:r/w:rPr/w:color{w:val=234bcd,w:themeColor=dark1}', None,
+         'w:r/w:rPr'),
+        ('w:r', None, 'w:r'),
+    ])
+    def theme_color_set_fixture(self, request):
+        r_cxml, member, expected_cxml = request.param
+        color_format = ColorFormat(element(r_cxml))
+        new_value = (
+            None if member is None else getattr(MSO_THEME_COLOR, member)
+        )
+        expected_xml = xml(expected_cxml)
+        return color_format, new_value, expected_xml
+
     @pytest.fixture(params=[
         ('w:r',                                   None),
         ('w:r/w:rPr',                             None),
