txt: use <w:br/> for line break instead of <w:cr/>

Steve Canny · Steve Canny · commit fffa94f45cf2 · 2014-07-13T01:32:54.000-07:00
Word does not interpret &lt;w:cr/&gt; element in run as a line break,
contrary to the behavior required by the ISO 29500 spec. Use &lt;w:br/&gt;
element to implement line break when a line feed (‘\n’) or carriage
return (‘\r’) character is encountered in text assigned to a run.
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -420,7 +420,7 @@ def add_char(self, char):
             self._r.add_tab()
         elif char in '\r\n':
             self.flush()
-            self._r.add_cr()
+            self._r.add_br()
         else:
             self._bfr.append(char)
 
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -136,7 +136,7 @@ def it_can_replace_its_content_with_a_string_of_text(
         ('w:tc/w:p', 'foobar',
          'w:tc/w:p/w:r/w:t"foobar"'),
         ('w:tc/w:p', 'fo\tob\rar\n',
-         'w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:cr,w:t"ar",w:cr)'),
+         'w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)'),
         ('w:tc/(w:tcPr, w:p, w:tbl, w:p)', 'foobar',
          'w:tc/(w:tcPr, w:p/w:r/w:t"foobar")'),
     ])
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -506,8 +506,8 @@ def text_get_fixture(self, request):
     @pytest.fixture(params=[
         ('abc  def', 'w:r/w:t"abc  def"'),
         ('abc\tdef', 'w:r/(w:t"abc", w:tab, w:t"def")'),
-        ('abc\ndef', 'w:r/(w:t"abc", w:cr,  w:t"def")'),
-        ('abc\rdef', 'w:r/(w:t"abc", w:cr,  w:t"def")'),
+        ('abc\ndef', 'w:r/(w:t"abc", w:br,  w:t"def")'),
+        ('abc\rdef', 'w:r/(w:t"abc", w:br,  w:t"def")'),
     ])
     def text_set_fixture(self, request):
         new_text, expected_cxml = request.param
