oxml: add CT_R.add_t()

Steve Canny · Steve Canny · commit ce4b630ce7cd · 2013-12-20T20:10:44.000-08:00
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -49,6 +49,14 @@ def new():
         xml = '<w:r %s/>' % nsdecls('w')
         return oxml_fromstring(xml)
 
+    def add_t(self, text):
+        """
+        Return a newly added CT_T (<w:t>) element containing *text*.
+        """
+        t = CT_Text.new(text)
+        self.append(t)
+        return t
+
 
 class CT_Text(OxmlBaseElement):
     """
diff --git a/docx/text.py b/docx/text.py
@@ -48,3 +48,6 @@ class Text(object):
     """
     Proxy object wrapping ``<w:t>`` element.
     """
+    def __init__(self, t_elm):
+        super(Text, self).__init__()
+        self._t = t_elm
diff --git a/tests/oxml/test_text.py b/tests/oxml/test_text.py
@@ -36,6 +36,15 @@ def it_can_construct_a_new_r_element(self):
         r = CT_R.new()
         assert r.xml == an_r().with_nsdecls().xml
 
+    def it_can_add_a_t_to_itself(self):
+        text = 'foobar'
+        r = an_r().with_nsdecls().element
+        # exercise -----------------
+        t = r.add_t(text)
+        # verify -------------------
+        assert r.xml == an_r().with_nsdecls().with_t(text).xml
+        assert isinstance(t, CT_Text)
+
 
 class DescribeCT_Text(object):
 
diff --git a/tests/unitdata.py b/tests/unitdata.py
@@ -126,12 +126,29 @@ class CT_RBuilder(BaseBuilder):
     def __init__(self):
         """Establish instance variables with default values"""
         super(CT_RBuilder, self).__init__()
+        self._t = []
+
+    @property
+    def is_empty(self):
+        return len(self._t) == 0
+
+    def with_t(self, text):
+        """Add an text element containing *text*"""
+        self._t.append(a_t(text))
+        return self
 
     @property
     def xml(self):
         """Return element XML based on attribute settings"""
         indent = ' ' * self._indent
-        return '%s<w:r%s/>\n' % (indent, self._nsdecls)
+        if self.is_empty:
+            xml = '%s<w:r%s/>\n' % (indent, self._nsdecls)
+        else:
+            xml = '%s<w:r%s>\n' % (indent, self._nsdecls)
+            for t_builder in self._t:
+                xml += t_builder.with_indent(self._indent+2).xml
+            xml += '%s</w:r>\n' % indent
+        return xml
 
 
 class CT_TextBuilder(BaseBuilder):
