Changeset 16148

Timestamp:

7 Jul 2020, 20:06:03 (4 years ago)

Author:

Henrik Bettermann

Message:

Revert changes from r16145.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/browser/pdf.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pdf.py

@@ -111 +111 @@
 
     Main things fixed here:
-    - just replace newlines by <br> tags
     If html code:
+    - remove newlines (not visible in HTML but visible in PDF)
     - add <br> tags after <div> (as divs break lines in HTML but not in PDF)
     - replace <li> tags (as lists are not supported by reportlab)
-    """
-    html = html.replace('\n', '<br />')
+    If not html code:
+    - just replace newlines by <br> tags
+    """
     if u'₦' in html:
         html = html.replace(u'₦', u'NGN')
@@ -123 +124 @@
         html = html.replace('<li>', '- ')
         html = html.replace('</li>', '<br />')
+        html = html.replace('\n', '')
+    else:
+        html = html.replace('\n', '<br />')
     return html