Remove redundant variables in tokenizer

novelwriter/core/tohtml.py

@@ -232,8 +232,8 @@ class ToHtml(Tokenizer):
             else:
                 hStyle = ""
 
-            if self._linkHeadings and self._nwItem:
-                tHH = f"{self._nwItem.itemHandle}:T{nHead:04d}"
+            if self._linkHeadings and self._handle:
+                tHH = f"{self._handle}:T{nHead:04d}"
                 aNm = f"<a name='{tHH}'></a>"
             else:
                 tHH = ""
@@ -257,31 +257,31 @@ class ToHtml(Tokenizer):
                 tHead = tText.replace(nwHeadFmt.BR, "<br/>")
                 lines.append(f"<h1 class='title'{hStyle}>{aNm}{tHead}</h1>\n")
                 if tHH:
-                    self._navMap[tHH] = f"TT {tHead}"
+                    self._navMap[tHH] = f"TT:{tHead}"
 
             elif tType == self.T_HEAD1:
                 tHead = tText.replace(nwHeadFmt.BR, "<br/>")
                 lines.append(f"<{h1}{h1Cl}{hStyle}>{aNm}{tHead}</{h1}>\n")
                 if tHH:
-                    self._navMap[tHH] = f"H1 {tHead}"
+                    self._navMap[tHH] = f"H1:{tHead}"
 
             elif tType == self.T_HEAD2:
                 tHead = tText.replace(nwHeadFmt.BR, "<br/>")
                 lines.append(f"<{h2}{hStyle}>{aNm}{tHead}</{h2}>\n")
                 if tHH:
-                    self._navMap[tHH] = f"H2 {tHead}"
+                    self._navMap[tHH] = f"H2:{tHead}"
 
             elif tType == self.T_HEAD3:
                 tHead = tText.replace(nwHeadFmt.BR, "<br/>")
                 lines.append(f"<{h3}{hStyle}>{aNm}{tHead}</{h3}>\n")
                 if tHH:
-                    self._navMap[tHH] = f"H3 {tHead}"
+                    self._navMap[tHH] = f"H3:{tHead}"
 
             elif tType == self.T_HEAD4:
                 tHead = tText.replace(nwHeadFmt.BR, "<br/>")
                 lines.append(f"<{h4}{hStyle}>{aNm}{tHead}</{h4}>\n")
                 if tHH:
-                    self._navMap[tHH] = f"H4 {tHead}"
+                    self._navMap[tHH] = f"H4:{tHead}"
 
             elif tType == self.T_SEP:
                 lines.append(f"<p class='sep'{hStyle}>{tText}</p>\n")

novelwriter/core/tokenizer.py

@@ -118,7 +118,7 @@ class Tokenizer(ABC):
 
         # Data Variables
         self._text   = ""    # The raw text to be tokenized
-        self._nwItem = None  # The NWItem currently being processed
+        self._handle = None  # The item handle currently being processed
         self._result = ""    # The result of the last document
         self._counts = {}    # Counter data
 
@@ -176,9 +176,7 @@ class Tokenizer(ABC):
         self._noSep      = True  # Flag to indicate that we don't want a scene separator
 
         # This File
-        self._isNone  = False  # Document has unknown layout
         self._isNovel = False  # Document is a novel document
-        self._isNote  = False  # Document is a project note
         self._isFirst = True   # Document is the first in a set
 
         # Error Handling
@@ -417,24 +415,21 @@ class Tokenizer(ABC):
 
         return True
 
-    def setText(self, tHandle: str, text: str | None = None) -> bool:
+    def setText(self, tHandle: str, text: str | None = None) -> None:
         """Set the text for the tokenizer from a handle. If text is not
-        set, load it from the file.
+        set, its is loaded from the file.
         """
-        self._nwItem = self._project.tree[tHandle]
-        if self._nwItem is None:
-            return False
+        self._text = ""
+        self._handle = None
+        if nwItem := self._project.tree[tHandle]:
+            if text is None:
+                text = self._project.storage.getDocument(tHandle).readDocument() or ""
 
-        if text is None:
-            text = self._project.storage.getDocument(tHandle).readDocument() or ""
+            self._text = text
+            self._handle = tHandle
+            self._isNovel = nwItem.itemLayout == nwItemLayout.DOCUMENT
 
-        self._text = text
-
-        self._isNone  = self._nwItem.itemLayout == nwItemLayout.NO_LAYOUT
-        self._isNovel = self._nwItem.itemLayout == nwItemLayout.DOCUMENT
-        self._isNote  = self._nwItem.itemLayout == nwItemLayout.NOTE
-
-        return True
+        return
 
     def doPreProcessing(self) -> None:
         """Run trough the various replace dictionaries."""
@@ -470,7 +465,7 @@ class Tokenizer(ABC):
         """
         self._tokens = []
         if self._isNovel:
-            self._hFormatter.setHandle(self._nwItem.itemHandle if self._nwItem else None)
+            self._hFormatter.setHandle(self._handle)
 
         nHead = 0
         breakNext = False

novelwriter/tools/manuscript.py

@@ -707,6 +707,7 @@ class _OutlineWidget(QWidget):
 
             root = self.listView.invisibleRootItem()
             parent = root
+            indent = False
             for anchor, text in data.items():
                 level = OUTLINE_MAP.get(text[:2], -1)
                 text = text[3:]
@@ -724,7 +725,9 @@ class _OutlineWidget(QWidget):
                         parent = item
                     elif parent:
                         parent.addChild(item)
+                        indent = True
 
+            self.listView.setIndentation(SHARED.theme.baseIconSize if indent else CONFIG.pxInt(4))
             self._outline = data
 
         return