ODT Export Fixes (#843)

* Fix issue with additional line breaks in ODT export
* Improve format handling in ToOdt, and remove some unused code
* Add test for tab in format
* Add class to write text formats to XML
* Simplify the XMLParagraph class a bit
* Correct a breach of ODT standard and add error checking
* Make some final corrections

tests/reference/coreToOdt_SaveFlat_document.fodt

@@ -0,0 +1,81 @@
+<?xml version='1.0' encoding='utf-8'?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
+  <office:meta>
+    <meta:creation-date>2021-08-13T18:57:51</meta:creation-date>
+    <meta:generator>novelWriter/1.5-alpha0</meta:generator>
+  </office:meta>
+  <office:font-face-decls>
+    <style:font-face style:name="Liberation Serif" style:font-pitch="variable"/>
+  </office:font-face-decls>
+  <office:styles>
+    <style:default-style style:family="paragraph">
+      <style:paragraph-properties style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="12pt" fo:language="nb" fo:country="NO"/>
+    </style:default-style>
+    <style:style style:name="Standard" style:family="paragraph" style:class="text">
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="12pt"/>
+    </style:style>
+    <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_Body" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.247cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="14pt"/>
+    </style:style>
+    <style:style style:name="Header_and_Footer" style:display-name="Header and Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"/>
+    <style:style style:name="Text_Body" style:family="paragraph" style:display-name="Text Body" style:parent-style-name="Standard" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.000cm" fo:margin-bottom="0.247cm" fo:line-height="115%" fo:text-align="left"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="12pt"/>
+    </style:style>
+    <style:style style:name="Text_Meta" style:family="paragraph" style:display-name="Text Meta" style:parent-style-name="Standard" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.000cm" fo:margin-bottom="0.247cm" fo:line-height="115%"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="12pt" fo:color="#813709" loext:opacity="100%"/>
+    </style:style>
+    <style:style style:name="Title" style:family="paragraph" style:display-name="Title" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:class="chapter">
+      <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" fo:text-align="center"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="30pt" fo:font-weight="bold"/>
+    </style:style>
+    <style:style style:name="Heading_1" style:family="paragraph" style:display-name="Heading 1" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:default-outline-level="1" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="24pt" fo:font-weight="bold" fo:color="#2a6099" loext:opacity="100%"/>
+    </style:style>
+    <style:style style:name="Heading_2" style:family="paragraph" style:display-name="Heading 2" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:default-outline-level="2" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.353cm" fo:margin-bottom="0.212cm"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="19pt" fo:font-weight="bold" fo:color="#2a6099" loext:opacity="100%"/>
+    </style:style>
+    <style:style style:name="Heading_3" style:family="paragraph" style:display-name="Heading 3" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:default-outline-level="3" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.247cm" fo:margin-bottom="0.212cm"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="16pt" fo:font-weight="bold" fo:color="#444444" loext:opacity="100%"/>
+    </style:style>
+    <style:style style:name="Heading_4" style:family="paragraph" style:display-name="Heading 4" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:default-outline-level="4" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.247cm" fo:margin-bottom="0.212cm"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="14pt" fo:font-weight="bold" fo:color="#444444" loext:opacity="100%"/>
+    </style:style>
+    <style:style style:name="Header" style:family="paragraph" style:display-name="Header" style:parent-style-name="Header_and_Footer">
+      <style:paragraph-properties fo:text-align="right"/>
+    </style:style>
+  </office:styles>
+  <office:automatic-styles>
+    <style:page-layout style:name="PM1">
+      <style:page-layout-properties fo:margin-top="2.000cm" fo:margin-bottom="2.000cm" fo:margin-left="2.000cm" fo:margin-right="2.000cm"/>
+      <style:header-style>
+        <style:header-footer-properties fo:min-height="0.600cm" fo:margin-left="0.000cm" fo:margin-right="0.000cm" fo:margin-bottom="0.500cm"/>
+      </style:header-style>
+    </style:page-layout>
+  </office:automatic-styles>
+  <office:master-styles>
+    <style:master-page style:name="Standard" style:page-layout-name="PM1">
+      <style:header>
+        <text:p text:style-name="Header">/  / <text:page-number text:select-page="current">2</text:page-number></text:p>
+      </style:header>
+      <style:header-first>
+        <text:p text:style-name="Header"/>
+      </style:header-first>
+    </style:master-page>
+  </office:master-styles>
+  <office:body>
+    <office:text>
+      <text:h text:style-name="Heading_2" text:outline-level="2">Chapter One</text:h>
+      <text:p text:style-name="Text_Body">Text</text:p>
+      <text:h text:style-name="Heading_2" text:outline-level="2">Chapter Two</text:h>
+      <text:p text:style-name="Text_Body">Text</text:p>
+    </office:text>
+  </office:body>
+</office:document>

tests/reference/coreToOdt_SaveFull_content.xml

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8'?>
+<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" office:version="1.2">
+  <office:font-face-decls>
+    <style:font-face style:name="Liberation Serif" style:font-pitch="variable"/>
+  </office:font-face-decls>
+  <office:automatic-styles/>
+  <office:body>
+    <office:text>
+      <text:h text:style-name="Heading_2" text:outline-level="2">Chapter One</text:h>
+      <text:p text:style-name="Text_Body">Text</text:p>
+      <text:h text:style-name="Heading_2" text:outline-level="2">Chapter Two</text:h>
+      <text:p text:style-name="Text_Body">Text</text:p>
+    </office:text>
+  </office:body>
+</office:document-content>

tests/reference/coreToOdt_SaveFull_manifest.xml

@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2">
+  <manifest:file-entry manifest:full-path="/" manifest:version="1.2" manifest:media-type="application/vnd.oasis.opendocument.text"/>
+  <manifest:file-entry manifest:full-path="settings.xml" manifest:media-type="text/xml"/>
+  <manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/>
+  <manifest:file-entry manifest:full-path="meta.xml" manifest:media-type="text/xml"/>
+  <manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/>
+</manifest:manifest>

tests/reference/coreToOdt_SaveFull_meta.xml

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" office:version="1.2">
+  <office:meta>
+    <meta:creation-date>2021-08-13T18:54:46</meta:creation-date>
+    <meta:generator>novelWriter/1.5-alpha0</meta:generator>
+  </office:meta>
+</office:document-meta>

tests/reference/coreToOdt_SaveFull_settings.xml

@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='utf-8'?>
+<office:document-settings xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
+  <office:settings/>
+</office:document-settings>

tests/reference/coreToOdt_SaveFull_styles.xml

@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='utf-8'?>
+<office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" office:version="1.2">
+  <office:font-face-decls>
+    <style:font-face style:name="Liberation Serif" style:font-pitch="variable"/>
+  </office:font-face-decls>
+  <office:styles>
+    <style:default-style style:family="paragraph">
+      <style:paragraph-properties style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="12pt" fo:language="en" fo:country="GB"/>
+    </style:default-style>
+    <style:style style:name="Standard" style:family="paragraph" style:class="text">
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="12pt"/>
+    </style:style>
+    <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_Body" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.247cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="14pt"/>
+    </style:style>
+    <style:style style:name="Header_and_Footer" style:display-name="Header and Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"/>
+    <style:style style:name="Text_Body" style:family="paragraph" style:display-name="Text Body" style:parent-style-name="Standard" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.000cm" fo:margin-bottom="0.247cm" fo:line-height="115%" fo:text-align="left"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="12pt"/>
+    </style:style>
+    <style:style style:name="Text_Meta" style:family="paragraph" style:display-name="Text Meta" style:parent-style-name="Standard" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.000cm" fo:margin-bottom="0.247cm" fo:line-height="115%"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="12pt" fo:color="None" loext:opacity="None"/>
+    </style:style>
+    <style:style style:name="Title" style:family="paragraph" style:display-name="Title" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:class="chapter">
+      <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" fo:text-align="center"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="30pt" fo:font-weight="bold"/>
+    </style:style>
+    <style:style style:name="Heading_1" style:family="paragraph" style:display-name="Heading 1" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:default-outline-level="1" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="24pt" fo:font-weight="bold" fo:color="None" loext:opacity="None"/>
+    </style:style>
+    <style:style style:name="Heading_2" style:family="paragraph" style:display-name="Heading 2" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:default-outline-level="2" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.353cm" fo:margin-bottom="0.212cm"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="19pt" fo:font-weight="bold" fo:color="None" loext:opacity="None"/>
+    </style:style>
+    <style:style style:name="Heading_3" style:family="paragraph" style:display-name="Heading 3" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:default-outline-level="3" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.247cm" fo:margin-bottom="0.212cm"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="16pt" fo:font-weight="bold" fo:color="None" loext:opacity="None"/>
+    </style:style>
+    <style:style style:name="Heading_4" style:family="paragraph" style:display-name="Heading 4" style:parent-style-name="Heading" style:next-style-name="Text_Body" style:default-outline-level="4" style:class="text">
+      <style:paragraph-properties fo:margin-top="0.247cm" fo:margin-bottom="0.212cm"/>
+      <style:text-properties style:font-name="Liberation Serif" fo:font-family="'Liberation Serif'" fo:font-size="14pt" fo:font-weight="bold" fo:color="None" loext:opacity="None"/>
+    </style:style>
+    <style:style style:name="Header" style:family="paragraph" style:display-name="Header" style:parent-style-name="Header_and_Footer">
+      <style:paragraph-properties fo:text-align="right"/>
+    </style:style>
+  </office:styles>
+  <office:automatic-styles>
+    <style:page-layout style:name="PM1">
+      <style:page-layout-properties fo:margin-top="2.000cm" fo:margin-bottom="2.000cm" fo:margin-left="2.000cm" fo:margin-right="2.000cm"/>
+      <style:header-style>
+        <style:header-footer-properties fo:min-height="0.600cm" fo:margin-left="0.000cm" fo:margin-right="0.000cm" fo:margin-bottom="0.500cm"/>
+      </style:header-style>
+    </style:page-layout>
+  </office:automatic-styles>
+  <office:master-styles>
+    <style:master-page style:name="Standard" style:page-layout-name="PM1">
+      <style:header>
+        <text:p text:style-name="Header">/  / <text:page-number text:select-page="current">2</text:page-number></text:p>
+      </style:header>
+      <style:header-first>
+        <text:p text:style-name="Header"/>
+      </style:header-first>
+    </style:master-page>
+  </office:master-styles>
+</office:document-styles>

tests/reference/guiBuild_Tool_Step1_Lorem_Ipsum.fodt

@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2021-07-26T23:47:22</meta:creation-date>
-    <meta:generator>novelWriter/1.4rc1</meta:generator>
+    <meta:creation-date>2021-08-02T23:47:45</meta:creation-date>
+    <meta:generator>novelWriter/1.5-alpha0</meta:generator>
   </office:meta>
   <office:font-face-decls>
     <style:font-face style:name="DejaVu Sans" style:font-pitch="variable"/>
@@ -88,9 +88,7 @@
   <office:body>
     <office:text>
       <text:h text:style-name="Title">Lorem Ipsum</text:h>
-      <text:p text:style-name="P1">
-        <text:span text:style-name="T1">By lipsum.com</text:span>
-      </text:p>
+      <text:p text:style-name="P1"><text:span text:style-name="T1">By lipsum.com</text:span></text:p>
       <text:p text:style-name="P1">“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”</text:p>
       <text:p text:style-name="P1">“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…”</text:p>
       <text:p text:style-name="Text_Body">Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of “de Finibus Bonorum et Malorum” (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, “Lorem ipsum dolor sit amet..”, comes from a line in section 1.10.32.</text:p>

tests/reference/guiBuild_Tool_Step2_Lorem_Ipsum.fodt

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2021-08-02T03:24:17</meta:creation-date>
+    <meta:creation-date>2021-08-02T23:48:04</meta:creation-date>
     <meta:generator>novelWriter/1.5-alpha0</meta:generator>
   </office:meta>
   <office:font-face-decls>
@@ -100,9 +100,7 @@
   <office:body>
     <office:text>
       <text:h text:style-name="Title">Lorem Ipsum</text:h>
-      <text:p text:style-name="P1">
-        <text:span text:style-name="T1">By lipsum.com</text:span>
-      </text:p>
+      <text:p text:style-name="P1"><text:span text:style-name="T1">By lipsum.com</text:span></text:p>
       <text:p text:style-name="P1">“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”</text:p>
       <text:p text:style-name="P1">“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…”</text:p>
       <text:p text:style-name="P2"><text:span text:style-name="T1">Comment:</text:span> Exctracted from the lipsum.com website.</text:p>

tests/reference/guiBuild_Tool_Step3_Lorem_Ipsum.fodt

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2021-08-02T03:25:21</meta:creation-date>
+    <meta:creation-date>2021-08-02T23:48:26</meta:creation-date>
     <meta:generator>novelWriter/1.5-alpha0</meta:generator>
   </office:meta>
   <office:font-face-decls>
@@ -100,9 +100,7 @@
   <office:body>
     <office:text>
       <text:h text:style-name="Title">Lorem Ipsum</text:h>
-      <text:p text:style-name="P1">
-        <text:span text:style-name="T1">By lipsum.com</text:span>
-      </text:p>
+      <text:p text:style-name="P1"><text:span text:style-name="T1">By lipsum.com</text:span></text:p>
       <text:p text:style-name="P1">“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”</text:p>
       <text:p text:style-name="P1">“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…”</text:p>
       <text:p text:style-name="P2"><text:span text:style-name="T1">Comment:</text:span> Exctracted from the lipsum.com website.</text:p>