From 3c72f195ba969dca0396535cab24dbc49095ada6 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 13 Feb 2021 12:54:16 +0100 Subject: [PATCH 1/4] Bumped version for release 1.1.1 --- CHANGELOG.md | 8 ++++++++ docs/source/conf.py | 4 ++-- nw/__init__.py | 6 +++--- nw/assets/text/release_notes.htm | 11 ++++++++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a3f4257..d52fc0cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # novelWriter Changelog +## Version 1.1.1 [2021-02-21] + +### Release Notes + +### Detailed Changelog + +---- + ## Version 1.1 [2021-02-07] ### Release Notes diff --git a/docs/source/conf.py b/docs/source/conf.py index 12bc825c..f7d8978a 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.1" +version = "1.1.1" # The full version, including alpha/beta/rc tags -release = "1.1" +release = "1.1.1" # -- General configuration --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index 37954bc6..f3464613 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -62,9 +62,9 @@ __license__ = "GPLv3" __author__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" -__version__ = "1.1" -__hexversion__ = "0x010100f0" -__date__ = "2021-02-07" +__version__ = "1.1.1" +__hexversion__ = "0x010101f0" +__date__ = "2021-02-21" __status__ = "Stable" __domain__ = "novelwriter.io" __url__ = "https://novelwriter.io" diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index 92506344..b215e736 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -2,6 +2,14 @@
+Released on 21 February 2021
+TBD
+ +See also the Releases page.
+ +Released on 7 February 2021
The main change in this release is the addition of a new tab to the project tree on the left @@ -25,8 +33,5 @@ clearer categories and hopefully better help text. Some new options have been ad syntax highlighting of multi-paragraph quotes. The highlighter can now optionally accept quotes to be left "hanging", that is, no closing quote in the same paragraph.
-The full changelog is available -here.
- From 254845d71f0db4e35a0e5345d6278a04bb279af7 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 20 Feb 2021 16:41:33 +0100 Subject: [PATCH 2/4] Update changelog and release notes --- CHANGELOG.md | 41 ++++++++++++++++++++++++++++++++ nw/assets/text/release_notes.htm | 12 +++++++++- nw/core/index.py | 3 ++- sample/nwProject.nwx | 8 +++---- 4 files changed, 58 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d52fc0cc..f392bc4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,49 @@ ### Release Notes +This patch makes a couple of minor improvements to the GUI. The keyboard shortcut for deleting +entries in the project tree has been changed from `Ctrl+Del` to `Ctrl+Shift+Del` to free up that +shortcut for the document editor. It is now possible to use the shortcut for deleting the word in +front of the cursor, a common and useful feature of many text editors. + +In addition, the way the negative word count filter option works on the Writing Statistics tool has +been changed to be more intuitive. Enabling this filter now appears to remove all negative entries +without altering the other entries. Previously, the removed negative counts would be included in +the following entries to make it consistent with the total word count. + +Other changes include improving the speed of the internal spell checker, used when the Enchant +spell check library isn't available. The internal spell checker is no longer significantly slower, +but is still lacking in functionality compared to Enchant. + ### Detailed Changelog +**User Interface** + +* The default GUI font on Windows is now Arial. It works better with the Qt framework than the + default system font. If Arial is missing, it falls back to the bundled font Cantarell. PR #655. +* The way word changes are calculated on the Writing Statistics tool has changed when the option to + exclude negative word counts is active. Previously, the entries with negative counts were + filtered out, but the change in count was still applied to the next line, altering the value. + Now, the GUI will instead just drop the lines that are negative and keep the other lines + unchanged. This is more intutitive, but it also means that the total count now longer matches the + sum of the lines. PR #659. +* The keyboard shortcut for deleting entries in the project tree has been changed from `Ctrl+Del` + to `Ctrl+Shift+Del`. The `Ctrl+Del` shortcut is thus free to be used exclusively by the editor to + delete the word in front of the cursor. Having the same shortcut do different things depending on + which area of the GUI has focus is a bit confusing. Related to #529. PR #666. + +**Other Improvements** + +* The internal spell checker, which is used when the Enchant library isn't available, has been + given a significant speed improvement by caching the imported dictionary as a Python `set` + instead of a `list`. The `set` has a hashed key lookup algorithm that is significantly faster. + PR #668. + +**Installation** + +* The PyPi packages now include the `setup.py` file, which makes it possible to install icon + launchers for novelWriter on both Linux and Windows after installing with `pip`. PR #655. + ---- ## Version 1.1 [2021-02-07] diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index b215e736..94f5f480 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -4,7 +4,17 @@Released on 21 February 2021
-TBD
+This patch makes a couple of minor improvements to the GUI. The keyboard shortcut for deleting +entries in the project tree has been changed from "Ctrl+Del" to "Ctrl+Shift+Del" to free up that +shortcut for the document editor. It is now possible to use the shortcut for deleting the word in +front of the cursor, a common and useful feature of many text editors.
+In addition, the way the negative word count filter option works on the Writing Statistics tool +has been changed to be more intuitive. Enabling this filter now appears to remove all negative +entries without altering the other entries. Previously, the removed negative counts would be +included in the following entries to make it consistent with the total word count.
+Other changes include improving the speed of the internal spell checker, used when the Enchant +spell check library isn't available. The internal spell checker is no longer significantly slower, +but is still lacking in functionality compared to Enchant.
See also the Releases page.
diff --git a/nw/core/index.py b/nw/core/index.py index 2299ab0d..73d469c4 100644 --- a/nw/core/index.py +++ b/nw/core/index.py @@ -714,7 +714,8 @@ class NWIndex(): for refTitle in self._refIndex[tHandle]: for aTag in self._refIndex[tHandle][refTitle].get("tags", []): if len(aTag) == 3 and (sTitle is None or sTitle == refTitle): - theRefs[aTag[1]].append(aTag[2]) + if aTag[1] in theRefs: # Future-compatible. Check can be removed in 1.2. + theRefs[aTag[1]].append(aTag[2]) return theRefs diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx index 39ddc718..ea219af2 100644 --- a/sample/nwProject.nwx +++ b/sample/nwProject.nwx @@ -1,13 +1,13 @@ -In addition, the way the negative word count filter option works on the Writing Statistics tool has been changed to be more intuitive. Enabling this filter now appears to remove all negative entries without altering the other entries. Previously, the removed negative counts would be -included in the following entries to make it consistent with the total word count.
+included in the following entries to make it consistent with the total word count. Writing sessions +shorter than five minutes, and with no change in the word count, are also no longer recorded in the +session log file.Other changes include improving the speed of the internal spell checker, used when the Enchant spell check library isn't available. The internal spell checker is no longer significantly slower, but is still lacking in functionality compared to Enchant.
From 4071c2ca43fc9be89ac8e87c9a42a9b286d857dd Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 21 Feb 2021 16:01:15 +0100 Subject: [PATCH 4/4] Last changes to release notes --- CHANGELOG.md | 12 ++++++------ nw/assets/text/release_notes.htm | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 679a2231..ed99680c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,12 +9,12 @@ entries in the project tree has been changed from `Ctrl+Del` to `Ctrl+Shift+Del` shortcut for the document editor. It is now possible to use the shortcut for deleting the word in front of the cursor, a common and useful feature of many text editors. -In addition, the way the negative word count filter option works on the Writing Statistics tool has -been changed to be more intuitive. Enabling this filter now appears to remove all negative entries -without altering the other entries. Previously, the removed negative counts would be included in -the following entries to make it consistent with the total word count. Writing sessions shorter -than five minutes, and with no change in the word count, are also no longer recorded in the session -log file. +The way the negative word count filter option works on the Writing Statistics tool has been changed +to be more intuitive. Enabling this filter now appears to remove all negative entries without +altering the other entries. Previously, the removed negative counts would be included in the +following entries to make it consistent with the total word count. In addition, writing sessions +shorter than five minutes, and with no change in the word count, are no longer recorded in the +session log file. Other changes include improving the speed of the internal spell checker, used when the Enchant spell check library isn't available. The internal spell checker is no longer significantly slower, diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm index 1cf37386..4db3412f 100644 --- a/nw/assets/text/release_notes.htm +++ b/nw/assets/text/release_notes.htm @@ -8,12 +8,12 @@ entries in the project tree has been changed from "Ctrl+Del" to "Ctrl+Shift+Del" to free up that shortcut for the document editor. It is now possible to use the shortcut for deleting the word in front of the cursor, a common and useful feature of many text editors. -In addition, the way the negative word count filter option works on the Writing Statistics tool -has been changed to be more intuitive. Enabling this filter now appears to remove all negative -entries without altering the other entries. Previously, the removed negative counts would be -included in the following entries to make it consistent with the total word count. Writing sessions -shorter than five minutes, and with no change in the word count, are also no longer recorded in the -session log file.
+The way the negative word count filter option works on the Writing Statistics tool has been +changed to be more intuitive. Enabling this filter now appears to remove all negative entries +without altering the other entries. Previously, the removed negative counts would be included in +the following entries to make it consistent with the total word count. In addition, writing +sessions shorter than five minutes, and with no change in the word count, are no longer recorded in +the session log file.
Other changes include improving the speed of the internal spell checker, used when the Enchant spell check library isn't available. The internal spell checker is no longer significantly slower, but is still lacking in functionality compared to Enchant.