Make page breaks visible in manuscript preview (#2086)

novelwriter/assets/i18n/project_en_GB.json

@@ -14,6 +14,7 @@
   "Objects": "Objects",
   "Entities": "Entities",
   "Custom": "Custom",
+  "New Page": "New Page",
   "0": "Zero",
   "1": "One",
   "2": "Two",

novelwriter/core/coretools.py

@@ -39,7 +39,7 @@
 
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import isHandle, minmax, simplified
-from novelwriter.constants import nwConst, nwFiles, nwItemClass
+from novelwriter.constants import nwConst, nwFiles, nwItemClass, nwStats
 from novelwriter.core.item import NWItem
 from novelwriter.core.project import NWProject
 from novelwriter.core.storage import NWStorageCreate
@@ -428,7 +428,6 @@ def _buildAndPopulate(self, path: Path, data: dict) -> bool:
 
         lblNewProject = self.tr("New Project")
         lblTitlePage  = self.tr("Title Page")
-        lblByAuthors  = self.tr("By")
 
         # Settings
         project.data.setUuid(None)
@@ -441,14 +440,29 @@ def _buildAndPopulate(self, path: Path, data: dict) -> bool:
         # Add Root Folders
         hNovelRoot = project.newRoot(nwItemClass.NOVEL)
         hTitlePage = project.newFile(lblTitlePage, hNovelRoot)
-        novelTitle = project.data.name
-
-        titlePage = f"#! {novelTitle}\n\n"
-        if project.data.author:
-            titlePage += f">> {lblByAuthors} {project.data.author} <<\n\n"
 
+        # Generate Title Page
         aDoc = project.storage.getDocument(hTitlePage)
-        aDoc.writeDocument(titlePage)
+        aDoc.writeDocument((
+            "{author}[br]\n"
+            "{address} 1[br]\n"
+            "{address} 2 <<\n"
+            "\n"
+            "[vspace:5]\n"
+            "\n"
+            "#! {title}\n"
+            "\n"
+            ">> **{by} {author}** <<\n"
+            "\n"
+            ">> {count}: [field:{field}] <<\n"
+        ).format(
+            author=project.data.author or "None",
+            address=self.tr("Address"),
+            title=project.data.name or "None",
+            by=self.tr("By"),
+            count=self.tr("Word Count"),
+            field=nwStats.WORDS_TEXT,
+        ))
 
         # Create a project structure based on selected root folders
         # and a number of chapters and scenes selected in the

novelwriter/core/docbuild.py

@@ -87,15 +87,6 @@ def lastBuild(self) -> Tokenizer | None:
         """
         return self._cache
 
-    ##
-    #  Setters
-    ##
-
-    def setBuildOutline(self, state: bool) -> None:
-        """Turn on/off outline for builds."""
-        self._outline = state
-        return
-
     ##
     #  Special Methods
     ##
@@ -122,11 +113,12 @@ def queueAll(self) -> None:
                 self._queue.append(item.itemHandle)
         return
 
-    def iterBuildPreview(self) -> Iterable[tuple[int, bool]]:
+    def iterBuildPreview(self, newPage: bool) -> Iterable[tuple[int, bool]]:
         """Build a preview QTextDocument."""
         makeObj = ToQTextDocument(self._project)
         filtered = self._setupBuild(makeObj)
         makeObj.initDocument()
+        makeObj.setShowNewPage(newPage)
         self._outline = True
         yield from self._iterBuild(makeObj, filtered)
         makeObj.closeDocument()
@@ -352,14 +344,17 @@ def _doBuild(self, bldObj: Tokenizer, tHandle: str, convert: bool = True) -> boo
         tItem = self._project.tree[tHandle]
         if isinstance(tItem, NWItem):
             try:
-                if tItem.isRootType() and not tItem.isNovelLike():
-                    bldObj.addRootHeading(tHandle)
-                    if convert:
-                        bldObj.doConvert()
-                    if self._count:
-                        bldObj.countStats()
-                    if self._outline:
-                        bldObj.buildOutline()
+                if tItem.isRootType():
+                    if tItem.isNovelLike():
+                        bldObj.setBreakNext()
+                    else:
+                        bldObj.addRootHeading(tHandle)
+                        if convert:
+                            bldObj.doConvert()
+                        if self._count:
+                            bldObj.countStats()
+                        if self._outline:
+                            bldObj.buildOutline()
                 elif tItem.isFileType():
                     bldObj.setText(tHandle)
                     bldObj.doPreProcessing()
@@ -370,8 +365,6 @@ def _doBuild(self, bldObj: Tokenizer, tHandle: str, convert: bool = True) -> boo
                         bldObj.buildOutline()
                     if convert:
                         bldObj.doConvert()
-                else:
-                    logger.info(f"Build: Skipping '{tHandle}'")
 
             except Exception:
                 self._error = f"Build: Failed to build '{tHandle}'"

novelwriter/core/options.py

@@ -60,7 +60,7 @@
     },
     "GuiManuscript": {
         "winWidth", "winHeight", "optsWidth", "viewWidth", "listHeight",
-        "detailsHeight", "detailsWidth", "detailsExpanded",
+        "detailsHeight", "detailsWidth", "detailsExpanded", "showNewPage",
     },
     "GuiManuscriptBuild": {
         "winWidth", "winHeight", "fmtWidth", "sumWidth",

novelwriter/formats/todocx.py

@@ -236,32 +236,31 @@ def doConvert(self) -> None:
             self._pars.append(par)
 
             # Styles
-            if tStyle is not None:
-                if tStyle & BlockFmt.LEFT:
-                    par.setAlignment("left")
-                elif tStyle & BlockFmt.RIGHT:
-                    par.setAlignment("right")
-                elif tStyle & BlockFmt.CENTRE:
-                    par.setAlignment("center")
-                elif tStyle & BlockFmt.JUSTIFY:
-                    par.setAlignment("both")
-
-                if tStyle & BlockFmt.PBB:
-                    par.setPageBreakBefore(True)
-                if tStyle & BlockFmt.PBA:
-                    par.setPageBreakAfter(True)
-
-                if tStyle & BlockFmt.Z_BTM:
-                    par.setMarginBottom(0.0)
-                if tStyle & BlockFmt.Z_TOP:
-                    par.setMarginTop(0.0)
-
-                if tStyle & BlockFmt.IND_T:
-                    par.setIndentFirst(True)
-                if tStyle & BlockFmt.IND_L:
-                    par.setMarginLeft(bIndent)
-                if tStyle & BlockFmt.IND_R:
-                    par.setMarginRight(bIndent)
+            if tStyle & BlockFmt.LEFT:
+                par.setAlignment("left")
+            elif tStyle & BlockFmt.RIGHT:
+                par.setAlignment("right")
+            elif tStyle & BlockFmt.CENTRE:
+                par.setAlignment("center")
+            elif tStyle & BlockFmt.JUSTIFY:
+                par.setAlignment("both")
+
+            if tStyle & BlockFmt.PBB:
+                par.setPageBreakBefore(True)
+            if tStyle & BlockFmt.PBA:
+                par.setPageBreakAfter(True)
+
+            if tStyle & BlockFmt.Z_BTM:
+                par.setMarginBottom(0.0)
+            if tStyle & BlockFmt.Z_TOP:
+                par.setMarginTop(0.0)
+
+            if tStyle & BlockFmt.IND_T:
+                par.setIndentFirst(True)
+            if tStyle & BlockFmt.IND_L:
+                par.setMarginLeft(bIndent)
+            if tStyle & BlockFmt.IND_R:
+                par.setMarginRight(bIndent)
 
             # Process Text Types
             if tType == BlockTyp.TEXT:

novelwriter/formats/tohtml.py

@@ -171,7 +171,7 @@ def doConvert(self) -> None:
 
             # Styles
             aStyle = []
-            if tStyle is not None and self._cssStyles:
+            if self._cssStyles:
                 if tStyle & BlockFmt.LEFT:
                     aStyle.append("text-align: left;")
                 elif tStyle & BlockFmt.RIGHT: