novelWriter 2.5b1__tar.gz → 2.5rc1__tar.gz

{novelwriter-2.5b1 → novelwriter-2.5rc1}/CHANGELOG.md

@@ -1,5 +1,70 @@
 # novelWriter Changelog
 
+## Version 2.5 RC 1 [2024-06-22]
+
+### Release Notes
+
+This is a release candidate of the next release version, and is intended for testing purposes.
+Please be careful when using this version on live writing projects, and make sure you take frequent
+backups.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* The Status bar LEDs are now properly updated when the theme changes. Issue #1893. PR #1906.
+* All HTML tags are now properly closed at the end of each paragraph in HTML output. After
+  shortcodes were introduced, it was possible to leave formatting tags open. Issue #1919. PR #1926.
+
+**Improvements**
+
+* Move the first line indent setting from being an Open Document feature to a general build
+  settings feature that also applies to HTML, and make it visible in the Manuscript build tool
+  preview. Issue #1839 and #1858. PR #1898.
+* Make sure the document in the editor is saved before the same document is opened in the viewer.
+  Issue #1884. PR #1902.
+* The project name now appears before "novelWriter" in the main window title, which improves the
+  task bar label on at least Linux Mint Cinnamon, and Windows. Issue #1910. PR #1911.
+* Dialogue highlighting now only applies to novel documents, not notes. It is also possible to
+  apply it to HTML and ODT manuscripts, and it also shows up in the preview and in the document
+  viewer. Issue #1774. PR #1908.
+* The Welcome dialog and other tools that use the project name to generate files of folder names
+  are now less restrictive on what characters it allows in the file or folder names. Issue #1917.
+  PR #1922.
+* Last used folder paths are now remembered individually for each tool or feature that requires
+  path input from the user. Issues #1930 and #1933. PR #1934.
+* The Manuscript preview will now show line height as set in build settings. Issue #1920. PR #1935.
+* Global search now refreshes if any of the search option buttons are toggled, and the search
+  result will show the complete word if the search term only matches part of a word. Issue #1830.
+  PR #1936.
+* When a new note is created from a reference tag in the editor, the syntax highlighting is
+  properly updated to indicate the tag is now valid. Issue #1916. PR #1938.
+* The `Ctrl+E` shortcut now toggles focus between editor and viewer instead of just going to the
+  editor. The header text colour changes to indicate which panel has focus. This should make it
+  easier to scroll the content of the viewer without having to click it with the mouse first.
+  Issue #1387. PRs #1940 and #1941.
+
+**Code Improvements**
+
+* Change how dialogs are handled in memory, and drop the calls to deleteLater for the underlying Qt
+  object as it caused problems in some cases. Instead, the dialog is disconnected from the parent
+  object, which seems to let the Python and Qt garbage collectors to kick in.
+  PRs #1899. #1913 and #1921.
+* Overload the reject call for dialogs rather to call close, which the default implementation does
+  not. This simplifies the logic when closing dialogs, as reject() is also a slot, which close() is
+  not. Issue #1915. PR #1918.
+* Processing of dialogue highlighting has been added to the Tokenizer class, and the RegEx handling
+  moved to a separate factory class. PR #1908.
+* The progress bar widgets have been moved to a single module, and test coverage added. PR #1937.
+
+**Packaging**
+
+* The Windows installer is now built with Inno Setup 6.3, and uses zip compression rather than
+  lzma. It also properly sets the undelete icon, and the undelete process is better at cleaning up
+  files. PR #1932.
+
+----
+
 ## Version 2.5 Beta 1 [2024-05-26]
 
 ### Release Notes
@@ -98,6 +163,32 @@ careful when using this version on live writing projects, and make sure you take
 
 ----
 
+## Version 2.4.4 [2024-06-12]
+
+### Release Notes
+
+This is a patch release that fixes a usage issue when setting document label from an unsaved
+document, fixes a rare chance of a crash when closing the Manuscript tool, and updates the
+Portuguese translation.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Backported some memory improvements from the upcoming 2.5 release. This also fixes a potential,
+  but low probability crash in the Manuscript tool. If the tool is closed during the milliseconds
+  long window when the clock on the yellow label is updated, the app can crash with a segmentation
+  fault. PRs #1903 and #1905.
+* Fixed an issue where changing a document's label to match the document heading would suggest the
+  wrong title if the document was open in the editor, but in an unsaved state. An easy condition to
+  encounter when creating a new document and setting the heading first. Issue #1914. PR #1923.
+
+**Internationalisation**
+
+* Portuguese translation updated by Oli Maia. PR #1904.
+
+----
+
 ## Version 2.4.3 [2024-05-20]
 
 ### Release Notes
@@ -110,14 +201,14 @@ the spell check dictionary install tool.
 
 **Bugfixes**
 
-* Fix a crash in the dictionaries install tool on Windows if the config folder reported by the
+* Fixed a crash in the dictionaries install tool on Windows if the config folder reported by the
   third party Enchant spell checker tool didn't already exist prior to adding new dictionaries.
   The folder is now created when the tool is opened if it doesn't exist. Issue #1874. PR #1876.
-* Fix issues setting a different text font for the editor and viewer, and related issues with the
-  preview in the Manuscript Build tool, on certain platforms. Changing the font and setting
-  non-standard font sizes produced unexpected results when reloading. The issue seems to be related
-  to Qt 5.15.3, but that is not fully confirmed. However, the only place so far where the issue is
-  observed is on Mint 21.3. Issues #1862 and #1875. PR #1877.
+* Fixed issues when setting a different text font for the editor and viewer, and related issues
+  with the preview in the Manuscript Build tool, on certain platforms. Changing the font and
+  setting non-standard font sizes produced unexpected results when reloading. The issue seems to be
+  related to Qt 5.15.3, but that is not fully confirmed. However, the only place so far where the
+  issue is observed is on Mint 21.3. Issues #1862 and #1875. PR #1877.
 
 ----
 

{novelwriter-2.5b1 → novelwriter-2.5rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.5b1
+Version: 2.5rc1
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelWriter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.5b1
+Version: 2.5rc1
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelWriter.egg-info/SOURCES.txt

@@ -308,13 +308,12 @@ novelwriter/dialogs/preferences.py
 novelwriter/dialogs/projectsettings.py
 novelwriter/dialogs/quotes.py
 novelwriter/dialogs/wordlist.py
-novelwriter/extensions/circularprogress.py
 novelwriter/extensions/configlayout.py
 novelwriter/extensions/eventfilters.py
 novelwriter/extensions/modified.py
 novelwriter/extensions/novelselector.py
 novelwriter/extensions/pagedsidebar.py
-novelwriter/extensions/simpleprogress.py
+novelwriter/extensions/progressbars.py
 novelwriter/extensions/statusled.py
 novelwriter/extensions/switch.py
 novelwriter/extensions/switchbox.py
@@ -334,6 +333,7 @@ novelwriter/gui/sidebar.py
 novelwriter/gui/statusbar.py
 novelwriter/gui/theme.py
 novelwriter/text/counting.py
+novelwriter/text/patterns.py
 novelwriter/tools/dictionaries.py
 novelwriter/tools/lipsum.py
 novelwriter/tools/manusbuild.py

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/__init__.py

@@ -47,9 +47,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.5b1"
-__hexversion__ = "0x020500b1"
-__date__       = "2024-05-26"
+__version__    = "2.5rc1"
+__hexversion__ = "0x020500c1"
+__date__       = "2024-06-22"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 

novelwriter-2.5rc1/novelwriter/assets/i18n/project_pt_BR.json

@@ -0,0 +1,116 @@
+{
+  "Synopsis": "Sinopse",
+  "Short Description": "Descrição breve",
+  "Comment": "Comentário",
+  "Notes": "Notas",
+  "Tag": "Etiqueta",
+  "Point of View": "Ponto de vista",
+  "Focus": "Foco",
+  "Characters": "Personagens",
+  "Plot": "Trama",
+  "Timeline": "Linha do tempo",
+  "Locations": "Lugares",
+  "Objects": "Objetos",
+  "Entities": "Entidades",
+  "Custom": "Outros",
+  "0": "Zero",
+  "1": "Um",
+  "2": "Dois",
+  "3": "Três",
+  "4": "Quatro",
+  "5": "Cinco",
+  "6": "Seis",
+  "7": "Sete",
+  "8": "Oito",
+  "9": "Nove",
+  "10": "Dez",
+  "11": "Onze",
+  "12": "Doze",
+  "13": "Treze",
+  "14": "Quatorze",
+  "15": "Quinze",
+  "16": "Dezesseis",
+  "17": "Dezessete",
+  "18": "Dezoito",
+  "19": "Dezenove",
+  "20": "Vinte",
+  "21": "Vinte e um",
+  "22": "Vinte e dois",
+  "23": "Vinte e três",
+  "24": "Vinte e quatro",
+  "25": "Vinte e cinco",
+  "26": "Vinte e seis",
+  "27": "Vinte e sete",
+  "28": "Vinte e oito",
+  "29": "Vinte e nove",
+  "30": "Trinta",
+  "31": "Trinta e um",
+  "32": "Trinta e dois",
+  "33": "Trinta e três",
+  "34": "Trinta e quatro",
+  "35": "Trinta e cinco",
+  "36": "Trinta e seis",
+  "37": "Trinta e sete",
+  "38": "Trinta e oito",
+  "39": "Trinta e nove",
+  "40": "Quarenta",
+  "41": "Quarenta e um",
+  "42": "Quarenta e dois",
+  "43": "Quarenta e três",
+  "44": "Quarenta e quatro",
+  "45": "Quarenta e cinco",
+  "46": "Quarenta e seis",
+  "47": "Quarenta e sete",
+  "48": "Quarenta e oito",
+  "49": "Quarenta e nove",
+  "50": "Cinquenta",
+  "51": "Cinquenta e um",
+  "52": "Cinquenta e dois",
+  "53": "Cinquenta e três",
+  "54": "Cinquenta e quatro",
+  "55": "Cinquenta e cinco",
+  "56": "Cinquenta e seis",
+  "57": "Cinquenta e sete",
+  "58": "Cinquenta e oito",
+  "59": "Cinquenta e nove",
+  "60": "Sessenta",
+  "61": "Sessenta e um",
+  "62": "Sessenta e dois",
+  "63": "Sessenta e três",
+  "64": "Sessenta e quatro",
+  "65": "Sessenta e cinco",
+  "66": "Sessenta e seis",
+  "67": "Sessenta e sete",
+  "68": "Sessenta e oito",
+  "69": "Sessenta e nove",
+  "70": "Setenta",
+  "71": "Setenta e um",
+  "72": "Setenta e dois",
+  "73": "Setenta e três",
+  "74": "Setenta e quatro",
+  "75": "Setenta e cinco",
+  "76": "Setenta e seis",
+  "77": "Setenta e sete",
+  "78": "Setenta e oito",
+  "79": "Setenta e nove",
+  "80": "Oitenta",
+  "81": "Oitenta e um",
+  "82": "Oitenta e dois",
+  "83": "Oitenta e três",
+  "84": "Oitenta e quatro",
+  "85": "Oitenta e cinco",
+  "86": "Oitenta e seis",
+  "87": "Oitenta e sete",
+  "88": "Oitenta e oito",
+  "89": "Oitenta e nove",
+  "90": "Noventa",
+  "91": "Noventa e um",
+  "92": "Noventa e dois",
+  "93": "Noventa e três",
+  "94": "Noventa e quatro",
+  "95": "Noventa e cinco",
+  "96": "Noventa e seis",
+  "97": "Noventa e sete",
+  "98": "Noventa e oito",
+  "99": "Noventa e nove"
+}

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/assets/themes/cyberpunk_night.conf

@@ -25,6 +25,7 @@ linkvisited     =  50,   0,  80
 
 [GUI]
 helptext        =  97,  97,  97
+fadedtext       =  97,  97,  97
 errortext       = 255,  77,  77
 statusnone      =  50,  50,  50
 statussaved     =  77, 255,  77

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/assets/themes/default_dark.conf

@@ -26,6 +26,7 @@ linkvisited     = 102, 153, 204
 
 [GUI]
 helptext        = 164, 164, 164
+fadedtext       = 148, 148, 148
 errortext       = 255, 164, 164
 statusnone      = 150, 152, 150
 statussaved     =  39, 135,  78

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/assets/themes/default_light.conf

@@ -26,6 +26,7 @@ linkvisited     =  66, 113, 174
 
 [GUI]
 helptext        =  92,  92,  92
+fadedtext       = 108, 108, 108
 errortext       = 255,  92,  92
 statusnone      = 120, 120, 120
 statussaved     = 200,  15,  39

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/assets/themes/dracula.conf

@@ -41,6 +41,7 @@ linkvisited     = 139, 233, 253
 
 [GUI]
 helptext        = 204, 172, 249
+fadedtext       =  98, 114, 164
 errortext       = 255,  85,  85
 statusnone      =  98, 114, 164
 statussaved     =  80, 250, 123

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/assets/themes/solarized_dark.conf

@@ -25,6 +25,7 @@ linkvisited     =  38, 139, 210
 
 [GUI]
 helptext        = 166, 161, 149
+fadedtext       = 166, 161, 149
 errortext       = 255, 161, 149
 statusnone      =  88, 110, 117
 statussaved     =  42, 161, 152

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/assets/themes/solarized_light.conf

@@ -25,6 +25,7 @@ linkvisited     =  38, 139, 210
 
 [GUI]
 helptext        =  78,  91,  95
+fadedtext       =  78,  91,  95
 errortext       = 255,  91,  95
 statusnone      =  88, 110, 117
 statussaved     =  42, 161, 152

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/common.py

@@ -523,12 +523,11 @@ def readTextFile(path: str | Path) -> str:
 
 
 def makeFileNameSafe(text: str) -> str:
-    """Return a filename safe string.
+    """Return a filename-safe string.
     See: https://unicode.org/reports/tr15/#Norm_Forms
     """
     text = unicodedata.normalize("NFKC", text).strip()
-    allowed = (" ", ".", "-", "_")
-    return "".join(c for c in text if c.isalnum() or c in allowed)
+    return "".join(c for c in text if c.isprintable() and c not in r'\/:*?"<>|')
 
 
 def getFileSize(path: Path) -> int:

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/config.py

@@ -5,6 +5,7 @@ novelWriter – Config Class
 File History:
 Created: 2018-09-22 [0.0.1]  Config
 Created: 2022-11-09 [2.0rc2] RecentProjects
+Created: 2024-06-16 [2.5rc1] RecentPaths
 
 This file is a part of novelWriter
 Copyright 2018–2024, Veronica Berglyd Olsen
@@ -103,7 +104,8 @@ class Config:
         # User Settings
         # =============
 
-        self._recentObj = RecentProjects(self)
+        self._recentProjects = RecentProjects(self)
+        self._recentPaths = RecentPaths(self)
 
         # General GUI Settings
         self.guiLocale    = self._qLocale.name()
@@ -180,7 +182,6 @@ class Config:
         self.fmtPadThin      = False
 
         # User Paths
-        self._lastPath   = self._homePath  # The user's last used path
         self._backupPath = self._backPath  # Backup path to use, can be none
 
         # Spell Checking Settings
@@ -253,7 +254,7 @@ class Config:
 
     @property
     def recentProjects(self) -> RecentProjects:
-        return self._recentObj
+        return self._recentProjects
 
     @property
     def mainWinSize(self) -> list[int]:
@@ -343,7 +344,7 @@ class Config:
         self._outlnPanePos = [int(x/self.guiScale) for x in pos]
         return
 
-    def setLastPath(self, path: str | Path) -> None:
+    def setLastPath(self, key: str, path: str | Path) -> None:
         """Set the last used path. Only the folder is saved, so if the
         path is not a folder, the parent of the path is used instead.
         """
@@ -352,8 +353,7 @@ class Config:
             if not path.is_dir():
                 path = path.parent
             if path.is_dir():
-                self._lastPath = path
-                logger.debug("Last path updated: %s" % self._lastPath)
+                self._recentPaths.setPath(key, path)
         return
 
     def setBackupPath(self, path: Path | str) -> None:
@@ -438,11 +438,12 @@ class Config:
             return self._appPath / "assets" / target
         return self._appPath / "assets"
 
-    def lastPath(self) -> Path:
+    def lastPath(self, key: str) -> Path:
         """Return the last path used by the user, if it exists."""
-        if isinstance(self._lastPath, Path):
-            if self._lastPath.is_dir():
-                return self._lastPath
+        if path := self._recentPaths.getPath(key):
+            asPath = Path(path)
+            if asPath.is_dir():
+                return asPath
         return self._homePath
 
     def backupPath(self) -> Path:
@@ -516,7 +517,6 @@ class Config:
         logger.debug("Data Path: %s", self._dataPath)
         logger.debug("App Root: %s", self._appRoot)
         logger.debug("App Path: %s", self._appPath)
-        logger.debug("Last Path: %s", self._lastPath)
         logger.debug("PDF Manual: %s", self.pdfDocs)
 
         # If the config and data folders don't exist, create them
@@ -531,7 +531,8 @@ class Config:
             (self._dataPath / "syntax").mkdir(exist_ok=True)
             (self._dataPath / "themes").mkdir(exist_ok=True)
 
-        self._recentObj.loadCache()
+        self._recentPaths.loadCache()
+        self._recentProjects.loadCache()
         self._checkOptionalPackages()
 
         logger.debug("Config instance initialised")
@@ -600,7 +601,6 @@ class Config:
         self.hideHScroll = conf.rdBool(sec, "hidehscroll", self.hideHScroll)
         self.lastNotes   = conf.rdStr(sec, "lastnotes", self.lastNotes)
         self.nativeFont  = conf.rdBool(sec, "nativefont", self.nativeFont)
-        self._lastPath   = conf.rdPath(sec, "lastpath", self._lastPath)
 
         # Sizes
         sec = "Sizes"
@@ -710,7 +710,6 @@ class Config:
             "hidehscroll":  str(self.hideHScroll),
             "lastnotes":    str(self.lastNotes),
             "nativefont":   str(self.nativeFont),
-            "lastpath":     str(self._lastPath),
         }
 
         conf["Sizes"] = {
@@ -811,7 +810,7 @@ class Config:
         """Pack a list of items into a comma-separated string for saving
         to the config file.
         """
-        return ", ".join([str(inVal) for inVal in data])
+        return ", ".join(str(inVal) for inVal in data)
 
     def _checkOptionalPackages(self) -> None:
         """Check optional packages used by some features."""
@@ -893,3 +892,56 @@ class RecentProjects:
             logger.debug("Removed recent: %s", path)
             self.saveCache()
         return
+
+
+class RecentPaths:
+
+    KEYS = ["default", "project", "import", "outline", "stats"]
+
+    def __init__(self, config: Config) -> None:
+        self._conf = config
+        self._data = {}
+        return
+
+    def setPath(self, key: str, path: Path | str) -> None:
+        """Set a path for a given key, and save the cache."""
+        if key in self.KEYS:
+            self._data[key] = str(path)
+        self.saveCache()
+        return
+
+    def getPath(self, key: str) -> str | None:
+        """Get a path for a given key, or return None."""
+        return self._data.get(key)
+
+    def loadCache(self) -> bool:
+        """Load the cache file for recent paths."""
+        self._data = {}
+        cacheFile = self._conf.dataPath(nwFiles.RECENT_PATH)
+        if cacheFile.is_file():
+            try:
+                with open(cacheFile, mode="r", encoding="utf-8") as inFile:
+                    data = json.load(inFile)
+                if isinstance(data, dict):
+                    for key, path in data.items():
+                        if key in self.KEYS and isinstance(path, str):
+                            self._data[key] = path
+            except Exception:
+                logger.error("Could not load recent paths cache")
+                logException()
+                return False
+        return True
+
+    def saveCache(self) -> bool:
+        """Save the cache dictionary of recent paths."""
+        cacheFile = self._conf.dataPath(nwFiles.RECENT_PATH)
+        cacheTemp = cacheFile.with_suffix(".tmp")
+        try:
+            with open(cacheTemp, mode="w+", encoding="utf-8") as outFile:
+                json.dump(self._data, outFile, indent=2)
+            cacheTemp.replace(cacheFile)
+        except Exception:
+            logger.error("Could not save recent paths cache")
+            logException()
+            return False
+        return True

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/constants.py

@@ -57,17 +57,14 @@ class nwConst:
     STATUS_MSG_TIMEOUT = 15000  # milliseconds
     MAX_SEARCH_RESULT = 1000
 
-    # Dialogs
-    DLG_FINISHED = 2
-
 
 class nwRegEx:
 
     FMT_EI = r"(?<![\w\\])(_)(?![\s_])(.+?)(?<![\s\\])(\1)(?!\w)"
-    FMT_EB = r"(?<![\w\\])([\*]{2})(?![\s\*])(.+?)(?<![\s\\])(\1)(?!\w)"
-    FMT_ST = r"(?<![\w\\])([~]{2})(?![\s~])(.+?)(?<![\s\\])(\1)(?!\w)"
-    FMT_SC = r"(?i)(?<!\\)(\[[\/\!]?(?:i|b|s|u|m|sup|sub)\])"
-    FMT_SV = r"(?<!\\)(\[(?i)(?:footnote):)(.+?)(?<!\\)(\])"
+    FMT_EB = r"(?<![\w\\])(\*{2})(?![\s\*])(.+?)(?<![\s\\])(\1)(?!\w)"
+    FMT_ST = r"(?<![\w\\])(~{2})(?![\s~])(.+?)(?<![\s\\])(\1)(?!\w)"
+    FMT_SC = r"(?i)(?<!\\)(\[[\/\!]?(?:b|i|s|u|m|sup|sub)\])"
+    FMT_SV = r"(?i)(?<!\\)(\[(?:footnote):)(.+?)(?<!\\)(\])"
 
 
 class nwShortcode:
@@ -107,6 +104,7 @@ class nwFiles:
     # Config Files
     CONF_FILE   = "novelwriter.conf"
     RECENT_FILE = "recentProjects.json"
+    RECENT_PATH = "recentPaths.json"
 
     # Project Root Files
     PROJ_FILE   = "nwProject.nwx"
@@ -414,7 +412,7 @@ class nwUnicode:
     U_EMDASH = "\u2014"  # Long dash
     U_HBAR   = "\u2015"  # Horizontal bar
     U_HELLIP = "\u2026"  # Ellipsis
-    U_MAPOSS = "\u02bc"  # Modifier letter single apostrophe
+    U_MAPOS  = "\u02bc"  # Modifier letter single apostrophe
     U_PRIME  = "\u2032"  # Prime
     U_DPRIME = "\u2033"  # Double prime
 
@@ -481,7 +479,7 @@ class nwUnicode:
     H_EMDASH = "&mdash;"
     H_HBAR   = "&#8213;"
     H_HELLIP = "&hellip;"
-    H_MAPOSS = "&#700;"
+    H_MAPOS  = "&#700;"
     H_PRIME  = "&prime;"
     H_DPRIME = "&#8243;"
 
@@ -546,7 +544,7 @@ class nwHtmlUnicode():
         nwUnicode.U_EMDASH: nwUnicode.H_EMDASH,
         nwUnicode.U_HBAR:   nwUnicode.H_HBAR,
         nwUnicode.U_HELLIP: nwUnicode.H_HELLIP,
-        nwUnicode.U_MAPOSS: nwUnicode.H_MAPOSS,
+        nwUnicode.U_MAPOS:  nwUnicode.H_MAPOS,
         nwUnicode.U_PRIME:  nwUnicode.H_PRIME,
         nwUnicode.U_DPRIME: nwUnicode.H_DPRIME,
 

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/core/buildsettings.py

@@ -82,6 +82,7 @@ SETTINGS_TEMPLATE = {
     "format.stripUnicode":     (bool, False),
     "format.replaceTabs":      (bool, False),
     "format.keepBreaks":       (bool, True),
+    "format.showDialogue":     (bool, False),
     "format.firstLineIndent":  (bool, False),
     "format.firstIndentWidth": (float, 1.4),
     "format.indentFirstPar":   (bool, False),
@@ -131,6 +132,7 @@ SETTINGS_LABELS = {
     "format.stripUnicode":     QT_TRANSLATE_NOOP("Builds", "Replace Unicode Characters"),
     "format.replaceTabs":      QT_TRANSLATE_NOOP("Builds", "Replace Tabs with Spaces"),
     "format.keepBreaks":       QT_TRANSLATE_NOOP("Builds", "Preserve Hard Line Breaks"),
+    "format.showDialogue":     QT_TRANSLATE_NOOP("Builds", "Apply Dialogue Highlighting"),
 
     "format.grpParIndent":     QT_TRANSLATE_NOOP("Builds", "First Line Indent"),
     "format.firstLineIndent":  QT_TRANSLATE_NOOP("Builds", "Enable Indent"),
@@ -217,7 +219,7 @@ class BuildSettings:
         return self._order
 
     @property
-    def lastPath(self) -> Path:
+    def lastBuildPath(self) -> Path:
         """The last used build path."""
         if self._path.is_dir():
             return self._path
@@ -291,7 +293,7 @@ class BuildSettings:
             self._order = value
         return
 
-    def setLastPath(self, path: Path | str | None) -> None:
+    def setLastBuildPath(self, path: Path | str | None) -> None:
         """Set the last used build path."""
         if isinstance(path, str):
             path = Path(path)
@@ -459,7 +461,7 @@ class BuildSettings:
         self.setName(data.get("name", ""))
         self.setBuildID(data.get("uuid", ""))
         self.setOrder(data.get("order", 0))
-        self.setLastPath(data.get("path", None))
+        self.setLastBuildPath(data.get("path", None))
         self.setLastBuildName(data.get("build", ""))
 
         buildFmt = str(data.get("format", ""))

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/core/coretools.py

@@ -348,7 +348,9 @@ class DocSearch:
             rxMatch = rxItt.next()
             pos = rxMatch.capturedStart()
             num = rxMatch.capturedLength()
-            context = text[pos:pos+100].partition("\n")[0]
+            lim = text[:pos].rfind("\n") + 1
+            cut = text[lim:pos].rfind(" ") + lim + 1
+            context = text[cut:cut+100].partition("\n")[0]
             if context:
                 results.append((pos, num, context))
                 count += 1

{novelwriter-2.5b1 → novelwriter-2.5rc1}/novelwriter/core/docbuild.py

@@ -338,6 +338,7 @@ class NWBuildDocument:
         bldObj.setJustify(self._build.getBool("format.justifyText"))
         bldObj.setLineHeight(self._build.getFloat("format.lineHeight"))
         bldObj.setKeepLineBreaks(self._build.getBool("format.keepBreaks"))
+        bldObj.setDialogueHighlight(self._build.getBool("format.showDialogue"))
         bldObj.setFirstLineIndent(
             self._build.getBool("format.firstLineIndent"),
             self._build.getFloat("format.firstIndentWidth"),