From 15803cf0a300b2245c50afa8862d2cc64fbac5a5 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:33:37 +0200
Subject: [PATCH 1/2] Bump version and update changelog

---
 CHANGELOG.md            | 30 ++++++++++++++++++++++++++++++
 novelwriter/__init__.py |  6 +++---
 sample/nwProject.nwx    |  4 ++--
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be568eb25..9a1417987 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # novelWriter Changelog
 
+## Version 2.5.2 [2024-09-17]
+
+### Release Notes
+
+This is a patch release that fixes a series of issues mostly affecting dialogue highlighting in the
+document viewer. The way the text is formatted in the viewer changed a lot in 2.5, and there were a
+few issues with the new implementation. The tab stop distance setting was also ignored, but has now
+been fixed as well.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed an issue where the tab stop distance setting was being ignored in the document viewer. It
+  must be set again every time a document is loaded. Issue #1996. PR #2014.
+* Fixed an issue with overlapping formatting markers when processing text into new formats. This
+  issues was introduced when dialogue highlighting was added to the document viewer and manuscript
+  build. It arises because start and end of dialogue can occur on the same character as other
+  formatting, and then the order these markers are processed matters. This was not properly handled
+  in the code. Issue #2012. PR #2014.
+* Dialogue highlighting is now only applied to plain text paragraphs, not comments, headings, and
+  other places where there should be no dialogue. Issue #2013. PR #2014.
+* Note documents no longer get dialogue highlighting. Issue #2011. PR #2014.
+
+**Documentation**
+
+* Added a section about spell checking in the documentation. PR #2015.
+
+----
+
 ## Version 2.5.1 [2024-07-28]
 
 ### Release Notes
diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py
index f40caddbe..76480febe 100644
--- a/novelwriter/__init__.py
+++ b/novelwriter/__init__.py
@@ -47,9 +47,9 @@
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.5.1"
-__hexversion__ = "0x020501f0"
-__date__       = "2024-07-28"
+__version__    = "2.5.2"
+__hexversion__ = "0x020502f0"
+__date__       = "2024-09-17"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index c4d06852f..b9e8108c4 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.5.1" hexVersion="0x020501f0" fileVersion="1.5" fileRevision="4" timeStamp="2024-07-21 20:05:31">
-  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="1955" autoCount="277" editTime="90998">
+<novelWriterXML appVersion="2.5.2" hexVersion="0x020502f0" fileVersion="1.5" fileRevision="4" timeStamp="2024-09-17 15:33:20">
+  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="1956" autoCount="277" editTime="91001">
     <name>Sample Project</name>
     <author>Jane Smith</author>
   </project>

From 8dc28ddbee6f9db50c32f9eda4dd6c11d51cbc24 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:45:30 +0200
Subject: [PATCH 2/2] Add signing request to windows build

---
 .github/workflows/build_win.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
index 086b71035..ca7c7009e 100644
--- a/.github/workflows/build_win.yml
+++ b/.github/workflows/build_win.yml
@@ -28,7 +28,27 @@ jobs:
       - name: Build Setup Installer
         run: python pkgutils.py build-win-exe
 
-      - name: Upload Artifacts
+      - name: Upload Unsigned Artifacts
+        id: upload-unsigned-artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Win-Setup
+          path: dist/*.exe
+          if-no-files-found: error
+          retention-days: 14
+
+      - name: Submit Signing Request
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: "${{ secrets.SIGNPATH_API_TOKEN }}"
+          organization-id: "0471e52c-66fa-4e9a-bfb9-36167095ca3f"
+          project-slug: "novelWriter"
+          signing-policy-slug: "release-signing"
+          github-artifact-id: "${{ steps.upload-unsigned-artifact.outputs.artifact-id }}"
+          wait-for-completion: true
+          output-artifact-directory: "dist/"
+
+      - name: Upload Signed Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: Win-Setup