Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Novel Layouts (#837)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
sample/nwProject.nwx
+31 -31
View File
@@ -1,13 +1,13 @@
<?xml version='1.0' encoding='utf-8'?>
<novelWriterXML appVersion="1.4.1" hexVersion="0x010401f0" fileVersion="1.2" timeStamp="2021-07-27 23:46:07">
<novelWriterXML appVersion="1.5-alpha0" hexVersion="0x010500a0" fileVersion="1.3" timeStamp="2021-08-02 17:47:45">
<project>
<name>Sample Project</name>
<title>Sample Project</title>
<author>Jane Smith</author>
<author>Jay Doh</author>
<saveCount>1110</saveCount>
<autoCount>189</autoCount>
<editTime>53279</editTime>
<saveCount>1136</saveCount>
<autoCount>194</autoCount>
<editTime>54509</editTime>
</project>
<settings>
<doBackup>False</doBackup>
@@ -17,8 +17,8 @@
<autoOutline>True</autoOutline>
<lastEdited>636b6aa9b697b</lastEdited>
<lastViewed>636b6aa9b697b</lastViewed>
<lastWordCount>1216</lastWordCount>
<novelWordCount>840</novelWordCount>
<lastWordCount>1209</lastWordCount>
<novelWordCount>833</novelWordCount>
<notesWordCount>376</notesWordCount>
<autoReplace>
<entry key="A">B</entry>
@@ -62,11 +62,11 @@
<class>NOVEL</class>
<status>Started</status>
<exported>True</exported>
<layout>TITLE</layout>
<charCount>241</charCount>
<wordCount>42</wordCount>
<paraCount>3</paraCount>
<cursorPos>252</cursorPos>
<layout>DOCUMENT</layout>
<charCount>93</charCount>
<wordCount>19</wordCount>
<paraCount>2</paraCount>
<cursorPos>2</cursorPos>
</item>
<item handle="974e400180a99" order="1" parent="7031beac91f75">
<name>Page</name>
@@ -74,11 +74,11 @@
<class>NOVEL</class>
<status>New</status>
<exported>True</exported>
<layout>PAGE</layout>
<charCount>125</charCount>
<wordCount>26</wordCount>
<paraCount>2</paraCount>
<cursorPos>127</cursorPos>
<layout>DOCUMENT</layout>
<charCount>206</charCount>
<wordCount>42</wordCount>
<paraCount>3</paraCount>
<cursorPos>21</cursorPos>
</item>
<item handle="edca4be2fcaf8" order="2" parent="7031beac91f75">
<name>Part One</name>
@@ -86,11 +86,11 @@
<class>NOVEL</class>
<status>New</status>
<exported>True</exported>
<layout>PARTITION</layout>
<layout>DOCUMENT</layout>
<charCount>26</charCount>
<wordCount>6</wordCount>
<paraCount>1</paraCount>
<cursorPos>30</cursorPos>
<cursorPos>33</cursorPos>
</item>
<item handle="e7ded148d6e4a" order="3" parent="7031beac91f75">
<name>A Folder</name>
@@ -105,7 +105,7 @@
<class>NOVEL</class>
<status>Notes</status>
<exported>True</exported>
<layout>CHAPTER</layout>
<layout>DOCUMENT</layout>
<charCount>75</charCount>
<wordCount>14</wordCount>
<paraCount>1</paraCount>
@@ -117,11 +117,11 @@
<class>NOVEL</class>
<status>1st Draft</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>2429</charCount>
<wordCount>432</wordCount>
<paraCount>14</paraCount>
<cursorPos>1329</cursorPos>
<cursorPos>813</cursorPos>
</item>
<item handle="bc0cbd2a407f3" order="2" parent="e7ded148d6e4a">
<name>Another Scene</name>
@@ -129,7 +129,7 @@
<class>NOVEL</class>
<status>1st Draft</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>476</charCount>
<wordCount>93</wordCount>
<paraCount>3</paraCount>
@@ -141,11 +141,11 @@
<class>NOVEL</class>
<status>New</status>
<exported>True</exported>
<layout>UNNUMBERED</layout>
<charCount>617</charCount>
<layout>DOCUMENT</layout>
<charCount>618</charCount>
<wordCount>101</wordCount>
<paraCount>3</paraCount>
<cursorPos>1137</cursorPos>
<cursorPos>4</cursorPos>
</item>
<item handle="96b68994dfa3d" order="4" parent="e7ded148d6e4a">
<name>A Note on Structure</name>
@@ -165,7 +165,7 @@
<class>NOVEL</class>
<status>1st Draft</status>
<exported>True</exported>
<layout>CHAPTER</layout>
<layout>DOCUMENT</layout>
<charCount>139</charCount>
<wordCount>28</wordCount>
<paraCount>1</paraCount>
@@ -177,7 +177,7 @@
<class>NOVEL</class>
<status>1st Draft</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>189</charCount>
<wordCount>37</wordCount>
<paraCount>1</paraCount>
@@ -268,14 +268,14 @@
<name>Outtakes</name>
<type>ROOT</type>
<class>ARCHIVE</class>
<status>None</status>
<status>New</status>
<expanded>True</expanded>
</item>
<item handle="ae9bf3c3ea159" order="0" parent="6827118336ac1">
<name>Scenes</name>
<type>FOLDER</type>
<class>ARCHIVE</class>
<status>None</status>
<status>New</status>
<expanded>True</expanded>
</item>
<item handle="8a5deb88c0e97" order="0" parent="ae9bf3c3ea159">
@@ -284,7 +284,7 @@
<class>NOVEL</class>
<status>1st Draft</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>315</charCount>
<wordCount>55</wordCount>
<paraCount>1</paraCount>
@@ -303,7 +303,7 @@
<class>NOVEL</class>
<status>New</status>
<exported>True</exported>
<layout>SCENE</layout>
<layout>DOCUMENT</layout>
<charCount>30</charCount>
<wordCount>6</wordCount>
<paraCount>1</paraCount>