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

tests/test_dialogs/test_dlg_itemeditor.py

@@ -64,14 +64,14 @@ def testDlgItemEditor_Dialog(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir)
 
     qtbot.addWidget(itemEdit)
 
-    assert itemEdit.editName.text()          == "New Scene"
+    assert itemEdit.editName.text() == "New Scene"
     assert itemEdit.editStatus.currentData() == "New"
-    assert itemEdit.editLayout.currentData() == nwItemLayout.SCENE
+    assert itemEdit.editLayout.currentData() == nwItemLayout.DOCUMENT
 
     for c in "Just a Page":
         qtbot.keyClick(itemEdit.editName, c, delay=typeDelay)
     itemEdit.editStatus.setCurrentIndex(1)
-    layoutIdx = itemEdit.editLayout.findData(nwItemLayout.PAGE)
+    layoutIdx = itemEdit.editLayout.findData(nwItemLayout.DOCUMENT)
     itemEdit.editLayout.setCurrentIndex(layoutIdx)
 
     itemEdit.editExport.setChecked(False)
@@ -86,9 +86,9 @@ def testDlgItemEditor_Dialog(qtbot, monkeypatch, nwGUI, fncProj, refDir, outDir)
     itemEdit.show()
 
     qtbot.addWidget(itemEdit)
-    assert itemEdit.editName.text()          == "Just a Page"
+    assert itemEdit.editName.text() == "Just a Page"
     assert itemEdit.editStatus.currentData() == "Note"
-    assert itemEdit.editLayout.currentData() == nwItemLayout.PAGE
+    assert itemEdit.editLayout.currentData() == nwItemLayout.DOCUMENT
     itemEdit._doClose()
 
     # Check that the header is updated

tests/test_dialogs/test_dlg_merge.py

@@ -142,7 +142,7 @@ def testDlgMerge_Main(qtbot, monkeypatch, nwGUI, fncProj):
         assert readFile(mergedFile) == (
             "%%%%~name: New Chapter\n"
             "%%%%~path: 73475cb40a568/2858dcd1057d3\n"
-            "%%%%~kind: NOVEL/SCENE\n"
+            "%%%%~kind: NOVEL/DOCUMENT\n"
             "%s\n\n"
             "%s\n\n"
             "%s\n\n"

tests/test_dialogs/test_dlg_preferences.py

@@ -62,8 +62,7 @@ def testDlgPreferences_Main(qtbot, monkeypatch, fncDir, outDir, refDir):
     nwGUI = nw.main(["--testmode", "--config=%s" % fncDir, "--data=%s" % fncDir])
     qtbot.addWidget(nwGUI)
     nwGUI.show()
-    qtbot.waitForWindowShown(nwGUI)
-    qtbot.wait(20)
+    qtbot.wait(stepDelay)
 
     theConf = nwGUI.mainConf
     assert theConf.confPath == fncDir

tests/test_dialogs/test_dlg_split.py

@@ -178,49 +178,49 @@ def testDlgSplit_Main(qtbot, monkeypatch, nwGUI, fncProj):
         assert readFile(os.path.join(contentDir, hPartition+".nwd")) == (
             "%%%%~name: Nantucket\n"
             "%%%%~path: 031b4af5197ec/%s\n"
-            "%%%%~kind: NOVEL/PARTITION\n"
+            "%%%%~kind: NOVEL/DOCUMENT\n"
             "%s\n\n"
         ) % (hPartition, tPartition)
 
         assert readFile(os.path.join(contentDir, hChapterOne+".nwd")) == (
             "%%%%~name: Chapter One\n"
             "%%%%~path: 031b4af5197ec/%s\n"
-            "%%%%~kind: NOVEL/CHAPTER\n"
+            "%%%%~kind: NOVEL/DOCUMENT\n"
             "%s\n\n"
         ) % (hChapterOne, tChapterOne)
 
         assert readFile(os.path.join(contentDir, hSceneOne+".nwd")) == (
             "%%%%~name: Scene One\n"
             "%%%%~path: 031b4af5197ec/%s\n"
-            "%%%%~kind: NOVEL/SCENE\n"
+            "%%%%~kind: NOVEL/DOCUMENT\n"
             "%s\n\n"
         ) % (hSceneOne, tSceneOne)
 
         assert readFile(os.path.join(contentDir, hSceneTwo+".nwd")) == (
             "%%%%~name: Scene Two\n"
             "%%%%~path: 031b4af5197ec/%s\n"
-            "%%%%~kind: NOVEL/SCENE\n"
+            "%%%%~kind: NOVEL/DOCUMENT\n"
             "%s\n\n"
         ) % (hSceneTwo, tSceneTwo)
 
         assert readFile(os.path.join(contentDir, hSceneThree+".nwd")) == (
             "%%%%~name: Scene Three\n"
             "%%%%~path: 031b4af5197ec/%s\n"
-            "%%%%~kind: NOVEL/SCENE\n"
+            "%%%%~kind: NOVEL/DOCUMENT\n"
             "%s\n\n"
         ) % (hSceneThree, tSceneThree)
 
         assert readFile(os.path.join(contentDir, hSceneFour+".nwd")) == (
             "%%%%~name: Scene Four\n"
             "%%%%~path: 031b4af5197ec/%s\n"
-            "%%%%~kind: NOVEL/SCENE\n"
+            "%%%%~kind: NOVEL/DOCUMENT\n"
             "%s\n\n"
         ) % (hSceneFour, tSceneFour)
 
         assert readFile(os.path.join(contentDir, hSceneFive+".nwd")) == (
             "%%%%~name: The End\n"
             "%%%%~path: 031b4af5197ec/%s\n"
-            "%%%%~kind: NOVEL/SCENE\n"
+            "%%%%~kind: NOVEL/DOCUMENT\n"
             "%s\n\n"
         ) % (hSceneFive, tSceneFive)