New test for ToHtml class

nw/core/tohtml.py

@@ -68,16 +68,16 @@ class ToHtml(Tokenizer):
     #  Setters
     ##
 
-    def setPreview(self, forPreview, doComments, doSynopsis):
+    def setPreview(self, doComments, doSynopsis):
         """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.
         """
-        if forPreview:
-            self.genMode    = self.M_PREVIEW
-            self.doKeywords = True
-            self.doComments = doComments
-            self.doSynopsis = doSynopsis
+        self.genMode    = self.M_PREVIEW
+        self.doKeywords = True
+        self.doComments = doComments
+        self.doSynopsis = doSynopsis
+
         return
 
     def setStyles(self, cssStyles):
@@ -141,11 +141,13 @@ class ToHtml(Tokenizer):
             # For novel files for export, we bump the titles one level
             # up as this is more useful for printing and word processor
             # imports.
-            h1 = "h1 class='title'"
+            h1Cl = " class='title'"
+            h1 = "h1"
             h2 = "h1"
             h3 = "h2"
             h4 = "h3"
         else:
+            h1Cl = ""
             h1 = "h1"
             h2 = "h2"
             h3 = "h3"
@@ -193,7 +195,7 @@ class ToHtml(Tokenizer):
             else:
                 aNm = ""
 
-            # Process TextType
+            # Process Text Type
             if tType == self.T_EMPTY:
                 if parStyle is None:
                     parStyle = ""
@@ -214,7 +216,7 @@ class ToHtml(Tokenizer):
 
             elif tType == self.T_HEAD1:
                 tHead = tText.replace(r"\\", "<br/>")
-                tmpResult.append("<%s%s>%s%s</%s>\n" % (h1, hStyle, aNm, tHead, h1))
+                tmpResult.append("<%s%s%s>%s%s</%s>\n" % (h1, h1Cl, hStyle, aNm, tHead, h1))
 
             elif tType == self.T_HEAD2:
                 tHead = tText.replace(r"\\", "<br/>")

nw/gui/docviewer.py

@@ -169,7 +169,7 @@ class GuiDocViewer(QTextBrowser):
 
         sPos = self.verticalScrollBar().value()
         aDoc = ToHtml(self.theProject, self.theParent)
-        aDoc.setPreview(True, self.mainConf.viewComments, self.mainConf.viewSynopsis)
+        aDoc.setPreview(self.mainConf.viewComments, self.mainConf.viewSynopsis)
         aDoc.setLinkHeaders(True)
 
         # Be extra careful here to prevent crashes when first opening a

nw/guimain.py

@@ -81,14 +81,14 @@ class GuiMain(QMainWindow):
         # Core Classes
         # ============
 
-        # Core Classes and settings
+        # Core Classes and Settings
         self.theTheme    = GuiTheme(self)
         self.theProject  = NWProject(self)
         self.theIndex    = NWIndex(self.theProject, self)
         self.hasProject  = False
         self.isFocusMode = False
 
-        # Prepare main window
+        # Prepare Main Window
         self.resize(*self.mainConf.getWinSize())
         self._setWindowTitle()
         self.setWindowIcon(QIcon(self.mainConf.appIcon))
@@ -1073,10 +1073,10 @@ class GuiMain(QMainWindow):
 
         self.isFocusMode = not self.isFocusMode
         if self.isFocusMode:
-            logger.debug("Activating Focus mode")
+            logger.debug("Activating Focus Mode")
             self.tabWidget.setCurrentWidget(self.splitDocs)
         else:
-            logger.debug("Deactivating Focus mode")
+            logger.debug("Deactivating Focus Mode")
 
         isVisible = not self.isFocusMode
         self.treePane.setVisible(isVisible)