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:
committed by
GitHub
parent
c6973043e6
commit
bb1a778277
@@ -1,5 +1,5 @@
|
||||
%%~name: New Scene
|
||||
%%~path: a6d311a93600a/8c659a11cd429
|
||||
%%~kind: NOVEL/SCENE
|
||||
%%~kind: NOVEL/DOCUMENT
|
||||
### New Scene
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
%%~name: Title Page
|
||||
%%~path: a508bb932959c/a35baf2e93843
|
||||
%%~kind: NOVEL/TITLE
|
||||
# Minimal
|
||||
%%~kind: NOVEL/DOCUMENT
|
||||
#! Minimal
|
||||
|
||||
By Jane Doe, John Doh
|
||||
>> By Jane Doe, John Doh <<
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
%%~name: New Chapter
|
||||
%%~path: a6d311a93600a/f5ab3e30151e1
|
||||
%%~kind: NOVEL/CHAPTER
|
||||
%%~kind: NOVEL/DOCUMENT
|
||||
## New Chapter
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<novelWriterXML appVersion="1.0b5" hexVersion="0x010000b5" fileVersion="1.2" timeStamp="2020-10-24 18:55:14">
|
||||
<novelWriterXML appVersion="1.5-alpha0" hexVersion="0x010500a0" fileVersion="1.3" timeStamp="2021-08-02 17:47:26">
|
||||
<project>
|
||||
<name>Test Minimal</name>
|
||||
<title>Minimal</title>
|
||||
<author>Jane Doe</author>
|
||||
<author>John Doh</author>
|
||||
<saveCount>3</saveCount>
|
||||
<autoCount>1</autoCount>
|
||||
<editTime>33</editTime>
|
||||
<saveCount>9</saveCount>
|
||||
<autoCount>2</autoCount>
|
||||
<editTime>113</editTime>
|
||||
</project>
|
||||
<settings>
|
||||
<doBackup>True</doBackup>
|
||||
@@ -47,7 +47,7 @@
|
||||
<type>ROOT</type>
|
||||
<class>NOVEL</class>
|
||||
<status>New</status>
|
||||
<expanded>False</expanded>
|
||||
<expanded>True</expanded>
|
||||
</item>
|
||||
<item handle="a35baf2e93843" order="0" parent="a508bb932959c">
|
||||
<name>Title Page</name>
|
||||
@@ -55,7 +55,7 @@
|
||||
<class>NOVEL</class>
|
||||
<status>New</status>
|
||||
<exported>True</exported>
|
||||
<layout>TITLE</layout>
|
||||
<layout>DOCUMENT</layout>
|
||||
<charCount>28</charCount>
|
||||
<wordCount>6</wordCount>
|
||||
<paraCount>1</paraCount>
|
||||
@@ -66,7 +66,7 @@
|
||||
<type>FOLDER</type>
|
||||
<class>NOVEL</class>
|
||||
<status>New</status>
|
||||
<expanded>False</expanded>
|
||||
<expanded>True</expanded>
|
||||
</item>
|
||||
<item handle="f5ab3e30151e1" order="0" parent="a6d311a93600a">
|
||||
<name>New Chapter</name>
|
||||
@@ -74,7 +74,7 @@
|
||||
<class>NOVEL</class>
|
||||
<status>New</status>
|
||||
<exported>True</exported>
|
||||
<layout>CHAPTER</layout>
|
||||
<layout>DOCUMENT</layout>
|
||||
<charCount>11</charCount>
|
||||
<wordCount>2</wordCount>
|
||||
<paraCount>0</paraCount>
|
||||
@@ -86,7 +86,7 @@
|
||||
<class>NOVEL</class>
|
||||
<status>New</status>
|
||||
<exported>True</exported>
|
||||
<layout>SCENE</layout>
|
||||
<layout>DOCUMENT</layout>
|
||||
<charCount>9</charCount>
|
||||
<wordCount>2</wordCount>
|
||||
<paraCount>0</paraCount>
|
||||
|
||||
Reference in New Issue
Block a user