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/item.py

@@ -29,6 +29,7 @@ from lxml import etree
 
 from nw.enum import nwItemType, nwItemClass, nwItemLayout
 from nw.common import checkInt, isHandle, isItemClass, isItemLayout, isItemType
+from nw.constants import nwLists
 
 logger = logging.getLogger(__name__)
 
@@ -230,6 +231,8 @@ class NWItem():
             self.itemLayout = theLayout
         elif isItemLayout(theLayout):
             self.itemLayout = nwItemLayout[theLayout]
+        elif theLayout in nwLists.DEP_LAYOUT:
+            self.itemLayout = nwItemLayout.DOCUMENT
         else:
             logger.error("Unrecognised item layout '%s'", theLayout)
             self.itemLayout = nwItemLayout.NO_LAYOUT
@@ -239,7 +242,7 @@ class NWItem():
         """Set the item status by looking it up in the valid status
         items of the current project.
         """
-        if self.itemClass == nwItemClass.NOVEL:
+        if self.itemClass in nwLists.CLS_NOVEL:
             self.itemStatus = self.theProject.statusItems.checkEntry(theStatus)
         else:
             self.itemStatus = self.theProject.importItems.checkEntry(theStatus)