From 0a1f6be4a5b9a4295c8879c97de9bc741e34a1c4 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 23 Jan 2021 15:39:41 +0100
Subject: [PATCH 1/2] Bump version and update changelog

---
 CHANGELOG.md        | 38 ++++++++++++++++++++++++++++++++++++++
 docs/source/conf.py |  4 ++--
 nw/__init__.py      |  6 +++---
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a875128..65603647 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,43 @@
 # novelWriter Change Log
 
+## Version 1.0.3 [2021-01-24]
+
+### Release Notes
+
+### Detailed Changelog
+
+**Bug Fixes**
+
+* Fix crash when starting novelWriter from command line on Windows from a different mounted drive
+  than where it is installed. This was caused by a relative path lookup that defaulted to the wrong
+  current directory. This works on Linux/macOS which have a common root path, but not on Windows.
+  Issue #581, PR #587.
+
+**User Interface**
+
+* Added Solarized Dark and Light GUI and syntax themes. PR #578 by @nullbasis.
+* The Typewriter Scroll Mode now works better in combination with the Scroll Past End feature. The
+  scroll mode still only works when there is actually any document to scroll, but previously it
+  would also not work until the total length of the document reached 40% of the height of the
+  editor window. This was quite confusing. This limit is now reduced to 10%. Issue #589, PR #593.
+
+**Installation**
+
+* Merged the `make.py` script into `setup.py`. PR #584.
+* Added a second way to build distributable packages of novelWriter for Windows. The new method
+  does not use any of the current package tools that produce a Windows executable of the app. These
+  packages tend to cause false virus warnings. This method uses the Python tool `zipapp` to bundle
+  novelWriter as an executable `.pyz` file, and adds Python embeddable and library dependencies
+  into the same folder. The folder itself can be distributed as-is, or a Windows installer
+  executable can be generated with `setup.py setup-pyz`. Issue #580, PR #584.
+
+**Documentation**
+
+* Updated documentation, main README and Contribution Guide to make them more consistent and to
+  improve installation instructions. Based on issue #586 and input from @mgrhm. PR #592.
+
+----
+
 ## Version 1.0.2 [2021-01-19]
 
 ### Release Notes
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 86a78181..707ae026 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -25,9 +25,9 @@ copyright = "2018–2021, Veronica Berglyd Olsen"
 author = "Veronica Berglyd Olsen"
 
 # The short X.Y version
-version = "1.0.2"
+version = "1.0.3"
 # The full version, including alpha/beta/rc tags
-release = "1.0.2"
+release = "1.0.3"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/nw/__init__.py b/nw/__init__.py
index 02438d68..38c98cda 100644
--- a/nw/__init__.py
+++ b/nw/__init__.py
@@ -63,9 +63,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "1.0.2"
-__hexversion__ = "0x010002f0"
-__date__       = "2021-01-19"
+__version__    = "1.0.3"
+__hexversion__ = "0x010003f0"
+__date__       = "2021-01-24"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 __url__        = "https://novelwriter.io"

From 13f98e1675fbd49a42b0114b97053fe49d1a6575 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sun, 24 Jan 2021 14:14:43 +0100
Subject: [PATCH 2/2] Update changelog and release notes

---
 CHANGELOG.md                     | 35 ++++++++++++++++++++++++--------
 nw/assets/text/release_notes.htm | 20 +++++++++++++++---
 sample/nwProject.nwx             |  6 +++---
 3 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65603647..99087d0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@
 
 ### Release Notes
 
+This patch release fixes a minor bug sometimes encountered when running novelWriter from command
+line on Windows. In addition, the Solarized Dark and Solarized Light themes have been added to the
+selection of GUI and syntax themes by a user contribution.
+
+The main change in this release is to the install scripts and the documentation related to
+installing and running novelWriter. The primary change is a different method of packaging the app
+for Windows. Instead of building an `.exe` file, the new setup instead builds a runnable zip file
+`.pyz`. The executable would often be mistakenly flagged by virus control software due to the
+packaging tools. This is a known problem with pyinstaller and similar tools, but such warnings are
+always concerning even if they are false positives.
+
 ### Detailed Changelog
 
 **Bug Fixes**
@@ -15,27 +26,35 @@
 
 **User Interface**
 
-* Added Solarized Dark and Light GUI and syntax themes. PR #578 by @nullbasis.
+* Added Solarized Dark and Solarized Light GUI and syntax themes. PR #578 by @nullbasis.
 * The Typewriter Scroll Mode now works better in combination with the Scroll Past End feature. The
-  scroll mode still only works when there is actually any document to scroll, but previously it
-  would also not work until the total length of the document reached 40% of the height of the
-  editor window. This was quite confusing. This limit is now reduced to 10%. Issue #589, PR #593.
+  scroll mode still only works when there is actually any document to scroll into, but previously
+  it would also not work until the total length of the document reached 40% of the height of the
+  editor window. This was quite confusing. This limit is now reduced to 10%, which means that as
+  long as the Scroll Past End option is enabled, the Typewriter Scroll will always work according
+  to its settings. Issue #589, PR #593.
 
 **Installation**
 
 * Merged the `make.py` script into `setup.py`. PR #584.
 * Added a second way to build distributable packages of novelWriter for Windows. The new method
   does not use any of the current package tools that produce a Windows executable of the app. These
-  packages tend to cause false virus warnings. This method uses the Python tool `zipapp` to bundle
-  novelWriter as an executable `.pyz` file, and adds Python embeddable and library dependencies
-  into the same folder. The folder itself can be distributed as-is, or a Windows installer
-  executable can be generated with `setup.py setup-pyz`. Issue #580, PR #584.
+  packages tend to cause false virus warnings. This new method uses the Python tool `zipapp` to
+  bundle novelWriter as an executable `.pyz` file, and adds Python embeddable and library
+  dependencies into the same folder. The folder itself can be distributed as-is, or a Windows
+  installer executable can be generated with `setup.py setup-pyz`. Issue #580, PR #584.
 
 **Documentation**
 
 * Updated documentation, main README and Contribution Guide to make them more consistent and to
   improve installation instructions. Based on issue #586 and input from @mgrhm. PR #592.
 
+**Other CHanges**
+
+* The HTML generator now adds line breaks after `div` blocks used to wrap tag/reference lines. This
+  makes the output easier to process by scripts, but has no impact on browser rendering and import
+  into other applications. PR #597.
+
 ----
 
 ## Version 1.0.2 [2021-01-19]
diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm
index cdee0872..7052b51c 100644
--- a/nw/assets/text/release_notes.htm
+++ b/nw/assets/text/release_notes.htm
@@ -2,15 +2,29 @@
 <html>
 <body>
 
+<h2>Release Notes for 1.0.3</h2>
+<p><i>Released on 24 January 2021</i></p>
+<p>This patch release fixes a minor bug sometimes encountered when running novelWriter from command
+line on Windows. In addition, the Solarized Dark and Solarized Light themes have been added to the
+selection of GUI and syntax themes by a user contribution.</p>
+<p>The main change in this release is to the install scripts and the documentation related to
+installing and running novelWriter. The primary change is a different method of packaging the app
+for Windows. Instead of building an <i>.exe</i> file, the new setup instead builds a runnable zip
+file <i>.pyz</i>. The executable would often be mistakenly flagged by virus control software due to
+the packaging tools. This is a known problem with pyinstaller and similar tools, but such warnings
+are always concerning even if they are false positives.</p>
+
+<p><i>The full changelog is available
+<a href="https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md">here</a>.</i></p>
+
+<hr/>
+
 <h2>Release Notes for 1.0.2</h2>
 <p><i>Released on 19 January 2021</i></p>
 <p>This patch release fixes a few minor cosmetic issues, a minor issue with the indexer, and a bug
 when adding words to the user's own spell check dictionary. Additionally, the documentation has
 been updated based on user feedback, and some install issues resolved.</p>
 
-<p><i>The full changelog is available
-<a href="https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md">here</a>.</i></p>
-
 <hr/>
 
 <h2>Release Notes for 1.0.1</h2>
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index f2e81250..fd136fe7 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.0.2" hexVersion="0x010002f0" fileVersion="1.2" timeStamp="2021-01-19 20:55:33">
+<novelWriterXML appVersion="1.0.3" hexVersion="0x010003f0" fileVersion="1.2" timeStamp="2021-01-24 14:14:09">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
-    <saveCount>826</saveCount>
+    <saveCount>830</saveCount>
     <autoCount>153</autoCount>
-    <editTime>39506</editTime>
+    <editTime>39583</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>