Merge Novel Layouts (#837)

* Merge novel layouts and simplify the Tokenizer class
* Fix core tests
* Delete auto-layout code
* Remove no longer needed item layouts
* Remove references to deleted item layouts in test
* Make some minor changes to Tokenizer class and update tests
* Update test reference files
* Update sample project
* Fix a few issues with the Tokenizer
* Centre some text in the sample documents
* Make some minor changes to how new projects are generated
* Add support for New Page and VSpace commands to the Tokenizer
* Remove Title and Page layouts and add codes for page break and vertical space
* Add document layout and fix some issues in index class with new title formats
* Update tests and reference files
* Bump the project file version and fix a minor issue in items class
* Update tests and test coverage
* Clean up some warnings and issues in tests
This commit is contained in:
Veronica Berglyd Olsen
2021-08-02 23:44:35 +02:00
committed by GitHub
parent c6973043e6
commit bb1a778277
92 changed files with 1574 additions and 1121 deletions
+20 -20
View File
@@ -1,12 +1,12 @@
<?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="1.0b5" hexVersion="0x010000b5" fileVersion="1.2" timeStamp="2020-10-24 18:43:56">
<novelWriterXML appVersion="1.5-alpha0" hexVersion="0x010500a0" fileVersion="1.3" timeStamp="2021-08-02 17:47:39">
<project>
<name>Lorem Ipsum</name>
<title>Lorem Ipsum</title>
<author>lipsum.com</author>
<saveCount>10</saveCount>
<autoCount>22</autoCount>
<editTime>1571</editTime>
<saveCount>17</saveCount>
<autoCount>24</autoCount>
<editTime>1777</editTime>
</project>
<settings>
<doBackup>False</doBackup>
@@ -14,7 +14,7 @@
<spellCheck>False</spellCheck>
<spellLang>None</spellLang>
<autoOutline>True</autoOutline>
<lastEdited>04468803b92e1</lastEdited>
<lastEdited>7a992350f3eb6</lastEdited>
<lastViewed>None</lastViewed>
<lastWordCount>3847</lastWordCount>
<novelWordCount>3109</novelWordCount>
@@ -57,11 +57,11 @@
<class>NOVEL</class>
<status>Finished</status>
<exported>True</exported>
<layout>TITLE</layout>
<layout>DOCUMENT</layout>
<charCount>230</charCount>
<wordCount>40</wordCount>
<paraCount>3</paraCount>
<cursorPos>239</cursorPos>
<cursorPos>148</cursorPos>
</item>
<item handle="8c58a65414c23" order="1" parent="b3643d0f92e32">
<name>Front Matter</name>
@@ -69,7 +69,7 @@
<class>NOVEL</class>
<status>Finished</status>
<exported>True</exported>
<layout>PAGE</layout>
<layout>DOCUMENT</layout>
<charCount>1058</charCount>
<wordCount>176</wordCount>
<paraCount>2</paraCount>
@@ -81,11 +81,11 @@
<class>NOVEL</class>
<status>Draft</status>
<exported>True</exported>
<layout>UNNUMBERED</layout>
<layout>DOCUMENT</layout>
<charCount>584</charCount>
<wordCount>92</wordCount>
<paraCount>1</paraCount>
<cursorPos>79</cursorPos>
<cursorPos>4</cursorPos>
</item>
<item handle="db7e733775d4d" order="3" parent="b3643d0f92e32">
<name>Act One</name>
@@ -93,11 +93,11 @@
<class>NOVEL</class>
<status>New</status>
<exported>True</exported>
<layout>PARTITION</layout>
<layout>DOCUMENT</layout>
<charCount>35</charCount>
<wordCount>6</wordCount>
<paraCount>1</paraCount>
<cursorPos>39</cursorPos>
<cursorPos>42</cursorPos>
</item>
<item handle="45e6b01ca35c1" order="4" parent="b3643d0f92e32">
<name>Chapter One</name>
@@ -112,7 +112,7 @@
<class>NOVEL</class>
<status>Draft</status>
<exported>True</exported>
<layout>CHAPTER</layout>
<layout>DOCUMENT</layout>
<charCount>419</charCount>
<wordCount>67</wordCount>
<paraCount>1</paraCount>
@@ -124,7 +124,7 @@
<class>NOVEL</class>
<status>Finished</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>2758</charCount>
<wordCount>404</wordCount>
<paraCount>4</paraCount>
@@ -136,7 +136,7 @@
<class>NOVEL</class>
<status>Finished</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>4043</charCount>
<wordCount>600</wordCount>
<paraCount>6</paraCount>
@@ -148,7 +148,7 @@
<class>NOVEL</class>
<status>New</status>
<exported>False</exported>
<layout>BOOK</layout>
<layout>DOCUMENT</layout>
<charCount>631</charCount>
<wordCount>109</wordCount>
<paraCount>3</paraCount>
@@ -167,7 +167,7 @@
<class>NOVEL</class>
<status>Draft</status>
<exported>True</exported>
<layout>CHAPTER</layout>
<layout>DOCUMENT</layout>
<charCount>477</charCount>
<wordCount>70</wordCount>
<paraCount>1</paraCount>
@@ -179,7 +179,7 @@
<class>NOVEL</class>
<status>Finished</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>3006</charCount>
<wordCount>439</wordCount>
<paraCount>4</paraCount>
@@ -191,7 +191,7 @@
<class>NOVEL</class>
<status>Finished</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>3839</charCount>
<wordCount>563</wordCount>
<paraCount>6</paraCount>
@@ -203,7 +203,7 @@
<class>NOVEL</class>
<status>Finished</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>3644</charCount>
<wordCount>543</wordCount>
<paraCount>5</paraCount>