From fa76cb2866f7efcfce9cb662872ba34fc8f48770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Mon, 27 Mar 2017 11:16:48 +0200
Subject: [PATCH] Fixed linebreaks in pdf.

---
 openslides/core/static/js/core/pdf.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openslides/core/static/js/core/pdf.js b/openslides/core/static/js/core/pdf.js
index 487842f66..139ac8160 100644
--- a/openslides/core/static/js/core/pdf.js
+++ b/openslides/core/static/js/core/pdf.js
@@ -662,7 +662,11 @@ angular.module('OpenSlidesApp.core.pdf', [])
                                     break;
                                 case "br":
                                     //in case of inline-line-numbers and the os-line-break class ignore the break
-                                    if (!(lineNumberMode == "inline" && element.getAttribute("class") == "os-line-break")) {
+                                    if ((lineNumberMode == "inline" && element.getAttribute("class") == "os-line-break") ||
+                                        (lineNumberMode == "outside" && element.getAttribute("class") == "os-line-break" && element.parentNode.tagName == "INS") ||
+                                        (lineNumberMode == "outside" && element.getAttribute("class") == "os-line-break" && element.parentNode.getAttribute("class") == "merge-before")) {
+                                        break;
+                                    } else {
                                         currentParagraph = create("text");
                                         currentParagraph.lineHeight = 1.25;
                                         alreadyConverted.push(currentParagraph);