Merge branch 'main' into release_2.1rc1

docs/source/int_source.rst

@@ -136,12 +136,12 @@ the ``assets`` folder of the source. This file can be built from setup script by
 Building the Documentation
 ==========================
 
-A local copy of this documentation can be generated as HTML. This requires the following Python
+A local copy of this documentation can be generated as HTML. This requires installing some Python
 packages from PyPi:
 
 .. code-block:: bash
 
-   pip install furo sphinx
+   pip install -r docs/source/requirements.txt
 
 The documentation can then be built from the root folder in the source code by running:
 

docs/source/int_started.rst

@@ -186,7 +186,7 @@ command will not work in the command line window.
 
    Screenshot of the Python installer on Windows.
 
-When Python is installed, you should be able to run Python commands from the COmmand Prompt or
+When Python is installed, you should be able to run Python commands from the Command Prompt or
 from PowerShell. You can verify this by running:
 
 .. code-block:: bash

docs/source/usage_format.rst

@@ -109,7 +109,7 @@ background, depending on the selected theme.
 Text Emphasis
 =============
 
-A minimal set of text emphasis styles are supported.
+A minimal set of text emphasis styles are supported for text paragraphs.
 
 ``_text_``
    The text is rendered as emphasised text (italicised).
@@ -120,7 +120,7 @@ A minimal set of text emphasis styles are supported.
 ``~~text~~``
    Strikethrough text.
 
-In markdown guides it is often recommended to differentiate between strong importance and emphasis
+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 ``__``
 for strong and ``*`` for emphasis. However, since the differentiation makes the highlighting and
 conversion significantly simpler and faster, in novelWriter this is a rule, not just a
@@ -132,11 +132,20 @@ In addition, the following rules apply:
    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 wrapper.
+3. If using both ``**`` and ``_`` to wrap the same text, the underscore must be the *inner*
-   This is due to the underscore also being a valid word character, so if they are on the outside,
+   wrapper. This is due to the underscore also being a valid word character, so if they are on the
-   they violate rule 2.
+   outside, they violate rule 2.
 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.
+
+.. tip::
+
+   novelWriter supports standard escape syntax for the emphasis markup characters in case the
+   editor misunderstands your intended usage of them. That is, ``\*``, ``\_`` and ``\~`` will
+   generate a plain ``*``, ``_`` and ``~``, respectively, without interpreting them as part of the
+   markup.
 
 
 .. _a_fmt_comm:

docs/source/usage_interface.rst

@@ -204,6 +204,12 @@ match the word being replaced.
 The regular expression search is somewhat dependant on which version of Qt your system has. If you
 have Qt 5.13 or higher, there is better support for unicode symbols in the search.
 
+.. seealso::
+
+   For more information on the capabilities of the Regular Expression option, see the Qt
+   documentation for the `QRegularExpression <https://doc.qt.io/qt-5/qregularexpression.html>`_
+   class.
+
 
 .. _a_ui_edit_auto:
 

i18n/nw_base.ts

@@ -1978,32 +1978,32 @@
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="880" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="875" />
       <source>User Manual (Online)</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="887" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="882" />
       <source>User Manual (PDF)</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="891" />
       <source>Report an Issue (GitHub)</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
       <source>Ask a Question (GitHub)</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="906" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
       <source>The novelWriter Website</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="914" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="909" />
       <source>Check for New Release</source>
       <translation type="unfinished" />
     </message>

i18n/nw_de_DE.ts

@@ -1978,32 +1978,32 @@
       <translation>Über Qt5</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="880" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="875" />
       <source>User Manual (Online)</source>
       <translation>Benutzerhandbuch (online)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="887" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="882" />
       <source>User Manual (PDF)</source>
       <translation>Benutzerhandbuch (PDF)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="891" />
       <source>Report an Issue (GitHub)</source>
       <translation>Fehler melden (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
       <source>Ask a Question (GitHub)</source>
       <translation>Frage stellen (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="906" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
       <source>The novelWriter Website</source>
       <translation>novelWriter-Website</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="914" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="909" />
       <source>Check for New Release</source>
       <translation>Auf neue Version überprüfen</translation>
     </message>

i18n/nw_en_US.ts

@@ -1978,32 +1978,32 @@
       <translation>About Qt5</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="880" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="875" />
       <source>User Manual (Online)</source>
       <translation>User Manual (Online)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="887" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="882" />
       <source>User Manual (PDF)</source>
       <translation>User Manual (PDF)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="891" />
       <source>Report an Issue (GitHub)</source>
       <translation>Report an Issue (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
       <source>Ask a Question (GitHub)</source>
       <translation>Ask a Question (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="906" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
       <source>The novelWriter Website</source>
       <translation>The novelWriter Website</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="914" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="909" />
       <source>Check for New Release</source>
       <translation>Check for New Release</translation>
     </message>

i18n/nw_es_419.ts

@@ -1978,32 +1978,32 @@
       <translation>Acerca de Qt5</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="880" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="875" />
       <source>User Manual (Online)</source>
       <translation>Manual de Usuario (En línea)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="887" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="882" />
       <source>User Manual (PDF)</source>
       <translation>Manual de Usuario (PDF)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="891" />
       <source>Report an Issue (GitHub)</source>
       <translation>Reportar un Problema (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
       <source>Ask a Question (GitHub)</source>
       <translation>Hacer una Pregunta (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="906" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
       <source>The novelWriter Website</source>
       <translation>El Sitio Web de novelWriter</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="914" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="909" />
       <source>Check for New Release</source>
       <translation>Verificar Versiones Nuevas</translation>
     </message>

i18n/nw_it_IT.ts

@@ -1978,32 +1978,32 @@
       <translation>A proposito di Qt5</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="880" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="875" />
       <source>User Manual (Online)</source>
       <translation>Manuale utente (Online)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="887" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="882" />
       <source>User Manual (PDF)</source>
       <translation>Manuale utente (PDF)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="891" />
       <source>Report an Issue (GitHub)</source>
       <translation>Segnala un problema (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
       <source>Ask a Question (GitHub)</source>
       <translation>Fai una domanda (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="906" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
       <source>The novelWriter Website</source>
       <translation>Il sito web di novelWriter</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="914" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="909" />
       <source>Check for New Release</source>
       <translation>Controlla per aggiornamenti</translation>
     </message>

i18n/nw_ja_JP.ts

@@ -1978,32 +1978,32 @@
       <translation>Qt5について</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="880" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="875" />
       <source>User Manual (Online)</source>
       <translation>ユーザーマニュアル (オンライン)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="887" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="882" />
       <source>User Manual (PDF)</source>
       <translation>ユーザーマニュアル (PDF)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="891" />
       <source>Report an Issue (GitHub)</source>
       <translation>問題を報告 (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
       <source>Ask a Question (GitHub)</source>
       <translation>質問する (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="906" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
       <source>The novelWriter Website</source>
       <translation>novelWriterのウェブサイト</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="914" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="909" />
       <source>Check for New Release</source>
       <translation>新しいリリースを確認</translation>
     </message>

i18n/nw_nb_NO.ts

@@ -1978,32 +1978,32 @@
       <translation>Om Qt5</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="880" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="875" />
       <source>User Manual (Online)</source>
       <translation>Brukermanual (på nett)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="887" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="882" />
       <source>User Manual (PDF)</source>
       <translation>Brukermanual (PDF)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="891" />
       <source>Report an Issue (GitHub)</source>
       <translation>Rapporter en feil (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="896" />
       <source>Ask a Question (GitHub)</source>
       <translation>Still et spørsmål (GitHub)</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="906" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="901" />
       <source>The novelWriter Website</source>
       <translation>novelWriters nettside</translation>
     </message>
     <message>
-      <location filename="../novelwriter/gui/mainmenu.py" line="914" />
+      <location filename="../novelwriter/gui/mainmenu.py" line="909" />
       <source>Check for New Release</source>
       <translation>Sjekk etter oppdateringer</translation>
     </message>