From 39fb9702333606bc43cb831121b688077831832b Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sun, 21 Apr 2019 17:30:39 +0200
Subject: Add second Tav fix

---
 src/file-update.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/file-update.cpp')

diff --git a/src/file-update.cpp b/src/file-update.cpp
index 84a598f8e..ff72f9b0e 100644
--- a/src/file-update.cpp
+++ b/src/file-update.cpp
@@ -208,11 +208,26 @@ void sp_file_convert_text_baseline_spacing(SPDocument *doc)
 void _remove_style_on_empty_lines(SPObject *o)
 {
     std::vector<SPObject *> cl = o->childList(false);
+    bool begin = true;
+    std::string cur_y = "";
     for (std::vector<SPObject *>::const_iterator ci = cl.begin(); ci != cl.end(); ++ci) {
-        if (SP_IS_TSPAN(*ci) and (*ci)->childList(false).empty() and is_line(*ci)) {
+        if (!SP_IS_TSPAN(*ci))
+            continue;
+        if (!is_line(*ci))
+            continue;
+        if (!(*ci)->childList(false).empty()) {
+            if (begin)
+                cur_y = (*ci)->getAttribute("y") ? (*ci)->getAttribute("y") : cur_y;
+            begin = false;
+        } else {
             (*ci)->removeAttribute("style");
             (*ci)->updateRepr();
+            if (begin) {
+                (*ci)->deleteObject();
+            }
         }
+        if (cur_y != "")
+            o->setAttribute("y", cur_y);
     }
 }
 
-- 
cgit v1.2.3