text: add xml:space="preserve" on <w:t>

Steve Canny · Steve Canny · commit 752314eed5ce · 2014-01-04T23:13:09.000-08:00
when added text has leading or trailing space
diff --git a/docx/oxml/shared.py b/docx/oxml/shared.py
@@ -19,6 +19,7 @@
     'w':   ('http://schemas.openxmlformats.org/wordprocessingml/2006/main'),
     'wp':  ('http://schemas.openxmlformats.org/drawingml/2006/wordprocessing'
             'Drawing'),
+    'xml': ('http://www.w3.org/XML/1998/namespace')
 }
 
 # configure XML parser
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -206,6 +206,8 @@ def add_t(self, text):
         Return a newly added CT_T (<w:t>) element containing *text*.
         """
         t = CT_Text.new(text)
+        if len(text.strip()) < len(text):
+            t.set(qn('xml:space'), 'preserve')
         self.append(t)
         return t
 
diff --git a/tests/oxml/unitdata/text.py b/tests/oxml/unitdata/text.py
@@ -49,6 +49,10 @@ class CT_TextBuilder(BaseBuilder):
     __nspfxs__ = ('w',)
     __attrs__ = ()
 
+    def with_space(self, value):
+        self._set_xmlattr('xml:space', str(value))
+        return self
+
 
 def a_b():
     return CT_OnOffBuilder('w:b')
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -30,10 +30,7 @@ def it_has_a_sequence_of_the_runs_it_contains(self, runs_fixture):
 
     def it_can_add_a_run_to_itself(self, add_run_fixture):
         paragraph, text, expected_xml = add_run_fixture
-        if text is None:
-            run = paragraph.add_run()
-        else:
-            run = paragraph.add_run(text)
+        run = paragraph.add_run(text)
         assert paragraph._p.xml == expected_xml
         assert isinstance(run, Run)
         assert run._r is paragraph._p.r_lst[0]
@@ -180,13 +177,13 @@ def add_break_fixture(self, request, run):
         expected_xml = an_r().with_nsdecls().with_child(br_bldr).xml()
         return run, break_type, expected_xml
 
-    @pytest.fixture
-    def add_text_fixture(self, run, Text_):
-        text_str = 'foobar'
-        expected_xml = (
-            an_r().with_nsdecls().with_child(
-                a_t().with_text(text_str))
-        ).xml()
+    @pytest.fixture(params=['foobar', ' foo bar', 'bar foo '])
+    def add_text_fixture(self, request, run, Text_):
+        text_str = request.param
+        t_bldr = a_t().with_text(text_str)
+        if text_str.startswith(' ') or text_str.endswith(' '):
+            t_bldr.with_space('preserve')
+        expected_xml = an_r().with_nsdecls().with_child(t_bldr).xml()
         return run, text_str, expected_xml, Text_
 
     @pytest.fixture(params=[True, False, None])

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`'w': ('http://schemas.openxmlformats.org/wordprocessingml/2006/main'),`
`20`	`20`	`'wp': ('http://schemas.openxmlformats.org/drawingml/2006/wordprocessing'`
`21`	`21`	`'Drawing'),`
	`22`	`+ 'xml': ('http://www.w3.org/XML/1998/namespace')`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`# configure XML parser`