font: add Font.name setter

Steve Canny · Steve Canny · commit 270271fc4139 · 2015-02-08T00:01:40.000-08:00
diff --git a/docx/oxml/text/run.py b/docx/oxml/text/run.py
@@ -26,6 +26,7 @@ class CT_Fonts(BaseOxmlElement):
     types.
     """
     ascii = OptionalAttribute('w:ascii', ST_String)
+    hAnsi = OptionalAttribute('w:hAnsi', ST_String)
 
 
 class CT_R(BaseOxmlElement):
@@ -180,6 +181,31 @@ def rFonts_ascii(self):
             return None
         return rFonts.ascii
 
+    @rFonts_ascii.setter
+    def rFonts_ascii(self, value):
+        if value is None:
+            self._remove_rFonts()
+            return
+        rFonts = self.get_or_add_rFonts()
+        rFonts.ascii = value
+
+    @property
+    def rFonts_hAnsi(self):
+        """
+        The value of `w:rFonts/@w:hAnsi` or |None| if not present.
+        """
+        rFonts = self.rFonts
+        if rFonts is None:
+            return None
+        return rFonts.hAnsi
+
+    @rFonts_hAnsi.setter
+    def rFonts_hAnsi(self, value):
+        if value is None and self.rFonts is None:
+            return
+        rFonts = self.get_or_add_rFonts()
+        rFonts.hAnsi = value
+
     @property
     def style(self):
         """
diff --git a/docx/text/run.py b/docx/text/run.py
@@ -394,6 +394,12 @@ def name(self):
             return None
         return rPr.rFonts_ascii
 
+    @name.setter
+    def name(self, value):
+        rPr = self._element.get_or_add_rPr()
+        rPr.rFonts_ascii = value
+        rPr.rFonts_hAnsi = value
+
 
 class _Text(object):
     """
diff --git a/features/txt-font-props.feature b/features/txt-font-props.feature
@@ -14,7 +14,6 @@ Feature: Get or set font properties
       | Avenir Black  | Avenir Black |
 
 
-  @wip
   Scenario Outline: Set typeface name
     Given a font having typeface name <name>
      When I assign <value> to font.name
diff --git a/tests/text/test_run.py b/tests/text/test_run.py
@@ -374,6 +374,12 @@ def it_knows_its_typeface_name(self, name_get_fixture):
         font, expected_value = name_get_fixture
         assert font.name == expected_value
 
+    def it_can_change_its_typeface_name(self, name_set_fixture):
+        font, value, expected_xml = name_set_fixture
+        font.name = value
+        print(font._element.xml)
+        assert font._element.xml == expected_xml
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -386,3 +392,19 @@ def name_get_fixture(self, request):
         r_cxml, expected_value = request.param
         font = Font(element(r_cxml))
         return font, expected_value
+
+    @pytest.fixture(params=[
+        ('w:r',                                          'Foo',
+         'w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}'),
+        ('w:r/w:rPr',                                    'Foo',
+         'w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}'),
+        ('w:r/w:rPr/w:rFonts{w:hAnsi=Foo}',              'Bar',
+         'w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}'),
+        ('w:r/w:rPr/w:rFonts{w:ascii=Foo,w:hAnsi=Foo}',  'Bar',
+         'w:r/w:rPr/w:rFonts{w:ascii=Bar,w:hAnsi=Bar}'),
+    ])
+    def name_set_fixture(self, request):
+        r_cxml, value, expected_r_cxml = request.param
+        font = Font(element(r_cxml))
+        expected_xml = xml(expected_r_cxml)
+        return font, value, expected_xml
