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
2021-08-02 23:44:35 +02:00
parent c6973043e6
commit bb1a778277
92 changed files with 1574 additions and 1121 deletions
@@ -1,10 +1,9 @@
 %%~name: Title Page
 %%~path: 7031beac91f75/53b69b83cdafc
-%%~kind: NOVEL/TITLE
-# My Novel
+%%~kind: NOVEL/DOCUMENT
+#! My Novel

-**By Jane Doh**
+>> **By Jane Doh** <<

-It’s also possible to add some text on this page. Everything on Title and Partition pages is by default centred, but this can be overridden on individual paragraphs.
-
-For instance, the text can be left-aligned like this. <<
+>> This is the title page. <<
+>> It should be the first document of the project. <<
@@ -1,6 +1,6 @@
 %%~name: Making a Scene
 %%~path: e7ded148d6e4a/636b6aa9b697b
-%%~kind: NOVEL/SCENE
+%%~kind: NOVEL/DOCUMENT
 ### Making a Scene

@pov: Jane
@@ -1,6 +1,6 @@
 %%~name: Chapter One
 %%~path: e7ded148d6e4a/6a2d6d5f4f401
-%%~kind: NOVEL/CHAPTER
+%%~kind: NOVEL/DOCUMENT
 ## So it Begins

@pov: Jane
@@ -1,6 +1,6 @@
 %%~name: Chapter Two
 %%~path: e7ded148d6e4a/88706ddc78b1b
-%%~kind: NOVEL/CHAPTER
+%%~kind: NOVEL/DOCUMENT
 ## Where has John Gone?

@pov: Jane
@@ -1,6 +1,6 @@
 %%~name: Old File
 %%~path: ae9bf3c3ea159/8a5deb88c0e97
-%%~kind: NOVEL/SCENE
+%%~kind: NOVEL/DOCUMENT
 ### Discarded Scene

 If you have files you no longer want in your main project, you can move them to the “Outtakes” folder. This is equivalent to turning off the “Include when building project” switch, just that you also put the file away, although the switch can be ignored when building the project, this folder cannot.
@@ -1,6 +1,9 @@
 %%~name: Page
 %%~path: 7031beac91f75/974e400180a99
-%%~kind: NOVEL/PAGE
+%%~kind: NOVEL/DOCUMENT
+[NEW PAGE]
+[VSPACE:2]
+
 This is a plain page with some text on it.

-Text on plain pages will always start on a fresh page when the project is exported.
+If you want the text to start on a fresh page, add the [NEW PAGE] code above the text. You can also add empty paragraphs with the ]VSPACE] code.
@@ -1,6 +1,6 @@
 %%~name: We Found John!
 %%~path: e7ded148d6e4a/ae7339df26ded
-%%~kind: NOVEL/SCENE
+%%~kind: NOVEL/DOCUMENT
 ### We Found John!

@pov: John
@@ -1,6 +1,6 @@
 %%~name: Delete Me!
 %%~path: 98acd8c76c93a/b8136a5a774a0
-%%~kind: NOVEL/SCENE
+%%~kind: NOVEL/DOCUMENT
 ### Delete Me!

 This scene is trash.
@@ -1,7 +1,7 @@
 %%~name: Interlude
 %%~path: e7ded148d6e4a/ba8a28a246524
-%%~kind: NOVEL/UNNUMBERED
-## Interlude
+%%~kind: NOVEL/DOCUMENT
+##! Interlude

 % Notice that this is a file with the flag ‘N.Un’. The ‘N’ means it’s a novel file, and the ‘Un’ means it’s an unnumbered chapter. Unnumbered chapters can be treated separately from numbered chapters during export. Perfect for when you want to add an interlude, or for a prologue or epilogue.

@@ -1,6 +1,6 @@
 %%~name: Another Scene
 %%~path: e7ded148d6e4a/bc0cbd2a407f3
-%%~kind: NOVEL/SCENE
+%%~kind: NOVEL/DOCUMENT
 ### Another Scene

@pov: John
@@ -1,6 +1,6 @@
 %%~name: Part One
 %%~path: 7031beac91f75/edca4be2fcaf8
-%%~kind: NOVEL/PARTITION
+%%~kind: NOVEL/DOCUMENT
 # Part One

-In the beginning …
+>> In the beginning … <<