Release 2.2 (#1641)

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Python Setup
         uses: actions/setup-python@v4
         with:
-          python-version: 3
+          python-version: "3.11"
           architecture: x64
 
       - name: Install Packages (apt)
@@ -48,7 +48,7 @@ jobs:
       - name: Python Setup
         uses: actions/setup-python@v4
         with:
-          python-version: 3
+          python-version: "3.11"
           architecture: x64
 
       - name: Install Packages (pip)

.github/workflows/syntax.yml

@@ -1,4 +1,4 @@
-name: flake8
+name: Flake8
 
 on:
   push:

.gitignore

@@ -10,6 +10,7 @@ setup.iss
 /novelwriter.desktop
 /novelWriter.pyw
 /setup/macos/Info.plist
+.venv
 
 # Translations
 /novelwriter/assets/i18n/*.qm

.readthedocs.yml

@@ -1,11 +0,0 @@
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-version: 2
-sphinx:
-  configuration: docs/source/conf.py
-formats:
-  - htmlzip
-  - pdf
-python:
-  install:
-    - requirements: docs/source/requirements.txt

CHANGELOG.md

@@ -1,5 +1,307 @@
 # novelWriter Changelog
 
+## Version 2.2 [2023-12-17]
+
+### Release Notes
+
+This release comes with a number of new features. These are some highlights.
+
+In addition to the common Markdown style formatting for bold, italic and strike through, a set of
+new shortcodes have been added. The shortcodes are far more flexible than the Markdown style
+syntax, and can be used for more complex formatting cases. Like when you need to add multiple,
+overlapping formats, or add emphasis to just a part of a word. The shortcodes also allow for
+underline, subscript and superscript, which the Markdown syntax does not. The new formats are
+available in the "Format" menu, and in a new toolbar in the editor that can be enabled by clicking
+the three dots in the top--left corner. The shortcode format was chosen because it can later be
+extended to include other requested features as well. Please have a look at the documentation for
+more details about the new shortcodes.
+
+The Tags and References system has been improved. The tags themselves are no longer case sensitive
+when you use them in references, but they are still displayed as you typed them in the tag
+definition when they are displayed in the user interface. Starting to type the `@` symbol in the
+text editor, on a new line, will now open an auto-completer menu which will display available
+options. It may not display all of your tags if you have a lot of them, but starting to type more
+characters will filter the list down further.
+
+You can now automatically create a note file for a new tag that you have added to a reference list
+in a document, but is not yet defined in a project note. So, for instance, if you come up with a
+new character while writing, and add a new tag to your `@char` references, you can right-click the
+new tag and create a new note for that entry directly. In addition, it is now also possible to
+right-click a heading in an open document and set the item label in the project tree to match the
+heading.
+
+In addition to the changes in the editor, the "References" panel below the document viewer has also
+been completely redesigned. It now shows all the references to the document you are viewing as a
+list, with a lot more details than before. In addition, tabs in the panel will appear to show all
+the tags you have defined in your notes, sorted as one tab per category. Like for instance
+Characters, Locations, Objects, etc. You can also give each note a short description comment on the
+same format as the summary comments for chapters and scenes. The short description comment can be
+added from the "Insert" menu under "Special Comments".
+
+The last major change in this release is the new multi-select feature in the project tree. You can
+now select multiple documents and folders using the mouse while pressing `Ctrl` or `Shift`. By
+right-clicking the selected items, you can perform a limited set of operations on all of them, like
+changing active status, and the status or importance labels. You can also drag and drop multiple
+items under the condition that all the selected items are in the same folder, at the same level.
+This restriction is in place due to limitations in the framework novelWriter is based on. But this
+should help in cases where multiple documents need to be moved in and out of folders or between
+folders. Note that adding the multi-select feature meant that the undo feature of the project tree
+had to be removed. It may be added back later.
+
+_These Release Notes also include the changes from the 2.2 Beta 1 and 2.2 RC 1 releases._
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fix column widths for columns with no text in the viewer panel lists, and fix an issues where
+  icons were not updated on theme switch. Issue #1627. PR #1626.
+* Fix auto-selection of words with apostrophes. Issue #1624. PR #1632.
+
+**Usability**
+
+* Use `Ctrl+K, H` for inserting short description comments (alias to synopsis), drop the space
+  after the `%` symbol when inserting special comments, add a browse icon to the open open project
+  dialog, and remove the popup warning for Alpha releases. PR #1626.
+* Menu entries no longer clear the status bar message when they are hovered. This was caused by a
+  status tip feature in Qt, which prints a blank message to the status bar. PR #1630.
+* The novel view panel now scrolls to bring the current document into view when iteratively
+  searching through documents in the project. Issue #1555. PR #1632.
+* The progress bar on the Manuscript Build dialog now stays for 3 seconds after completion instead
+  of 1 second. PR #1634.
+* The document viewer panel now shows the importance label next to each entry, and double-clicking
+  an entry will open it in the viewer. All entries also now show the content in tooltips so that
+  the columns can be shrunk to only view the icon if there is too little space. Issue #16220.
+  PR #1639.
+* The editor toolbar no longer uses the same buttons for markdown and shortcodes style formatting.
+  They have each received their separate buttons. Some additional space has been added between the
+  two types of buttons to visually separate them. Issues #1636 and #1637. PR #1638.
+* Convert the Synopsis and Comment buttons in the document viewer footer to buttons with both icon
+  and text, and drop the label. Issue #1628. PR #1638.
+
+**Internationalisation**
+
+* Updated US English, Norwegian, Japanese, Latin American Spanish, French, and Italian
+  translations. PRs #1625 and #1641.
+
+**Documentation**
+
+* The documentation has been updated to cover new features in 2.2. PR #1640.
+
+**Code Improvements**
+
+* Improve memory usage by making sure C++ objects are deleted when they are no longer used. There
+  is an issue between the Python and Qt side of things where objects are left in memory and not
+  properly garbage collected when they run out of scope. A number of deferred delete calls have
+  been added that seems to solve most of these cases. A `--meminfo` flag has been added to the
+  command line arguments to provide diagnostic data to help debug such issues. PR #1629.
+* Improve handling of alert boxes and their memory clean up, and refactor event filters. PR #1631.
+* Clean up unused methods in GUI extensions. PR #1634.
+
+----
+
+## Version 2.2 RC 1 [2023-11-26]
+
+### Release Notes
+
+This is a release candidate 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.
+
+Please check the changelog for an overview of changes. The full release notes will be added to the
+final release.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Revert the change of keyboard shortcut to delete a project tree item made in 2.2 Beta 1 as it
+  blocks certain features in the editor. This is a regression. PR 1616.
+
+**Features**
+
+* The old References panel under the Document Viewer has been replaced with a completely new widget
+  with a lot more features. The Back-references panel is still there, but is now a scrollable list
+  with a lot more information. In addition, tabs for each category of tags are available when there
+  are tags defined for them. These panels list all available tags, with a good deal of information
+  about them that may be useful to the writer, as well as buttons to open them in the viewer or
+  editor. Issues #925 and #998. PR #1606.
+* Multi-select is now possible in the project tree, with some limitations. Drag and drop is only
+  permitted if the selected items have the same parent item. Any other drag and drop selection will
+  be cancelled and the user notified. A new context menu has been added for the case when multiple
+  items are selected, with a reduced set of options that can be collectively applied to them.
+  Issues #1549 and #1592. PR #1612.
+* The "Scroll Past End" setting in Preferences has been added back in. It is slightly different
+  than the old one, as this one uses the Qt Plain Text Editor implementation, which has some side
+  effects some users may want to avoid. Issue #1602. PR #1605.
+* For Windows users, there is now an "Add Dictionaries" tool in the Tools menu where new spell
+  check dictionaries can be added. Links are provided to sources for these dictionaries, and a file
+  selector tool to import the files into novelWriter. Issue #982. PR #1611.
+* You can now update the name of a document by right-clicking on any heading inside the document
+  and select "Set as Document Name". This will open the Rename dialog with the text of the heading
+  pre-filled. Issue #1503. PR #1614.
+* A new special comment, called "Short" can be added to Project Notes. They are identical to
+  Synopsis comments, and are in fact just an alias for them. The "Short Description" will be
+  displayed alongside the tags in the new panel under the Document Viewer. Issues #1617 and #1621.
+  PRs #1617, #1619 and #1622.
+
+**Usability**
+
+* The feature to auto select word under cursor no longer uses the default Qt implementation, and
+  has instead been implemented by iterating backward and forward in the text to find the nearest
+  word boundaries. It will stop on characters that aren't Unicode alphanumeric as per Python's
+  definition. Toggling markup will also move the cursor to after the markup if it was already at
+  the end of the word. Otherwise it remains within the word at the same position. The word is not
+  selected after formatting if it wasn't selected before. If no selection was made, and no word is
+  auto selected, the formatting tags are inserted in-place with the cursor in the middle.
+  Issues #1333 and #1598. PR #1600.
+* The auto complete context menu is now only triggered on actual user input consisting of adding or
+  removing a single character. PR #1601.
+* Various improvements to the visibility of the cursor when the dimensions of the editor changes
+  have been added. Like for instance keeping the cursor visible when opening or closing the Viewer
+  panel, or toggling Focus Mode. Issues #1302 and #1478. PR #1608.
+* The Manuscript Build dialog now has a button to open the output folder. Issue #1554. PR #1613.
+
+**Code Improvements**
+
+* Improve test coverage. PR #1607.
+
+----
+
+## Version 2.2 Beta 1 [2023-11-11]
+
+### 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.
+
+Please check the changelog for an overview of changes. The full release notes will be added to the
+final release.
+
+### Detailed Changelog
+
+**Features**
+
+* novelWriter has a new logo and icon. PR #1593.
+* The Document Editor is now a true plain text editor. This has a number of benefits and a couple
+  of drawbacks. The most important benefits is that the editor responds a lot faster, and can hold
+  much larger text documents. The big document limit has therefore been removed. It mostly affected
+  automatic spell checking. The syntax highlighter and spell checker are also more efficient, which
+  allows for needed improvements to these. The drawbacks are mainly that the editor now scrolls one
+  line at a time, instead of scrolling pixel by pixel like before. PRs #1521 and #1525.
+* Tags and References are now case insensitive. Their display name on the user interface remains
+  the same as the value set for the `@tag` entry. Issue #1313. PRs #1522 and #1578.
+* Keywords for Tags and References, and the References themselves, now have an auto-complete menu
+  that pops up in the editor on lines starting with the `@` character. It will first suggest what
+  keyword you want to use, and when it has been added, use that keyword to look up suggestions for
+  references to add. The suggestions improve as you type by looking for the characters you've
+  already typed in the tags you've previously defined. Issue #823. PR #1581.
+* You can now right-click an undefined tag, and a context menu option to create a Project Note for
+  that tag will appear in the menu. On selection, it will create a note in the first root folder of
+  the correct kind, and set the title and tag to match the undefined reference, making it instantly
+  defined. Issues #1580 and #823. PR #1582.
+* Shortcodes have been added to the Document Editor. Shortcodes are HTML-like syntax, but uses
+  square brackets instead of angular brackets. So `[b]text[/b]` will make the word "text" appear as
+  bold. Shortcodes currently support bold, italic, strike trough, underline, superscript and
+  subscript text. The first three are complimentary to the Markdown-like syntax that. The benefit
+  of the shortcode emphasis syntax, however, is that it does not care about word boundaries, and
+  can therefore be used any place in the text. Including in the middle of words. Issues #1337 and
+  #1444. PRs #1540 and #1583.
+* A show/hide toolbar has been added to the editor where tool buttons for formatting options are
+  available. The toolbar is hidden by default, but can be activated from a three dots icon in the
+  top left corner of the editor. Issue #1585. PR #1584.
+* Build Definitions in the Manuscript Build tool can now be re-ordered, and the order is preserved
+  when the tool is closed and re-opened. Issue #1542. PR #1591.
+
+**Usability**
+
+* The Settings menu in the sidebar now always pops out to the right and upwards from the bottom of
+  the icon. The previous behaviour was not guaranteed to stay in the visible area of the screen.
+  PR #1520.
+* The right click action on a misspelled word now uses the actual spell checker data for lookup.
+  Previously, the spell checker would underline a word that was misspelled, but the right click
+  action actually had no way of reading where the error line was, so it had to guess again what
+  word the user was clicking. Since these two parts of the code used different logic, they
+  sometimes produced different results. The spell checker now saves the location of each spell
+  check error, and the right click action retrieves this data when generating suggestions, which
+  should eliminate the problem of picking the correct word boundaries. Issue #1532. PR #1525.
+* The language of a project is not set in the New Project Wizard and in Project Settings. It is no
+  longer defined in the Build Settings panel. Issue #1588. PR #1589.
+* The way switching focus and view in the main GUI has changed. Pressing `Ctrl+T` will now switch
+  focus to the Project or Novel Tree if focus is elsewhere, or if either have focus already, it
+  will switch view to the other tree. Pressing `Ctrl+E` will switch focus and view to the Document
+  Editor. Pressing `Ctrl+Shift+T` will do the same for the Outline View. The old Alt-based
+  shortcuts have been removed. Issues #1310 and #1291. PR #1590.
+
+**User Interface**
+
+* The labels under the sidebar buttons have been removed. The tool tips have the necessary
+  information. PR #1520.
+
+**Other Improvements**
+
+* Also the Tags and References keywords are now translated into the project language when these are
+  included in Manuscript builds. As long as the phrases have been translated. PR #1586.
+
+----
+
+## Version 2.1.1 [2023-11-05]
+
+### Release Notes
+
+This is a patch release that fixes a layout issue and internationalisation issues with the new
+Manuscript Build tool. It also fixes a number of issues related to bugs in the underlying Qt
+framework that affects drag and drop functionality in the project tree. These issues were mostly
+only affecting Debian Linux package releases.
+
+Other, minor issues related to updating the editor on colour theme change and project word list
+changes have been fixed as well. See the full changelog for more details.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fix an issue with width of the last two columns on Selection page of the Build Settings dialog on
+  Windows. They were far too wide by default. Issue #1551. PR #1553.
+* Fix an issue where a lot of string were not translated to the UI language in the new Manuscript
+  Build tool. Issue #1563. PR #1565.
+* Fix an issue in the Document Viewer where it wouldn't scroll to a heading further down the page
+  when following a reference pointing to it. Issue #1566. PR #1568.
+* Add back in checks for illegal drag and drop moves in the project tree. In 2.0, the logic here
+  was changed to set certain restrictions on the elements of the project tree itself, but there are
+  numerous bugs in the Qt framework related to drag and drop, so the checks are ignored on at least
+  Qt 5.15.8. In particular, it is possible to drop items on the root level, and it's possible to
+  move root items to other locations. Neither should be possible and will severely mess up the
+  project if done. Issue #1569. PR #1570.
+* Add a custom auto-scroll feature when dragging an item in the project tree to near the top or
+  bottom. This is actually a default feature of the tree widget in the Qt library, but this too is
+  broken in some versions of Qt 5.15.x. The default feature has been permanently disabled and
+  replaced by a custom written feature that behaves similarly. Issue #1561. PR #1571.
+* Fix an issue where the editor document wasn't re-highlighted when the Syntax Theme for it was
+  changed. Issue #1535. PR #1573.
+* Fix an issue where editing the Project Word List would not refresh the spell checking of the
+  editor. Issue #1559. PR #1573.
+
+**Usability**
+
+* Changed how the default UI language is selected. It used to default to the system locale, but
+  that is now changed to British English if the system local is not available in novelWriter. The
+  only real effects of this is that the dropdown box in Preferences now selects British English if
+  the system locale is not available rather than the first in the list (currently Deutch). The
+  second effect is that the language on buttons and other Qt components will match the rest of the
+  UI. Issue #1564. PR #1565.
+* There is a bug in Qt on Wayland desktops where menus don't open in the correct location.
+  According to one Qt ticket, QTBUG-68636, this can be mitigated by ensuring all QMenu instances
+  have a parent set. This does not fix all issues, but it should help. The menus without a parent
+  set have now been updated. Issue #1536. PR #1572.
+
+**Documentation**
+
+* Fixed a number of spelling errors and typing mistakes in the documentation for 2.1. Contributed
+  by @nisemono-neko. PR #1567.
+
+----
+
 ## Version 2.1 [2023-10-17]
 
 ### Release Notes
@@ -193,7 +495,7 @@ This is a patch release that fixes a few issues and adds a Japanese translation.
 
 The issues were mostly related to spell checking. In particular, issues with finding the word
 boundary when using underscore characters for italics markup. These issues should now be resolved.
-In addition, escaped markup characters are now renderred properly in HTML and ODT build formats.
+In addition, escaped markup characters are now rendered properly in HTML and ODT build formats.
 
 A few usability improvements have also been made. The Add Item menu in the project tree no longer
 shows the options to create Novel Documents when an item in the tree is selected that cannot hold
@@ -353,7 +655,7 @@ This is a patch release that fixes a few bugs and usability issues. The editing
 importance labels in Project Settings should now be a bit more intuitive. Opening a document from
 the Outline View that is already open in the editor should now switch to the editor view. The
 convert folder to note or document feature in the project tree has also been fixed. Some icons have
-been updated and a renderring issue with one of them fixed. Chinese, Norwegian, US English, German
+been updated and a rendering issue with one of them fixed. Chinese, Norwegian, US English, German
 and Spanish translations have been updated as well. A new credits tab has been added to the About
 dialog box, replacing the Credits section on the main About tab.
 
@@ -623,7 +925,7 @@ opened, a request to update the file format will show up.
   PR #1212.
 * The GUI theme now determines which icon theme is to be loaded. It is no longer a separate
   setting. The icon theme can also be reloaded without restart. Issue #1172. PR #1212.
-* The block formating features in the Format menu now also works on empty lines. Issue #1178.
+* The block formatting features in the Format menu now also works on empty lines. Issue #1178.
   PR #1214.
 * There is now a Format menu entry and shortcut code for synopsis comments. Issue #1177. PR #1214.
 * The split document dialog now has the option to move teh source document to trash. Issue #1179.
@@ -660,7 +962,7 @@ opened, a request to update the file format will show up.
   correct type information. PR #1197.
 * Saving and loading of XML data is now handled by a separate set of reader and writer classes. The
   reader class is capable of reading all file formats that have been used thus far. The various
-  data classes have been improved, and a new XML file formart version 1.5 added. Issue #1189.
+  data classes have been improved, and a new XML file format version 1.5 added. Issue #1189.
   PRs #1221 and #1232.
 * The index is now automatically rebuilt when the project file format is updated. Issue #1235.
   PR #1236.
@@ -853,8 +1155,8 @@ final release.
   setting is preserved. Previously, the Importance setting would overwrite it during the
   conversion. PR #1030.
 * Item labels, Status labels, and other labels on the GUI are now run through a "simplify" function
-  before being accepted. This functions strips out all whitespaces and consecutive whitespaces and
-  replace them with single plain whitespaces. This is a safer format to store in XML, and also
+  before being accepted. This functions strips out all white spaces and consecutive white spaces
+  and replace them with single plain white spaces. This is a safer format to store in XML, and also
   makes sure there aren't invisible characters floating around in the labels. PR #1038.
 * Due to the changes to how drag and drop works, there are no longer any restrictions on folders
   and documents. Only root folders remain restricted in terms of moving. Root folders can only be
@@ -1360,7 +1662,7 @@ checking enabled if there is something wrong with the spell check package.
 **Bugfixes**
 
 * When the HTML converter replaced grater than or smaller than symbols with the corresponding HTML
-  entities. the poisition of the formatting tags following in the text would be shifted, but the
+  entities. the position of the formatting tags following in the text would be shifted, but the
   positions were not updated. This is now solved by updating these positions when such a symbol is
   encountered. This issue has been backported from 1.6 development. Issue #929.
 * If the pyenchant package is installed, but the underlying enchant library is broken in one way or
@@ -1525,7 +1827,7 @@ backups.
   the case. Having two alternative spell checkers complicated the code a great deal, and the
   internal spell checker also required full word lists to be distributed with novelWriter. PR #875.
 * Added a setting in Preferences to change how the word count on the status bar is calculated. The
-  new setting allows the project notes to be filetred out, leaving only the word count for novel
+  new setting allows the project notes to be filtered out, leaving only the word count for novel
   files. Feature request #857. PR #882.
 
 **Installation and Packaging**
@@ -1544,7 +1846,7 @@ backups.
 
 **Internationalisation**
 
-* The US English and Nowregian translation files have been updated. PR #884.
+* The US English and Norwegian translation files have been updated. PR #884.
 
 **Documentation**
 
@@ -1575,7 +1877,7 @@ careful when using this version on live writing projects, and make sure you take
 
 **Internationalisation**
 
-* The US English and Nowregian translation files have been updated. PR #870.
+* The US English and Norwegian translation files have been updated. PR #870.
 
 **Documentation**
 
@@ -2163,7 +2465,7 @@ buttons were blocked when they shouldn't. This release resolves these issues.
 This release is mainly focused on the Build Novel Project tool. Completely new export classes have
 been written to support Open Document and Markdown exports. In addition, the way document layouts
 are handled have been automated a little to assist the user in keeping header levels and document
-layout flags in sync. The third new additoion is the ability to record and log idle time during a
+layout flags in sync. The third new addition is the ability to record and log idle time during a
 writing session to improve the writing statistics information as requested by several users.
 Finally, it is now possible to directly edit the project dictionary via a new, simple GUI dialog.
 
@@ -2256,7 +2558,7 @@ _These Release Notes also include the changes from 1.2 Beta 1 and RC 1._
   the index on next load. For earlier versions of novelWriter before 1.1.1, it would also cause a
   crash. Invalid keywords are now rejected during indexing. Issue #688. PR #689.
 * The "Empty Trash" option was no longer working due to an earlier fix that added a requirement
-  that the project tree has focus to allow the emptying to procede. Since the Empty Trash feature
+  that the project tree has focus to allow the emptying to proceed. Since the Empty Trash feature
   opens a dialog, the tree loses focus, and the deletions are therefore ignored. The focus check is
   no longer considered when emptying the trash. Issue #701. PR #702.
 
@@ -2316,7 +2618,7 @@ _The Release Notes have been moved and merged into the 1.2 RC 1 notes._
 * A full Markdown exporter has been written and added for the Build Novel Project tool. This too
   replaces a Qt feature that was used to save the content of the preview window into a markdown
   file. The exporter allows for both standard markdown and GitHub flavour markdown. The only
-  relevant difference being that the latter allows strikethrough text. Issue #617. PR #650.
+  relevant difference being that the latter allows strike through text. Issue #617. PR #650.
 * The Build Novel Project tool now has a "Line height" property that is applied to the preview, and
   to the HTML5 and Open Document export formats. Discussion #653. Issue #654. PR #660.
 * The Build Novel Project tool now has an option to convert Unicode characters to HTML entities on
@@ -2397,7 +2699,7 @@ but is still lacking in functionality compared to Enchant.
   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
+  unchanged. This is more intuitive, 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
@@ -2410,7 +2712,7 @@ but is still lacking in functionality compared to Enchant.
   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.
-* Sessions shortar than 5 minutes, and with no word count changes, are no longer recorded in the
+* Sessions shorter than 5 minutes, and with no word count changes, are no longer recorded in the
   session stats log file. PR #685.
 
 **Installation**
@@ -2875,7 +3177,7 @@ issues are discovered, the next release will be the final version 1.0 release.
 
 * The tests for the core classes of novelWriter have been completely rewritten. Every class or
   source file of the core functionality (everything handling the actual project data and documents,
-  as well as the meta data) is now covered by its own testmodule with a 100% coverage for each
+  as well as the meta data) is now covered by its own test module with a 100% coverage for each
   module. PR #512.
 * Likewise, the base tests have been rewritten to cover the `Config` class, the `main` function
   that launches the app, and the error handling class. The structure matches the core tests from
@@ -2907,7 +3209,7 @@ The "Typewriter Mode" of the editor has been improved. Essentially, this feature
 scroll. It tries to keep the cursor stationary in the vertical direction, and will try to scroll
 the document up when the cursor skips to a new line while typing (or down in case of backspaces).
 This is similar to the way a typewriter scrolls the paper when hitting the return key. It improves
-the writing experience as the current active line will stay at the same eye heightlevel on the
+the writing experience as the current active line will stay at the same eye height level on the
 screen.
 
 Previously, the feature would lock the cursor to a given vertical position defined by the user.
@@ -2955,7 +3257,7 @@ Switching main GUI theme still requires a restart.
   handled by the various tools, but they shouldn't even trigger when there is no project or
   document to perform the action on. PR #492.
 * Clarify the message of the Close Project and Exit novelWriter dialogs. Previously, it may have
-  seemed to some users that clicking "No" would allow the closing to procede without saving
+  seemed to some users that clicking "No" would allow the closing to proceed without saving
   changes. This is not true as changes are saved automatically when editing a project. The dialog
   text should now make this clearer. Issue #494, PR #495.
 
@@ -3000,7 +3302,7 @@ Switching main GUI theme still requires a restart.
 **User Interface**
 
 * An option has been added in Preferences to hide horizontal or vertical scroll bars on the main
-  GUI. These optons will hide scroll bars on the Project Tree, Document Editor, Document Viewer,
+  GUI. These options will hide scroll bars on the Project Tree, Document Editor, Document Viewer,
   Outline Tab and on the controls of the Build Novel Project tool. Scroll bars take up space, and
   as long as the project doesn't contain very long documents, scrolling with the mouse wheel is
   enough. The feature is of course entirely optional. PRs #468 and #469.
@@ -3020,7 +3322,7 @@ Switching main GUI theme still requires a restart.
 * When applying a format from the format menu to a selection of multiple paragraphs (or lines),
   only the first paragraph (or line) receives the formatting. The editor doesn't allow markdown
   formatting to span multiple lines. Issue #451, PR #475.
-* The syntax highlighter no longer uses the same colour to highlight strikethrough text as for
+* The syntax highlighter no longer uses the same colour to highlight strike through text as for
   emphasised text. The colour is intended to stand out, which makes little sense for such text.
   Instead, the highlighter uses the same colour as for comments. PR #476.
 
@@ -3171,7 +3473,7 @@ Switching main GUI theme still requires a restart.
 
 **Code Improvements**
 
-* Minor improvemenmts have been made to the core project classes to improve encapsulation and
+* Minor improvements have been made to the core project classes to improve encapsulation and
   better ensure consistency between the different data structures that store the novel project in
   memory. PR #447.
 * Some unused or redundant code has been removed, and in some places, functions have been merged to
@@ -3188,9 +3490,9 @@ Switching main GUI theme still requires a restart.
 **Bugfixes**
 
 * If the horizontal scroll bar appeared at the bottom of the document editor or viewer, for
-  instance if a long, un-wrapable line was entered, the scroll bar would sit on top of the document
-  footer. The footer bar now properly moves out of the way when the horizontal scroll bar appears.
-  Issue #433, PR #434.
+  instance if a long, un-wrappable line was entered, the scroll bar would sit on top of the
+  document footer. The footer bar now properly moves out of the way when the horizontal scroll bar
+  appears. Issue #433, PR #434.
 
 **New Features**
 
@@ -3312,7 +3614,7 @@ Switching main GUI theme still requires a restart.
   leading line break. This was previously handled entirely by the Qt library, which does this for
   some reason. Issue #395, PR #405.
 * A chapter heading in a file with a different layout than `Unnumbered` can now also be flagged as
-  an unnumbered chapter heading by adding an asterisk to the begfinning of the title text. This
+  an unnumbered chapter heading by adding an asterisk to the beginning of the title text. This
   only affects the number assignment and counter when running the Build Novel Project tool. The
   rest of the app ignores the asterisk. Issue #402, PR #406.
 
@@ -3327,7 +3629,7 @@ Switching main GUI theme still requires a restart.
   create a copy of the example project from the source code. Either from the `sample` folder in the
   source, or from a `sample.zip` file generated by the `setup.py` script and saved to the
   `nw/assets` folder. PR #366.
-* When the user clicked cancel on the colour dialog in Project Settins, the icon would be reset to
+* When the user clicked cancel on the colour dialog in Project Settings, the icon would be reset to
   black. Instead, the colour should remain unchanged. A check that the user actually selected a
   colour has now been added. Issue #395, PR #403.
 
@@ -3403,7 +3705,7 @@ planned by GitHub. See their [notes](https://github.com/github/renaming) for mor
   [novelwriter.readthedocs.io](https://novelwriter.readthedocs.io/) has been rewritten. It was
   drifting out of sync with the development of the code. In addition, many improvements have been
   made to the reStructuredText formatting of the documentation source by providing better
-  cross-reference linking and highlightings. The main repository README file has been updated to
+  cross-reference linking and highlighting. The main repository README file has been updated to
   match. PRs #375, #382, and #384.
 * The main `setup.py` script has been updated to also build documentation for the Qt Assistant when
   given a `qthelp` flag. The compiled help files are copied into the `nw/assets/help` folder, and
@@ -3501,7 +3803,7 @@ longer be read by an earlier version due to the change of how autoReplace settin
   has been removed from the main window status bar. PR #348.
 * The document editor footer can optionally be hidden in Distraction Free mode. PR #351.
 * The Italic and Bold menu entries have been renamed to Emphasis and Strong Emphasis, which is more
-  in line with what they represent in Markdown and HTML. They are still renderred as Italic and
+  in line with what they represent in Markdown and HTML. They are still rendered as Italic and
   Bold in the document viewer, but the HTML export is using the `<em>` and `<strong>` tags.
   PR #350.
 * Due to several issues with the formatting of emphasised text using `*`, `**`, and `***` wrappers,
@@ -3514,9 +3816,9 @@ longer be read by an earlier version due to the change of how autoReplace settin
   for emphasis and strong is commonly recommended when writing Markdown anyway, so it is a sensible
   compromise between speed and flexibility. This PR partially reverses PR #310. Issue #353,
   PR #355.
-* The syntax highlighter now properly highlights overlapping formattings, including emphasised text
+* The syntax highlighter now properly highlights overlapping formatting, including emphasised text
   inside of highlighted quotes. PR #355.
-* The colour highlighting of emphasis, strong and strikethrough, can now be switch off in
+* The colour highlighting of emphasis, strong and strike through, can now be switch off in
   Preferences. The syntax highlighter will still apply the italic, bold and strike effects.
   PR #357.
 * The project path in the Details tab of Project Settings can now be selected and copied to
@@ -3547,7 +3849,7 @@ longer be read by an earlier version due to the change of how autoReplace settin
   visible in the tree. It is called when you for instance click the header of an open document. It
   was also activated when opening a document from the tree view with either double-click by mouse,
   or by using the Enter key. This meant that the tree view would often move, which made it hard to
-  mouse click on items after eachother since you ended up chasing a moving target. This feature is
+  mouse click on items after each other since you ended up chasing a moving target. This feature is
   now disabled for document open. In addition, the scroll into view feature has been added to the
   search/replace call to move into the next document when reaching the end of the current document.
   This was requested in Issue #332. PR #334.
@@ -3558,7 +3860,7 @@ longer be read by an earlier version due to the change of how autoReplace settin
 **Documentation**
 
 * The documentation has been updated to clarify the correct formatting for italic, bold and
-  strikethrough formatting tags. Issue #220, PR #338.
+  strike through formatting tags. Issue #220, PR #338.
 
 ----
 
@@ -3577,11 +3879,11 @@ longer be read by an earlier version due to the change of how autoReplace settin
 
 * Underline text formatting has been removed. It is not standard HTML5, nor Markdown, and was
   previously implemented using the double underscore notation that in standard Markdown is
-  renderred as bold text. Instead, novelWriter now renders a single `*` or `_` wrapping a piece of
+  rendered as bold text. Instead, novelWriter now renders a single `*` or `_` wrapping a piece of
   text _within_ a paragraphs as italicised text, and a double `**` or `__` as bold text. The
   keyboard shortcuts and automatic features _only_ support the `*` notation. A triple set of `***`
   are treated as both bold and italicised. PR #310.
-* Strikethrough formatting has been added back into novelWriter using the standard Markdown `~~`
+* Strike through formatting has been added back into novelWriter using the standard Markdown `~~`
   wrapping. PR #310.
 * Added support for thin spaces and non-breaking thin spaces. PR #319.
 * The `Ctrl+Z` key sequence (undo) would not go through the wrapper function for document action
@@ -3598,7 +3900,7 @@ longer be read by an earlier version due to the change of how autoReplace settin
   PR #309.
 * The text emphasis functions, either selected from the menu or via keyboard shortcuts, will now
   try to respond to the command in a more meaningful way. That is, the text editor will try to
-  toggle the bold or italics features independently of eachother on the selected text. A menu entry
+  toggle the bold or italics features independently of each other on the selected text. A menu entry
   to apply both at the same time has also been added. PR #310.
 * The document editor search tool has been completely rewritten. It now appears as a search box at
   the top of the document, and has a number of toggle switches added to it. You can modify the
@@ -3968,7 +4270,7 @@ that I can spend more time using it than creating it.
 **Additional thanks** to @countjocular for PRs #173 and #174, and to @johnblommers for all the
 helpful feedback and issue reports for the new features added in this, and previous releases.
 
-### Noteable Changes
+### Notable Changes
 
 * The Timeline View dialog is now gone. Instead, the main window area has been split into two tabs.
   The first, the "Editor", contains the Document Editor and Viewer panels. The second, the
@@ -4119,7 +4421,7 @@ helpful feedback and issue reports for the new features added in this, and previ
 **Bug Fixes**
 
 * Fixed an issue when closing the import file dialog without selecting a file, the import would
-  procede, but fail on file not found. The import is now cancelled when there is no file selected.
+  proceed, but fail on file not found. The import is now cancelled when there is no file selected.
   PR #149.
 * Fixed an issue with markdown export where it did not take into account hard line breaks. Issue
   #151, PR #152.
@@ -4529,7 +4831,7 @@ This is the initial release of a working version of novelWriter, but with very l
 capabilities. So far, the following has been implemented:
 
 * A document tree with a set of pre-defined root folders of a given set of classes for different
-  purposes for novel writing. That is, a root item for the novel itself, one for charcaters, plot
+  purposes for novel writing. That is, a root item for the novel itself, one for characters, plot
   elements, timeline, locations, objects, and a custom one.
 * A plain text editor with a simplified markdown format that allows for four levels of titles, and
   bold, italics and underline text.
@@ -4537,7 +4839,7 @@ capabilities. So far, the following has been implemented:
   * It also allows for keyword/value sets staring with the character `@`. These will later be used
     to link documents together as tags point to other documents. For instance, a scene file can
     point the keyword `@POV:name` to a character file with the keyword `@THIS:name`.
-* The text editor has a set of autoreplace features:
+* The text editor has a set of auto replace features:
   * Dashes are made by combining two or three hyphens.
   * Three dots are replaced with the ellipsis.
   * Straight quotes with your quote format of choice.

CREDITS.md

@@ -52,6 +52,12 @@ Some of the assets bundled with novelWriter were adapted from the following sour
 * [Owl](https://github.com/sdras/night-owl-vscode-theme) syntax themes by Sarah Drasner (MIT License)
 * [Solarized](https://github.com/altercation/solarized) themes by Ethan Schoonover (MIT License)
 
+## Fonts
+
+The font used for the main novelWriter logo, mimetype and text banners is:
+
+* Pridi by Cadson Demak (Open Font License, Version 1.1)
+
 ## Special Mentions
 
 Additional thanks to @johnblommers who was an early user and who has provided a lot of very useful

README.md

@@ -1,13 +1,12 @@
 # novelWriter
 
-[![release](https://img.shields.io/github/v/release/vkbo/novelwriter)](https://github.com/vkbo/novelWriter/releases)
 [![Linux](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_linux.yml)
 [![Windows](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_win.yml)
-[![macOS](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml)
-[![flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions)
-[![codecov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter)
+[![MacOS](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml/badge.svg?branch=main)](https://github.com/vkbo/novelWriter/actions/workflows/test_mac.yml)
+[![Flake8](https://github.com/vkbo/novelWriter/workflows/flake8/badge.svg)](https://github.com/vkbo/novelWriter/actions)
+[![CodeCov](https://codecov.io/gh/vkbo/novelWriter/branch/main/graph/badge.svg)](https://codecov.io/gh/vkbo/novelWriter)
 
-<img align="left" style="margin: 0 16px 4px 0;" src="https://raw.githubusercontent.com/vkbo/novelWriter/main/setup/novelwriter.png">
+<img align="left" style="margin: 0 0 4px 0;" src="https://raw.githubusercontent.com/vkbo/novelWriter/main/setup/novelwriter_readme.png">
 
 novelWriter is a plain text editor designed for writing novels assembled from many smaller text
 documents. It uses a minimal formatting syntax inspired by Markdown, and adds a meta data syntax

docs/source/conf.py

@@ -27,7 +27,7 @@ with open(initFile) as inFile:
     else:
         release = "unknown"
 
-version = release.split("-")[0]
+version = release.partition("-")[0]
 
 # -- General Configuration ---------------------------------------------------
 
@@ -67,11 +67,6 @@ html_sidebars = {
     "**": ["navbar-logo", "sidebar-title", "sbt-sidebar-nav"],
 }
 
-# -- Options for HTMLHelp Output ---------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = "novelWriterDoc"
-
 # -- Options for LaTeX Output ------------------------------------------------
 
 latex_elements = {
@@ -84,11 +79,6 @@ latex_elements = {
     "figure_align": "htbp",
 }
 latex_logo = "_static/novelwriter-pdf.png"
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
 latex_documents = [(
-    master_doc, "manual.tex", "User Guide",
-    author, "manual"
+    master_doc, "manual.tex", "User Guide", author, "manual"
 )]

docs/source/int_customise.rst

@@ -7,7 +7,7 @@ Customisations
 .. _Enchant: https://abiword.github.io/enchant
 .. _Free Desktop: https://cgit.freedesktop.org/libreoffice/dictionaries/tree/
 
-There are a few ways you can customise novelWriter youself. Currently, you can add new GUI themes,
+There are a few ways you can customise novelWriter yourself. Currently, you can add new GUI themes,
 your own syntax themes, and install additional dictionaries.
 
 
@@ -22,23 +22,35 @@ may not load all installed spell check dictionaries automatically.
 Linux and MacOS
 ---------------
 
-On Linux and MacOS, you generally only have to install hunspell or aspell dictionaries on your
-system like you do for other applications. See your distro or OS documentation for how to do this.
-These dictionaries should show up as available spell check languages in novelWriter.
+On Linux and MacOS, you generally only have to install hunspell, aspell or myspell dictionaries on
+your system like you do for other applications. See your distro or OS documentation for how to do
+this. These dictionaries should show up as available spell check languages in novelWriter.
 
 Windows
 -------
 
 For Windows, English is included with the installation. For other languages you have to download
-and add dictionaries yourself. You can find the various dictionaries on the `Free Desktop`_
-website. You should find a folder for your language, if it is available at all, and download the
-files ending with ``.aff`` and ``.dic``. These files must then be copied to the following location:
+and add dictionaries yourself.
+
+**Install Tool**
+
+A small tool to assist with this can be found under :guilabel:`Tools > Add Dictionaries`. It will
+import spell checking dictionaries from Free Office or Libre Office extensions. The dictionaries
+are then installed in the install location for the Enchant library.
+
+**Manual Install**
+
+If you prefer to do this manually or want to use a different source than the ones mentioned above,
+You need to get compatible dictionary files for your language. You need two files files ending with
+``.aff`` and ``.dic``. These files must then be copied to the following location: 
 
 ``C:\Users\<USER>\AppData\Local\enchant\hunspell``
 
 This assumes your user profile is stored at ``C:\Users\<USER>``. The last one or two folders may
 not exist, so you may need to create them.
 
+You can find the various dictionaries on the `Free Desktop`_ website.
+
 .. note::
    The Free Desktop link points to a repository, and what may look like file links inside the
    dictionary folder are actually links to web pages. If you right-click and download those, you
@@ -53,7 +65,7 @@ not exist, so you may need to create them.
 Syntax and GUI Themes
 =====================
 
-Adding your own GUI and syntax themes is relatively easy, altough it requires that you manually
+Adding your own GUI and syntax themes is relatively easy, although it requires that you manually
 edit config files with colour values. The themes are defined by simple plain text config files with
 meta data and colour settings.
 
@@ -87,7 +99,7 @@ set as ``name`` inside the file.
 Gustom GUI and Icons Theme
 --------------------------
 
-A GUI theme ``.conf`` file consists of the follwing settings:
+A GUI theme ``.conf`` file consists of the following settings:
 
 .. code-block:: cfg
 
@@ -127,7 +139,7 @@ In the Main section you must at least define the ``name`` and ``icontheme`` sett
 ``typicons_light`` or ``typicons_dark``, or to an icon theme in your custom icons directory. The
 setting must match the icon theme's folder name.
 
-The Palette values correspond the the Qt enum values for QPalette::ColorRole, see the
+The Palette values correspond to the Qt enum values for QPalette::ColorRole, see the
 `Qt documentation <https://doc.qt.io/qt-5.15/qpalette.html#ColorRole-enum>`_ for more details. The
 colour values are RGB numbers on the format ``r, g, b`` where each is an integer from  to 255.
 Omitted values are not loaded and will use default values.
@@ -136,7 +148,7 @@ Omitted values are not loaded and will use default values.
 Custom Syntax Theme
 -------------------
 
-A syntax theme ``.conf`` file consists of the follwing settings:
+A syntax theme ``.conf`` file consists of the following settings:
 
 .. code-block:: cfg
 
@@ -159,6 +171,7 @@ A syntax theme ``.conf`` file consists of the follwing settings:
    doublequotes   =   0,   0,   0
    singlequotes   =   0,   0,   0
    hidden         =   0,   0,   0
+   shortcode      =   0,   0,   0
    keyword        =   0,   0,   0
    value          =   0,   0,   0
    spellcheckline =   0,   0,   0
@@ -167,5 +180,9 @@ A syntax theme ``.conf`` file consists of the follwing settings:
    modifier       =   0,   0,   0
 
 In the Main section, you must define at least the ``name`` setting. The Syntax colour values are
-RGB numbers on the format ``r, g, b`` where each is an integer from  to 255. Omitted values default
+RGB numbers of the format ``r, g, b`` where each is an integer from  to 255. Omitted values default
 to black, except ``background`` which defaults to white,
+
+.. versionadded:: 2.2
+   The `shortcode` syntax colour entry was added, so you need to update your custom themes if you
+   made any before version 2.2.

docs/source/int_glossary.rst

@@ -32,7 +32,7 @@ Glossary
       for more details.
 
    Reference
-      A references is one of a set of :term:`keywords<keyword>` that can be used to link to a
+      A reference is one of a set of :term:`keywords<keyword>` that can be used to link to a
       :term:`tag` in another document. The reference keywords are specific to the different
       :term:`root folder` types. A full overview is available in the :ref:`a_references` chapter.
 
@@ -55,7 +55,7 @@ Glossary
 
    Keyword
       A keyword in novelWriter is a special command you put in the text of your documents. They are
-      not standard Markdown, but is used in novelWriter to add information that is interpreted by
+      not standard Markdown, but are used in novelWriter to add information that is interpreted by
       the application. For instance, keywords are used for :term:`tags<tag>` and
       :term:`references<reference>`.
 

docs/source/int_howto.rst

@@ -9,8 +9,8 @@ Tips & Tricks
 This is a list of hopefully helpful little tips on how to get the most out of novelWriter.
 
 .. note::
-   This section will be expanded over time, and if you would like to have something added, feel
-   free to contribute, or start a discussion on the project's `Discussions Page`_.
+   This section will be expanded over time. If you would like to have something added, feel free to
+   contribute, or start a discussion on the project's `Discussions Page`_.
 
 
 Managing the Project

docs/source/int_introduction.rst

@@ -10,11 +10,11 @@ Key Features
 At its core, novelWriter is a multi-document plain text editor. It uses a markup syntax inspired by
 Markdown_ to apply simple formatting to the text. It is designed for writing fiction, so the
 formatting features available are limited to those relevant for this purpose. It is *not* suitable
-for technical writing, and it is *not* a full-feature Markdown editor.
+for technical writing, and it is *not* a full-featured Markdown editor.
 
 Your novel project is organised as a collection of separate plain text documents instead of a
-single, large document. The idea here is to make it easier to reorganise your project structure
-without having to cut and paste text between chapters.
+single, large document. The idea is to make it easier to reorganise your project structure without
+having to cut and paste text between chapters.
 
 There are two kinds of documents in your project: :term:`Novel Documents` are documents that are
 part of your story. The other kind of documents are :term:`Project Notes`. These are intended for
@@ -22,21 +22,21 @@ your notes about your characters, your world building, and so on.
 
 You can at any point split the individual documents by their headers up into multiple documents, or
 merge multiple documents into single documents. This makes it easier to use variations of the
-Snowflake_ method for writing. You can focus on writing larger structure-focused documents, like
+Snowflake_ method for writing. You can start by writing larger structure-focused documents, like
 one per act for instance, and later effortlessly split these up into scenes by their headers.
 
 Below are some key features of novelWriter.
 
 **Focus on writing**
-   The aim of the user interface is to let the user focus on writing instead of spending time
-   formatting text. Formatting is therefore limited to a small set of formatting tags for simple
-   things like text emphasis and paragraph alignment. When you really want to focus on just
-   writing, you can switch the editor into :guilabel:`Focus Mode` where only the text editor panel
-   itself is vissible, and the project structure view is hidden away.
+   The aim of the user interface is to let you focus on writing instead of spending time formatting
+   text. Formatting is therefore limited to a small set of formatting tags for simple things like
+   text emphasis and paragraph alignment. When you really want to focus on just writing, you can
+   switch the editor into :guilabel:`Focus Mode` where only the text editor panel itself is
+   visible, and the project structure view is hidden away.
 
 **Keep an eye on your notes**
    The main window can optionally show a document viewer to the right of the editor. This view
-   panel is intended for displaying another scene document, you character notes, plot notes, or any
+   panel is intended for displaying another scene document, your character notes, plot notes, or any
    other document you may need to reference while writing. It is not intended as a preview panel
    for the document you're editing, but if you wish, you can also use it for this purpose.
 
@@ -45,8 +45,8 @@ Below are some key features of novelWriter.
    build the project into a manuscript, they are all glued together in the top-to-bottom order in
    which they appear in the project tree. You can use as few text documents as you like, but
    splitting the project up into chapters and scenes means you can easily reorder them using the
-   drag-and-drop feature. You can also start out with a few documents and then later split them
-   into multiple documents based on their headers.
+   drag-and-drop feature of the project tree. You can also start out with a few documents and then
+   later split them into multiple documents based on their headers.
 
 **Multi-novel project support**
    As of novelWriter 2.0, you can have multiple Novel type root folders in a project. This allows
@@ -56,9 +56,9 @@ Below are some key features of novelWriter.
 **Keep track of your plot elements**
    All notes in your project can be assigned a :term:`tag` that you can :term:`reference` from any
    other document or note. In fact, you can add a new tag under each heading of a note if you need
-   to be able to reference specific sections of ot.
+   to be able to reference specific sections of it.
 
-**Get an overview of your plot elements**
+**Get an overview of your story**
    In the :guilabel:`Outline View` on the main window you can see an outline of all the chapters,
    scenes, and sections of your project. If they have any references in them, these are listed in
    additional columns. You can also add a synopsis to each chapter or scene, which can be listed
@@ -66,6 +66,12 @@ Below are some key features of novelWriter.
    subset of the outline information is also available in the :guilabel:`Novel View` as an
    alternative view to the project tree.
 
+**Get an overview of your story elements**
+   Under the document viewer panel you will find a series of tabs that shows the different story
+   elements you have created tags for. The tabs are sorted into Characters, Plots, etc, depending
+   on which categories you are using in your story. This panel can be hidden when you don't need it
+   to free up space.
+
 **Building your manuscript**
    Whether you want to assemble a manuscript, or export all your notes, or generate an outline of
    your chapters and scenes with a synopsis, you can use the :guilabel:`Build Manuscript` tool to
@@ -83,9 +89,9 @@ Screenshots
 .. figure:: images/screenshot_default.png
    :class: dark-light
 
-   novelWriter with default theme
+   novelWriter with light colour theme
 
 .. figure:: images/screenshot_dark.png
    :class: dark-light
 
-   novelWriter with dark theme
+   novelWriter with dark colour theme

docs/source/int_overview.rst

@@ -14,8 +14,8 @@ novelWriter is built as a cross-platform application using `Python 3 <https://ww
 the programming language, and `Qt 5 <https://www.qt.io/>`_ for the user interface.
 
 novelWriter is built for Linux first, and this is where it works best. However, it also runs fine
-on Windows and MacOS due to the cross-platform framework it's build on. The author of the
-application doesn't own a Mac, so on-going Mac support is dependant on user feedback and user
+on Windows and MacOS due to the cross-platform framework it's built on. The author of the
+application doesn't own a Mac, so on-going Mac support is dependent on user feedback and user
 contributions.
 
 Spell checking in novelWriter is provided by a third party library called
@@ -36,15 +36,15 @@ read on.
    This chapter explains the basics of how the application works and what it can and cannot do.
 
 :ref:`a_ui_project` – Recommended Reading
-   This chapter will give you a more detailed explanation of how you the user interface components
-   to organise and view your project work.
+   This chapter will give you a more detailed explanation of how you can use the user interface
+   components to organise and view your project work.
 
 :ref:`a_ui_writing` – Recommended Reading
    This chapter will give you a more detailed explanation of how the text editor and viewer work.
 
 :ref:`a_fmt` – Essential Information
    This chapter covers how you should format your text. The editor is plain text, so text
-   formatting requires some basic markup. The structure of your novel is also inferred by how you
+   formatting requires some basic markup. The structure of your novel is also inferred from how you
    use headings. Tags and references are implemented by special keywords.
 
 :ref:`a_kb` – Optional / Lookup
@@ -55,7 +55,7 @@ read on.
 :ref:`a_typ` – Optional
    This chapter gives you an overview of the special typographical symbols available in
    novelWriter. The auto-replace feature can handle the insertion of standard quote symbols for
-   your language, and other special characters. If you use any symbols aside from these. their
+   your language, and other special characters. If you use any symbols aside from these, their
    intended use is explained here.
 
 :ref:`a_prjfmt` – Optional
@@ -68,7 +68,7 @@ read on.
 Organising Your Projects
 ========================
 
-In addition to manage a collection of plain text files, novelWriter can interpret and map the
+In addition to managing a collection of plain text files, novelWriter can interpret and map the
 structure of your novel and show you additional information about its flow and content. In order
 to take advantage of these features, you must structure your text in a specific way and add some
 meta data for it to extract.

docs/source/int_started.rst

@@ -14,8 +14,8 @@ Getting Started
 .. _Releases: https://github.com/vkbo/novelWriter/releases
 .. _AppImage: https://appimage.org/
 
-Package installers for novelWriter are available for all major platforms, including Linux, Windows
-and MacOS. See below for install instructions for each platform.
+Ready-made packages and installers for novelWriter are available for all major platforms, including
+Linux, Windows and MacOS. See below for install instructions for each platform.
 
 You can also install novelWriter from the Python Package Index (PyPi). See :ref:`a_started_pip`.
 Installing from PyPi does not set up icon launchers, so you will either have to do this yourself,

docs/source/project_overview.rst

@@ -5,7 +5,7 @@ Novel Projects
 **************
 
 New projects can be created from the :guilabel:`Project` menu by selecting :guilabel:`New Project`.
-This will open the :guilabel:`New Project Wizard` that will assist you in creating a barebone
+This will open the :guilabel:`New Project Wizard` that will assist you in creating a bare bone
 project suited to your needs.
 
 A novelWriter project requires a dedicated folder for storing its files on the local file system.
@@ -41,7 +41,7 @@ to reference them from other documents and notes. The intended usage of each typ
 listed below. However, aside from the :guilabel:`Novel` folder, no restrictions are applied by the
 application on what you put in them. You can use them however you want.
 
-The root folder system is closesly connected to how the Tags and References system works. For more
+The root folder system is closely connected to how the Tags and References system works. For more
 details, see the :ref:`a_references` chapter.
 
 :guilabel:`Novel`

docs/source/project_references.rst

@@ -28,7 +28,7 @@ Metadata in novelWriter
 
 The structure of your novelWriter project is inferred from the :term:`headings` within the
 documents, not the documents themselves. See :ref:`a_struct_heads` for more details. Therefore,
-metadata is also associated with headings, and not documents.
+metadata is also associated with headings, and not the documents directly.
 
 If you split your project into separate documents for each scene, this distinction may not matter.
 However, there are several benefits to using documents at a larger structural scale when starting
@@ -51,9 +51,8 @@ by using the ``@tags`` :term:`keyword`. The full format of a tag is ``@tag: tagn
 ``tagname`` is an identifier of your choosing. You can only set *one* tag per heading, and the tag
 has to be unique across all documents in the project.
 
-.. note::
-   In version 2.2, tags will be made case insensitive, but as of novelWriter 2.1 they are not. You
-   should however avoid using tags that are only distinguished by case.
+.. versionadded:: 2.2
+   Tags are now case insensitive.
 
 After the tags have been defined, they can then be referenced in the novel documents, or
 cross-referenced in other notes. they will also show up in the :guilabel:`Outline View` and in the
@@ -64,10 +63,10 @@ allowed, that is, the tag is unique. Duplicate tags should be detected as long a
 to date. An invalid tag should have a green wiggly line under it, and will not receive the syntax
 colour that valid tags do.
 
-The tag is the only part of these notes that the novelWriter uses. The rest of the document content
-is there for the writer to use in whatever way they wish. Of course, the content of the documents
-can be added to the manuscript, or an outline document. If you want to compile a single document of
-all your notes, you can do this from the :guilabel:`Manuscript Build` tool.
+The tag is the only part of these notes that novelWriter uses. The rest of the document content is
+there for you to use in whatever way you wish. Of course, the content of the documents can be added
+to the manuscript, or an outline document. If you want to compile a single document of all your
+notes, you can do this from the :guilabel:`Manuscript Build` tool.
 
 Example of a heading with a tag for a character of the story:
 
@@ -81,10 +80,13 @@ Example of a heading with a tag for a character of the story:
 
 When this is done in a document in a :term:`Root Folder` of type "Characters", the tag is
 automatically treated as an available character in your project, and you will be able to reference
-it in any of your other documents using the reference keywords for characters.
+it in any of your other documents using the reference keywords for characters. It will also show up
+in the Character tab in the Reference panel below the document viewer, and in the reference
+auto-completer menu in the editor when you fill in references. See :ref:`a_ui_view` and
+:ref:`a_references_completer`.
 
 It is the root folder type that defines what category of story elements the tag is indexed under.
-See the :ref:`a_proj_roots` section for an overview of availabe root folder types. They are also
+See the :ref:`a_proj_roots` section for an overview of available root folder types. They are also
 covered in the next section.
 
 
@@ -148,6 +150,12 @@ that the tags referenced exist.
    In general, the index for a document is regenerated when it is saved, so this shouldn't normally
    be necessary.
 
+.. tip::
+   If you add a reference in the editor to a tag that doesn't yet exist, you can right-click it and
+   select :guilabel:`Create Note for Tag`. This will generate a new project note automatically with
+   the new tag defined. In order for this to be possible, a root folder for that category of
+   references must already exist.
+
 One note can also reference another note in the same way novel documents do. When the note is
 opened in the document viewer, the references become clickable links, making it easier to follow
 connections in the plot. You can follow links in the document editor by clicking them with the
@@ -176,3 +184,19 @@ Example of a novel document with references to characters and plots:
    @plot: Main
 
    Once upon a time ...
+
+
+.. _a_references_completer:
+
+The References Auto-Completer
+-----------------------------
+
+An auto-completer context menu will show up automatically in the document editor when you type the
+character ``@`` on a new line. It will first suggest tag or reference keywords for you to add, and
+after the ``:`` has been added, suggest references from the list of tags you have already defined.
+
+You can use the auto-completer to add multiple references with a ``,`` between them, and even type
+new ones. New references can be created by right-clicking on them and selecting
+:guilabel:`Create Note for Tag` from the menu.
+
+.. versionadded:: 2.2

docs/source/usage_breakdown.rst

@@ -23,6 +23,7 @@ at the same time provide useful features needed for writing a novel.
 
 The main window does not have an editor toolbar like many other applications do. This reduces
 clutter, and since the documents are formatted with style tags, it is more or less redundant.
+
 Most formatting features supported are available through convenient keyboard shortcuts. They are
 also available in the main menu, so you don't have to look up formatting codes every time you need
 them. For reference, a list of all shortcuts can be found in the :ref:`a_kb` chapter.
@@ -36,13 +37,18 @@ On the left side of the main window, you will find a sidebar. This bar has butto
 views you can switch between, a quick link to the :guilabel:`Build Manuscript` tool, and a set of
 project-related tools and quick access to settings at the bottom.
 
+.. versionadded:: 2.2
+   A number of new formatting options were added in 2.2 to allow for some special formatting cases.
+   At the same time, a small formatting toolbar was added in the editor. It is hidden by default,
+   but can be opened by pressing the three dots icon in the top right corner.
 
-Project Tree View
------------------
+
+Project Tree and Editor View
+----------------------------
 
 .. figure:: images/fig_project_tree_view.png
 
-   A screenshot of the Project Tree View.
+   A screenshot of the Project Tree and Editor View.
 
 When in :guilabel:`Project Tree View` mode, the main work area of the main window is split in two,
 or optionally three, panels. The left-most panel contains the project tree and all the documents in
@@ -59,8 +65,8 @@ the editor's header, or by pressing :kbd:`F8`. When :guilabel:`Focus Mode` is en
 interface elements other than the document editor itself are hidden away.
 
 
-Novel Tree View
----------------
+Novel Tree and Editor View
+--------------------------
 
 .. figure:: images/fig_novel_tree_view.png
 
@@ -105,7 +111,7 @@ much all collected meta data is available here in different columns.
 
 You can select which novel root folder to display from the dropdown box, and you can select which
 columns to show or hide from the menu button. You can also rearrange the columns by drag and drop.
-The app will remember you column order and size between sessions, and for each individual project.
+The app will remember your column order and size between sessions, and for each individual project.
 
 
 Colour Themes
@@ -134,7 +140,7 @@ This is a brief introduction to how you structure your writing projects. All of
 covered in more detail later.
 
 The main point of novelWriter is that you are free to organise your project documents as you wish
-into subfolders or subdocuments, and split the text between these documents in whatever way suits
+into sub-folders or sub-documents, and split the text between these documents in whatever way suits
 you. All that matters to novelWriter is the linear order the documents appear at in the project
 tree (top to bottom). The chapters, scenes and sections of the novel are determined by the headings
 within those documents.
@@ -153,8 +159,8 @@ The four heading levels (**H1** to **H4**) are treated as follows:
 The project tree will select an icon for the document based on the first heading in it.
 
 This header level structure is only taken into account for :term:`novel documents`. For
-:term:`project notes`, the header levels have no structural meaning, and the user is free to do
-whatever they want. See :ref:`a_struct` and :ref:`a_references` for more details.
+:term:`project notes`, the header levels have no structural meaning, and you are free to use them
+however you want. See :ref:`a_struct` and :ref:`a_references` for more details.
 
 .. versionadded:: 2.0
    You can add documents as child items of other documents. This is often more useful than adding
@@ -173,8 +179,9 @@ The project can at any time be assembled into a range of different formats throu
 various flavours of Markdown.
 
 The HTML5 format is suitable for conversion by a number of other tools like Pandoc_, or for
-importing into word processors if the Open Document format isn't suitable. In addition, printing
-is also possible. Print to PDF is available from the print dialog.
+importing into word processors if the Open Document format isn't suitable. The Open Document format
+is supported by most Office type applications. In addition, printing is also possible. Print to PDF
+is available from the print dialog.
 
 In addition, you can export the content of the project to a JSON file. This is useful if you want
 to write your own custom processing script in for instance Python, as the entire novel can be read
@@ -220,7 +227,7 @@ makes it easier to track them with version control software.
    Drive is mapped on Linux Gnome desktops using gvfs/gio.
 
 .. caution::
-   You should not add additional files to the project folder yourself. Nor should you,a s a rule,
+   You should not add additional files to the project folder yourself. Nor should you, as a rule,
    manually edit files within it. If you really must manually edit the text files, e.g. with some
    automated task you want to perform, you need to rebuild the :term:`Project Index` when you open
    the project again.

docs/source/usage_format.rst

@@ -7,7 +7,8 @@ Formatting Your Text
 The novelWriter text editor is a plain text editor that uses formatting codes for setting meta data
 values and allowing for some text formatting. The syntax is based on Markdown, but novelWriter is
 *not* a Markdown editor. It supports basic formatting like emphasis (italic), strong importance
-(bold) and strikethrough text, as well as four levels of headings.
+(bold) and strike through text, as well as four levels of headings. Form some further complex
+formatting needs, a set of shortcodes can be used.
 
 In addition to formatting codes, novelWriter allows for comments, a synopsis tag, and a set of
 keyword and value sets used for :term:`tags<tag>` and :term:`references<reference>`. There are also
@@ -20,7 +21,7 @@ Syntax Highlighting
 ===================
 
 The editor has a syntax highlighter feature that is meant to help you know when you've used the
-formtatting tags or other features correctly. It will change the colour and font size of your
+formatting tags or other features correctly. It will change the colour and font size of your
 headings, change the text colour of emphasised text, and it can also show you where you have
 dialogue in your text.
 
@@ -34,7 +35,7 @@ have a distinct colour, and the references themselves will get a colour if they
 references will get a squiggly error line underneath. The same applies to duplicate tags.
 
 There are a number of syntax highlighter colour themes available, both for light and dark GUIs. You
-can select them for :guilabel:`Preferences`.
+can select them from :guilabel:`Preferences`.
 
 
 .. _a_fmt_head:
@@ -72,7 +73,7 @@ For headers level one and two, adding a ``!`` modifies the behaviour of the head
 ``#! Title Text``
    This tells the build tool that the level one heading is intended to be used for the novel's
    main title, like for instance on the front page. When building the manuscript, this will use a
-   different styling and will exclude the title from for instance a Table of Contents in Libre
+   different styling and will exclude the title from, for instance, a Table of Contents in Libre
    Office.
 
 ``##! Title Text``
@@ -94,7 +95,7 @@ A text paragraph is indicated by a blank line. That is, you need two line breaks
 fragments of text into two paragraphs. Single line breaks are treated as line breaks within a
 paragraph.
 
-In addition, the editor supports a few additional types of whitespaces:
+In addition, the editor supports a few additional types of white spaces:
 
 * A non-breaking space can be inserted with :kbd:`Ctrl+K`, :kbd:`Space`.
 * Thin spaces are also supported, and can be inserted with :kbd:`Ctrl+K`, :kbd:`Shift+Space`.
@@ -126,7 +127,7 @@ A minimal set of text emphasis styles are supported for text paragraphs.
    The text is rendered as strongly important text (bold).
 
 ``~~text~~``
-   Strikethrough text.
+   Strike through text.
 
 In Markdown guides it is often recommended to differentiate between strong importance and emphasis
 by using ``**`` for strong and ``_`` for emphasis, although Markdown generally also supports ``__``
@@ -136,8 +137,8 @@ recommendation.
 
 In addition, the following rules apply:
 
-1. The emphasis and strikethrough formatting tags do not allow spaces between the words and the tag
-   itself. That is, ``**text**`` is valid, ``**text **`` is not.
+1. The emphasis and strike through formatting tags do not allow spaces between the words and the
+   tag itself. That is, ``**text**`` is valid, ``**text **`` is not.
 2. More generally, the delimiters must be on the outer edge of words. That is, ``some **text in
    bold** here`` is valid, ``some** text in bold** here`` is not.
 3. If using both ``**`` and ``_`` to wrap the same text, the underscore must be the *inner*
@@ -146,7 +147,7 @@ In addition, the following rules apply:
 4. Text emphasis does not span past line breaks. If you need to add emphasis to multiple lines or
    paragraphs, you must apply it to each of them in turn.
 5. Text emphasis can only be used in plain paragraphs. Comments, titles, and meta data tags don't
-   allow for formatting, and any formatting markup will be renderred as-is.
+   allow for formatting, and any formatting markup will be rendered as-is.
 
 .. tip::
    novelWriter supports standard escape syntax for the emphasis markup characters in case the
@@ -155,6 +156,39 @@ In addition, the following rules apply:
    markup.
 
 
+.. _a_fmt_shortcodes:
+
+Extended Formatting with Shortcodes
+===================================
+
+For additional formatting options, you can use shortcodes. Shortcodes is a form of in-line codes
+that can be used to change the format of the text that follows and opening code, and last until
+that formatting region is ended with a closing code.
+
+These shortcodes are intended for special formatting cases, or more complex cases that cannot be
+solved with simple Markdown-like formatting codes. Available shortcodes are listed below.
+
+.. csv-table:: Shortcodes Formats
+   :header: "Syntax", "Description"
+   :widths: 40, 60
+   :class: "tight-table"
+
+   "``[b]text[/b]``",     "Text is rendered as bold text."
+   "``[i]text[/i]``",     "Text is rendered as italicised text."
+   "``[s]text[/s]``",     "Text is rendered as strike through text."
+   "``[u]text[/u]``",     "Text is rendered as underlined text."
+   "``[sup]text[/sup]``", "Text is rendered as superscript text."
+   "``[sub]text[/sub]``", "Text is rendered as subscript text."
+
+Unlike Markdown style codes, these can be used anywhere within a paragraph. Even in the middle of a
+word if you need to. You can also freely combine them to form more complex formatting.
+
+The shortcodes are available from the :guilabel:`Format` menu and in the editor toolbar, which can
+be activated by clicking the three dots in the editor header.
+
+.. versionadded:: 2.2
+
+
 .. _a_fmt_comm:
 
 Comments and Synopsis
@@ -169,19 +203,25 @@ in a special manner and will show up in the :ref:`a_ui_outline` in a dedicated c
 ``synopsis`` is not case sensitive. If it is correctly formatted, the syntax highlighter will
 indicate this by altering the colour of the word.
 
-``% text...``
-   This is a comment. The text is not renderred by default (this can be overridden), seen in the
+``% text ...``
+   This is a comment. The text is not rendered by default (this can be overridden), seen in the
    document viewer, or counted towards word counts.
 
-``% Synopsis: text...``
+``%Synopsis: text ...``
    This is a synopsis comment. It is generally treated in the same way as a regular comment, except
    that it is also captured by the indexing algorithm and displayed in the :ref:`a_ui_outline`. It
    can also be filtered separately when building the project to for instance generate an outline
    document of the whole project.
 
+``%Short: text ...``
+   This is a short description comment. It is identical to the synopsis comment, but is intended to
+   be used for project notes. The text shows up in the Reference panel below the document viewer in
+   the last column labelled :guilabel:`Short Description`.
+
 .. note::
-   Only one comment can be flagged as a synopsis comment for each heading. If multiple comments are
-   flagged as synopsis comments, the last one will be used and the rest ignored.
+   Only one comment can be flagged as a synopsis or short comment for each heading. If multiple
+   comments are flagged as synopsis or short comments, the last one will be used and the rest
+   ignored.
 
 
 .. _a_fmt_tags:
@@ -196,16 +236,17 @@ Tags use the command ``@tag:`` to define a tag. The tag can be set once per sect
 heading. Setting it multiple times under the same heading will just override the previous setting.
 
 ``@tag: value``
-   A tag commad followed by the tag value, like for instance the name of a character.
+   A tag command followed by the tag value, like for instance the name of a character.
 
 References can be set anywhere within a section, and are collected according to their category.
-References are on the form:
+References are in the form:
 
 ``@keyword: value``
    A reference keyword followed by a value, or a comma separated list of values.
 
-Tags andreferences are covered in detail in the :ref:`a_references` chapter. The keywords can be
-inserted at the cursor position in the editor via the :guilabel:`Insert` menu.
+Tags and references are covered in detail in the :ref:`a_references` chapter. The keywords can be
+inserted at the cursor position in the editor via the :guilabel:`Insert` menu. If you start typing
+an ``@`` on a new line, and auto-complete menu will also pop up suggesting keywords.
 
 
 .. _a_fmt_align:
@@ -236,7 +277,7 @@ Examples:
    "``>> Centred text <<``",           "The text paragraph is centred."
    "``> Left indented text``",         "The text has an increased left margin."
    "``Right indented text <``",        "The text has an increased right margin."
-   "``> Left/right indented text <``", "The text has an both margins increased."
+   "``> Left/right indented text <``", "The text has both margins increased."
 
 .. note::
    The text editor will not show the alignment and indentation live. But the viewer will show them

docs/source/usage_project.rst

@@ -28,7 +28,7 @@ the project, and has four columns.
 
 **Column 2**
    The second column shows the word count of the document, or the sum of words of the child items
-   for folders and documents with subdocuments. If the counts seem incorrect, they can be updated
+   for folders and documents with sub-documents. If the counts seem incorrect, they can be updated
    by rebuilding the :term:`project index` from the :guilabel:`Tools` menu, or by pressing
    :kbd:`F9`.
 
@@ -62,6 +62,11 @@ Below the project tree you will find a small details panel showing the full info
 currently selected item. This panel also includes the latest paragraph and character counts in
 addition to the word count.
 
+.. tip::
+   If you want to set the label of a document to be the same as a header within it, you can
+   right-click a header in the document when it is open in the editor and select
+   :guilabel:`Set as Document Name` from the context menu.
+
 
 .. _a_ui_tree_split_merge:
 
@@ -73,6 +78,7 @@ will find several options on how to change a document or folder. This includes c
 document and note, but also splitting them into multiple documents, or merging child items into a
 single document.
 
+
 Splitting Documents
 ^^^^^^^^^^^^^^^^^^^
 
@@ -91,6 +97,7 @@ hierarchy of documents. That is, put sections under scenes, and scenes under cha
 The source document *is not* deleted in the process, but you have the option to let the tool move
 the source document to the :guilabel:`Trash` folder.
 
+
 Merging Documents
 ^^^^^^^^^^^^^^^^^
 
@@ -137,10 +144,14 @@ The project tree allows drag & drop to a certain extent to allow you to reorder
 folders. Moving a document in the project tree will affect the text's position when you assemble
 your manuscript in the :guilabel:`Manuscript Build` tool.
 
-Drag & drop has only limited support for moving documents. In general, bulk actions are not
-allowed. This is deliberate to avoid accidentally messing up your project. If you make a mistake,
-the last move action can be undone by pressing :kbd:`Ctrl+Shift+Z` or from the menu icon in the
-project tree's toolbar.
+.. versionadded:: 2.2
+   You can now select multiple items in the project tree by holding down the :kbd:`Ctrl` or
+   :kbd:`Shift` key while selecting items.
+
+You can drag and drop documents and regular folders, but not root folders. If you select multiple
+items, they can only be dragged and dropped if they are siblings. That is, they have the same
+parent item in the project. This is due to the way drag and drop is implemented in the user
+interface framework novelWriter is built upon.
 
 Documents and their folders can be rearranged freely within their root folders. If you move a Novel
 document out of a Novel folder, it will be converted to a project note. Notes can be moved freely
@@ -149,8 +160,8 @@ folder, its "Importance" setting will be switched with a "Status" setting. See
 :ref:`a_ui_tree_status`. The old value will not be overwritten though, and should be restored if
 you move it back at some point.
 
-Root folders in the project tree cannot be dragged & dropped at all. If you want to reorder them,
-you can move them up or down with respect to eachother from the arrow buttons at the top of the
+Root folders in the project tree cannot be dragged and dropped at all. If you want to reorder them,
+you can move them up or down with respect to each other from the arrow buttons at the top of the
 project tree, or by pressing :kbd:`Ctrl+Shift+Up` or :kbd:`Ctrl+Shift+Down` when they are selected.
 
 

docs/source/usage_shortcuts.rst

@@ -4,7 +4,7 @@
 Keyboard Shortcuts
 ******************
 
-Most features in novelWriter are available as keyboard shortcuts. This is a reference list if these
+Most features in novelWriter are available as keyboard shortcuts. This is a reference list of those
 shortcuts. Most of them are also listed in the application's user interface.
 
 .. note::
@@ -25,19 +25,19 @@ Main Window Shortcuts
    ":kbd:`F8`",           "Toggle :guilabel:`Focus Mode`"
    ":kbd:`F9`",           "Re-build the project index"
    ":kbd:`F11`",          "Toggle full screen mode"
-   ":kbd:`Alt+1`",        "Switch focus to the project tree (Windows :kbd:`Ctrl+Alt+1`)"
-   ":kbd:`Alt+2`",        "Switch focus to document editor (Windows :kbd:`Ctrl+Alt+2`)"
-   ":kbd:`Alt+3`",        "Switch focus to document viewer (Windows :kbd:`Ctrl+Alt+3`)"
-   ":kbd:`Alt+4`",        "Switch focus to outline view (Windows :kbd:`Ctrl+Alt+4`)"
    ":kbd:`Ctrl+,`",       "Open the :guilabel:`Preferences` dialog"
+   ":kbd:`Ctrl+E`",       "Switch focus to the document editor"
+   ":kbd:`Ctrl+T`",       "Switch focus to the project/novel tree"
    ":kbd:`Ctrl+Q`",       "Exit novelWriter"
    ":kbd:`Ctrl+Shift+,`", "Open the :guilabel:`Project Settings` dialog"
    ":kbd:`Ctrl+Shift+O`", "Open a project"
    ":kbd:`Ctrl+Shift+S`", "Save the current project"
+   ":kbd:`Ctrl+Shift+T`", "Switch focus to the outline view"
    ":kbd:`Ctrl+Shift+W`", "Close the current project"
    ":kbd:`Shift+F1`",     "Open the local user manual (PDF) if it is available"
    ":kbd:`Shift+F6`",     "Open the :guilabel:`Project Details` dialog"
 
+
 .. _a_kb_tree:
 
 Project Tree Shortcuts
@@ -59,8 +59,8 @@ Project Tree Shortcuts
    ":kbd:`Ctrl+R`",         "Open the selected document in the viewer"
    ":kbd:`Ctrl+Up`",        "Move selected item one step up in the tree"
    ":kbd:`Ctrl+Down`",      "Move selected item one step down in the tree"
-   ":kbd:`Ctrl+Shift+Z`",   "Undo the last move of a project item, if possible"
    ":kbd:`Ctrl+Shift+Del`", "Move the selected item to Trash"
+   ":kbd:`Ctrl+Shift+Z`",   "Undo the last move of a project item, if possible"
 
 
 .. _a_kb_editor:
@@ -77,10 +77,10 @@ Text Search Shortcuts
 
    ":kbd:`F3`",           "Find the next occurrence of the search word"
    ":kbd:`Ctrl+F`",       "Open the search bar and search for the selected word, if any is selected"
-   ":kbd:`Ctrl+G`",       "Find next occurrence of search word in current document"
+   ":kbd:`Ctrl+G`",       "Find the next occurrence of the search word"
    ":kbd:`Ctrl+H`",       "Open the search tool and populate with the selected word (Mac :kbd:`Cmd+=`)"
    ":kbd:`Ctrl+Shift+1`", "Replace selected occurrence of the search word, and move to the next"
-   ":kbd:`Ctrl+Shift+G`", "Find previous occurrence of the search word"
+   ":kbd:`Ctrl+Shift+G`", "Find the previous occurrence of the search word"
    ":kbd:`Shift+F3`",     "Find the previous occurrence of the search word"
 
 
@@ -90,6 +90,8 @@ Text Formatting Shortcuts
 .. csv-table::
    :header: "Shortcut", "Description"
 
+   ":kbd:`Ctrl+'`",       "Wrap selected text, or word under cursor, in single quotes"
+   ":kbd:`Ctrl+""`",      "Wrap selected text, or word under cursor, in double quotes"
    ":kbd:`Ctrl+/`",       "Toggle block format as comment"
    ":kbd:`Ctrl+0`",       "Remove block formatting for block under cursor"
    ":kbd:`Ctrl+1`",       "Change block format to header level 1"
@@ -102,10 +104,8 @@ Text Formatting Shortcuts
    ":kbd:`Ctrl+8`",       "Add a left margin to the block"
    ":kbd:`Ctrl+9`",       "Add a right margin to the block"
    ":kbd:`Ctrl+B`",       "Format selected text, or word under cursor, with strong emphasis (bold)"
-   ":kbd:`Ctrl+D`",       "Strikethrough selected text, or word under cursor"
+   ":kbd:`Ctrl+D`",       "Strike through selected text, or word under cursor"
    ":kbd:`Ctrl+I`",       "Format selected text, or word under cursor, with emphasis (italic)"
-   ":kbd:`Ctrl+'`",       "Wrap selected text, or word under cursor, in single quotes"
-   ":kbd:`Ctrl+""`",      "Wrap selected text, or word under cursor, in double quotes"
    ":kbd:`Ctrl+Shift+/`", "Remove block formatting for block under cursor"
 
 
@@ -127,13 +127,14 @@ Other Editor Shortcuts
    ":kbd:`Ctrl+X`",         "Cut selected text to clipboard"
    ":kbd:`Ctrl+Y`",         "Redo latest undo"
    ":kbd:`Ctrl+Z`",         "Undo latest changes"
-   ":kbd:`Ctrl+Del`",       "Delete the word after the cursor"
    ":kbd:`Ctrl+Backspace`", "Delete the word before the cursor"
-   ":kbd:`Ctrl+Return`",    "Open the tag or reference under the cursor in the viewer"
+   ":kbd:`Ctrl+Del`",       "Delete the word after the cursor"
    ":kbd:`Ctrl+F7`",        "Toggle spell checking"
+   ":kbd:`Ctrl+Return`",    "Open the tag or reference under the cursor in the viewer"
    ":kbd:`Ctrl+Shift+A`",   "Select all text in the current paragraph"
    ":kbd:`Ctrl+Shift+I`",   "Import text to the current document from a text file"
 
+
 .. _a_kb_ins:
 
 Insert Shortcuts
@@ -146,39 +147,40 @@ a key or key combination for the inserted content.
 .. csv-table::
    :header: "Shortcut", "Description"
 
-   ":kbd:`Ctrl+K`, :kbd:`−`",           "Insert a short dash (en dash)"
+   ":kbd:`Ctrl+K`, :kbd:`Space`",       "Insert a non-breaking space"
    ":kbd:`Ctrl+K`, :kbd:`_`",           "Insert a long dash (em dash)"
-   ":kbd:`Ctrl+K`, :kbd:`Ctrl+_`",      "Insert a horizontal bar (quotation dash)"
+   ":kbd:`Ctrl+K`, :kbd:`.`",           "Insert an ellipsis"
+   ":kbd:`Ctrl+K`, :kbd:`'`",           "Insert a modifier apostrophe"
+   ":kbd:`Ctrl+K`, :kbd:`*`",           "Insert a list bullet"
+   ":kbd:`Ctrl+K`, :kbd:`%`",           "Insert a per mille symbol"
    ":kbd:`Ctrl+K`, :kbd:`~`",           "Insert a figure dash (same width as a number)"
+   ":kbd:`Ctrl+K`, :kbd:`−`",           "Insert a short dash (en dash)"
    ":kbd:`Ctrl+K`, :kbd:`1`",           "Insert a left single quote"
    ":kbd:`Ctrl+K`, :kbd:`2`",           "Insert a right single quote"
    ":kbd:`Ctrl+K`, :kbd:`3`",           "Insert a left double quote"
    ":kbd:`Ctrl+K`, :kbd:`4`",           "Insert a right double quote"
-   ":kbd:`Ctrl+K`, :kbd:`'`",           "Insert a modifier apostrophe"
-   ":kbd:`Ctrl+K`, :kbd:`.`",           "Insert an ellipsis"
-   ":kbd:`Ctrl+K`, :kbd:`Ctrl+'`",      "Insert a prime"
-   ":kbd:`Ctrl+K`, :kbd:`Ctrl+""`",     "Insert a double prime"
-   ":kbd:`Ctrl+K`, :kbd:`Space`",       "Insert a non-breaking space"
-   ":kbd:`Ctrl+K`, :kbd:`Shift+Space`", "Insert a thin space"
-   ":kbd:`Ctrl+K`, :kbd:`Ctrl+Space`",  "Insert a thin non-breaking space"
-   ":kbd:`Ctrl+K`, :kbd:`*`",           "Insert a list bullet"
-   ":kbd:`Ctrl+K`, :kbd:`Ctrl+−`",      "Insert a hyphen bullet (alternative bullet)"
-   ":kbd:`Ctrl+K`, :kbd:`Ctrl+*`",      "Insert a flower mark (alternative bullet)"
-   ":kbd:`Ctrl+K`, :kbd:`%`",           "Insert a per mille symbol"
-   ":kbd:`Ctrl+K`, :kbd:`Ctrl+O`",      "Insert a degree symbol"
-   ":kbd:`Ctrl+K`, :kbd:`Ctrl+X`",      "Insert a times sign"
-   ":kbd:`Ctrl+K`, :kbd:`Ctrl+D`",      "Insert a division sign"
-   ":kbd:`Ctrl+K`, :kbd:`G`",           "Insert a ``@tag`` keyword"
-   ":kbd:`Ctrl+K`, :kbd:`V`",           "Insert a ``@pov`` keyword"
-   ":kbd:`Ctrl+K`, :kbd:`F`",           "Insert a ``@focus`` keyword"
    ":kbd:`Ctrl+K`, :kbd:`C`",           "Insert a ``@char`` keyword"
+   ":kbd:`Ctrl+K`, :kbd:`E`",           "Insert an ``@entity`` keyword"
+   ":kbd:`Ctrl+K`, :kbd:`F`",           "Insert a ``@focus`` keyword"
+   ":kbd:`Ctrl+K`, :kbd:`G`",           "Insert a ``@tag`` keyword"
+   ":kbd:`Ctrl+K`, :kbd:`H`",           "Insert a short description comment"
+   ":kbd:`Ctrl+K`, :kbd:`L`",           "Insert a ``@location`` keyword"
+   ":kbd:`Ctrl+K`, :kbd:`O`",           "Insert an ``@object`` keyword"
    ":kbd:`Ctrl+K`, :kbd:`P`",           "Insert a ``@plot`` keyword"
    ":kbd:`Ctrl+K`, :kbd:`S`",           "Insert a synopsis comment"
    ":kbd:`Ctrl+K`, :kbd:`T`",           "Insert a ``@time`` keyword"
-   ":kbd:`Ctrl+K`, :kbd:`L`",           "Insert a ``@location`` keyword"
-   ":kbd:`Ctrl+K`, :kbd:`O`",           "Insert an ``@object`` keyword"
-   ":kbd:`Ctrl+K`, :kbd:`E`",           "Insert an ``@entity`` keyword"
+   ":kbd:`Ctrl+K`, :kbd:`V`",           "Insert a ``@pov`` keyword"
    ":kbd:`Ctrl+K`, :kbd:`X`",           "Insert a ``@custom`` keyword"
+   ":kbd:`Ctrl+K`, :kbd:`Ctrl+Space`",  "Insert a thin non-breaking space"
+   ":kbd:`Ctrl+K`, :kbd:`Ctrl+_`",      "Insert a horizontal bar (quotation dash)"
+   ":kbd:`Ctrl+K`, :kbd:`Ctrl+'`",      "Insert a prime"
+   ":kbd:`Ctrl+K`, :kbd:`Ctrl+""`",     "Insert a double prime"
+   ":kbd:`Ctrl+K`, :kbd:`Ctrl+*`",      "Insert a flower mark (alternative bullet)"
+   ":kbd:`Ctrl+K`, :kbd:`Ctrl+−`",      "Insert a hyphen bullet (alternative bullet)"
+   ":kbd:`Ctrl+K`, :kbd:`Ctrl+D`",      "Insert a division sign"
+   ":kbd:`Ctrl+K`, :kbd:`Ctrl+O`",      "Insert a degree symbol"
+   ":kbd:`Ctrl+K`, :kbd:`Ctrl+X`",      "Insert a times sign"
+   ":kbd:`Ctrl+K`, :kbd:`Shift+Space`", "Insert a thin space"
 
 
 .. _a_kb_viewer:

docs/source/usage_typography.rst

@@ -61,7 +61,7 @@ Single and Double Prime
 Both single and double prime symbols are available in the :guilabel:`Insert` menu. These symbols
 are the correct symbols to use for unit symbols for feet, inches, minutes, and seconds. The usage
 of these is described in more detail on the Wikipedia Prime_ page. They look very similar to single
-and double straight quotes, and may be renderred similarly by the font, but they have different
+and double straight quotes, and may be rendered similarly by the font, but they have different
 codes. Using these correctly will also prevent the auto-replace and dialogue highlighting features
 misunderstanding their meaning in the text.
 
@@ -74,7 +74,7 @@ even if it is intended as an apostrophe. This also includes the syntax highlight
 assume the first following apostrophe is the closing symbol of a single quoted region of text.
 
 To get around this, an alternative apostrophe is available. It is a special Unicode character that
-is not categorised as punctuation, but as a modifier. It is usually renderred the same way as the
+is not categorised as punctuation, but as a modifier. It is usually rendered the same way as the
 right single quotation marks, depending on the font. There is a Wikipedia article for the
 `Modifier letter apostrophe`_ with more details.
 

docs/source/usage_writing.rst

@@ -24,9 +24,8 @@ Markdown-like syntax for some features, and a novelWriter-specific syntax for ot
 format is described in the :ref:`a_fmt` chapter.
 
 The editor has a maximise button (toggles the :guilabel:`Focus Mode`) and a close button in the
-top--right corner. On the top--left side you will find an edit button that opens the
-:guilabel:`Item Label` dialog for the currently open document, and a search button to open the
-search dialog.
+top--right corner. On the top--left side you will find a tools button that opens a toolbar with a
+few buttons for applying text formatting, and a search button to open the search dialog.
 
 Both the document editor and viewer will show the label of the currently open document in the
 header at the top of the edit or view panel. Optionally, the full project path to the document can
@@ -40,6 +39,18 @@ Any :term:`references<reference>` in the editor can be opened in the viewer by m
 the label and pressing :kbd:`Ctrl+Return`. You can also control-click them with your mouse.
 
 
+Editor Auto-Completer
+---------------------
+
+If you type the character ``@`` on a new line, a context menu will appear showing the different
+available keywords. The list will shorten as you type. Once a keyword command has been selected or
+typed, the editor may suggest further content based on your project content. See
+:ref:`a_references_completer` for more details.
+
+.. versionadded:: 2.2
+   The auto-completer feature was added.
+
+
 .. _a_ui_view:
 
 Viewing a Document
@@ -68,11 +79,10 @@ buttons, these can be used as well. They work just like the backward and forward
 browser.
 
 At the bottom of the view panel there is a :guilabel:`References` panel. (If it is hidden, click
-the icon next to it to reveal it.) This panel will show links to all documents referring back to
-the one you're currently viewing, if any has been defined. The :guilabel:`Sticky` button will
-freeze the content of the panel to the current document, even if you navigate to another document.
-This is convenient if you want to quickly look through all documents in the list in the
-:guilabel:`References` panel without losing the list in the process.
+the button on the left side of the footer area to reveal it.) This panel contains a References tab
+with links to all documents referring back to the one you're currently viewing, if any has been
+defined. If you have created root folders and tags for various story elements like characters and
+plot points, these will appear as additional tabs in this panel.
 
 .. note::
    The :guilabel:`References` panel relies on an up-to-date :term:`index<project index>` of the
@@ -80,6 +90,9 @@ This is convenient if you want to quickly look through all documents in the list
    the index can always be rebuilt by selecting :guilabel:`Rebuild Index` from the
    :guilabel:`Tools` menu, or by pressing :kbd:`F9`.
 
+.. versionadded:: 2.2
+   The reference panel was redesigned and the additional tabs added.
+
 
 .. _a_ui_edit_search:
 

i18n/README.md

@@ -48,6 +48,7 @@ instance `en_GB` for British English.
 You will need the translation tool Qt 5 Linguist on your system.
 
 For Ubuntu/Debian, run:
+
 ```bash
 sudo apt install qttools5-dev-tools
 ```
@@ -75,6 +76,7 @@ The `i18n` folder at the root of the repository contains the `nw_XX.ts` translat
 
 Whether to add a new language to the translation framework, or to  update the file against the
 current source code, you must first run the `qtlupdate` command:
+
 ```bash
 python3 pkgutils.py qtlupdate i18n/nw_XX.ts
 ```
@@ -86,6 +88,10 @@ be a valid ISO language code, otherwise novelWriter will not accept the file.
 For instance, the French translation uses the language code `fr_FR`, so its translation file will
 be `nw_fr_FR.ts`
 
+Note: The `qtlupdate` command needs the `lupdate` tool provided by PyQt6, which uses the latest
+TS file format. The tool in PyQt5 generates an older file format. On Debian/Ubuntu it is provided
+by the package `pyqt6-dev-tools`.
+
 
 ### Edit the Translation File in Qt Linguist
 
@@ -100,6 +106,7 @@ Please select "English" and "United Kingdom" as the _source_ language if prompte
 The application does not use `.ts` files directly. The `novelwriter/assets/i18n/nw_XX.qm` files are
 the actual files used to translate the GUI into another language other than the default British
 English. These files are not generated by default, but they can be built with:
+
 ```bash
 python3 pkgutils.py qtlrelease
 ```

novelwriter/__init__.py

@@ -33,26 +33,8 @@ from novelwriter.error import exceptionHandler, logException
 from novelwriter.config import Config
 from novelwriter.shared import SharedData
 
-##
-#  Version Scheme
-# ================
-#  Generally follows PEP 440
-#  Hex Version:
-#  - Digit 1,2 : Major Version (01-ff)
-#  - Digit 3,4 : Minor Version (01-ff)
-#  - Digit 5,6 : Patch Version (01-ff)
-#  - Digit 7   : Release Type (a: alpha, b: beta, c: candidate, f: final)
-#  - Digit 8   : Release Number (0-f)
-#
-#  Example    : Full        Short   Description
-# --------------------------------------------------------------------
-#  0x010200a0 : 1.2-alpha0  1.2a0   Use while developing next release
-#  0x010200a1 : 1.2-alpha1  1.2a1   First alpha release
-#  0x010200b1 : 1.2-beta1   1.2b1   First beta release
-#  0x010200c1 : 1.2-rc1     1.2rc1  First release candidate
-#  0x010200f0 : 1.2.0       1.2.0   Final release
-#  0x010201f0 : 1.2.1       1.2.1   Patch release
-##
+# Package Meta
+# ============
 
 __package__    = "novelwriter"
 __copyright__  = "Copyright 2018–2023, Veronica Berglyd Olsen"
@@ -60,9 +42,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.1"
-__hexversion__ = "0x020100f0"
-__date__       = "2023-10-17"
+__version__    = "2.2"
+__hexversion__ = "0x020200f0"
+__date__       = "2023-12-17"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 
@@ -73,7 +55,7 @@ logger = logging.getLogger(__name__)
 #  Main Program
 ##
 
-# Global config singleton
+# Global config and data singletons
 CONFIG = Config()
 SHARED = SharedData()
 
@@ -94,6 +76,7 @@ def main(sysArgs: list | None = None):
         "config=",
         "data=",
         "testmode",
+        "meminfo"
     ]
 
     helpMsg = (
@@ -110,6 +93,7 @@ def main(sysArgs: list | None = None):
         " -v, --version  Print program version and exit.\n"
         "     --info     Print additional runtime information.\n"
         "     --debug    Print debug output. Includes --info.\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"
         "     --data=    Alternative user data path.\n"
@@ -145,6 +129,7 @@ def main(sysArgs: list | None = None):
         elif inOpt == "--info":
             logLevel = logging.INFO
         elif inOpt == "--debug":
+            CONFIG.isDebug = True
             logLevel = logging.DEBUG
             logFormat  = "[{asctime:}]  {filename:>17}:{lineno:<4d}  {levelname:8}  {message:}"
         elif inOpt == "--style":
@@ -155,6 +140,8 @@ def main(sysArgs: list | None = None):
             dataPath = inArg
         elif inOpt == "--testmode":
             testMode = True
+        elif inOpt == "--meminfo":
+            CONFIG.memInfo = True
 
     # Setup Logging
     pkgLogger = logging.getLogger(__package__)

novelwriter/assets/i18n/project_de_DE.json

@@ -2,6 +2,16 @@
   "Synopsis": "Synopsis",
   "Comment": "Kommentar",
   "Notes": "Notizen",
+  "Tag": "Schlagwort",
+  "Point of View": "Perspektive",
+  "Focus": "Mittelpunkt",
+  "Characters": "Charaktere",
+  "Plot": "Handlungen",
+  "Timeline": "Zeitleiste",
+  "Locations": "Schauplätze",
+  "Objects": "Objekte",
+  "Entities": "Organisationen",
+  "Custom": "Benutzerdefiniert",
   "0": "Null",
   "1": "Eins",
   "2": "Zwei",

novelwriter/assets/i18n/project_en_GB.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Synopsis",
+  "Short Description": "Short Description",
   "Comment": "Comment",
   "Notes": "Notes",
+  "Tag": "Tag",
+  "Point of View": "Point of View",
+  "Focus": "Focus",
+  "Characters": "Characters",
+  "Plot": "Plot",
+  "Timeline": "Timeline",
+  "Locations": "Locations",
+  "Objects": "Objects",
+  "Entities": "Entities",
+  "Custom": "Custom",
   "0": "Zero",
   "1": "One",
   "2": "Two",

novelwriter/assets/i18n/project_en_US.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Synopsis",
+  "Short Description": "Short Description",
   "Comment": "Comment",
   "Notes": "Notes",
+  "Tag": "Tag",
+  "Point of View": "Point of View",
+  "Focus": "Focus",
+  "Characters": "Characters",
+  "Plot": "Plot",
+  "Timeline": "Timeline",
+  "Locations": "Locations",
+  "Objects": "Objects",
+  "Entities": "Entities",
+  "Custom": "Custom",
   "0": "Zero",
   "1": "One",
   "2": "Two",

novelwriter/assets/i18n/project_es_419.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Sinopsis",
+  "Short Description": "Breve Descripción",
   "Comment": "Comentario",
   "Notes": "Notas",
+  "Tag": "Etiqueta",
+  "Point of View": "Punto de Vista",
+  "Focus": "Foco",
+  "Characters": "Personajes",
+  "Plot": "Argumento",
+  "Timeline": "Línea de Tiempo",
+  "Locations": "Lugares",
+  "Objects": "Objetos",
+  "Entities": "Entidades",
+  "Custom": "Otros",
   "0": "Cero",
   "1": "Uno",
   "2": "Dos",

novelwriter/assets/i18n/project_fr_FR.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Synopsis",
+  "Short Description": "Description sommaire",
   "Comment": "Commentaire",
   "Notes": "Notes",
+  "Tag": "Étiquette",
+  "Point of View": "Point de vue",
+  "Focus": "Focus",
+  "Characters": "Personnages",
+  "Plot": "Intrigue",
+  "Timeline": "Chronologie",
+  "Locations": "Lieux",
+  "Objects": "Objets",
+  "Entities": "Entités",
+  "Custom": "Personnalisé",
   "0": "Zero",
   "1": "Un",
   "2": "Deux",

novelwriter/assets/i18n/project_it_IT.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Sinossi",
+  "Short Description": "Breve descrizione",
   "Comment": "Commento",
   "Notes": "Note",
+  "Tag": "Etichetta",
+  "Point of View": "Punto di vista",
+  "Focus": "Focus",
+  "Characters": "Personaggi",
+  "Plot": "Trama",
+  "Timeline": "Sequenza temporale",
+  "Locations": "Luoghi",
+  "Objects": "Oggetti",
+  "Entities": "Enti",
+  "Custom": "Personalizzato",
   "0": "Zero",
   "1": "Uno",
   "2": "Due",

novelwriter/assets/i18n/project_ja_JP.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "あらすじ",
+  "Short Description": "短い説明",
   "Comment": "コメント ",
   "Notes": "ノート",
+  "Tag": "タグ",
+  "Point of View": "視点",
+  "Focus": "焦点",
+  "Characters": "キャラクター",
+  "Plot": "プロット",
+  "Timeline": "タイムライン",
+  "Locations": "場所",
+  "Objects": "オブジェクト",
+  "Entities": "エンティティ",
+  "Custom": "カスタム",
   "0": "零",
   "1": "一",
   "2": "二",

novelwriter/assets/i18n/project_nb_NO.json

@@ -1,7 +1,18 @@
 {
   "Synopsis": "Sammendrag",
+  "Short Description": "Kort beskrivelse",
   "Comment": "Kommentar",
   "Notes": "Notat",
+  "Tag": "Knagg",
+  "Point of View": "Perspektiv",
+  "Focus": "Fokus",
+  "Characters": "Karakterer",
+  "Plot": "Plott",
+  "Timeline": "Tidslinje",
+  "Locations": "Lokasjoner",
+  "Objects": "Objekter",
+  "Entities": "Enheter",
+  "Custom": "Annet",
   "0": "null",
   "1": "én",
   "2": "to",

novelwriter/assets/i18n/project_nn_NO.json

@@ -2,6 +2,16 @@
   "Synopsis": "Samandrag",
   "Comment": "Kommentar",
   "Notes": "Notat",
+  "Tag": "Knagg",
+  "Point of View": "Perspektiv",
+  "Focus": "Fokus",
+  "Characters": "Karakterar",
+  "Plot": "Plott",
+  "Timeline": "Tidslinje",
+  "Locations": "Lokasjonar",
+  "Objects": "Objekt",
+  "Entities": "Eining",
+  "Custom": "Anna",
   "0": "null",
   "1": "ein",
   "2": "to",

novelwriter/assets/icons/typicons_dark/icons.conf

@@ -46,11 +46,21 @@ cross           = typ_times.svg
 down            = typ_chevron-down.svg
 edit            = typ_pencil.svg
 export          = typ_export.svg
+fmt_bold        = nw_tb-bold.svg
+fmt_bold-md     = nw_tb-bold-md.svg
+fmt_italic      = nw_tb-italic.svg
+fmt_italic-md   = nw_tb-italic-md.svg
+fmt_strike      = nw_tb-strike.svg
+fmt_strike-md   = nw_tb-strike-md.svg
+fmt_subscript   = nw_tb-subscript.svg
+fmt_superscript = nw_tb-superscript.svg
+fmt_underline   = nw_tb-underline.svg
 forward         = typ_chevron-right.svg
 maximise        = typ_arrow-maximise.svg
-menu            = typ_th-menu.svg
+menu            = typ_th-dot-menu.svg
 minimise        = typ_arrow-minimise.svg
 noncheckable    = mixed_input-none.svg
+panel           = nw_panel.svg
 proj_chapter    = mixed_document-chapter.svg
 proj_details    = typ_th-list-grey.svg
 proj_document   = typ_document-text.svg
@@ -60,7 +70,6 @@ proj_scene      = mixed_document-scene.svg
 proj_section    = mixed_document-section.svg
 proj_stats      = typ_chart-bar-grey.svg
 proj_title      = mixed_document-title.svg
-reference       = typ_at.svg
 refresh         = typ_refresh.svg
 remove          = typ_minus.svg
 revert          = typ_refresh-flipped.svg
@@ -83,14 +92,21 @@ sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
 unchecked       = mixed_input-unchecked.svg
 up              = typ_chevron-up.svg
+view            = typ_eye.svg
 view_build      = typ_export-grey.svg
 view_editor     = mixed_edit.svg
 view_novel      = typ_book-grey.svg
 view_outline    = typ_puzzle-outline.svg
 
 deco_doc_h0     = nw_deco-h0.svg
+deco_doc_h0_n   = nw_deco-h0.svg
 deco_doc_h1     = nw_deco-h1.svg
+deco_doc_h1_n   = nw_deco-h1.svg
 deco_doc_h2     = nw_deco-h2.svg
+deco_doc_h2_n   = nw_deco-h2-narrow.svg
 deco_doc_h3     = nw_deco-h3.svg
+deco_doc_h3_n   = nw_deco-h3-narrow.svg
 deco_doc_h4     = nw_deco-h4.svg
+deco_doc_h4_n   = nw_deco-h4-narrow.svg
 deco_doc_more   = nw_deco-noveltree-more.svg
+deco_doc_nt_n   = nw_deco-note.svg

novelwriter/assets/icons/typicons_dark/nw_deco-h2-narrow.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#d64848" stroke-width="0"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_deco-h3-narrow.svg

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

novelwriter/assets/icons/typicons_dark/nw_deco-h4-narrow.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#fff" stroke-width="0"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_deco-note.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#ffff84" stroke-width="0"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_panel.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="m17.853 2.0017c-0.14248-0.00428-0.28548-1.936e-4 -0.42925 0.01171h-11.135c-2.3531-0.068148-4.4276 2.1102-4.2808 4.4518 0.00689 3.8473-0.014486 7.6959 0.00976 11.542 0.12963 2.1674 2.0751 4.0505 4.2711 3.9912 3.8794-0.0037 7.7592 0.0071 11.639-0.0059 2.3157-0.05864 4.2507-2.2581 4.0603-4.5591-0.0037-3.7862 0.0071-7.5728-0.0059-11.359-0.054966-2.1716-1.9914-4.0089-4.1286-4.0732zm-11.533 2.8514c0.10262-0.00515 0.20595 1.374e-4 0.30828 0.015613 2.2719-0.00131 4.5437 0.0026 6.8153-0.00195 1.5163 0.01818 3.0369-0.036922 4.5501 0.029275 0.83106 0.14317 1.246 1.0195 1.1395 1.7956-0.0023 1.7714-9.95e-4 3.543 0 5.3144h-14.271c-9.495e-4 -1.9468-0.0019-3.8929 0.00585-5.8394 0.049778-0.75434 0.73334-1.2775 1.4517-1.3135z" fill="#848484" stroke-width=".99912"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-bold-md.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1.3672 5.5562v-4.7625h1.6289q0.37252 0 0.68662 0.058435 0.32139 0.051131 0.55513 0.18991 0.24104 0.13878 0.37252 0.36522 0.13878 0.22644 0.13878 0.56975 0 0.1607-0.043826 0.32139t-0.12417 0.29948q-0.080349 0.13878-0.19721 0.24835-0.10957 0.10957-0.25565 0.1607v0.029218q0.18261 0.043827 0.33601 0.13878 0.1534 0.087653 0.27027 0.22644 0.11687 0.13878 0.18261 0.3287 0.065739 0.18261 0.065739 0.42365 0 0.36522-0.14608 0.62818-0.13878 0.26295-0.39444 0.43826-0.24835 0.168-0.58435 0.25565-0.33601 0.080349-0.72313 0.080349zm1.0737-2.8561h0.50401q0.39444 0 0.56975-0.1534 0.18261-0.1534 0.18261-0.40905 0-0.27757-0.18261-0.39444t-0.56244-0.11687h-0.51131zm0 2.0233h0.60626q0.88383 0 0.88383-0.64279 0-0.31408-0.21914-0.44557-0.21914-0.13878-0.6647-0.13878h-0.60626z" fill="#aeaeae" stroke-opacity=".78039" stroke-width=".54782"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-bold.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1.568 5.2917v-4.2333h1.4479q0.33113 0 0.61033 0.051942 0.28568 0.04545 0.49345 0.16881 0.21426 0.12336 0.33113 0.32464 0.12336 0.20128 0.12336 0.50644 0 0.14284-0.038957 0.28568-0.038956 0.14284-0.11037 0.2662-0.071421 0.12336-0.1753 0.22076-0.097396 0.097396-0.22724 0.14284v0.025972q0.16232 0.038957 0.29868 0.12336 0.13636 0.077914 0.24024 0.20128 0.10388 0.12336 0.16232 0.29218 0.058435 0.16232 0.058435 0.37658 0 0.32464-0.12985 0.55838-0.12336 0.23373-0.35061 0.38956-0.22076 0.14933-0.51942 0.22724-0.29868 0.071422-0.64278 0.071422zm0.9544-2.5388h0.44801q0.35061 0 0.50644-0.13636 0.16232-0.13636 0.16232-0.3636 0-0.24673-0.16232-0.35061-0.16232-0.10388-0.49995-0.10388h-0.4545zm0 1.7985h0.5389q0.78563 0 0.78563-0.57137 0-0.27918-0.19479-0.39606-0.19479-0.12336-0.59084-0.12336h-0.5389z" fill="#aeaeae" stroke-opacity=".78039" stroke-width=".48695"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#69c" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#69c" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-italic-md.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.3084 5.5562 0.94666-4.7625h0.78646l-0.94666 4.7625z" fill="#aeaeae" stroke-opacity=".78039" stroke-width=".54615"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-italic.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.417 5.2917 0.84148-4.2333h0.69908l-0.84148 4.2333z" fill="#aeaeae" stroke-opacity=".78039" stroke-width=".48547"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#69c" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#69c" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-strike-md.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.1785 5.5562q-0.46361 0-0.89912-0.17561-0.42848-0.17561-0.75863-0.49873l0.47766-0.55492q0.24585 0.2318 0.56195 0.37931 0.3161 0.14049 0.63219 0.14049 0.39336 0 0.59707-0.16156t0.20371-0.42848q0-0.14049-0.056194-0.23883-0.04917-0.098341-0.14751-0.16858-0.091316-0.077267-0.22478-0.14049-0.12644-0.063219-0.28097-0.12644l-0.63219-0.27395q-0.16858-0.070243-0.33717-0.17561-0.16156-0.10537-0.29502-0.25288t-0.21775-0.34419q-0.077268-0.19668-0.077268-0.44956 0-0.27395 0.11239-0.50575 0.11941-0.23883 0.32312-0.41444t0.48468-0.27395q0.288-0.098341 0.62517-0.098341 0.40039 0 0.77268 0.16156 0.37229 0.15454 0.63921 0.42146l-0.41444 0.5198q-0.22478-0.18263-0.46361-0.288t-0.53385-0.10537q-0.33014 0-0.52683 0.14751-0.19668 0.14049-0.19668 0.39336 0 0.13346 0.056194 0.2318 0.063219 0.091316 0.16156 0.16858 0.10537 0.070244 0.23883 0.13346 0.13346 0.056194 0.27395 0.11239l0.62516 0.2599q0.20371 0.084291 0.37229 0.19668 0.16858 0.11239 0.288 0.2599 0.12644 0.14751 0.19668 0.34419 0.070244 0.18966 0.070244 0.44253 0 0.28097-0.11239 0.52683-0.11239 0.24585-0.33015 0.43551-0.21073 0.18263-0.5198 0.29502-0.30205 0.10536-0.68838 0.10536zm-2.3848-2.6458h4.7625v0.52917h-4.7625z" fill="#aeaeae" stroke-opacity=".78039" stroke-width=".52683"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-strike.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.1782 5.2917q-0.4121 0-0.79922-0.1561-0.38087-0.1561-0.67434-0.44331l0.42459-0.49326q0.21853 0.20604 0.49951 0.33716 0.28098 0.12488 0.56195 0.12488 0.34965 0 0.53073-0.14361 0.18108-0.14361 0.18108-0.38087 0-0.12488-0.04995-0.21229-0.043707-0.087414-0.13112-0.14985-0.08117-0.068682-0.1998-0.12488-0.11239-0.056194-0.24975-0.11239l-0.56195-0.24351q-0.14985-0.062438-0.29971-0.1561-0.14361-0.093662-0.26224-0.22478-0.11863-0.13112-0.19356-0.30595-0.068682-0.17483-0.068682-0.39961 0-0.24351 0.099902-0.44955 0.10614-0.21229 0.28722-0.36839 0.18108-0.1561 0.43083-0.24351 0.256-0.087414 0.55571-0.087414 0.3559 0 0.68683 0.14361 0.33092 0.13737 0.56819 0.37463l-0.36839 0.46204q-0.1998-0.16234-0.4121-0.256-0.21229-0.093662-0.47453-0.093662-0.29346 0-0.46829 0.13112-0.17483 0.12488-0.17483 0.34965 0 0.11863 0.04995 0.20604 0.056194 0.08117 0.14361 0.14985 0.093662 0.062439 0.21229 0.11863 0.11863 0.04995 0.24351 0.099902l0.5557 0.23102q0.18108 0.074925 0.33092 0.17483 0.14985 0.099902 0.256 0.23102 0.11239 0.13112 0.17483 0.30595 0.062439 0.16859 0.062439 0.39336 0 0.24975-0.099902 0.46829-0.099902 0.21853-0.29347 0.38712-0.18732 0.16234-0.46204 0.26224-0.26849 0.093653-0.61189 0.093653zm-2.1198-2.3518h4.2333v0.47037h-4.2333z" fill="#aeaeae" stroke-opacity=".78039" stroke-width=".46829"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#69c" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#69c" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-subscript.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.2992 3.0475-0.13958 0.48548h1.0134l-0.13958-0.48548q-0.097092-0.31556-0.18812-0.64932-0.084958-0.33377-0.16992-0.66146h-0.024273q-0.084958 0.33377-0.16992 0.66752-0.084958 0.32769-0.18205 0.64325zm-1.329 2.1118 1.2926-3.9688h0.82531l1.2926 3.9688h-0.74035l-0.30949-1.0741h-1.3351l-0.30949 1.0741z" fill="#aeaeae" stroke-opacity=".78039" stroke-width=".45513"/>
+ <path d="m3.9467 5.1593v-1.9843h0.62795q0.15323 0 0.27942 0.027308 0.12919 0.024273 0.22233 0.081922 0.09615 0.054615 0.14722 0.14868 0.054082 0.094058 0.054082 0.23059 0 0.14261-0.072107 0.26397-0.072108 0.12137-0.2013 0.16688v0.012137q0.16224 0.036409 0.2674 0.15474 0.10816 0.1153 0.10816 0.31556 0 0.14868-0.057086 0.2579-0.057085 0.10922-0.15923 0.18205-0.099158 0.072819-0.23736 0.10922-0.13821 0.033375-0.30045 0.033375zm0.34852-1.1651h0.24938q0.20732 0 0.29744-0.075853 0.093142-0.075854 0.093142-0.20328 0-0.14564-0.09615-0.20632-0.09615-0.060682-0.28843-0.060682h-0.25538zm0 0.89208h0.29445q0.21632 0 0.3335-0.078888 0.11718-0.081923 0.11718-0.2488 0-0.15778-0.11418-0.22757-0.11418-0.07282-0.33651-0.07282h-0.29445z" fill="#fff" stroke-opacity=".78039" stroke-width=".22645"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#69c" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#69c" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-superscript.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.9467 3.175v-1.9843h0.62793q0.15324 0 0.27942 0.027307 0.12919 0.024274 0.22233 0.081922 0.09615 0.054615 0.14722 0.14868 0.054082 0.094058 0.054082 0.23059 0 0.14261-0.072107 0.26397-0.072107 0.12137-0.2013 0.16688v0.012138q0.16224 0.03641 0.2674 0.15475 0.10816 0.1153 0.10816 0.31556 0 0.14868-0.057086 0.2579-0.057085 0.10922-0.15923 0.18204-0.099142 0.072818-0.23735 0.10922-0.13821 0.033375-0.30045 0.033375zm0.34853-1.1651h0.24937q0.20732 0 0.29744-0.075853 0.093141-0.075853 0.093141-0.20328 0-0.14564-0.09615-0.20632-0.09615-0.060682-0.28843-0.060682h-0.25538zm0 0.89208h0.29443q0.21632 0 0.3335-0.078888 0.11718-0.081923 0.11718-0.24879 0-0.15777-0.11418-0.22756-0.11418-0.07282-0.33651-0.07282h-0.29443z" fill="#fff" stroke-opacity=".78039" stroke-width=".25475"/>
+ <path d="m2.2992 3.0475-0.13958 0.48548h1.0134l-0.13958-0.48548q-0.097092-0.31556-0.18812-0.64932-0.084958-0.33377-0.16992-0.66146h-0.024273q-0.084958 0.33377-0.16992 0.66753-0.084958 0.32769-0.18205 0.64325zm-1.329 2.1118 1.2926-3.9688h0.82531l1.2926 3.9688h-0.74035l-0.30949-1.0741h-1.3351l-0.30949 1.0741z" fill="#aeaeae" stroke-opacity=".78039" stroke-width=".45513"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#69c" stroke-width="1.1186"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#69c" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_dark/nw_tb-underline.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.1778 4.846q-0.32417 0-0.58578-0.090994-0.25592-0.096685-0.4436-0.30143-0.18199-0.20474-0.28436-0.52323-0.096684-0.32417-0.096684-0.78483v-2.0872h0.65971v2.1383q0 0.30143 0.051184 0.51185 0.056872 0.20474 0.15355 0.32985 0.10237 0.12512 0.23887 0.18199 0.13649 0.051184 0.30711 0.051184 0.17061 0 0.3128-0.051184 0.14218-0.056873 0.24455-0.18199 0.10237-0.12512 0.15924-0.32985 0.056873-0.21043 0.056873-0.51185v-2.1383h0.63128v2.0872q0 0.46067-0.096685 0.78483-0.096684 0.31848-0.28436 0.52323-0.18199 0.20474-0.4436 0.30143-0.25592 0.090994-0.5801 0.090994z" fill="#aeaeae" stroke-opacity=".78039" stroke-width=".42654"/>
+ <rect x="1.5875" y="5.0271" width="3.175" height=".39688" fill="#aeaeae" stroke-width=".91291"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#69c" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#69c" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_at.svg

@@ -1,4 +0,0 @@
-<?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="m12 2c-5.5138 0-10 4.4862-10 10s4.4862 10 10 10c2.02 0 3.965-0.59875 5.6238-1.73 0.57-0.39 0.7175-1.1675 0.32875-1.7375-0.38875-0.57125-1.165-0.715-1.7375-0.32875-1.2425 0.84875-2.7 1.2962-4.215 1.2962-4.1362 0-7.5-3.3638-7.5-7.5s3.3638-7.5 7.5-7.5 7.5 3.3638 7.5 7.5v0.625c0 0.69-0.56 1.25-1.25 1.25s-1.25-0.56-1.25-1.25v-3.75c0-0.69125-0.55875-1.25-1.25-1.25-0.55125 0-1.0062 0.3625-1.1725 0.86-0.725-0.53375-1.6112-0.86-2.5775-0.86-2.4125 0-4.375 1.9625-4.375 4.375s1.9625 4.375 4.375 4.375c1.3062 0 2.4688-0.5875 3.27-1.4988 0.685 0.90375 1.76 1.4988 2.98 1.4988 2.0675 0 3.75-1.6825 3.75-3.75v-0.625c0-5.5138-4.4862-10-10-10zm0 11.875c-1.0338 0-1.875-0.84125-1.875-1.875s0.84125-1.875 1.875-1.875 1.875 0.84125 1.875 1.875-0.84125 1.875-1.875 1.875z" fill="#69c" stroke-width="1.25"/>
-</svg>

novelwriter/assets/icons/typicons_dark/typ_eye.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="m22.803 11.373c-0.0913-0.1309-2.2682-3.2384-5.2724-5.3626-1.5576-1.1033-3.5222-1.7105-5.5309-1.7105-2.0075 0-3.9721 0.60721-5.5331 1.7105-3.0041 2.1241-5.1789 5.2317-5.2702 5.3626-0.2618 0.3773-0.2618 0.87781 0 1.2551 0.091301 0.1309 2.266 3.2384 5.2702 5.3626 1.5609 1.1022 3.5255 1.7094 5.5331 1.7094 2.0086 0 3.9732-0.60721 5.5309-1.7105 3.0041-2.1241 5.1811-5.2317 5.2724-5.3626 0.2629-0.3762 0.2629-0.87781 0-1.254zm-10.803 4.4771c-2.1274 0-3.85-1.727-3.85-3.85 0-2.1274 1.7226-3.85 3.85-3.85 2.123 0 3.85 1.7226 3.85 3.85 0 2.123-1.727 3.85-3.85 3.85zm2.2-3.85c0 1.2122-0.98781 2.2-2.2 2.2-1.2155 0-2.2-0.98781-2.2-2.2 0-1.2155 0.98451-2.2 2.2-2.2 1.2122 0 2.2 0.98451 2.2 2.2z" fill="#69c" stroke-width="1.1"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_th-dot-menu.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="m12 2a2.6315 2.6315 0 0 0-2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314-2.6314 2.6315 2.6315 0 0 0-2.6314-2.6314zm0 7.3686a2.6315 2.6315 0 0 0-2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314-2.6314 2.6315 2.6315 0 0 0-2.6314-2.6314zm0 7.3686a2.6315 2.6315 0 0 0-2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314-2.6314 2.6315 2.6315 0 0 0-2.6314-2.6314z" fill="#aeaeae" stroke-width=".90909"/>
+</svg>

novelwriter/assets/icons/typicons_dark/typ_th-menu.svg

@@ -1,4 +0,0 @@
-<?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="M19 17h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 10h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 3h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2z" fill="#69c"/>
-</svg>

novelwriter/assets/icons/typicons_light/icons.conf

@@ -46,11 +46,21 @@ cross           = typ_times.svg
 down            = typ_chevron-down.svg
 edit            = typ_pencil.svg
 export          = typ_export.svg
+fmt_bold        = nw_tb-bold.svg
+fmt_bold-md     = nw_tb-bold-md.svg
+fmt_italic      = nw_tb-italic.svg
+fmt_italic-md   = nw_tb-italic-md.svg
+fmt_strike      = nw_tb-strike.svg
+fmt_strike-md   = nw_tb-strike-md.svg
+fmt_subscript   = nw_tb-subscript.svg
+fmt_superscript = nw_tb-superscript.svg
+fmt_underline   = nw_tb-underline.svg
 forward         = typ_chevron-right.svg
 maximise        = typ_arrow-maximise.svg
-menu            = typ_th-menu.svg
+menu            = typ_th-dot-menu.svg
 minimise        = typ_arrow-minimise.svg
 noncheckable    = mixed_input-none.svg
+panel           = nw_panel.svg
 proj_chapter    = mixed_document-chapter.svg
 proj_details    = typ_th-list-grey.svg
 proj_document   = typ_document-text.svg
@@ -60,7 +70,6 @@ proj_scene      = mixed_document-scene.svg
 proj_section    = mixed_document-section.svg
 proj_stats      = typ_chart-bar-grey.svg
 proj_title      = mixed_document-title.svg
-reference       = typ_at.svg
 refresh         = typ_refresh.svg
 remove          = typ_minus.svg
 revert          = typ_refresh-flipped.svg
@@ -83,14 +92,21 @@ sticky-off      = typ_pin-outline.svg
 sticky-on       = typ_pin.svg
 unchecked       = mixed_input-unchecked.svg
 up              = typ_chevron-up.svg
+view            = typ_eye.svg
 view_build      = typ_export-grey.svg
 view_editor     = mixed_edit.svg
 view_novel      = typ_book-grey.svg
 view_outline    = typ_puzzle-outline.svg
 
 deco_doc_h0     = nw_deco-h0.svg
+deco_doc_h0_n   = nw_deco-h0.svg
 deco_doc_h1     = nw_deco-h1.svg
+deco_doc_h1_n   = nw_deco-h1.svg
 deco_doc_h2     = nw_deco-h2.svg
+deco_doc_h2_n   = nw_deco-h2-narrow.svg
 deco_doc_h3     = nw_deco-h3.svg
+deco_doc_h3_n   = nw_deco-h3-narrow.svg
 deco_doc_h4     = nw_deco-h4.svg
+deco_doc_h4_n   = nw_deco-h4-narrow.svg
 deco_doc_more   = nw_deco-noveltree-more.svg
+deco_doc_nt_n   = nw_deco-note.svg

novelwriter/assets/icons/typicons_light/nw_deco-h2-narrow.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#c82829" stroke-width="0"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_deco-h3-narrow.svg

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

novelwriter/assets/icons/typicons_light/nw_deco-h4-narrow.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#333" stroke-width="0"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_deco-note.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="4" height="24" version="1.2" viewBox="0 0 4 24" xmlns="http://www.w3.org/2000/svg">
+ <rect y="1" width="4" height="22" rx="2" ry="2" fill="#ad8700" stroke-width="0"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_panel.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="m17.853 2.0017c-0.14248-0.00428-0.28548-1.936e-4 -0.42925 0.01171h-11.135c-2.3531-0.068148-4.4276 2.1102-4.2808 4.4518 0.00689 3.8473-0.014486 7.6959 0.00976 11.542 0.12963 2.1674 2.0751 4.0505 4.2711 3.9912 3.8794-0.0037 7.7592 0.0071 11.639-0.0059 2.3157-0.05864 4.2507-2.2581 4.0603-4.5591-0.0037-3.7862 0.0071-7.5728-0.0059-11.359-0.054966-2.1716-1.9914-4.0089-4.1286-4.0732zm-11.533 2.8514c0.10262-0.00515 0.20595 1.374e-4 0.30828 0.015613 2.2719-0.00131 4.5437 0.0026 6.8153-0.00195 1.5163 0.01818 3.0369-0.036922 4.5501 0.029275 0.83106 0.14317 1.246 1.0195 1.1395 1.7956-0.0023 1.7714-9.95e-4 3.543 0 5.3144h-14.271c-9.495e-4 -1.9468-0.0019-3.8929 0.00585-5.8394 0.049778-0.75434 0.73334-1.2775 1.4517-1.3135z" fill-opacity=".78039" stroke-width=".99912"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-bold-md.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1.3672 5.5562v-4.7625h1.6289q0.37252 0 0.68662 0.058435 0.32139 0.051131 0.55513 0.18991 0.24104 0.13878 0.37252 0.36522 0.13878 0.22644 0.13878 0.56975 0 0.1607-0.043826 0.32139t-0.12417 0.29948q-0.080349 0.13878-0.19721 0.24835-0.10957 0.10957-0.25565 0.1607v0.029218q0.18261 0.043827 0.33601 0.13878 0.1534 0.087653 0.27027 0.22644 0.11687 0.13878 0.18261 0.3287 0.065739 0.18261 0.065739 0.42365 0 0.36522-0.14608 0.62818-0.13878 0.26295-0.39444 0.43826-0.24835 0.168-0.58435 0.25565-0.33601 0.080349-0.72313 0.080349zm1.0737-2.8561h0.50401q0.39444 0 0.56975-0.1534 0.18261-0.1534 0.18261-0.40905 0-0.27757-0.18261-0.39444t-0.56244-0.11687h-0.51131zm0 2.0233h0.60626q0.88383 0 0.88383-0.64279 0-0.31408-0.21914-0.44557-0.21914-0.13878-0.6647-0.13878h-0.60626z" fill-opacity=".78039" stroke-opacity=".78039" stroke-width=".54782"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-bold.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1.568 5.2917v-4.2333h1.4479q0.33113 0 0.61033 0.051942 0.28568 0.04545 0.49345 0.16881 0.21426 0.12336 0.33113 0.32464 0.12336 0.20128 0.12336 0.50644 0 0.14284-0.038957 0.28568-0.038956 0.14284-0.11037 0.2662-0.071421 0.12336-0.1753 0.22076-0.097396 0.097396-0.22724 0.14284v0.025972q0.16232 0.038957 0.29868 0.12336 0.13636 0.077914 0.24024 0.20128 0.10388 0.12336 0.16232 0.29218 0.058435 0.16232 0.058435 0.37658 0 0.32464-0.12985 0.55838-0.12336 0.23373-0.35061 0.38956-0.22076 0.14933-0.51942 0.22724-0.29868 0.071422-0.64278 0.071422zm0.9544-2.5388h0.44801q0.35061 0 0.50644-0.13636 0.16232-0.13636 0.16232-0.3636 0-0.24673-0.16232-0.35061-0.16232-0.10388-0.49995-0.10388h-0.4545zm0 1.7985h0.5389q0.78563 0 0.78563-0.57137 0-0.27918-0.19479-0.39606-0.19479-0.12336-0.59084-0.12336h-0.5389z" fill-opacity=".78039" stroke-opacity=".78039" stroke-width=".48695"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#4271ae" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#4271ae" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-italic-md.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.3084 5.5562 0.94666-4.7625h0.78646l-0.94666 4.7625z" fill-opacity=".78039" stroke-opacity=".78039" stroke-width=".54615"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-italic.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.417 5.2917 0.84148-4.2333h0.69908l-0.84148 4.2333z" fill-opacity=".78039" stroke-opacity=".78039" stroke-width=".48547"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#4271ae" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#4271ae" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-strike-md.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.1785 5.5562q-0.46361 0-0.89912-0.17561-0.42848-0.17561-0.75863-0.49873l0.47766-0.55492q0.24585 0.2318 0.56195 0.37931 0.3161 0.14049 0.63219 0.14049 0.39336 0 0.59707-0.16156t0.20371-0.42848q0-0.14049-0.056194-0.23883-0.04917-0.098341-0.14751-0.16858-0.091316-0.077267-0.22478-0.14049-0.12644-0.063219-0.28097-0.12644l-0.63219-0.27395q-0.16858-0.070243-0.33717-0.17561-0.16156-0.10537-0.29502-0.25288t-0.21775-0.34419q-0.077268-0.19668-0.077268-0.44956 0-0.27395 0.11239-0.50575 0.11941-0.23883 0.32312-0.41444t0.48468-0.27395q0.288-0.098341 0.62517-0.098341 0.40039 0 0.77268 0.16156 0.37229 0.15454 0.63921 0.42146l-0.41444 0.5198q-0.22478-0.18263-0.46361-0.288t-0.53385-0.10537q-0.33014 0-0.52683 0.14751-0.19668 0.14049-0.19668 0.39336 0 0.13346 0.056194 0.2318 0.063219 0.091316 0.16156 0.16858 0.10537 0.070244 0.23883 0.13346 0.13346 0.056194 0.27395 0.11239l0.62516 0.2599q0.20371 0.084291 0.37229 0.19668 0.16858 0.11239 0.288 0.2599 0.12644 0.14751 0.19668 0.34419 0.070244 0.18966 0.070244 0.44253 0 0.28097-0.11239 0.52683-0.11239 0.24585-0.33015 0.43551-0.21073 0.18263-0.5198 0.29502-0.30205 0.10536-0.68838 0.10536zm-2.3848-2.6458h4.7625v0.52917h-4.7625z" fill-opacity=".78039" stroke-opacity=".78039" stroke-width=".52683"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-strike.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.1782 5.2917q-0.4121 0-0.79922-0.1561-0.38087-0.1561-0.67434-0.44331l0.42459-0.49326q0.21853 0.20604 0.49951 0.33716 0.28098 0.12488 0.56195 0.12488 0.34965 0 0.53073-0.14361 0.18108-0.14361 0.18108-0.38087 0-0.12488-0.04995-0.21229-0.043707-0.087414-0.13112-0.14985-0.08117-0.068682-0.1998-0.12488-0.11239-0.056194-0.24975-0.11239l-0.56195-0.24351q-0.14985-0.062438-0.29971-0.1561-0.14361-0.093662-0.26224-0.22478-0.11863-0.13112-0.19356-0.30595-0.068682-0.17483-0.068682-0.39961 0-0.24351 0.099902-0.44955 0.10614-0.21229 0.28722-0.36839 0.18108-0.1561 0.43083-0.24351 0.256-0.087414 0.55571-0.087414 0.3559 0 0.68683 0.14361 0.33092 0.13737 0.56819 0.37463l-0.36839 0.46204q-0.1998-0.16234-0.4121-0.256-0.21229-0.093662-0.47453-0.093662-0.29346 0-0.46829 0.13112-0.17483 0.12488-0.17483 0.34965 0 0.11863 0.04995 0.20604 0.056194 0.08117 0.14361 0.14985 0.093662 0.062439 0.21229 0.11863 0.11863 0.04995 0.24351 0.099902l0.5557 0.23102q0.18108 0.074925 0.33092 0.17483 0.14985 0.099902 0.256 0.23102 0.11239 0.13112 0.17483 0.30595 0.062439 0.16859 0.062439 0.39336 0 0.24975-0.099902 0.46829-0.099902 0.21853-0.29347 0.38712-0.18732 0.16234-0.46204 0.26224-0.26849 0.093653-0.61189 0.093653zm-2.1198-2.3518h4.2333v0.47037h-4.2333z" fill-opacity=".78039" stroke-opacity=".78039" stroke-width=".46829"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#4271ae" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#4271ae" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-subscript.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.2992 3.0475-0.13958 0.48548h1.0134l-0.13958-0.48548q-0.097092-0.31556-0.18812-0.64932-0.084958-0.33377-0.16992-0.66146h-0.024273q-0.084958 0.33377-0.16992 0.66752-0.084958 0.32769-0.18205 0.64325zm-1.329 2.1118 1.2926-3.9688h0.82531l1.2926 3.9688h-0.74035l-0.30949-1.0741h-1.3351l-0.30949 1.0741z" fill-opacity=".78039" stroke-opacity=".78039" stroke-width=".45513"/>
+ <path d="m3.9467 5.1593v-1.9843h0.62795q0.15323 0 0.27942 0.027308 0.12919 0.024273 0.22233 0.081922 0.09615 0.054615 0.14722 0.14868 0.054082 0.094058 0.054082 0.23059 0 0.14261-0.072107 0.26397-0.072108 0.12137-0.2013 0.16688v0.012137q0.16224 0.036409 0.2674 0.15474 0.10816 0.1153 0.10816 0.31556 0 0.14868-0.057086 0.2579-0.057085 0.10922-0.15923 0.18205-0.099158 0.072819-0.23736 0.10922-0.13821 0.033375-0.30045 0.033375zm0.34852-1.1651h0.24938q0.20732 0 0.29744-0.075853 0.093142-0.075854 0.093142-0.20328 0-0.14564-0.09615-0.20632-0.09615-0.060682-0.28843-0.060682h-0.25538zm0 0.89208h0.29445q0.21632 0 0.3335-0.078888 0.11718-0.081923 0.11718-0.2488 0-0.15778-0.11418-0.22757-0.11418-0.07282-0.33651-0.07282h-0.29445z" stroke-opacity=".78039" stroke-width=".22645"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#4271ae" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#4271ae" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-superscript.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.9467 3.175v-1.9843h0.62793q0.15324 0 0.27942 0.027307 0.12919 0.024274 0.22233 0.081922 0.09615 0.054615 0.14722 0.14868 0.054082 0.094058 0.054082 0.23059 0 0.14261-0.072107 0.26397-0.072107 0.12137-0.2013 0.16688v0.012138q0.16224 0.03641 0.2674 0.15475 0.10816 0.1153 0.10816 0.31556 0 0.14868-0.057086 0.2579-0.057085 0.10922-0.15923 0.18204-0.099142 0.072818-0.23735 0.10922-0.13821 0.033375-0.30045 0.033375zm0.34853-1.1651h0.24937q0.20732 0 0.29744-0.075853 0.093141-0.075853 0.093141-0.20328 0-0.14564-0.09615-0.20632-0.09615-0.060682-0.28843-0.060682h-0.25538zm0 0.89208h0.29443q0.21632 0 0.3335-0.078888 0.11718-0.081923 0.11718-0.24879 0-0.15777-0.11418-0.22756-0.11418-0.07282-0.33651-0.07282h-0.29443z" stroke-opacity=".78039" stroke-width=".25475"/>
+ <path d="m2.2992 3.0475-0.13958 0.48548h1.0134l-0.13958-0.48548q-0.097092-0.31556-0.18812-0.64932-0.084958-0.33377-0.16992-0.66146h-0.024273q-0.084958 0.33377-0.16992 0.66753-0.084958 0.32769-0.18205 0.64325zm-1.329 2.1118 1.2926-3.9688h0.82531l1.2926 3.9688h-0.74035l-0.30949-1.0741h-1.3351l-0.30949 1.0741z" fill-opacity=".78039" stroke-opacity=".78039" stroke-width=".45513"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#4271ae" stroke-width="1.1186"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#4271ae" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_light/nw_tb-underline.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.1" viewBox="0 0 6.35 6.35" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.1778 4.846q-0.32417 0-0.58578-0.090994-0.25592-0.096685-0.4436-0.30143-0.18199-0.20474-0.28436-0.52323-0.096684-0.32417-0.096684-0.78483v-2.0872h0.65971v2.1383q0 0.30143 0.051184 0.51185 0.056872 0.20474 0.15355 0.32985 0.10237 0.12512 0.23887 0.18199 0.13649 0.051184 0.30711 0.051184 0.17061 0 0.3128-0.051184 0.14218-0.056873 0.24455-0.18199 0.10237-0.12512 0.15924-0.32985 0.056873-0.21043 0.056873-0.51185v-2.1383h0.63128v2.0872q0 0.46067-0.096685 0.78483-0.096684 0.31848-0.28436 0.52323-0.18199 0.20474-0.4436 0.30143-0.25592 0.090994-0.5801 0.090994z" fill-opacity=".78039" stroke-opacity=".78039" stroke-width=".42654"/>
+ <rect x="1.5875" y="5.0271" width="3.175" height=".39688" fill-opacity=".78039" stroke-width=".91291"/>
+ <path d="m4.9555 5.5562v-0.43195h0.54619v-3.8986h-0.54619v-0.43195h1.1299v4.7624z" fill="#4271ae" stroke-width="1.1186"/>
+ <path d="m0.26458 5.5562v-4.7624h1.1299v0.43195h-0.54083v3.8986h0.54083v0.43195z" fill="#4271ae" stroke-width="1.1186"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_at.svg

@@ -1,4 +0,0 @@
-<?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="m12 2c-5.5138 0-10 4.4862-10 10s4.4862 10 10 10c2.02 0 3.965-0.59875 5.6238-1.73 0.57-0.39 0.7175-1.1675 0.32875-1.7375-0.38875-0.57125-1.165-0.715-1.7375-0.32875-1.2425 0.84875-2.7 1.2962-4.215 1.2962-4.1362 0-7.5-3.3638-7.5-7.5s3.3638-7.5 7.5-7.5 7.5 3.3638 7.5 7.5v0.625c0 0.69-0.56 1.25-1.25 1.25s-1.25-0.56-1.25-1.25v-3.75c0-0.69125-0.55875-1.25-1.25-1.25-0.55125 0-1.0062 0.3625-1.1725 0.86-0.725-0.53375-1.6112-0.86-2.5775-0.86-2.4125 0-4.375 1.9625-4.375 4.375s1.9625 4.375 4.375 4.375c1.3062 0 2.4688-0.5875 3.27-1.4988 0.685 0.90375 1.76 1.4988 2.98 1.4988 2.0675 0 3.75-1.6825 3.75-3.75v-0.625c0-5.5138-4.4862-10-10-10zm0 11.875c-1.0338 0-1.875-0.84125-1.875-1.875s0.84125-1.875 1.875-1.875 1.875 0.84125 1.875 1.875-0.84125 1.875-1.875 1.875z" fill="#4271ae" stroke-width="1.25"/>
-</svg>

novelwriter/assets/icons/typicons_light/typ_eye.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="m22.803 11.373c-0.0913-0.1309-2.2682-3.2384-5.2724-5.3626-1.5576-1.1033-3.5222-1.7105-5.5309-1.7105-2.0075 0-3.9721 0.60721-5.5331 1.7105-3.0041 2.1241-5.1789 5.2317-5.2702 5.3626-0.2618 0.3773-0.2618 0.87781 0 1.2551 0.091301 0.1309 2.266 3.2384 5.2702 5.3626 1.5609 1.1022 3.5255 1.7094 5.5331 1.7094 2.0086 0 3.9732-0.60721 5.5309-1.7105 3.0041-2.1241 5.1811-5.2317 5.2724-5.3626 0.2629-0.3762 0.2629-0.87781 0-1.254zm-10.803 4.4771c-2.1274 0-3.85-1.727-3.85-3.85 0-2.1274 1.7226-3.85 3.85-3.85 2.123 0 3.85 1.7226 3.85 3.85 0 2.123-1.727 3.85-3.85 3.85zm2.2-3.85c0 1.2122-0.98781 2.2-2.2 2.2-1.2155 0-2.2-0.98781-2.2-2.2 0-1.2155 0.98451-2.2 2.2-2.2 1.2122 0 2.2 0.98451 2.2 2.2z" fill="#4271ae" stroke-width="1.1"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_th-dot-menu.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="m12 2a2.6315 2.6315 0 0 0-2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314-2.6314 2.6315 2.6315 0 0 0-2.6314-2.6314zm0 7.3686a2.6315 2.6315 0 0 0-2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314-2.6314 2.6315 2.6315 0 0 0-2.6314-2.6314zm0 7.3686a2.6315 2.6315 0 0 0-2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314 2.6314 2.6315 2.6315 0 0 0 2.6314-2.6314 2.6315 2.6315 0 0 0-2.6314-2.6314z" fill-opacity=".78039" stroke-width=".90909"/>
+</svg>

novelwriter/assets/icons/typicons_light/typ_th-menu.svg

@@ -1,4 +0,0 @@
-<?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="M19 17h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 10h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2zM19 3h-14c-1.103 0-2 .897-2 2s.897 2 2 2h14c1.103 0 2-.897 2-2s-.897-2-2-2z" fill="#4271ae"/>
-</svg>

novelwriter/assets/icons/x-novelwriter-project.svg

@@ -1,207 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 270.93333 270.93334"
-   height="1024"
-   width="1024">
-  <defs
-     id="defs2">
-    <linearGradient
-       id="linearGradient2515">
-      <stop
-         style="stop-color:#f7f7f7;stop-opacity:1"
-         offset="0"
-         id="stop2511" />
-      <stop
-         style="stop-color:#e5e5e5;stop-opacity:1"
-         offset="1"
-         id="stop2513" />
-    </linearGradient>
-    <rect
-       x="60.484347"
-       y="205.79962"
-       width="130.57787"
-       height="65.785888"
-       id="rect852" />
-    <rect
-       id="rect1474"
-       height="28.631245"
-       width="177.70083"
-       y="18.019813"
-       x="13.463703" />
-    <rect
-       id="rect852-7"
-       height="65.785889"
-       width="130.57787"
-       y="205.79962"
-       x="60.484348" />
-    <rect
-       id="rect1544"
-       height="65.785889"
-       width="130.57787"
-       y="205.79962"
-       x="60.484348" />
-    <rect
-       x="60.484348"
-       y="205.79962"
-       width="130.57787"
-       height="65.785889"
-       id="rect1570" />
-    <rect
-       x="13.463703"
-       y="18.019813"
-       width="177.70083"
-       height="28.631245"
-       id="rect1587" />
-    <filter
-       id="filter1444"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood1434"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
-      <feComposite
-         id="feComposite1436"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur1438"
-         result="blur"
-         stdDeviation="3"
-         in="composite1" />
-      <feOffset
-         id="feOffset1440"
-         result="offset"
-         dy="6"
-         dx="6" />
-      <feComposite
-         id="feComposite1442"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
-    <filter
-       id="filter1456"
-       style="color-interpolation-filters:sRGB">
-      <feFlood
-         id="feFlood1446"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.498039" />
-      <feComposite
-         id="feComposite1448"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur1450"
-         result="blur"
-         stdDeviation="3"
-         in="composite1" />
-      <feOffset
-         id="feOffset1452"
-         result="offset"
-         dy="6"
-         dx="6" />
-      <feComposite
-         id="feComposite1454"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
-    <radialGradient
-       xlink:href="#linearGradient2515"
-       id="radialGradient2517"
-       cx="605.42725"
-       cy="623.97186"
-       fx="605.42725"
-       fy="623.97186"
-       r="410"
-       gradientTransform="matrix(2.4110274,1.7617596,-0.719517,0.98463462,-776.23441,-1372.7537)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer3"
-     style="display:inline">
-    <path
-       clip-path="none"
-       transform="scale(0.26458333)"
-       d="m 192,22 c -44.32,0 -80,35.680002 -80,80 v 820 c 0,44.32002 35.68,80 80,80 h 640 c 44.31999,0 80,-35.67998 80,-80 V 213.44727 L 720.55469,22 Z"
-       style="fill:url(#radialGradient2517);fill-opacity:1;stroke:#999999;stroke-width:20;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1481" />
-    <path
-       id="path1490"
-       style="display:inline;fill:#e0e0e0;fill-opacity:1;stroke:#999999;stroke-width:5.29167;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 241.30037,56.474215 190.64713,5.8204593 V 35.307549 c 0,11.726333 9.44034,21.166666 21.16667,21.166666 z" />
-    <g
-       aria-label=".nwx"
-       transform="matrix(1.7893481,0,0,1.782571,-45.41919,-191.90571)"
-       id="text850"
-       style="font-size:5.64444px;line-height:1.25;font-family:'Fira Sans';-inkscape-font-specification:'Fira Sans, Normal';letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);display:inline;fill:#666666;fill-opacity:1">
-      <path
-         d="m 63.088865,241.76928 q 0,-1.36426 0.909505,-2.27376 0.930175,-0.93018 2.480467,-0.93018 1.550291,0 2.459796,0.93018 0.909504,0.9095 0.909504,2.27376 0,1.34359 -0.909504,2.27376 -0.909505,0.9095 -2.459796,0.9095 -1.550292,0 -2.480467,-0.9095 -0.909505,-0.93017 -0.909505,-2.27376 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.3333px;font-family:Roboto;-inkscape-font-specification:'Roboto, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#666666;fill-opacity:1"
-         id="path856" />
-      <path
-         d="m 84.75161,226.78312 q -2.542479,0 -3.782712,2.14974 v 15.79231 h -5.973791 v -22.36554 h 5.601721 l 0.206705,2.56314 q 2.397785,-2.97656 6.428544,-2.97656 3.162595,0 5.105627,1.88103 1.943033,1.88102 1.963703,6.55256 v 14.34537 h -5.994461 v -14.26269 q 0,-2.14973 -0.930175,-2.91454 -0.909505,-0.76482 -2.625161,-0.76482 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.3333px;font-family:Roboto;-inkscape-font-specification:'Roboto, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#666666;fill-opacity:1"
-         id="path858" />
-      <path
-         d="m 126.96089,222.35963 -5.68441,22.36554 h -5.00227 l -4.25814,-14.07665 -4.23746,14.07665 h -4.9816 l -5.705078,-22.36554 h 5.767088 l 2.95589,14.22134 4.05143,-14.22134 h 4.32014 l 4.09277,14.20067 2.91455,-14.20067 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.3333px;font-family:Roboto;-inkscape-font-specification:'Roboto, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#666666;fill-opacity:1"
-         id="path860" />
-      <path
-         d="m 134.77436,222.35963 3.65869,6.65592 3.76204,-6.65592 h 6.3872 l -6.36653,10.93472 6.63525,11.43082 h -6.3872 l -4.01009,-7.04866 -3.94808,7.04866 h -6.42854 l 6.63525,-11.43082 -6.36654,-10.93472 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:42.3333px;font-family:Roboto;-inkscape-font-specification:'Roboto, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#666666;fill-opacity:1"
-         id="path862" />
-    </g>
-  </g>
-  <g
-     id="g2509"
-     transform="matrix(1.2371037,0,0,1.2371037,206.3182,37.341857)">
-    <path
-       transform="matrix(0.16895991,0,0,0.18329422,-134.6942,-19.491243)"
-       id="rect1406-1"
-       style="display:inline;fill:#a11212;fill-opacity:1;stroke:#7e1b1b;stroke-width:9.99999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1444)"
-       d="m 145.18984,56.414257 c -44.32,0 -79.999998,35.68 -79.999998,80.000003 v 199.99805 a 279.99999,279.99999 0 0 0 0,0.002 279.99999,279.99999 0 0 0 0,0.0195 v 199.98242 c 0,44.31999 35.679998,80 79.999998,80 44.32,0 80,-35.68001 80,-80 v -200 a 120,120 0 0 1 120,-120 120,120 0 0 1 120,120 v 282.83592 h 160 V 336.41621 a 279.99999,279.99999 0 0 0 -280,-280.000003 279.99999,279.99999 0 0 0 -0.81055,0 279.99999,279.99999 0 0 0 -133.46484,34.29688 c -14.4245,-20.75262 -38.42829,-34.29883 -65.72461,-34.29883 z M 376.65078,619.64082 c -0.62174,0.0972 -1.2172,0.22317 -1.7793,0.37696 0.5621,-0.15379 1.15756,-0.27973 1.7793,-0.37696 z m -1.7793,0.37696 c -0.5621,0.15378 -1.09071,0.33534 -1.58008,0.53906 0.48937,-0.20372 1.01798,-0.38528 1.58008,-0.53906 z m 338.85742,-0.37696 c 0.62174,0.0972 1.2172,0.22317 1.7793,0.37696 -0.5621,-0.15379 -1.15756,-0.27973 -1.7793,-0.37696 z m 1.7793,0.37696 c 0.5621,0.15378 1.09071,0.33534 1.58008,0.53906 -0.48938,-0.20372 -1.01798,-0.38528 -1.58008,-0.53906 z" />
-    <path
-       transform="matrix(0.16895991,0,0,0.18329422,-134.6942,-19.491243)"
-       id="path897"
-       style="display:inline;fill:#730d0d;fill-opacity:1;stroke:#590d0d;stroke-width:9.99999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1456)"
-       d="m 465.18984,619.25215 v 0.16406 h -85.58398 c -5.49302,0 -9.91602,2.2329 -9.91602,5.00586 0,0.52294 0.15913,1.02696 0.45117,1.5 h -0.44531 c 0.30916,2.03607 1.24102,3.99791 2.81641,5.57227 l 165.59961,165.49414 c 3.92061,3.91808 10.23371,3.91812 14.15429,0 L 717.86757,631.49434 c 1.57569,-1.57463 2.50725,-3.53578 2.81641,-5.57227 h -0.44531 c 0.29216,-0.47304 0.45117,-0.97706 0.45117,-1.5 0,-2.77296 -4.42304,-5.00586 -9.91602,-5.00586 h -85.58398 v -0.16406 z" />
-    <rect
-       style="display:inline;fill:#c32222;fill-opacity:1;stroke:none;stroke-width:1.75982;stroke-linejoin:round;stroke-opacity:1"
-       id="rect914"
-       width="6.7583966"
-       height="82.482399"
-       x="-118.27303"
-       y="1.2969339"
-       rx="3.3791983"
-       ry="3.6658845" />
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="256" height="256" version="1.1" viewBox="0 0 67.733 67.733" xmlns="http://www.w3.org/2000/svg">
+ <path d="m12.869 1.7145c-2.9081 0-5.2493 2.3412-5.2493 5.2493v53.806c0 2.9081 2.3412 5.2493 5.2493 5.2493h41.995c2.9081 0 5.2493-2.3412 5.2493-5.2493v-46.493l-12.562-12.562z" fill="#ececec" stroke="#999" stroke-linejoin="round" stroke-width="1.3123"/>
+ <path d="m60.113 14.277-12.562-12.562v7.3128c0 2.9081 2.3412 5.2493 5.2493 5.2493z" fill="#e0e0e0" stroke="#999" stroke-linejoin="round" stroke-width="1.3123"/>
+ <path d="m34.617 50.796c-0.31888 0-0.57319 0.09267-0.7628 0.27797-0.1853 0.18099-0.27797 0.41156-0.27797 0.69167 0 0.2758 0.09268 0.50636 0.27797 0.69166 0.18961 0.18099 0.44392 0.27144 0.7628 0.27144s0.57306-0.09044 0.76266-0.27144c0.18961-0.1853 0.28438-0.41587 0.28438-0.69166 0-0.28011-0.09477-0.51067-0.28438-0.69167-0.18961-0.1853-0.44378-0.27797-0.76266-0.27797zm-21.512 0.36204v9.4116h1.9456v-3.3226h1.7323c1.1118 0 1.978-0.26924 2.5985-0.8079 0.62484-0.53867 0.93722-1.2627 0.93722-2.172 0-0.90065-0.31238-1.644-0.93722-2.2301-0.62053-0.58607-1.4867-0.87903-2.5985-0.87903zm38.395 0.69154v1.7259h-1.0278v1.364h1.0278v3.6909c0 0.74121 0.1809 1.2713 0.54287 1.5902 0.36198 0.31889 0.84896 0.47828 1.4609 0.47828 0.40076 0 0.77566-0.0582 1.1247-0.17455v-1.4156c-0.17237 0.03448-0.3534 0.05178-0.543 0.05178-0.23701 0-0.41581-0.04745-0.53647-0.14226-0.12066-0.09481-0.18096-0.28867-0.18096-0.58171v-3.497h1.1893v-1.364h-1.1893v-1.7259zm-36.45 0.87916h1.7323c0.55589 0 0.95662 0.15729 1.2022 0.47188 0.24562 0.31027 0.36845 0.67008 0.36845 1.0795 0 0.40939-0.12283 0.7456-0.36845 1.0085-0.24562 0.26287-0.64636 0.39421-1.2022 0.39421h-1.7323zm9.8574 0.71755c-0.67224 0-1.1915 0.32101-1.5578 0.96311l-0.05818-0.83392h-1.7646v6.9942h1.8744v-4.583c0.21977-0.47834 0.68093-0.71756 1.3833-0.71756l0.67872 0.05178 0.01934-1.7906c-0.14651-0.05602-0.33829-0.08395-0.5753-0.08395zm4.2402 0c-1.0514 0-1.8659 0.34041-2.4433 1.0213-0.57743 0.67657-0.86609 1.5233-0.86609 2.5403v0.21979c0.01724 0.99546 0.31244 1.8228 0.88557 2.4822 0.57743 0.65933 1.3897 0.98899 2.4368 0.98899 1.0558 0 1.8702-0.33831 2.4433-1.0149 0.57312-0.67657 0.85968-1.5233 0.85968-2.5403v-0.13572c0-1.017-0.28655-1.8638-0.85968-2.5403-0.57313-0.68088-1.3919-1.0213-2.4563-1.0213zm10.93 0c-0.99974 0-1.7948 0.33819-2.3851 1.0148-0.58605 0.67657-0.87903 1.5429-0.87903 2.5987v0.27144c0.0043 0.93082 0.31236 1.7259 0.92427 2.3853 0.61191 0.65502 1.4608 0.98246 2.5467 0.98246 0.68085 0 1.2498-0.13134 1.7065-0.39421 0.45678-0.26287 0.79721-0.55386 1.0213-0.87275l-0.9244-1.0213c-0.41368 0.52143-0.97605 0.78214-1.6871 0.78214-0.47832 0-0.86398-0.13789-1.157-0.41369-0.29303-0.28011-0.47183-0.64634-0.53647-1.0988h4.4536v-0.79509c0-1.0342-0.26296-1.8659-0.78868-2.4951-0.52572-0.62917-1.2906-0.94376-2.2947-0.94376zm7.0715 0c-1.0816 0-1.8896 0.34251-2.424 1.0277-0.53434 0.68519-0.8015 1.5212-0.8015 2.508v0.18108c0 0.99115 0.26716 1.8293 0.8015 2.5145 0.53865 0.68088 1.3488 1.0213 2.4304 1.0213 0.81013 0 1.4932-0.23909 2.0491-0.71743 0.5602-0.47834 0.84453-1.0881 0.85314-1.8293h-1.7581c-0.0043 0.31889-0.11639 0.57306-0.33616 0.76267-0.21977 0.1853-0.4999 0.27797-0.84033 0.27797-0.55158 0-0.91141-0.20251-1.0795-0.6076-0.16375-0.40939-0.24555-0.88337-0.24555-1.422 0-0.65933 0.08403-1.1916 0.25208-1.5967 0.16806-0.40939 0.52357-0.614 1.0665-0.614 0.37921 0 0.67009 0.12059 0.87262 0.36192 0.20253 0.23702 0.30596 0.52578 0.31027 0.86622h1.7581c-0.0086-0.84032-0.2822-1.5061-0.82085-1.9973-0.53434-0.49127-1.2303-0.73691-2.0878-0.73691zm-13.432 0.12918v7.382c0 0.60331-0.28223 0.90492-0.84674 0.90492-0.19822 0-0.39643-0.01939-0.59465-0.05818v1.4803c0.29734 0.07326 0.60972 0.10983 0.93722 0.10983 0.75411 0 1.338-0.20894 1.7517-0.62695 0.41799-0.41801 0.62707-1.0214 0.62707-1.81v-7.382zm-4.57 1.3769c0.53003 0 0.90284 0.20462 1.1183 0.614 0.21977 0.40508 0.32962 0.88561 0.32962 1.4415 0 0.66364-0.10985 1.1937-0.32962 1.5902-0.21546 0.39646-0.58395 0.59465-1.1054 0.59465-0.53004 0-0.90494-0.19819-1.1247-0.59465-0.21546-0.40077-0.32321-0.88562-0.32321-1.4545 0-0.65072 0.10775-1.1786 0.32321-1.5836 0.21546-0.40508 0.58604-0.6076 1.1118-0.6076zm10.917 0c0.43092 0 0.7454 0.12492 0.94362 0.37486 0.20254 0.24563 0.30819 0.5559 0.3168 0.93081v0.14226h-2.5985c0.06464-0.43094 0.20477-0.78 0.42023-1.0472 0.21546-0.26718 0.52142-0.40075 0.91786-0.40075z" fill="#666" stroke-width=".1773" style="shape-inside:url(#rect2964);white-space:pre"/>
+ <path d="m16.933 38.766h1.5478q1.2383 0 1.7336-0.49531 0.55722-0.55722 0.55722-1.7955v-15.912q0-1.2383-0.49531-1.7336-0.49531-0.55722-1.7336-0.55722h-1.3002v-4.6435h7.9249l0.37148 4.1482q2.1051-2.6623 4.7673-3.8386 2.7242-1.2383 6.5628-1.2383 9.9062 0 9.9062 10.278v13.497q0 1.2383 0.49531 1.7955 0.55722 0.49531 1.7955 0.49531h1.7336v4.5816h-10.649v-20.308q0-3.0957-1.3002-4.4578-1.3002-1.424-4.2101-1.424-3.1576 0-5.2007 1.7955-2.0431 1.7955-2.0431 5.015v12.507q0 1.2383 0.43339 1.7955 0.49531 0.49531 1.6717 0.49531h1.6098v4.5816h-14.178z" fill="#346598" stroke-linecap="round" stroke-width=".16123"/>
 </svg>

novelwriter/assets/syntax/default_dark.conf

@@ -17,6 +17,7 @@ straightquotes = 200,  46,   0
 doublequotes   = 184, 200,   0
 singlequotes   = 136, 200,   0
 hidden         = 150, 150, 150
+shortcode      =   0, 155, 200
 keyword        = 200,  46,   0
 value          = 184, 200,   0
 spellcheckline = 200,  46,   0

novelwriter/assets/syntax/default_light.conf

@@ -17,6 +17,7 @@ straightquotes = 200,   0,   0
 doublequotes   =   0,   0, 200
 singlequotes   =   0,   0, 200
 hidden         = 100, 100, 100
+shortcode      =   0, 100,   0
 keyword        = 200,  50,  50
 value          =  50, 150,  50
 spellcheckline = 200,   0,   0

novelwriter/assets/syntax/grey_dark.conf

@@ -17,6 +17,7 @@ straightquotes = 200, 200, 200
 doublequotes   = 200, 200, 200
 singlequotes   = 200, 200, 200
 hidden         = 150, 150, 150
+shortcode      = 225, 225, 225
 keyword        = 225, 225, 225
 value          = 200, 200, 200
 spellcheckline = 200,  46,   0

novelwriter/assets/syntax/grey_light.conf

@@ -17,6 +17,7 @@ straightquotes =  20,  20,  20
 doublequotes   =  20,  20,  20
 singlequotes   =  20,  20,  20
 hidden         = 100, 100, 100
+shortcode      =   0,   0,   0
 keyword        =   0,   0,   0
 value          =  20,  20,  20
 spellcheckline = 200,   0,   0

novelwriter/assets/syntax/light_owl.conf

@@ -37,6 +37,7 @@ straightquotes = 222,  61,  58
 doublequotes   =   8, 145, 106
 singlequotes   = 255, 235, 149
 hidden         = 152, 159, 177
+shortcode      =  40, 142, 215
 keyword        = 222,  61,  58
 value          = 150,  74, 193
 spellcheckline = 222,  61,  58

novelwriter/assets/syntax/night_owl.conf

@@ -37,6 +37,7 @@ straightquotes = 247, 140, 108
 doublequotes   = 173, 219, 103
 singlequotes   = 255, 235, 149
 hidden         =  99, 119, 119
+shortcode      = 130, 170, 255
 keyword        = 247, 140, 108
 value          = 199, 146, 234
 spellcheckline = 247, 140, 108

novelwriter/assets/syntax/solarized_dark.conf

@@ -17,6 +17,7 @@ straightquotes =  211, 54, 130
 doublequotes   =  42, 161, 152
 singlequotes   =  42, 161, 152
 hidden         = 147, 161, 161
+shortcode      = 147, 161, 161
 keyword        = 133, 153,   0
 value          = 203,  75,  22
 spellcheckline = 203,  75,  22