Make preview mode in HTML build also usable by Manuscript tool

novelwriter/core/docbuild.py

@@ -170,6 +170,7 @@ class NWBuildDocument:
         makeObj = ToHtml(self._project)
         filtered = self._setupBuild(makeObj)
 
+        makeObj.setPreview(self._preview)
         for i, tHandle in enumerate(self._queue):
             self._error = None
             if filtered.get(tHandle, (False, 0))[0]:

novelwriter/core/tohtml.py

@@ -74,15 +74,9 @@ class ToHtml(Tokenizer):
     #  Setters
     ##
 
-    def setPreview(self, doComments: bool, doSynopsis: bool) -> None:
-        """If we're using this class to generate markdown preview, we
-        need to make a few changes to formatting, which is managed by
-        these flags.
-        """
-        self._genMode = self.M_PREVIEW
-        self._doKeywords = True
-        self._doComments = doComments
-        self._doSynopsis = doSynopsis
+    def setPreview(self, state: bool) -> None:
+        """Set to preview generator mode."""
+        self._genMode = self.M_PREVIEW if state else self.M_EXPORT
         return
 
     def setStyles(self, cssStyles: bool) -> None:
@@ -302,8 +296,7 @@ class ToHtml(Tokenizer):
                 lines.append(tTemp)
 
         self._result = "".join(lines)
-        if self._genMode != self.M_PREVIEW:
-            self._fullHTML.append(self._result)
+        self._fullHTML.append(self._result)
 
         return
 

novelwriter/gui/docviewer.py

@@ -197,7 +197,10 @@ class GuiDocViewer(QTextBrowser):
 
         sPos = self.verticalScrollBar().value()
         aDoc = ToHtml(SHARED.project)
-        aDoc.setPreview(CONFIG.viewComments, CONFIG.viewSynopsis)
+        aDoc.setPreview(True)
+        aDoc.setKeywords(True)
+        aDoc.setComments(CONFIG.viewComments)
+        aDoc.setSynopsis(CONFIG.viewSynopsis)
         aDoc.setLinkHeadings(True)
 
         # Be extra careful here to prevent crashes when first opening a