From c9083675ad49d1ae5ce62d57b8519d1efe6b885b Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 30 May 2020 14:19:40 +0200 Subject: [PATCH 1/6] Updated changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e143fee..683bca00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,12 @@ * Clicking a tag now tries to scroll to the header where the tag is set. The index needed a couple of minor changes for this feature, so this will invalidate the old index for a project, and require a new to be built. This is done automatically. PR #234. * Moved the Close button on the "Build Novel project" dialog to the area with the other buttons since we anyway increased the size of that area. PR #256. * Updated the unit for Preferences > Editor > Big document limit from `kb` to `kb`. Issue #258, PR #260. +* Added Typicos-based coloured icon set also for light GUI background. PR #265. **Project Structure** * The project folder structure has been simplified and cleaned up. We also now freeze the main entry values in the main XML file. The XML file is now given version 1.1, and no further core changes to its structure will be made without bumping this version. We're also locking it to only be opened by version 0.7 or later. An old project file is converted on first open. PRs #253 and #261. -* When a project is closed, two table of contents files are written to the project folder. They are named `ToC.txt` and `ToC.json` and are there for the user's convenience if they want to find a specific file from the project in the data folders. As discussed in Issue #259, PR #261. +* When a project is closed, two table of contents files are written to the project folder. They are named `ToC.txt` and `ToC.json` and are there for the user's convenience if they want to find a specific file from the project in the data folders. As discussed in Issue #259, PRs #261 and #262. * The expanded node flag from the project tree was also saved for file entries, which cannot actually be expanded. These flags are no longer saved in the XML file. PR #261. **Other Changes** @@ -20,6 +21,10 @@ * Dropped the usage of .bak copies of document files. This was the old method to ensure the document data was written successfully, but it uses twice the storage space. Instead, writing via a temp file is the safe way to save files. PR #248. * The project class now records the accumulated time in seconds a project has been opened. This data is not yet displayed anywhere, but it is being tracked in the project XML file. PR #261. +**Test Suite** + +* Added tests for Build Novel Project, Merge Folder and Split Document tools. PRs #263 and #264. + ## Version 0.6.3 [2020-05-28] From c82a3efcbf75ce28ffc242d24619e4411a602355 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 30 May 2020 14:21:18 +0200 Subject: [PATCH 2/6] Bumped version to 0.7 --- docs/source/conf.py | 2 +- nw/__init__.py | 6 +++--- setup.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 02f7ed85..d54df48e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -26,7 +26,7 @@ author = "Veronica Berglyd Olsen" # The short X.Y version version = "0.7.0" # The full version, including alpha/beta/rc tags -release = "0.7.0rc1" +release = "0.7.0" # -- General configuration --------------------------------------------------- diff --git a/nw/__init__.py b/nw/__init__.py index 9956c0d0..61aa56bb 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -40,9 +40,9 @@ __package__ = "novelWriter" __author__ = "Veronica Berglyd Olsen" __copyright__ = "Copyright 2018–2020, Veronica Berglyd Olsen" __license__ = "GPLv3" -__version__ = "0.7.0rc1" -__hexversion__ = "0x000700c1" -__date__ = "2020-05-28" +__version__ = "0.7.0" +__hexversion__ = "0x000700f0" +__date__ = "2020-06-01" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __status__ = "Pre-Release" diff --git a/setup.py b/setup.py index f0cbdbef..46e916af 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open("README.md", "r") as inFile: setuptools.setup( name = "novelWriter", - version = "0.7.0rc1", + version = "0.7", author = "Veronica Berglyd Olsen", author_email = "code@vkbo.net", description = "A markdown-like document editor for writing novels", From f825e101463e7f629e5c57cf7d42749109e7b830 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sat, 30 May 2020 14:21:41 +0200 Subject: [PATCH 3/6] Set release date to 2020-06-01 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 683bca00..f73474c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # novelWriter ChangeLog -## Version 0.7 RC1 [2020-xx-xx] +## Version 0.7 [2020-06-01] **User Interface** From 91acfb569f4c37db0e680e4e87d2857c46776eac Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 31 May 2020 17:35:17 +0200 Subject: [PATCH 4/6] Updated changelog --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f73474c6..001e72eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Version 0.7 [2020-06-01] +**Bugfixes** + +* Fixed a bug where novelWriter might crash if a file was deleted immediately after being created, and also if the project was new. PR #267. + **User Interface** * The back-references list now shows references to any tag in the open document, not just the first tag. Issue #227, PR #234. @@ -9,6 +13,14 @@ * Moved the Close button on the "Build Novel project" dialog to the area with the other buttons since we anyway increased the size of that area. PR #256. * Updated the unit for Preferences > Editor > Big document limit from `kb` to `kb`. Issue #258, PR #260. * Added Typicos-based coloured icon set also for light GUI background. PR #265. +* The export check mark that was added to the Flags column in the project tree in Version 0.6 has been moved to its own column, and been replaced with a proper icon. The details panel below it has been updated as well. PR #268. +* Icon sizes are now calculated based on the size of the text, and all text and icons should scale relative to the default GUI font size. PR #268. +* The font family and size of the main GUI font can now be changed in Preferences. For Windows, this defaults to Cantarell 11pt, which is now shipped with novelWriter, on other systems it defaults to the system font. PRs #269 and #270. +* There are no Monospace fonts on the GUI any more. Where fixed with is needed, the size is calculated beforehand with Qt's font metrics class. PR #271. +* Fonts are now selected via the system's font dialog, rather than the font combo box. PR #270. +* Word, character and paragraph counts are now updated on the project tree details panel if the currently edited file is selected. PR #272. +* The Build Novel Project dialog now shows the previous generated content when it's opened. PR #272. +* The Build Novel Project tool can now export the HTML and NWD output into a JSON data file. This file is convenient if the user wants to post-process the output with for instance Python, or one of the other numerous langauges that can read JSON files. PR #272. **Project Structure** From cc300956e419a2fd394a947873a84aeae28fb3f1 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 1 Jun 2020 12:44:03 +0200 Subject: [PATCH 5/6] Updated changelog with the latest changes --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 001e72eb..6329c427 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,18 +4,18 @@ **Bugfixes** -* Fixed a bug where novelWriter might crash if a file was deleted immediately after being created, and also if the project was new. PR #267. +* Fixed a bug where novelWriter might crash if a file is deleted immediately after being created, and also additional points-of-failure if the project was new. PR #267. **User Interface** * The back-references list now shows references to any tag in the open document, not just the first tag. Issue #227, PR #234. -* Clicking a tag now tries to scroll to the header where the tag is set. The index needed a couple of minor changes for this feature, so this will invalidate the old index for a project, and require a new to be built. This is done automatically. PR #234. +* Clicking a tag now tries to scroll to the header where the tag is set. The index needed a couple of minor changes for this feature, so this will invalidate the old index for a project and require a new to be built. This is done automatically. PR #234. * Moved the Close button on the "Build Novel project" dialog to the area with the other buttons since we anyway increased the size of that area. PR #256. * Updated the unit for Preferences > Editor > Big document limit from `kb` to `kb`. Issue #258, PR #260. -* Added Typicos-based coloured icon set also for light GUI background. PR #265. +* Added Typicons-based coloured icon set also for light GUI background. PR #265. * The export check mark that was added to the Flags column in the project tree in Version 0.6 has been moved to its own column, and been replaced with a proper icon. The details panel below it has been updated as well. PR #268. * Icon sizes are now calculated based on the size of the text, and all text and icons should scale relative to the default GUI font size. PR #268. -* The font family and size of the main GUI font can now be changed in Preferences. For Windows, this defaults to Cantarell 11pt, which is now shipped with novelWriter, on other systems it defaults to the system font. PRs #269 and #270. +* The font family and size of the main GUI font can now be changed in Preferences. For Windows, this defaults to Cantarell 11pt, which is now shipped with novelWriter, on other systems it defaults to the system font. Special accommodations had be made for Ubuntu where the font size of the tree widget was not updated automatically (Issue #273) PRs #269, #270, #274 and #275. * There are no Monospace fonts on the GUI any more. Where fixed with is needed, the size is calculated beforehand with Qt's font metrics class. PR #271. * Fonts are now selected via the system's font dialog, rather than the font combo box. PR #270. * Word, character and paragraph counts are now updated on the project tree details panel if the currently edited file is selected. PR #272. @@ -30,7 +30,7 @@ **Other Changes** -* Dropped the usage of .bak copies of document files. This was the old method to ensure the document data was written successfully, but it uses twice the storage space. Instead, writing via a temp file is the safe way to save files. PR #248. +* Dropped the usage of `.bak` copies of document files. This was the old method to ensure the document data was written successfully, but it uses twice the storage space. Instead, writing via a temp file is the current safe way to save files. PR #248. * The project class now records the accumulated time in seconds a project has been opened. This data is not yet displayed anywhere, but it is being tracked in the project XML file. PR #261. **Test Suite** From 7f963ac817f74df23700d87f73e30df22958e028 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 1 Jun 2020 12:49:10 +0200 Subject: [PATCH 6/6] Added a mention of the JSON export option in the docs. --- docs/source/export.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/source/export.rst b/docs/source/export.rst index 5cf24cff..91cfb5d6 100644 --- a/docs/source/export.rst +++ b/docs/source/export.rst @@ -95,3 +95,18 @@ Plain Text ========== The plain text export format writes a simple ``.txt`` file without any formatting at all. + +************************* +Additional Export Options +************************* + +In addition to the above document formats, the novelWriter HTML and Markdown formats can also be wrapped in a JSON file. +The files will have a meta data entry and a body entry. +For HTML, also the accompanying css styles are exported. + +The text body is saved in a two-level list. +The outer list contains one entry per exported file, in the order they appear in the project tree. +Each file is then split up into a lst as well, with one entry per line. + +These files are mainly intended for scripted post-processing for those who want that option. +A JSON file can be imported directly into a Python dict object or a PHP array, to mentions a few options.