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

nw/core/index.py

@@ -354,6 +354,12 @@ class NWIndex():
         elif aLine.startswith("#### "):
             hDepth = "H4"
             hText = aLine[5:].strip()
+        elif aLine.startswith("#! "):
+            hDepth = "H1"
+            hText = aLine[2:].strip()
+        elif aLine.startswith("##! "):
+            hDepth = "H2"
+            hText = aLine[4:].strip()
         else:
             return False
 
@@ -861,7 +867,13 @@ def countWords(theText):
         if aLine[0] == "@" or aLine[0] == "%":
             continue
 
-        if aLine[0] == "#":
+        if aLine[0] == "[":
+            if aLine.startswith(("[NEWPAGE]", "[NEW PAGE]", "[VSPACE]")):
+                continue
+            elif aLine.startswith("[VSPACE:") and aLine.endswith("]"):
+                continue
+
+        elif aLine[0] == "#":
             if aLine[:5] == "#### ":
                 aLine = aLine[5:]
                 countPara = False
@@ -874,6 +886,13 @@ def countWords(theText):
             elif aLine[:2] == "# ":
                 aLine = aLine[2:]
                 countPara = False
+            elif aLine[:3] == "#! ":
+                aLine = aLine[3:]
+                countPara = False
+            elif aLine[:4] == "##! ":
+                aLine = aLine[4:]
+                countPara = False
+
         elif aLine[0] == ">" or aLine[-1] == "<":
             if aLine[:2] == ">>":
                 aLine = aLine[2:].lstrip(" ")