oxml: add CT_P.add_r()

Steve Canny · Steve Canny · commit 017bf055b0d3 · 2013-12-20T20:10:44.000-08:00
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -23,6 +23,9 @@ def add_r(self):
         """
         Return a newly added CT_R (<w:r>) element.
         """
+        r = CT_R.new()
+        self.append(r)
+        return r
 
     @staticmethod
     def new():
diff --git a/tests/oxml/test_text.py b/tests/oxml/test_text.py
@@ -21,6 +21,14 @@ def it_can_construct_a_new_p_element(self):
         expected_xml = a_p().with_nsdecls().xml
         assert p.xml == expected_xml
 
+    def it_can_add_an_r_to_itself(self):
+        p = a_p().with_nsdecls().element
+        # exercise -----------------
+        r = p.add_r()
+        # verify -------------------
+        assert p.xml == a_p().with_nsdecls().with_r().xml
+        assert isinstance(r, CT_R)
+
 
 class DescribeCT_R(object):
 
diff --git a/tests/unitdata.py b/tests/unitdata.py
@@ -92,12 +92,29 @@ class CT_PBuilder(BaseBuilder):
     def __init__(self):
         """Establish instance variables with default values"""
         super(CT_PBuilder, self).__init__()
+        self._r = []
+
+    @property
+    def is_empty(self):
+        return len(self._r) == 0
+
+    def with_r(self, count=1):
+        """Add *count* empty run elements"""
+        for i in range(count):
+            self._r.append(an_r())
+        return self
 
     @property
     def xml(self):
         """Return element XML based on attribute settings"""
         indent = ' ' * self._indent
-        xml = '%s<w:p%s/>\n' % (indent, self._nsdecls)
+        if self.is_empty:
+            xml = '%s<w:p%s/>\n' % (indent, self._nsdecls)
+        else:
+            xml = '%s<w:p%s>\n' % (indent, self._nsdecls)
+            for r in self._r:
+                xml += r.with_indent(self._indent+2).xml
+            xml += '%s</w:p>\n' % indent
         return xml
 
 
