From ebc3b1f74538e0d887c4785272148eaa39d4b0c8 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Mon, 29 May 2023 22:12:55 +0200
Subject: [PATCH] Fix redundant line wrapping in ODT header style

---
 novelwriter/core/toodt.py                            | 1 +
 tests/reference/coreToOdt_SaveFlat_document.fodt     | 7 +++----
 tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.fodt | 7 +++----
 tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt | 7 +++----
 tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt | 7 +++----
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/novelwriter/core/toodt.py b/novelwriter/core/toodt.py
index 8a351a6a..b707f46c 100644
--- a/novelwriter/core/toodt.py
+++ b/novelwriter/core/toodt.py
@@ -992,6 +992,7 @@ class ToOdt(Tokenizer):
             _mkTag("text", "select-page"): "current"
         })
         xTail.text = "2"
+        xTail.tail = ""  # Prevent line break in indented XML
 
         # First Page Header
         xHead = ET.SubElement(xPage, _mkTag("style", "header-first"))
diff --git a/tests/reference/coreToOdt_SaveFlat_document.fodt b/tests/reference/coreToOdt_SaveFlat_document.fodt
index dd64cb33..0c2b658e 100644
--- a/tests/reference/coreToOdt_SaveFlat_document.fodt
+++ b/tests/reference/coreToOdt_SaveFlat_document.fodt
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2023-05-29T19:49:56</meta:creation-date>
+    <meta:creation-date>2023-05-29T22:10:15</meta:creation-date>
     <meta:generator>novelWriter/2.0.7</meta:generator>
     <meta:initial-creator>Jane Smith</meta:initial-creator>
     <meta:editing-cycles>1234</meta:editing-cycles>
     <meta:editing-duration>P42DT12H34M56S</meta:editing-duration>
     <dc:title>Test Project</dc:title>
-    <dc:date>2023-05-29T19:49:56</dc:date>
+    <dc:date>2023-05-29T22:10:15</dc:date>
     <dc:creator>Jane Smith</dc:creator>
   </office:meta>
   <office:font-face-decls>
@@ -72,8 +72,7 @@
   <office:master-styles>
     <style:master-page style:name="Standard" style:page-layout-name="PM1">
       <style:header>
-        <text:p text:style-name="Header">Test Project / Jane Smith / <text:page-number text:select-page="current">2</text:page-number>
-        </text:p>
+        <text:p text:style-name="Header">Test Project / Jane Smith / <text:page-number text:select-page="current">2</text:page-number></text:p>
       </style:header>
       <style:header-first>
         <text:p text:style-name="Header" />
diff --git a/tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.fodt b/tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.fodt
index de682d59..4bd71182 100644
--- a/tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.fodt
+++ b/tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.fodt
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2023-05-29T20:51:32</meta:creation-date>
+    <meta:creation-date>2023-05-29T22:10:29</meta:creation-date>
     <meta:generator>novelWriter/2.0.7</meta:generator>
     <meta:initial-creator>lipsum.com</meta:initial-creator>
     <meta:editing-cycles>40</meta:editing-cycles>
     <meta:editing-duration>P0DT0H31M45S</meta:editing-duration>
     <dc:title>Lorem Ipsum</dc:title>
-    <dc:date>2023-05-29T20:51:32</dc:date>
+    <dc:date>2023-05-29T22:10:29</dc:date>
     <dc:creator>lipsum.com</dc:creator>
   </office:meta>
   <office:font-face-decls>
@@ -84,8 +84,7 @@
   <office:master-styles>
     <style:master-page style:name="Standard" style:page-layout-name="PM1">
       <style:header>
-        <text:p text:style-name="Header">Lorem Ipsum / lipsum.com / <text:page-number text:select-page="current">2</text:page-number>
-        </text:p>
+        <text:p text:style-name="Header">Lorem Ipsum / lipsum.com / <text:page-number text:select-page="current">2</text:page-number></text:p>
       </style:header>
       <style:header-first>
         <text:p text:style-name="Header" />
diff --git a/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt b/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt
index ff23fc4a..cf329eb6 100644
--- a/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt
+++ b/tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2023-05-29T20:57:00</meta:creation-date>
+    <meta:creation-date>2023-05-29T22:11:22</meta:creation-date>
     <meta:generator>novelWriter/2.0.7</meta:generator>
     <meta:initial-creator>lipsum.com</meta:initial-creator>
     <meta:editing-cycles>40</meta:editing-cycles>
     <meta:editing-duration>P0DT0H31M45S</meta:editing-duration>
     <dc:title>Lorem Ipsum</dc:title>
-    <dc:date>2023-05-29T20:57:00</dc:date>
+    <dc:date>2023-05-29T22:11:22</dc:date>
     <dc:creator>lipsum.com</dc:creator>
   </office:meta>
   <office:font-face-decls>
@@ -96,8 +96,7 @@
   <office:master-styles>
     <style:master-page style:name="Standard" style:page-layout-name="PM1">
       <style:header>
-        <text:p text:style-name="Header">Lorem Ipsum / lipsum.com / <text:page-number text:select-page="current">2</text:page-number>
-        </text:p>
+        <text:p text:style-name="Header">Lorem Ipsum / lipsum.com / <text:page-number text:select-page="current">2</text:page-number></text:p>
       </style:header>
       <style:header-first>
         <text:p text:style-name="Header" />
diff --git a/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt b/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt
index dfa9262c..d5891721 100644
--- a/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt
+++ b/tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2023-05-29T21:06:32</meta:creation-date>
+    <meta:creation-date>2023-05-29T22:11:58</meta:creation-date>
     <meta:generator>novelWriter/2.0.7</meta:generator>
     <meta:initial-creator>lipsum.com</meta:initial-creator>
     <meta:editing-cycles>40</meta:editing-cycles>
     <meta:editing-duration>P0DT0H31M45S</meta:editing-duration>
     <dc:title>Lorem Ipsum</dc:title>
-    <dc:date>2023-05-29T21:06:32</dc:date>
+    <dc:date>2023-05-29T22:11:58</dc:date>
     <dc:creator>lipsum.com</dc:creator>
   </office:meta>
   <office:font-face-decls>
@@ -96,8 +96,7 @@
   <office:master-styles>
     <style:master-page style:name="Standard" style:page-layout-name="PM1">
       <style:header>
-        <text:p text:style-name="Header">Lorem Ipsum / lipsum.com / <text:page-number text:select-page="current">2</text:page-number>
-        </text:p>
+        <text:p text:style-name="Header">Lorem Ipsum / lipsum.com / <text:page-number text:select-page="current">2</text:page-number></text:p>
       </style:header>
       <style:header-first>
         <text:p text:style-name="Header" />