novelWriter 2.4b1__py3-none-any.whl → 2.4.1__py3-none-any.whl

novelwriter/core/coretools.py

@@ -337,32 +337,32 @@ class DocSearch:
         """Iteratively search through documents in a project."""
         self._regEx.setPattern(self._buildPattern(search))
         logger.debug("Searching with pattern '%s'", self._regEx.pattern())
-
-        num = len(search)
         storage = project.storage
         for item in project.tree:
             if item.isFileType():
-                text = storage.getDocumentText(item.itemHandle)
-                rxItt = self._regEx.globalMatch(text)
-                count = 0
-                capped = False
-                results = []
-                while rxItt.hasNext():
-                    rxMatch = rxItt.next()
-                    pos = rxMatch.capturedStart()
-                    num = rxMatch.capturedLength()
-                    context = text[pos:pos+100].partition("\n")[0]
-                    if context:
-                        results.append((pos, num, context))
-                        count += 1
-                        if count >= nwConst.MAX_SEARCH_RESULT:
-                            capped = True
-                            break
-
+                results, capped = self.searchText(storage.getDocumentText(item.itemHandle))
                 yield item, results, capped
-
         return
 
+    def searchText(self, text: str) -> tuple[list[tuple[int, int, str]], bool]:
+        """Search a piece of text for RegEx matches."""
+        rxItt = self._regEx.globalMatch(text)
+        count = 0
+        capped = False
+        results = []
+        while rxItt.hasNext():
+            rxMatch = rxItt.next()
+            pos = rxMatch.capturedStart()
+            num = rxMatch.capturedLength()
+            context = text[pos:pos+100].partition("\n")[0]
+            if context:
+                results.append((pos, num, context))
+                count += 1
+                if count >= nwConst.MAX_SEARCH_RESULT:
+                    capped = True
+                    break
+        return results, capped
+
     ##
     #  Internal Functions
     ##
@@ -382,8 +382,7 @@ class DocSearch:
                         escaped += f"\\{c}"
                 search = escaped
         if self._words:
-            search = search if search.startswith("\\b") else f"\\b{search}"
-            search = search if search.endswith("\\b") else f"{search}\\b"
+            search = f"(?:^|\\b){search}(?:$|\\b)"
         return search
 
 # END Class DocSearch

novelwriter/core/docbuild.py

@@ -306,8 +306,8 @@ class NWBuildDocument:
             self._build.getBool("headings.hideScene")
         )
         bldObj.setHardSceneFormat(
-            self._build.getStr("headings.fmtHardScene"),
-            self._build.getBool("headings.hideHardScene")
+            self._build.getStr("headings.fmtAltScene"),
+            self._build.getBool("headings.hideAltScene")
         )
         bldObj.setSectionFormat(
             self._build.getStr("headings.fmtSection"),

novelwriter/core/projectxml.py

@@ -449,7 +449,7 @@ class ProjectXMLReader:
                 result[xEntry.attrib["key"]] = checkString(xEntry.text, "")
         return result
 
-    def _parseDictTagText(self, xItem) -> dict:
+    def _parseDictTagText(self, xItem: ET.Element) -> dict:
         """Parse a dictionary stored with key as the tag and the value
         as the text property.
         """

novelwriter/core/spellcheck.py

@@ -74,7 +74,7 @@ class NWSpellEnchant:
     #  Setters
     ##
 
-    def setLanguage(self, language: str | None):
+    def setLanguage(self, language: str | None) -> None:
         """Load a dictionary for the language specified in the config.
         If that fails, we load a mock dictionary so that lookups don't
         crash. Note that enchant will allow loading an empty string as
@@ -182,10 +182,10 @@ class FakeEnchant:
     def check(self, word: str) -> bool:
         return True
 
-    def suggest(self, word) -> list[str]:
+    def suggest(self, word: str) -> list[str]:
         return []
 
-    def add_to_session(self, word: str):
+    def add_to_session(self, word: str) -> None:
         return
 
 # END Class FakeEnchant

novelwriter/core/status.py

@@ -35,6 +35,7 @@ from PyQt5.QtCore import QRectF
 
 from novelwriter import CONFIG
 from novelwriter.common import minmax, simplified
+from novelwriter.types import QtPaintAnitAlias, QtTransparent
 
 if TYPE_CHECKING:  # pragma: no cover
     from typing import TypeGuard  # Requires Python 3.10
@@ -248,10 +249,10 @@ class NWStatus:
     def _createIcon(self, red: int, green: int, blue: int) -> QIcon:
         """Generate an icon for a status label."""
         pixmap = QPixmap(self._iPX, self._iPX)
-        pixmap.fill(QColor(0, 0, 0, 0))
+        pixmap.fill(QtTransparent)
 
         painter = QPainter(pixmap)
-        painter.setRenderHint(QPainter.Antialiasing)
+        painter.setRenderHint(QtPaintAnitAlias)
         painter.fillPath(self._iconPath, QColor(red, green, blue))
         painter.end()
 

novelwriter/core/tokenizer.py

@@ -49,7 +49,7 @@ ESCAPES = {r"\*": "*", r"\~": "~", r"\_": "_", r"\[": "[", r"\]": "]", r"\ ": ""
 RX_ESC = re.compile("|".join([re.escape(k) for k in ESCAPES.keys()]), flags=re.DOTALL)
 
 
-def stripEscape(text) -> str:
+def stripEscape(text: str) -> str:
     """Strip escaped Markdown characters from paragraph text."""
     if "\\" in text:
         return RX_ESC.sub(lambda x: ESCAPES[x.group(0)], text)
@@ -639,8 +639,8 @@ class Tokenizer(ABC):
                     tmpMarkdown.append(f"{aLine}\n")
 
             elif aLine.startswith(("### ", "###! ")):
-                # (Hard) Scene Headings
-                # =====================
+                # (Alternative) Scene Headings
+                # ============================
                 # Scene headings in novel documents are treated as centred
                 # separators if the formatting does not change the text. If the
                 # format is empty, the scene can be hidden or a blank paragraph