From ef4277437b1b426cabf6403c02b32e057d8e1e31 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Fri, 20 Oct 2023 00:04:23 +0200
Subject: [PATCH] Add regexes and highlighting for in-line commands

---
 novelwriter/constants.py         | 10 +++++++++-
 novelwriter/gui/dochighlight.py  |  4 +++-
 sample/content/636b6aa9b697b.nwd |  8 +++++---
 sample/nwProject.nwx             |  8 ++++----
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/novelwriter/constants.py b/novelwriter/constants.py
index 066af83b..aa28fe49 100644
--- a/novelwriter/constants.py
+++ b/novelwriter/constants.py
@@ -59,7 +59,15 @@ class nwRegEx:
     FMT_EI = r"(?<![\w\\])(_)(?![\s_])(.+?)(?<![\s\\])(\1)(?!\w)"
     FMT_EB = r"(?<![\w\\])([\*]{2})(?![\s\*])(.+?)(?<![\s\\])(\1)(?!\w)"
     FMT_ST = r"(?<![\w\\])([~]{2})(?![\s~])(.+?)(?<![\s\\])(\1)(?!\w)"
-    FMT_IN = r"(?<![\\])(\[[\^_])(.+?)(?<![\\])(\])"
+    FMT_IN = r"(?<![\\])(\[)(b|i|u|s|sup|sub)(:)(.+?)(?<![\\])(\])"
+
+    # Format breakdown of inline codes from FMT_IN
+    INL_EI = r"(?<![\\])(\[i:)(.+?)(?<![\\])(\])"
+    INL_EB = r"(?<![\\])(\[b:)(.+?)(?<![\\])(\])"
+    INL_ST = r"(?<![\\])(\[s:)(.+?)(?<![\\])(\])"
+    INL_UN = r"(?<![\\])(\[u:)(.+?)(?<![\\])(\])"
+    INL_UP = r"(?<![\\])(\[sup:)(.+?)(?<![\\])(\])"
+    INL_DN = r"(?<![\\])(\[sub:)(.+?)(?<![\\])(\])"
 
 # END Class nwRegEx
 
diff --git a/novelwriter/gui/dochighlight.py b/novelwriter/gui/dochighlight.py
index 11350287..482e2612 100644
--- a/novelwriter/gui/dochighlight.py
+++ b/novelwriter/gui/dochighlight.py
@@ -209,8 +209,10 @@ class GuiDocHighlighter(QSyntaxHighlighter):
         self._hRules.append((
             nwRegEx.FMT_IN, {
                 1: self._hStyles["keyword"],
-                2: self._hStyles["codevalue"],
+                2: self._hStyles["keyword"],
                 3: self._hStyles["keyword"],
+                4: self._hStyles["codevalue"],
+                5: self._hStyles["keyword"],
             }
         ))
 
diff --git a/sample/content/636b6aa9b697b.nwd b/sample/content/636b6aa9b697b.nwd
index de7f32d7..2df724ed 100644
--- a/sample/content/636b6aa9b697b.nwd
+++ b/sample/content/636b6aa9b697b.nwd
@@ -1,8 +1,8 @@
 %%~name: Making a Scene
 %%~path: 6a2d6d5f4f401/636b6aa9b697b
 %%~kind: NOVEL/DOCUMENT
-%%~hash: 7aae771de46c3cab06d8be0e860dc0bd383860a5
-%%~date: Unknown/2023-09-07 19:00:10
+%%~hash: 4bcd431d1d8b84d7bbfcacb5442d7b83f65745bb
+%%~date: Unknown/2023-10-19 23:57:46
 ### Making a Scene
 
 @pov: Jane
@@ -13,7 +13,9 @@ A scene is defined by a level three heading, like the one at the top of this pag
 
 Each paragraph in the scene is separated by a blank line. The text supports minimal formatting, like **bold**, _italic_ and **_bold italic_**. You can also ~~strike through~~ text. There is **some support for _nested_ emphasis**, but there are some known limitations. If the syntax highlighter doesn’t show it correctly, the export tool will not either.
 
-In addition, the editor supports automatic formatting of “quotes”, both double and ‘single’. Depending on the syntax highlighter settings and colour theme, these can be in different colours. “You can of course use **bold** and _italic_ text inside of quotes too.”
+For special formatting aside from standard emphasis, you can use inline commands. Here we have super[sup:script] and sub[sub:script], and [b:part]ial bold too, which ends in the middle of a word.
+
+In addition, the editor supports automatic formatting of “quotes”, both double and ‘single’. Depending on the syntax highlighter settings and colour theme, these can be in different colours. “You can of course use **bold** and _italic_ text inside of quotes too[sup:yay].”
 
 If you have the need for it, you can also add text that can be automatically replaced by other text when you generate a preview or export the project. Now, let’s auto-replace this A with <A>, and this C with <C>. While <E> is just <E>. Press Ctrl+R to see what this looks like in the view pane. The list of auto-replaced text is set in Project Settings.
 
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index 3128d766..807db16e 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.2-alpha1" hexVersion="0x020200a1" fileVersion="1.5" fileRevision="1" timeStamp="2023-09-07 19:14:50">
-  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="1531" autoCount="238" editTime="75619">
+<novelWriterXML appVersion="2.2-alpha1" hexVersion="0x020200a1" fileVersion="1.5" fileRevision="1" timeStamp="2023-10-19 23:58:24">
+  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="1560" autoCount="248" editTime="79484">
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
@@ -36,7 +36,7 @@
       <entry key="i56be10" count="1" red="117" green="0" blue="175">Main</entry>
     </importance>
   </settings>
-  <content items="27" novelWords="954" notesWords="409">
+  <content items="27" novelWords="984" notesWords="409">
     <item handle="7031beac91f75" parent="None" root="7031beac91f75" order="0" type="ROOT" class="NOVEL">
       <meta expanded="yes" />
       <name status="sc24b8f" import="ia857f0">Novel</name>
@@ -58,7 +58,7 @@
       <name status="sf24ce6" import="ia857f0" active="yes">Chapter One</name>
     </item>
     <item handle="636b6aa9b697b" parent="6a2d6d5f4f401" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H3" charCount="2686" wordCount="479" paraCount="14" cursorPos="19" />
+      <meta expanded="no" heading="H3" charCount="2890" wordCount="509" paraCount="15" cursorPos="1207" />
       <name status="s90e6c9" import="ia857f0" active="yes">Making a Scene</name>
     </item>
     <item handle="bc0cbd2a407f3" parent="6a2d6d5f4f401" root="7031beac91f75" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">