Merge 3c85db8 into c3dd139

softhyphen/html.py

@@ -66,7 +66,7 @@ def hyphenate(html, language=None, hyphenator=None, blacklist_tags=(
     # Recursively hyphenate each element
     hyphenate_element(soup, hyphenator, blacklist_tags)
 
-    return six.text_type(soup)
+    return fix_linebreaks(six.text_type(soup))
 
 
 # Constants
@@ -151,6 +151,10 @@ def get_hyphenator_for_language(language):
     return Hyphenator(path)
 
 
+def fix_linebreaks(html):
+    return html.replace('</br>', '')
+
+
 # Test when standalone
 def _test():
     """Run doctests"""

softhyphen/tests.py

@@ -102,3 +102,14 @@ def test_russian_filter(self):
             after,
             six.u('<h1>\u043f\u0435&shy;\u0440\u0435.</h1>')
         )
+
+    def test_linebreak_fix(self):
+        '''
+        Test that <br> tags are handled correctly.
+        '''
+        before = six.u('<p>Breaking<br>changes</p>')
+        after = hyphenate(before)
+        self.failUnlessEqual(
+            after,
+            six.u('<p>Break&shy;ing<br>changes</p>')
+        )