novelWriter 2.5.3__tar.gz → 2.6b2__tar.gz

{novelwriter-2.5.3 → novelwriter-2.6b2}/CHANGELOG.md

@@ -1,5 +1,131 @@
 # novelWriter Changelog
 
+## Version 2.6 Beta 2 [2024-12-23]
+
+### Release Notes
+
+This is a beta release 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
+
+**New Features**
+
+* The project tree has been completely rewritten under the hood. The main difference in the GUI is
+  a lifting of restrictions on drag and drop. You can now select multiple items in multiple places
+  in the tree, and drag them to a new location. It is still not allowed to drag root level items,
+  or drop items on the root level. PR #2119.
+* You can now drag and drop items from the project tree onto the editor and viewer to load the
+  documents there. PR #2119.
+
+**Bugfixes**
+
+* Make line height in DocX scale correctly. Issue #2099. PR #2102.
+* Make margins scale with font size in ODT and HTML output. PR #2102.
+* Fix DocX page count to work with Office 365. PR #2102.
+* Fix font scaling issues for PDF output. Issue #2100. PR #2104.
+* Fix an issue that cleared the editor when the return key was used on a folder item. PR #2113.
+* Fix an issue where the viewer and preview would not reset text emphasis when selecting a default
+  font style with emphasis features. Issue #2121. PR #2122.
+* Change how custom fonts are loaded to ensure that the Qt framework don't take shortcuts by using
+  a similar font instead of the chosen font. This is a side effect of the Qt font matching feature.
+  Issue #2118. PR #2122.
+
+**Improvements**
+
+* Move processing of alternative apostrophe and dash to a later point in the tokenization process.
+  It needs to happen after dialogue is processed to work as intended. PR #2095.
+* Use icons for text margin settings in Build Settings. Issue #2098. PR #2102.
+* Replace the toolbar icon in the editor. PR #2103.
+* Turn off auto-default button on the Build dialog. Issue #2101. PR #2105.
+* Add ANSI colours to log output for easier debugging. PRs #2114 and #2117.
+* Document header is now aligned to the bottom of the top page margin in the same way for ODT and
+  DocX output. Issue #2120. PR #2128.
+* Dialogue detection for quoted dialogue has been improved to better support Chinese, and other
+  languages that don't use whitespaces to separate words. Some improvements have also been made to
+  how single quoted dialogues are processed when apostrophes are present. Issue #2131. PR #2138.
+
+**Code Improvements**
+
+* Completely rewrite the project tree into a model/view set with one single definition if the
+  project structure. PR #2109.
+* The auto-replace feature in the editor has been refactored. It is now better separated from the
+  editor code, and may have some minor performance improvements. Issue #2129. PR #2132.
+
+----
+
+## Version 2.6 Beta 1 [2024-11-12]
+
+### Release Notes
+
+This is a beta release 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
+
+**New Features**
+
+* Added PDF build format. Issue #2046. PR #2048.
+* Added DocX (MS Word) format. Issue #1537. PR #2056.
+* The Build settings tool has the following changes: Ability to control page break and centring of
+  main titles, an option to disable styling for headings altogether, and the ODT section has been
+  generalised to apply to all document formats. Issue #2023. PR #2045.
+* Text and heading margin can now be control in the Manuscript Build tool. Issue #2023. PR #2051.
+* Word counts and other such statistics can now be inserted into the manuscript. This is done
+  through new insert actions in the Insert menu, and processed at build time. Issue #2024.
+  PR #2073.
+* Forced line breaks can now be inserted as a shortcode. This is useful when line breaks in
+  paragraphs are ignored when building the manuscript. Issue #1991. PR #2063.
+* A new `@mentions` keyword has been added that can list any tag in the project as being mentioned
+  in the current section. These are listed separately from tags present in the story section.
+  Issue #1822. PR #2064.
+* Tags in novel documents can now be referenced with the `@story` keyword. Issue #1990. PR #2072.
+* URLs starting with http/https are now recognised and clickable in the editor, viewer, and
+  manuscript preview. Issue #1426. PR #2067.
+* Added dialogue highlighting for Portuguese and Polish dialogue styles. Issues #2066 and #2070.
+  Related to #1773. PRs #2068, #2079, #2081 and #2082.
+* Four dashes in the editor are now replaced by a horizontal bar. This is useful as a replacement
+  symbol for em dash when using dialogue highlighting to avoid triggering it. The horizontal bar is
+  replaced with an em dash in the manuscript. Issue #2070. PR #2079.
+* Manuscript Build settings can now be duplicated. Issue #1931. PR #2084.
+* Page breaks can optionally be made visible in the Manuscript preview. PR #2086.
+* The document status label can now be selected in the Outline View. Issue #1909. PR #2088.
+* The document viewer now has an edit button to open the document in the editor. Issue #1963.
+  PR #2089.
+
+**User Interface**
+
+* The Manuscript Build settings have now been moved into a single scrollable page, using the same
+  layout as in Preferences. The heading and filtering pages are still separate forms, as they are
+  of a more complex nature. PR #2031.
+* The currently open document in the editor is now highlighted in the project tree, just like it is
+  in the novel view. Issue #1981. PR #2077.
+* The details panel in the Outline view is now resizable. PR #2078.
+
+**Improvements**
+
+* Add an option to ignore a word in the spell checker. An ignored word is ignored only for the
+  current writing session. PR #2030.
+* Word counts and other such statistics is now exported as custom variables to ODT files, and can
+  be inserted in the text in LibreOffice, and similar. Issue #2033. PR #2035.
+
+**Code Improvements**
+
+* Added Python 3.13 coverage to ensure the new Python release is supported. Issue #2040. PR #2044.
+* Preparation for Qt6: Clean up Qt enums. PR #2025.
+* Preparation for Qt6: Replace Qt regular expression tools with the internal Python re module for
+  markup processing and syntax highlighting. It is both slightly faster, and there are issues with
+  text encoding in at least some versions of Qt6 or PyQt6. PRs #2028 and #2043.
+* Preparation for Qt6: Added a wrapper function for connecting signals to slots that has a
+  different function signature. Python lambdas generate warnings inn Qt6. PR #2075.
+* Refactored manuscript formats and moved most of the processing to the Tokenizer class to simplify
+  the format classes and also make them more consistent. PRs #2060, #2061 and #2062.
+* The document builder has been refactored to support more generalised format classes. PR #2047.
+* Action parent assignment has been rafactored in the main menu. #2075.
+* Raw text format output has been refactored and reduced to just appending documents. PR #2087.
+
+----
+
 ## Version 2.5.3 [2024-11-26]
 
 ### Release Notes

{novelwriter-2.5.3 → novelwriter-2.6b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.5.3
+Version: 2.6b2
 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.5.3 → novelwriter-2.6b2}/README.md

@@ -31,10 +31,12 @@ documentation.
 
 ## Sponsors
 
-<img align="left" style="height: 1.5em; margin: 0 0.5em 0 0;" src="https://raw.githubusercontent.com/vkbo/novelWriter/main/setup/signpath_logo.png">
-
-Free code signing on Windows provided by [SignPath.io](https://about.signpath.io/),
-certificate by [SignPath Foundation](https://signpath.org/).
+<table style="border: none;">
+<tr>
+  <td><img align="left" style="height: 25px;" src="https://raw.githubusercontent.com/vkbo/novelWriter/main/setup/signpath_logo.png"></td>
+  <td>Free code signing on Windows provided by <a href="https://about.signpath.io/">SignPath.io</a>, certificate by <a href="https://signpath.org/">SignPath Foundation</a>.</td>
+</tr>
+</table>
 
 ## Implementation
 

{novelwriter-2.5.3 → novelwriter-2.6b2}/novelWriter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.5.3
+Version: 2.6b2
 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.5.3 → novelwriter-2.6b2}/novelWriter.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ novelwriter/assets/icons/x-novelwriter-project.ico
 novelwriter/assets/icons/x-novelwriter-project.svg
 novelwriter/assets/icons/typicons_dark/README.md
 novelwriter/assets/icons/typicons_dark/icons.conf
+novelwriter/assets/icons/typicons_dark/mixed_copy.svg
 novelwriter/assets/icons/typicons_dark/mixed_document-chapter.svg
 novelwriter/assets/icons/typicons_dark/mixed_document-new.svg
 novelwriter/assets/icons/typicons_dark/mixed_document-note.svg
@@ -66,7 +67,13 @@ novelwriter/assets/icons/typicons_dark/mixed_import.svg
 novelwriter/assets/icons/typicons_dark/mixed_input-checked.svg
 novelwriter/assets/icons/typicons_dark/mixed_input-none.svg
 novelwriter/assets/icons/typicons_dark/mixed_input-unchecked.svg
+novelwriter/assets/icons/typicons_dark/mixed_margin-bottom.svg
+novelwriter/assets/icons/typicons_dark/mixed_margin-left.svg
+novelwriter/assets/icons/typicons_dark/mixed_margin-right.svg
+novelwriter/assets/icons/typicons_dark/mixed_margin-top.svg
 novelwriter/assets/icons/typicons_dark/mixed_search-replace.svg
+novelwriter/assets/icons/typicons_dark/mixed_size-height.svg
+novelwriter/assets/icons/typicons_dark/mixed_size-width.svg
 novelwriter/assets/icons/typicons_dark/nw_deco-h0.svg
 novelwriter/assets/icons/typicons_dark/nw_deco-h1.svg
 novelwriter/assets/icons/typicons_dark/nw_deco-h2-narrow.svg
@@ -94,6 +101,7 @@ novelwriter/assets/icons/typicons_dark/nw_tb-strike.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-subscript.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-superscript.svg
 novelwriter/assets/icons/typicons_dark/nw_tb-underline.svg
+novelwriter/assets/icons/typicons_dark/nw_toolbar.svg
 novelwriter/assets/icons/typicons_dark/typ_arrow-down-thick-grey.svg
 novelwriter/assets/icons/typicons_dark/typ_arrow-forward.svg
 novelwriter/assets/icons/typicons_dark/typ_arrow-maximise.svg
@@ -155,6 +163,7 @@ novelwriter/assets/icons/typicons_dark/typ_user.svg
 novelwriter/assets/icons/typicons_dark/typ_warning-full.svg
 novelwriter/assets/icons/typicons_light/README.md
 novelwriter/assets/icons/typicons_light/icons.conf
+novelwriter/assets/icons/typicons_light/mixed_copy.svg
 novelwriter/assets/icons/typicons_light/mixed_document-chapter.svg
 novelwriter/assets/icons/typicons_light/mixed_document-new.svg
 novelwriter/assets/icons/typicons_light/mixed_document-note.svg
@@ -166,7 +175,13 @@ novelwriter/assets/icons/typicons_light/mixed_import.svg
 novelwriter/assets/icons/typicons_light/mixed_input-checked.svg
 novelwriter/assets/icons/typicons_light/mixed_input-none.svg
 novelwriter/assets/icons/typicons_light/mixed_input-unchecked.svg
+novelwriter/assets/icons/typicons_light/mixed_margin-bottom.svg
+novelwriter/assets/icons/typicons_light/mixed_margin-left.svg
+novelwriter/assets/icons/typicons_light/mixed_margin-right.svg
+novelwriter/assets/icons/typicons_light/mixed_margin-top.svg
 novelwriter/assets/icons/typicons_light/mixed_search-replace.svg
+novelwriter/assets/icons/typicons_light/mixed_size-height.svg
+novelwriter/assets/icons/typicons_light/mixed_size-width.svg
 novelwriter/assets/icons/typicons_light/nw_deco-h0.svg
 novelwriter/assets/icons/typicons_light/nw_deco-h1.svg
 novelwriter/assets/icons/typicons_light/nw_deco-h2-narrow.svg
@@ -194,6 +209,7 @@ novelwriter/assets/icons/typicons_light/nw_tb-strike.svg
 novelwriter/assets/icons/typicons_light/nw_tb-subscript.svg
 novelwriter/assets/icons/typicons_light/nw_tb-superscript.svg
 novelwriter/assets/icons/typicons_light/nw_tb-underline.svg
+novelwriter/assets/icons/typicons_light/nw_toolbar.svg
 novelwriter/assets/icons/typicons_light/typ_arrow-down-thick-grey.svg
 novelwriter/assets/icons/typicons_light/typ_arrow-forward.svg
 novelwriter/assets/icons/typicons_light/typ_arrow-maximise.svg
@@ -289,6 +305,7 @@ novelwriter/core/docbuild.py
 novelwriter/core/document.py
 novelwriter/core/index.py
 novelwriter/core/item.py
+novelwriter/core/itemmodel.py
 novelwriter/core/options.py
 novelwriter/core/project.py
 novelwriter/core/projectdata.py
@@ -297,11 +314,6 @@ novelwriter/core/sessions.py
 novelwriter/core/spellcheck.py
 novelwriter/core/status.py
 novelwriter/core/storage.py
-novelwriter/core/tohtml.py
-novelwriter/core/tokenizer.py
-novelwriter/core/tomarkdown.py
-novelwriter/core/toodt.py
-novelwriter/core/toqdoc.py
 novelwriter/core/tree.py
 novelwriter/dialogs/about.py
 novelwriter/dialogs/docmerge.py
@@ -321,6 +333,14 @@ novelwriter/extensions/statusled.py
 novelwriter/extensions/switch.py
 novelwriter/extensions/switchbox.py
 novelwriter/extensions/versioninfo.py
+novelwriter/formats/shared.py
+novelwriter/formats/todocx.py
+novelwriter/formats/tohtml.py
+novelwriter/formats/tokenizer.py
+novelwriter/formats/tomarkdown.py
+novelwriter/formats/toodt.py
+novelwriter/formats/toqdoc.py
+novelwriter/formats/toraw.py
 novelwriter/gui/doceditor.py
 novelwriter/gui/dochighlight.py
 novelwriter/gui/docviewer.py

{novelwriter-2.5.3 → novelwriter-2.6b2}/novelwriter/__init__.py

@@ -3,7 +3,7 @@ novelWriter – Init File
 =======================
 
 File History:
-Created: 2018-09-22 [0.0.1]
+Created: 2018-09-22 [0.0.1]  main
 
 This file is a part of novelWriter
 Copyright 2018–2024, Veronica Berglyd Olsen
@@ -47,9 +47,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.5.3"
-__hexversion__ = "0x020503f0"
-__date__       = "2024-11-26"
+__version__    = "2.6b2"
+__hexversion__ = "0x020600b2"
+__date__       = "2024-12-23"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 
@@ -60,10 +60,26 @@ logger = logging.getLogger(__name__)
 #  Main Program
 ##
 
-# Global config and data singletons
+# Globals Singletons
 CONFIG = Config()
 SHARED = SharedData()
 
+# ANSI Colours
+C_RED    = "\033[91m"
+C_GREEN  = "\033[92m"
+C_YELLOW = "\033[93m"
+C_BLUE   = "\033[94m"
+C_WHITE  = "\033[97m"
+C_END    = "\033[0m"
+
+# Log Formats
+L_TIME = "[{asctime:}]"
+L_FILE = "{filename:>18}"
+L_LINE = "{lineno:<4d}"
+L_LVLP = "{levelname:8}"
+L_LVLC = "{levelname:17}"
+L_TEXT = "{message:}"
+
 
 def main(sysArgs: list | None = None) -> GuiMain | None:
     """Parse command line, set up logging, and launch main GUI."""
@@ -77,6 +93,7 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
         "version",
         "info",
         "debug",
+        "color",
         "style=",
         "config=",
         "data=",
@@ -98,6 +115,7 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
         " -v, --version  Print program version and exit.\n"
         "     --info     Print additional runtime information.\n"
         "     --debug    Print debug output. Includes --info.\n"
+        "     --color    Add ANSI colors to log output.\n"
         "     --meminfo  Show memory usage information in the status bar.\n"
         "     --style=   Sets Qt5 style flag. Defaults to 'Fusion'.\n"
         "     --config=  Alternative config file.\n"
@@ -106,12 +124,12 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
 
     # Defaults
     logLevel = logging.WARN
-    logFormat = "{levelname:8}  {message:}"
+    fmtFlags = 0b00
     confPath = None
     dataPath = None
     testMode = False
-    qtStyle = "Fusion"
-    cmdOpen = None
+    qtStyle  = "Fusion"
+    cmdOpen  = None
 
     # Parse Options
     try:
@@ -135,8 +153,10 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
             logLevel = logging.INFO
         elif inOpt == "--debug":
             CONFIG.isDebug = True
+            fmtFlags = fmtFlags | 0b10
             logLevel = logging.DEBUG
-            logFormat  = "[{asctime:}]  {filename:>18}:{lineno:<4d}  {levelname:8}  {message:}"
+        elif inOpt == "--color":
+            fmtFlags = fmtFlags | 0b01
         elif inOpt == "--style":
             qtStyle = inArg
         elif inOpt == "--config":
@@ -148,13 +168,32 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
         elif inOpt == "--meminfo":
             CONFIG.memInfo = True
 
+    if fmtFlags & 0b01:
+        # This will overwrite the default level names, and also ensure that
+        # they can be converted back to integer levels
+        logging.addLevelName(logging.DEBUG,    f"{C_BLUE}DEBUG{C_END}")
+        logging.addLevelName(logging.INFO,     f"{C_GREEN}INFO{C_END}")
+        logging.addLevelName(logging.WARNING,  f"{C_YELLOW}WARNING{C_END}")
+        logging.addLevelName(logging.ERROR,    f"{C_RED}ERROR{C_END}")
+        logging.addLevelName(logging.CRITICAL, f"{C_RED}CRITICAL{C_END}")
+
+    # Determine Log Format
+    if fmtFlags == 0b00:
+        logFmt = f"{L_LVLP}  {L_TEXT}"
+    elif fmtFlags == 0b01:
+        logFmt = f"{L_LVLC}  {L_TEXT}"
+    elif fmtFlags == 0b10:
+        logFmt = f"{L_TIME}  {L_FILE}:{L_LINE}  {L_LVLP}  {L_TEXT}"
+    elif fmtFlags == 0b11:
+        logFmt = f"{L_TIME}  {C_BLUE}{L_FILE}{C_END}:{C_WHITE}{L_LINE}{C_END}  {L_LVLC}  {L_TEXT}"
+
     # Setup Logging
     pkgLogger = logging.getLogger(__package__)
     pkgLogger.setLevel(logLevel)
     if len(pkgLogger.handlers) == 0:
         # Make sure we only create one logger (mostly an issue with tests)
         cHandle = logging.StreamHandler()
-        cHandle.setFormatter(logging.Formatter(fmt=logFormat, style="{"))
+        cHandle.setFormatter(logging.Formatter(fmt=logFmt, style="{"))
         pkgLogger.addHandler(cHandle)
 
     logger.info("Starting novelWriter %s (%s) %s", __version__, __hexversion__, __date__)

{novelwriter-2.5.3 → novelwriter-2.6b2}/novelwriter/assets/i18n/project_en_GB.json

@@ -14,6 +14,7 @@
   "Objects": "Objects",
   "Entities": "Entities",
   "Custom": "Custom",
+  "New Page": "New Page",
   "0": "Zero",
   "1": "One",
   "2": "Two",

{novelwriter-2.5.3 → novelwriter-2.6b2}/novelwriter/assets/icons/typicons_dark/icons.conf

@@ -44,6 +44,7 @@ cls_template    = mixed_document-new.svg
 cls_timeline    = typ_calendar.svg
 cls_trash       = typ_trash.svg
 cls_world       = typ_location.svg
+copy            = mixed_copy.svg
 cross           = typ_times.svg
 document        = typ_document.svg
 down            = typ_chevron-down.svg
@@ -63,6 +64,10 @@ font            = nw_font.svg
 forward         = typ_chevron-right.svg
 import          = mixed_import.svg
 list            = typ_th-list.svg
+margin_bottom   = mixed_margin-bottom.svg
+margin_left     = mixed_margin-left.svg
+margin_right    = mixed_margin-right.svg
+margin_top      = mixed_margin-top.svg
 maximise        = typ_arrow-maximise.svg
 menu            = typ_th-dot-menu.svg
 minimise        = typ_arrow-minimise.svg
@@ -93,6 +98,8 @@ search_regex    = nw_search-regex.svg
 search_replace  = mixed_search-replace.svg
 search_word     = nw_search-word.svg
 settings        = typ_cog.svg
+size_height     = mixed_size-height.svg
+size_width      = mixed_size-width.svg
 star            = typ_star.svg
 status_idle     = typ_media-pause-grey.svg
 status_lang     = typ_globe-grey.svg
@@ -101,6 +108,7 @@ status_stats    = typ_chart-bar-grey.svg
 status_time     = typ_stopwatch-grey.svg
 sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
+toolbar         = nw_toolbar.svg
 unchecked       = mixed_input-unchecked.svg
 unfold-hide     = typ_unfold-hidden.svg
 unfold-show     = typ_unfold-visible.svg

novelwriter-2.6b2/novelwriter/assets/icons/typicons_dark/mixed_copy.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.8824 2c-1.2988 0-2.3529 1.0541-2.3529 2.3529v2.3529h-1.1765c-1.2988 0-2.3529 1.0541-2.3529 2.3529v10.588c0 1.2988 1.0541 2.3529 2.3529 2.3529h10.588c1.2988 0 2.3529-1.0541 2.3529-2.3529v-1.1765h2.3529c1.2988 0 2.3529-1.0541 2.3529-2.3529v-11.765c0-1.2988-1.0541-2.3529-2.3529-2.3529zm0 2.3529h11.765v11.765h-2.3529v-7.0588c0-1.2988-1.0541-2.3529-2.3529-2.3529h-7.0588zm-3.5294 4.7059h10.588c0.32353 0 0-0.32353 0 0v10.588h-10.588v-9.8943z" fill="#69c" stroke-width="1.1765"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_dark/mixed_margin-bottom.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#e6e6e6" fill-opacity=".14902" stroke-linecap="round" stroke-width="2"/>
+ <rect x="2" y="18" width="20" height="4" rx="1" ry="1" fill="#848484" stroke-linecap="round" stroke-width="2"/>
+ <path d="m18.414 8.5959c0.78104 0.79361 0.78104 2.0837 0 2.8773l-6.4141 6.5268-6.4141-6.5268c-0.391-0.3968-0.58601-0.91769-0.58601-1.4386 0-0.52092 0.195-1.0418 0.58601-1.4386 0.78104-0.79464 2.047-0.79464 2.8281 0l3.5861 3.6475 3.5861-3.6475c0.78104-0.79464 2.047-0.79464 2.8281 0z" fill="#69c" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_dark/mixed_margin-left.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#e6e6e6" fill-opacity=".14902" stroke-linecap="round" stroke-width="2"/>
+ <rect x="2" y="2" width="4" height="20" rx="1" ry="1" fill="#848484" stroke-linecap="round" stroke-width="2"/>
+ <path d="m15.404 18.5c-0.79361 0.78104-2.0837 0.78104-2.8773 0l-6.5268-6.4141 6.5268-6.4141c0.3968-0.391 0.91769-0.58601 1.4386-0.58601 0.52092 0 1.0418 0.195 1.4386 0.58601 0.79464 0.78104 0.79464 2.047 0 2.8281l-3.6475 3.5861 3.6475 3.5861c0.79464 0.78104 0.79464 2.047 0 2.8281z" fill="#69c" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_dark/mixed_margin-right.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#e6e6e6" fill-opacity=".14902" stroke-linecap="round" stroke-width="2"/>
+ <rect x="18" y="2" width="4" height="20" rx="1" ry="1" fill="#848484" stroke-linecap="round" stroke-width="2"/>
+ <path d="m8.5959 18.5c0.79361 0.78104 2.0837 0.78104 2.8773 0l6.5268-6.4141-6.5268-6.4141c-0.3968-0.391-0.91769-0.58601-1.4386-0.58601-0.52092 0-1.0418 0.195-1.4386 0.58601-0.79464 0.78104-0.79464 2.047 0 2.8281l3.6475 3.5861-3.6475 3.5861c-0.79464 0.78104-0.79464 2.047 0 2.8281z" fill="#69c" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_dark/mixed_margin-top.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#e6e6e6" fill-opacity=".14902" stroke-linecap="round" stroke-width="2"/>
+ <rect x="2" y="2" width="20" height="4" rx="1" ry="1" fill="#848484" stroke-linecap="round" stroke-width="2"/>
+ <path d="m18.414 15.404c0.78104-0.79361 0.78104-2.0837 0-2.8773l-6.4141-6.5268-6.4141 6.5268c-0.391 0.3968-0.58601 0.91769-0.58601 1.4386 0 0.52092 0.195 1.0418 0.58601 1.4386 0.78104 0.79464 2.047 0.79464 2.8281 0l3.5861-3.6475 3.5861 3.6475c0.78104 0.79464 2.047 0.79464 2.8281 0z" fill="#69c" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_dark/mixed_size-height.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#e6e6e6" fill-opacity=".14902" stroke-linecap="round" stroke-width="2"/>
+ <path d="m18.414 10.404c0.78104-0.79361 0.78104-2.0837 0-2.8773l-6.4141-6.5268-6.4141 6.5268c-0.391 0.3968-0.58601 0.91769-0.58601 1.4386 0 0.52092 0.195 1.0418 0.58601 1.4386 0.78104 0.79464 2.047 0.79464 2.8281 0l3.5861-3.6475 3.5861 3.6475c0.78104 0.79464 2.047 0.79464 2.8281 0z" fill="#69c" stroke-width="1.0087"/>
+ <path d="m18.414 13.596c0.78104 0.79361 0.78104 2.0837 0 2.8773l-6.4141 6.5268-6.4141-6.5268c-0.391-0.3968-0.58601-0.91769-0.58601-1.4386 0-0.52092 0.195-1.0418 0.58601-1.4386 0.78104-0.79464 2.047-0.79464 2.8281 0l3.5861 3.6475 3.5861-3.6475c0.78104-0.79464 2.047-0.79464 2.8281 0z" fill="#69c" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_dark/mixed_size-width.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#e6e6e6" fill-opacity=".15" stroke-linecap="round" stroke-width="2"/>
+ <path d="m13.596 18.414c0.79361 0.78104 2.0837 0.78104 2.8773 0l6.5268-6.4141-6.5268-6.4141c-0.3968-0.391-0.91769-0.58601-1.4386-0.58601-0.52092 0-1.0418 0.195-1.4386 0.58601-0.79464 0.78104-0.79464 2.047 0 2.8281l3.6475 3.5861-3.6475 3.5861c-0.79464 0.78104-0.79464 2.047 0 2.8281z" fill="#69c" stroke-width="1.0087"/>
+ <path d="m10.404 18.414c-0.79361 0.78104-2.0837 0.78104-2.8773 0l-6.5268-6.4141 6.5268-6.4141c0.3968-0.391 0.91769-0.58601 1.4386-0.58601 0.52092 0 1.0418 0.195 1.4386 0.58601 0.79464 0.78104 0.79464 2.047 0 2.8281l-3.6475 3.5861 3.6475 3.5861c0.79464 0.78104 0.79464 2.047 0 2.8281z" fill="#69c" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_dark/nw_toolbar.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="8" y="2" width="8" height="8" rx="1" ry="1" fill="none" stroke="#69c" stroke-linecap="round" stroke-width="2"/>
+ <rect x="8" y="14" width="8" height="8" rx="1" ry="1" fill="none" stroke="#69c" stroke-linecap="round" stroke-width="2"/>
+</svg>

{novelwriter-2.5.3 → novelwriter-2.6b2}/novelwriter/assets/icons/typicons_light/icons.conf

@@ -44,6 +44,7 @@ cls_template    = mixed_document-new.svg
 cls_timeline    = typ_calendar.svg
 cls_trash       = typ_trash.svg
 cls_world       = typ_location.svg
+copy            = mixed_copy.svg
 cross           = typ_times.svg
 document        = typ_document.svg
 down            = typ_chevron-down.svg
@@ -63,6 +64,10 @@ font            = nw_font.svg
 forward         = typ_chevron-right.svg
 import          = mixed_import.svg
 list            = typ_th-list.svg
+margin_bottom   = mixed_margin-bottom.svg
+margin_left     = mixed_margin-left.svg
+margin_right    = mixed_margin-right.svg
+margin_top      = mixed_margin-top.svg
 maximise        = typ_arrow-maximise.svg
 menu            = typ_th-dot-menu.svg
 minimise        = typ_arrow-minimise.svg
@@ -93,6 +98,8 @@ search_regex    = nw_search-regex.svg
 search_replace  = mixed_search-replace.svg
 search_word     = nw_search-word.svg
 settings        = typ_cog.svg
+size_height     = mixed_size-height.svg
+size_width      = mixed_size-width.svg
 star            = typ_star.svg
 status_idle     = typ_media-pause-grey.svg
 status_lang     = typ_globe-grey.svg
@@ -101,6 +108,7 @@ status_stats    = typ_chart-bar-grey.svg
 status_time     = typ_stopwatch-grey.svg
 sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
+toolbar         = nw_toolbar.svg
 unchecked       = mixed_input-unchecked.svg
 unfold-hide     = typ_unfold-hidden.svg
 unfold-show     = typ_unfold-visible.svg

novelwriter-2.6b2/novelwriter/assets/icons/typicons_light/mixed_copy.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7.8824 2c-1.2988 0-2.3529 1.0541-2.3529 2.3529v2.3529h-1.1765c-1.2988 0-2.3529 1.0541-2.3529 2.3529v10.588c0 1.2988 1.0541 2.3529 2.3529 2.3529h10.588c1.2988 0 2.3529-1.0541 2.3529-2.3529v-1.1765h2.3529c1.2988 0 2.3529-1.0541 2.3529-2.3529v-11.765c0-1.2988-1.0541-2.3529-2.3529-2.3529zm0 2.3529h11.765v11.765h-2.3529v-7.0588c0-1.2988-1.0541-2.3529-2.3529-2.3529h-7.0588zm-3.5294 4.7059h10.588c0.32353 0 0-0.32353 0 0v10.588h-10.588v-9.8943z" fill="#4271ae" stroke-width="1.1765"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_light/mixed_margin-bottom.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#333" fill-opacity=".15" stroke-linecap="round" stroke-width="2"/>
+ <rect x="2" y="18" width="20" height="4" rx="1" ry="1" fill="#333" stroke-linecap="round" stroke-width="2"/>
+ <path d="m18.414 8.5959c0.78104 0.79361 0.78104 2.0837 0 2.8773l-6.4141 6.5268-6.4141-6.5268c-0.391-0.3968-0.58601-0.91769-0.58601-1.4386 0-0.52092 0.195-1.0418 0.58601-1.4386 0.78104-0.79464 2.047-0.79464 2.8281 0l3.5861 3.6475 3.5861-3.6475c0.78104-0.79464 2.047-0.79464 2.8281 0z" fill="#4271ae" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_light/mixed_margin-left.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#333" fill-opacity=".15" stroke-linecap="round" stroke-width="2"/>
+ <rect x="2" y="2" width="4" height="20" rx="1" ry="1" fill="#333" stroke-linecap="round" stroke-width="2"/>
+ <path d="m15.404 18.5c-0.79361 0.78104-2.0837 0.78104-2.8773 0l-6.5268-6.4141 6.5268-6.4141c0.3968-0.391 0.91769-0.58601 1.4386-0.58601 0.52092 0 1.0418 0.195 1.4386 0.58601 0.79464 0.78104 0.79464 2.047 0 2.8281l-3.6475 3.5861 3.6475 3.5861c0.79464 0.78104 0.79464 2.047 0 2.8281z" fill="#4271ae" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_light/mixed_margin-right.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#333" fill-opacity=".15" stroke-linecap="round" stroke-width="2"/>
+ <rect x="18" y="2" width="4" height="20" rx="1" ry="1" fill="#333" stroke-linecap="round" stroke-width="2"/>
+ <path d="m8.5959 18.5c0.79361 0.78104 2.0837 0.78104 2.8773 0l6.5268-6.4141-6.5268-6.4141c-0.3968-0.391-0.91769-0.58601-1.4386-0.58601-0.52092 0-1.0418 0.195-1.4386 0.58601-0.79464 0.78104-0.79464 2.047 0 2.8281l3.6475 3.5861-3.6475 3.5861c-0.79464 0.78104-0.79464 2.047 0 2.8281z" fill="#4271ae" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_light/mixed_margin-top.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#333" fill-opacity=".15" stroke-linecap="round" stroke-width="2"/>
+ <rect x="2" y="2" width="20" height="4" rx="1" ry="1" fill="#333" stroke-linecap="round" stroke-width="2"/>
+ <path d="m18.414 15.404c0.78104-0.79361 0.78104-2.0837 0-2.8773l-6.4141-6.5268-6.4141 6.5268c-0.391 0.3968-0.58601 0.91769-0.58601 1.4386 0 0.52092 0.195 1.0418 0.58601 1.4386 0.78104 0.79464 2.047 0.79464 2.8281 0l3.5861-3.6475 3.5861 3.6475c0.78104 0.79464 2.047 0.79464 2.8281 0z" fill="#4271ae" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_light/mixed_size-height.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#333" fill-opacity=".15" stroke-linecap="round" stroke-width="2"/>
+ <path d="m18.414 10.404c0.78104-0.79361 0.78104-2.0837 0-2.8773l-6.4141-6.5268-6.4141 6.5268c-0.391 0.3968-0.58601 0.91769-0.58601 1.4386 0 0.52092 0.195 1.0418 0.58601 1.4386 0.78104 0.79464 2.047 0.79464 2.8281 0l3.5861-3.6475 3.5861 3.6475c0.78104 0.79464 2.047 0.79464 2.8281 0z" fill="#4271ae" stroke-width="1.0087"/>
+ <path d="m18.414 13.596c0.78104 0.79361 0.78104 2.0837 0 2.8773l-6.4141 6.5268-6.4141-6.5268c-0.391-0.3968-0.58601-0.91769-0.58601-1.4386 0-0.52092 0.195-1.0418 0.58601-1.4386 0.78104-0.79464 2.047-0.79464 2.8281 0l3.5861 3.6475 3.5861-3.6475c0.78104-0.79464 2.047-0.79464 2.8281 0z" fill="#4271ae" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_light/mixed_size-width.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="1" ry="1" fill="#333" fill-opacity=".15" stroke-linecap="round" stroke-width="2"/>
+ <path d="m13.596 18.414c0.79361 0.78104 2.0837 0.78104 2.8773 0l6.5268-6.4141-6.5268-6.4141c-0.3968-0.391-0.91769-0.58601-1.4386-0.58601-0.52092 0-1.0418 0.195-1.4386 0.58601-0.79464 0.78104-0.79464 2.047 0 2.8281l3.6475 3.5861-3.6475 3.5861c-0.79464 0.78104-0.79464 2.047 0 2.8281z" fill="#4271ae" stroke-width="1.0087"/>
+ <path d="m10.404 18.414c-0.79361 0.78104-2.0837 0.78104-2.8773 0l-6.5268-6.4141 6.5268-6.4141c0.3968-0.391 0.91769-0.58601 1.4386-0.58601 0.52092 0 1.0418 0.195 1.4386 0.58601 0.79464 0.78104 0.79464 2.047 0 2.8281l-3.6475 3.5861 3.6475 3.5861c0.79464 0.78104 0.79464 2.047 0 2.8281z" fill="#4271ae" stroke-width="1.0087"/>
+</svg>

novelwriter-2.6b2/novelwriter/assets/icons/typicons_light/nw_toolbar.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="8" y="2" width="8" height="8" rx="1" ry="1" fill="none" stroke="#4271ae" stroke-linecap="round" stroke-width="2"/>
+ <rect x="8" y="14" width="8" height="8" rx="1" ry="1" fill="none" stroke="#4271ae" stroke-linecap="round" stroke-width="2"/>
+</svg>