From c598fdd00983526b85e4a1fb9f2c9f5f84428289 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Thu, 19 Jun 2025 20:30:54 +0200
Subject: [PATCH 1/7] Add separate toggle for notes in viewer

---
 novelwriter/config.py        |  7 +++++--
 novelwriter/gui/docviewer.py | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/novelwriter/config.py b/novelwriter/config.py
index 9e1735c7..93d8fb02 100644
--- a/novelwriter/config.py
+++ b/novelwriter/config.py
@@ -85,8 +85,8 @@ class Config:
         "showMultiSpaces", "showSessionTime", "showTabsNSpaces", "showViewerPanel",
         "spellLanguage", "stopWhenIdle", "tabWidth", "textFont", "textMargin", "textWidth",
         "themeMode", "useCharCount", "userIdleTime", "verPyQtString", "verPyQtValue",
-        "verPyString", "verQtString", "verQtValue", "viewComments", "viewPanePos", "viewSynopsis",
-        "welcomeWinSize",
+        "verPyString", "verQtString", "verQtValue", "viewComments", "viewNotes", "viewPanePos",
+        "viewSynopsis", "welcomeWinSize",
     )
 
     LANG_NW   = 1
@@ -249,6 +249,7 @@ class Config:
         self.showSessionTime = True   # Show the session time in the status bar
         self.viewComments    = True   # Comments are shown in the viewer
         self.viewSynopsis    = True   # Synopsis is shown in the viewer
+        self.viewNotes       = True   # Notes are shown in the viewer
 
         # Search Box States
         self.searchCase      = False
@@ -713,6 +714,7 @@ class Config:
         self.showSessionTime = conf.rdBool(sec, "showsessiontime", self.showSessionTime)
         self.viewComments    = conf.rdBool(sec, "viewcomments", self.viewComments)
         self.viewSynopsis    = conf.rdBool(sec, "viewsynopsis", self.viewSynopsis)
+        self.viewNotes       = conf.rdBool(sec, "viewnotes", self.viewNotes)
         self.searchCase      = conf.rdBool(sec, "searchcase", self.searchCase)
         self.searchWord      = conf.rdBool(sec, "searchword", self.searchWord)
         self.searchRegEx     = conf.rdBool(sec, "searchregex", self.searchRegEx)
@@ -840,6 +842,7 @@ class Config:
             "showsessiontime": str(self.showSessionTime),
             "viewcomments":    str(self.viewComments),
             "viewsynopsis":    str(self.viewSynopsis),
+            "viewnotes":       str(self.viewNotes),
             "searchcase":      str(self.searchCase),
             "searchword":      str(self.searchWord),
             "searchregex":     str(self.searchRegEx),
diff --git a/novelwriter/gui/docviewer.py b/novelwriter/gui/docviewer.py
index 9657ee4e..d5445536 100644
--- a/novelwriter/gui/docviewer.py
+++ b/novelwriter/gui/docviewer.py
@@ -231,6 +231,8 @@ class GuiDocViewer(QTextBrowser):
         qDoc.setCommentType(nwComment.PLAIN, CONFIG.viewComments)
         qDoc.setCommentType(nwComment.SYNOPSIS, CONFIG.viewSynopsis)
         qDoc.setCommentType(nwComment.SHORT, CONFIG.viewSynopsis)
+        qDoc.setCommentType(nwComment.STORY, CONFIG.viewNotes)
+        qDoc.setCommentType(nwComment.NOTE, CONFIG.viewNotes)
 
         # Be extra careful here to prevent crashes when first opening a
         # project as a crash here leaves no way of recovering.
@@ -911,12 +913,23 @@ class GuiDocViewFooter(QWidget):
         self.showSynopsis.toggled.connect(self._doToggleSynopsis)
         self.showSynopsis.setToolTip(self.tr("Show Synopsis Comments"))
 
+        # Show Notes
+        self.showNotes = QToolButton(self)
+        self.showNotes.setText(self.tr("Notes"))
+        self.showNotes.setCheckable(True)
+        self.showNotes.setChecked(CONFIG.viewNotes)
+        self.showNotes.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
+        self.showNotes.setIconSize(iSz)
+        self.showNotes.toggled.connect(self._doToggleNotes)
+        self.showNotes.setToolTip(self.tr("Show Notes"))
+
         # Assemble Layout
         self.outerBox = QHBoxLayout()
         self.outerBox.addWidget(self.showHide, 0)
         self.outerBox.addStretch(1)
         self.outerBox.addWidget(self.showComments, 0)
         self.outerBox.addWidget(self.showSynopsis, 0)
+        self.outerBox.addWidget(self.showNotes, 0)
         self.outerBox.setSpacing(4)
         self.setLayout(self.outerBox)
 
@@ -942,6 +955,7 @@ class GuiDocViewFooter(QWidget):
         self.setFont(SHARED.theme.guiFont)
         self.showComments.setFont(SHARED.theme.guiFontSmall)
         self.showSynopsis.setFont(SHARED.theme.guiFontSmall)
+        self.showNotes.setFont(SHARED.theme.guiFontSmall)
         return
 
     def updateTheme(self) -> None:
@@ -953,11 +967,13 @@ class GuiDocViewFooter(QWidget):
         self.showHide.setThemeIcon("panel")
         self.showComments.setIcon(bulletIcon)
         self.showSynopsis.setIcon(bulletIcon)
+        self.showNotes.setIcon(bulletIcon)
 
         buttonStyle = SHARED.theme.getStyleSheet(STYLES_MIN_TOOLBUTTON)
         self.showHide.setStyleSheet(buttonStyle)
         self.showComments.setStyleSheet(buttonStyle)
         self.showSynopsis.setStyleSheet(buttonStyle)
+        self.showNotes.setStyleSheet(buttonStyle)
 
         self.matchColors()
 
@@ -992,3 +1008,10 @@ class GuiDocViewFooter(QWidget):
         CONFIG.viewSynopsis = state
         self.docViewer.reloadText()
         return
+
+    @pyqtSlot(bool)
+    def _doToggleNotes(self, state: bool) -> None:
+        """Toggle the view notes button and reload the document."""
+        CONFIG.viewNotes = state
+        self.docViewer.reloadText()
+        return

From ba4fdd1f92c2251e2818add696f58b5e47722fd6 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Thu, 19 Jun 2025 20:47:34 +0200
Subject: [PATCH 2/7] Split up block types of comments in build formats

---
 novelwriter/formats/todocx.py               |  4 ++--
 novelwriter/formats/tohtml.py               |  4 ++--
 novelwriter/formats/tokenizer.py            | 22 ++++++++++++++++-----
 novelwriter/formats/tomarkdown.py           |  4 ++--
 novelwriter/formats/toodt.py                |  4 ++--
 novelwriter/formats/toqdoc.py               | 12 +++++++----
 tests/reference/baseConfig_novelwriter.conf |  1 +
 tests/test_formats/test_fmt_tokenizer.py    |  6 +++---
 8 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/novelwriter/formats/todocx.py b/novelwriter/formats/todocx.py
index 366191ef..1c7a2a1f 100644
--- a/novelwriter/formats/todocx.py
+++ b/novelwriter/formats/todocx.py
@@ -38,7 +38,7 @@ from novelwriter import __version__
 from novelwriter.common import firstFloat, xmlElement, xmlSubElem
 from novelwriter.constants import nwHeadFmt, nwStyles
 from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt, stripEscape
-from novelwriter.formats.tokenizer import Tokenizer
+from novelwriter.formats.tokenizer import COMMENT_BLOCKS, Tokenizer
 from novelwriter.types import QtHexRgb
 
 if TYPE_CHECKING:
@@ -296,7 +296,7 @@ class ToDocX(Tokenizer):
             elif tType == BlockTyp.SKIP:
                 self._processFragments(par, S_NORM, "")
 
-            elif tType == BlockTyp.COMMENT:
+            elif tType in COMMENT_BLOCKS:
                 self._processFragments(par, S_META, tText, tFormat)
 
             elif tType == BlockTyp.KEYWORD:
diff --git a/novelwriter/formats/tohtml.py b/novelwriter/formats/tohtml.py
index 404c6d09..4614050a 100644
--- a/novelwriter/formats/tohtml.py
+++ b/novelwriter/formats/tohtml.py
@@ -32,7 +32,7 @@ from typing import TYPE_CHECKING
 from novelwriter.common import formatTimeStamp
 from novelwriter.constants import nwHtmlUnicode, nwStyles
 from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt, stripEscape
-from novelwriter.formats.tokenizer import Tokenizer
+from novelwriter.formats.tokenizer import COMMENT_BLOCKS, Tokenizer
 from novelwriter.types import FONT_STYLE, FONT_WEIGHTS, QtHexRgb
 
 if TYPE_CHECKING:
@@ -228,7 +228,7 @@ class ToHtml(Tokenizer):
             elif tType == BlockTyp.SKIP:
                 lines.append(f"<p{hStyle}>&nbsp;</p>\n")
 
-            elif tType == BlockTyp.COMMENT:
+            elif tType in COMMENT_BLOCKS:
                 lines.append(f"<p class='comment'{hStyle}>{self._formatText(tText, tFmt)}</p>\n")
 
             elif tType == BlockTyp.KEYWORD:
diff --git a/novelwriter/formats/tokenizer.py b/novelwriter/formats/tokenizer.py
index ca1f20a8..984a3d71 100644
--- a/novelwriter/formats/tokenizer.py
+++ b/novelwriter/formats/tokenizer.py
@@ -71,11 +71,23 @@ COMMENT_STYLE = {
     nwComment.COMMENT:  ComStyle(),
     nwComment.STORY:    ComStyle("Story Structure", "modifier", "note"),
 }
-HEADINGS = [
+COMMENT_TYPE = {
+    nwComment.PLAIN:    BlockTyp.COMMENT,
+    nwComment.IGNORE:   BlockTyp.COMMENT,
+    nwComment.SYNOPSIS: BlockTyp.SUMMARY,
+    nwComment.SHORT:    BlockTyp.SUMMARY,
+    nwComment.NOTE:     BlockTyp.NOTE,
+    nwComment.FOOTNOTE: BlockTyp.COMMENT,
+    nwComment.COMMENT:  BlockTyp.COMMENT,
+    nwComment.STORY:    BlockTyp.NOTE,
+}
+HEADING_BLOCKS = [
     BlockTyp.TITLE, BlockTyp.PART, BlockTyp.HEAD1,
     BlockTyp.HEAD2, BlockTyp.HEAD3, BlockTyp.HEAD4,
 ]
-SKIP_INDENT = [*HEADINGS, BlockTyp.SEP, BlockTyp.SKIP]
+COMMENT_BLOCKS = (BlockTyp.COMMENT, BlockTyp.SUMMARY, BlockTyp.NOTE)
+META_BLOCKS = (BlockTyp.COMMENT, BlockTyp.SUMMARY, BlockTyp.NOTE, BlockTyp.KEYWORD)
+SKIP_INDENT = [*HEADING_BLOCKS, BlockTyp.SEP, BlockTyp.SKIP]
 B_EMPTY: T_Block = (BlockTyp.EMPTY, "", "", [], BlockFmt.NONE)
 
 
@@ -619,7 +631,7 @@ class Tokenizer(ABC):
                     bStyle = COMMENT_STYLE[cStyle]
                     tLine, tFmt = self._formatComment(bStyle, cKey, cText)
                     tBlocks.append((
-                        BlockTyp.COMMENT, "", tLine, tFmt, tStyle
+                        COMMENT_TYPE[cStyle], "", tLine, tFmt, tStyle
                     ))
 
                 elif cStyle == nwComment.FOOTNOTE:
@@ -990,7 +1002,7 @@ class Tokenizer(ABC):
                 allWordChars += nPWChars
                 textWordChars += nPWChars
 
-            elif tType in HEADINGS:
+            elif tType in HEADING_BLOCKS:
                 titleCount += 1
                 allWords += nWords
                 titleWords += nWords
@@ -1004,7 +1016,7 @@ class Tokenizer(ABC):
                 allChars += nChars
                 allWordChars += nWChars
 
-            elif tType in (BlockTyp.COMMENT, BlockTyp.KEYWORD):
+            elif tType in META_BLOCKS:
                 words = tText.split()
                 allWords += len(words)
                 allChars += len(tText)
diff --git a/novelwriter/formats/tomarkdown.py b/novelwriter/formats/tomarkdown.py
index b87d0325..0b477302 100644
--- a/novelwriter/formats/tomarkdown.py
+++ b/novelwriter/formats/tomarkdown.py
@@ -29,7 +29,7 @@ from typing import TYPE_CHECKING
 
 from novelwriter.constants import nwUnicode
 from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt
-from novelwriter.formats.tokenizer import Tokenizer
+from novelwriter.formats.tokenizer import COMMENT_BLOCKS, Tokenizer
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -144,7 +144,7 @@ class ToMarkdown(Tokenizer):
             elif tType == BlockTyp.SKIP:
                 lines.append(f"{cSkip}\n\n")
 
-            elif tType == BlockTyp.COMMENT:
+            elif tType in COMMENT_BLOCKS:
                 lines.append(f"{self._formatText(tText, tFormat, mTags)}\n\n")
 
             elif tType == BlockTyp.KEYWORD:
diff --git a/novelwriter/formats/toodt.py b/novelwriter/formats/toodt.py
index 15622845..ddd554ba 100644
--- a/novelwriter/formats/toodt.py
+++ b/novelwriter/formats/toodt.py
@@ -40,7 +40,7 @@ from novelwriter import __version__
 from novelwriter.common import xmlElement, xmlIndent, xmlSubElem
 from novelwriter.constants import nwHeadFmt, nwStyles
 from novelwriter.formats.shared import BlockFmt, BlockTyp, TextFmt, stripEscape
-from novelwriter.formats.tokenizer import Tokenizer
+from novelwriter.formats.tokenizer import COMMENT_BLOCKS, Tokenizer
 from novelwriter.types import FONT_STYLE, QtHexRgb
 
 if TYPE_CHECKING:
@@ -389,7 +389,7 @@ class ToOdt(Tokenizer):
             elif tType == BlockTyp.SKIP:
                 self._addTextPar(xText, S_TEXT, oStyle, "")
 
-            elif tType == BlockTyp.COMMENT:
+            elif tType in COMMENT_BLOCKS:
                 self._addTextPar(xText, S_META, oStyle, tText, tFmt=tFormat)
 
             elif tType == BlockTyp.KEYWORD:
diff --git a/novelwriter/formats/toqdoc.py b/novelwriter/formats/toqdoc.py
index 69c25fa4..28186b69 100644
--- a/novelwriter/formats/toqdoc.py
+++ b/novelwriter/formats/toqdoc.py
@@ -37,7 +37,7 @@ from PyQt6.QtPrintSupport import QPrinter
 from novelwriter import __version__
 from novelwriter.constants import nwStyles, nwUnicode
 from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt, stripEscape
-from novelwriter.formats.tokenizer import HEADINGS, Tokenizer
+from novelwriter.formats.tokenizer import HEADING_BLOCKS, META_BLOCKS, Tokenizer
 from novelwriter.types import (
     QtAlignAbsolute, QtAlignCenter, QtAlignJustify, QtAlignLeft, QtAlignRight,
     QtKeepAnchor, QtMoveAnchor, QtPageBreakAfter, QtPageBreakAuto,
@@ -214,7 +214,7 @@ class ToQTextDocument(Tokenizer):
         for tType, tMeta, tText, tFormat, tStyle in self._blocks:
 
             bFmt = QTextBlockFormat(self._blockFmt)
-            if tType in (BlockTyp.COMMENT, BlockTyp.KEYWORD):
+            if tType in META_BLOCKS:
                 bFmt.setTopMargin(self._mMeta[0])
                 bFmt.setBottomMargin(self._mMeta[1])
             elif tType == BlockTyp.SEP:
@@ -248,17 +248,21 @@ class ToQTextDocument(Tokenizer):
             if tStyle & BlockFmt.IND_T:
                 bFmt.setTextIndent(self._tIndent)
 
-            if tType in (BlockTyp.TEXT, BlockTyp.COMMENT, BlockTyp.KEYWORD):
+            if tType == BlockTyp.TEXT:
                 newBlock(cursor, bFmt)
                 self._insertFragments(tText, tFormat, cursor, self._charFmt)
 
-            elif tType in HEADINGS:
+            elif tType in HEADING_BLOCKS:
                 bFmt, cFmt = self._genHeadStyle(tType, tMeta, bFmt)
                 for tPart in tText.split("\n"):
                     newBlock(cursor, bFmt)
                     cursor.insertText(tPart, cFmt)
                     bFmt.setPageBreakPolicy(QtPageBreakAuto)
 
+            elif tType in META_BLOCKS:
+                newBlock(cursor, bFmt)
+                self._insertFragments(tText, tFormat, cursor, self._charFmt)
+
             elif tType == BlockTyp.SEP:
                 newBlock(cursor, bFmt)
                 cursor.insertText(tText, self._charFmt)
diff --git a/tests/reference/baseConfig_novelwriter.conf b/tests/reference/baseConfig_novelwriter.conf
index 859cca52..c3a45e6a 100644
--- a/tests/reference/baseConfig_novelwriter.conf
+++ b/tests/reference/baseConfig_novelwriter.conf
@@ -83,6 +83,7 @@ showedittoolbar = False
 showsessiontime = True
 viewcomments = True
 viewsynopsis = True
+viewnotes = True
 searchcase = False
 searchword = False
 searchregex = False
diff --git a/tests/test_formats/test_fmt_tokenizer.py b/tests/test_formats/test_fmt_tokenizer.py
index 62fe24bd..2b589ccc 100644
--- a/tests/test_formats/test_fmt_tokenizer.py
+++ b/tests/test_formats/test_fmt_tokenizer.py
@@ -783,7 +783,7 @@ def testFmtToken_MetaFormat(mockGUI):
     tokens._text = "% synopsis: The synopsis\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.COMMENT, "", "Synopsis: The synopsis", [
+        BlockTyp.SUMMARY, "", "Synopsis: The synopsis", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"),
             (9, TextFmt.COL_E, ""), (9, TextFmt.B_E, ""),
             (10, TextFmt.COL_B, "note"), (22, TextFmt.COL_E, "")
@@ -800,7 +800,7 @@ def testFmtToken_MetaFormat(mockGUI):
     tokens._text = "% short: A short description\n"
     tokens.tokenizeText()
     assert tokens._blocks == [(
-        BlockTyp.COMMENT, "", "Short Description: A short description", [
+        BlockTyp.SUMMARY, "", "Short Description: A short description", [
             (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"),
             (18, TextFmt.COL_E, ""), (18, TextFmt.B_E, ""),
             (19, TextFmt.COL_B, "note"), (38, TextFmt.COL_E, ""),
@@ -1563,7 +1563,7 @@ def testFmtToken_TextIndent(mockGUI):
     ]
     assert tokens._blocks == [
         (BlockTyp.HEAD3,   TM1, "Scene Two", [], BlockFmt.NONE),
-        (BlockTyp.COMMENT, "",  "Synopsis: Stuff happens.", tFmt, BlockFmt.NONE),
+        (BlockTyp.SUMMARY, "",  "Synopsis: Stuff happens.", tFmt, BlockFmt.NONE),
     ]
     assert tokens._noIndent is True
 

From c4cd151f2cfb14cbb3cdeceea82f432ed2d2d278 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Thu, 19 Jun 2025 21:05:44 +0200
Subject: [PATCH 3/7] Compact repeated blocks in both meta and note types

---
 novelwriter/formats/tokenizer.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/novelwriter/formats/tokenizer.py b/novelwriter/formats/tokenizer.py
index 984a3d71..176c4873 100644
--- a/novelwriter/formats/tokenizer.py
+++ b/novelwriter/formats/tokenizer.py
@@ -875,12 +875,12 @@ class Tokenizer(ABC):
                 # We don't need to keep the empty lines after this pass
                 pass
 
-            elif cBlock[0] == BlockTyp.KEYWORD:
-                # Adjust margins for lines in a list of keyword lines
+            elif cBlock[0] in (BlockTyp.KEYWORD, BlockTyp.NOTE):
+                # Adjust margins for lines in repeated meta blocks
                 aStyle = cBlock[4]
-                if pBlock[0] == BlockTyp.KEYWORD:
+                if pBlock[0] == cBlock[0]:
                     aStyle |= BlockFmt.Z_TOP
-                if nBlock[0] == BlockTyp.KEYWORD:
+                if nBlock[0] == cBlock[0]:
                     aStyle |= BlockFmt.Z_BTM
                 sBlocks.append((
                     cBlock[0], cBlock[1], cBlock[2], cBlock[3], aStyle

From efa82e1761102fa14b6a33620e91c9c1a4b826d8 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Thu, 19 Jun 2025 21:31:57 +0200
Subject: [PATCH 4/7] Add more new features to the Lipsum test project

---
 tests/lipsum/content/04468803b92e1.nwd |  6 ++--
 tests/lipsum/content/2426c6f0ca922.nwd |  6 ++--
 tests/lipsum/content/441420a886d82.nwd |  6 ++--
 tests/lipsum/content/47666c91c7ccf.nwd |  6 ++--
 tests/lipsum/content/4c4f28287af27.nwd |  6 ++--
 tests/lipsum/content/88243afbe5ed8.nwd |  6 ++--
 tests/lipsum/content/88d59a277361b.nwd |  7 ++--
 tests/lipsum/content/eb103bc70c90c.nwd |  6 ++--
 tests/lipsum/content/f8c0562e50f1b.nwd |  6 ++--
 tests/lipsum/content/f96ec11c6a3da.nwd |  6 ++--
 tests/lipsum/content/fb609cd8319dc.nwd |  6 ++--
 tests/lipsum/nwProject.nwx             | 48 +++++++++++++-------------
 12 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/tests/lipsum/content/04468803b92e1.nwd b/tests/lipsum/content/04468803b92e1.nwd
index 35a2dad3..c1a7ac41 100644
--- a/tests/lipsum/content/04468803b92e1.nwd
+++ b/tests/lipsum/content/04468803b92e1.nwd
@@ -1,12 +1,14 @@
 %%~name: Ancient Europe
 %%~path: 60bdf227455cc/04468803b92e1
 %%~kind: WORLD/NOTE
-%%~hash: 7b746485a1d06c64a5e0bf671e3141806ed51a54
-%%~date: Unknown/2024-01-30 21:36:44
+%%~hash: 9a0a98cda777f557ea10670ea1618cde253084b7
+%%~date: Unknown/2025-06-19 21:02:43
 # Ancient Europe
 
 @tag: Europe | Ancient Europe
 
+%Short: A strange place
+
 Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.
 
 Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.
diff --git a/tests/lipsum/content/2426c6f0ca922.nwd b/tests/lipsum/content/2426c6f0ca922.nwd
index e6d5dd54..47db3a77 100644
--- a/tests/lipsum/content/2426c6f0ca922.nwd
+++ b/tests/lipsum/content/2426c6f0ca922.nwd
@@ -1,12 +1,14 @@
 %%~name: Main
 %%~path: 6c6afb1247750/2426c6f0ca922
 %%~kind: PLOT/NOTE
-%%~hash: db3897d166e246acdb5e25e9bd98c5a40a699ed0
-%%~date: Unknown/Unknown
+%%~hash: ffc82e98d37621d83a808a75f06bd36923356706
+%%~date: Unknown/2025-06-19 21:02:33
 # Main Plot
 
 @tag: Main
 
+%Short: Where it all happens
+
 Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.
 
 Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.
\ No newline at end of file
diff --git a/tests/lipsum/content/441420a886d82.nwd b/tests/lipsum/content/441420a886d82.nwd
index 05881160..b31445e3 100644
--- a/tests/lipsum/content/441420a886d82.nwd
+++ b/tests/lipsum/content/441420a886d82.nwd
@@ -1,14 +1,14 @@
 %%~name: Chapter Two
 %%~path: 6bd935d2490cd/441420a886d82
 %%~kind: NOVEL/DOCUMENT
-%%~hash: fd6d46708faa1333f8f7ba0442fc5b35bf1e3f85
-%%~date: Unknown/Unknown
+%%~hash: 81d30d3448202c782a6e252c5f7ef030bca3bf7f
+%%~date: Unknown/2025-06-19 21:01:48
 ## Chapter Two
 
 @pov: Bod
 @plot: Main
 @location: Europe
 
-% Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.
+%Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.
 
 Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. Vestibulum pharetra fermentum leo, sed faucibus eros placerat quis. In hac habitasse platea dictumst. Donec metus massa, rutrum quis consequat et, tincidunt ac felis. Duis mollis metus ac nunc tincidunt blandit. Ut aliquet velit eu odio pharetra condimentum. Integer rutrum lacus orci, id venenatis libero accumsan at.
diff --git a/tests/lipsum/content/47666c91c7ccf.nwd b/tests/lipsum/content/47666c91c7ccf.nwd
index e551a0e3..5f6011ef 100644
--- a/tests/lipsum/content/47666c91c7ccf.nwd
+++ b/tests/lipsum/content/47666c91c7ccf.nwd
@@ -1,15 +1,15 @@
 %%~name: Scene Five
 %%~path: 6bd935d2490cd/47666c91c7ccf
 %%~kind: NOVEL/DOCUMENT
-%%~hash: d210c26966da6f9edea8726567abf4860b7bb9b7
-%%~date: Unknown/Unknown
+%%~hash: 680e26046056165f1560ed1468cf316a3c51f90e
+%%~date: Unknown/2025-06-19 21:01:59
 ### Scene Five
 
 @pov: Bod
 @plot: Main
 @location: Europe
 
-% Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
+%Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
 
 Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In sed felis auctor, rhoncus dui ac, consequat dolor. Integer volutpat libero sed nisl aliquet varius. Suspendisse et lorem sapien. Proin id ultrices nibh, ac suscipit diam. Suspendisse placerat varius porttitor. Curabitur elementum sed enim ultrices imperdiet.
 
diff --git a/tests/lipsum/content/4c4f28287af27.nwd b/tests/lipsum/content/4c4f28287af27.nwd
index 4bf57987..7ee071db 100644
--- a/tests/lipsum/content/4c4f28287af27.nwd
+++ b/tests/lipsum/content/4c4f28287af27.nwd
@@ -1,13 +1,15 @@
 %%~name: Mr. Nobody
 %%~path: 67a8707f2f249/4c4f28287af27
 %%~kind: CHARACTER/NOTE
-%%~hash: 2a9b9751e8207b719bfa6233ebe04e24928ff8a8
-%%~date: Unknown/2024-01-30 21:36:26
+%%~hash: 84639e78d265b3a1f2fb8e3211a08c223d95500a
+%%~date: Unknown/2025-06-19 21:02:21
 # Nobody Owens
 
 @tag: Bod | Nobody Owens
 @plot: Main
 
+%Short: The Hero
+
 Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.
 
 Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.
diff --git a/tests/lipsum/content/88243afbe5ed8.nwd b/tests/lipsum/content/88243afbe5ed8.nwd
index 3f40135a..c8276545 100644
--- a/tests/lipsum/content/88243afbe5ed8.nwd
+++ b/tests/lipsum/content/88243afbe5ed8.nwd
@@ -1,15 +1,15 @@
 %%~name: Scene One
 %%~path: 45e6b01ca35c1/88243afbe5ed8
 %%~kind: NOVEL/DOCUMENT
-%%~hash: a09245a7a772bbe02850b5db109977e336cd9cc1
-%%~date: Unknown/Unknown
+%%~hash: d660202d320b3c99dbcc3bd9dd39d464d4f422ae
+%%~date: Unknown/2025-06-19 21:01:38
 ### Scene One
 
 @pov: Bod
 @plot: Main
 @location: Europe
 
-% Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.
+%Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.
 
 Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. Donec quis ante nunc. Mauris ut leo ipsum. Vestibulum est neque, hendrerit nec neque a, ullamcorper lobortis tellus. Fusce sollicitudin purus quis congue bibendum. Aliquam condimentum ipsum tristique blandit tristique. Donec pulvinar neque ac suscipit malesuada.
 
diff --git a/tests/lipsum/content/88d59a277361b.nwd b/tests/lipsum/content/88d59a277361b.nwd
index a05c84e6..367ea3e1 100644
--- a/tests/lipsum/content/88d59a277361b.nwd
+++ b/tests/lipsum/content/88d59a277361b.nwd
@@ -1,11 +1,12 @@
 %%~name: Prologue
 %%~path: b3643d0f92e32/88d59a277361b
 %%~kind: NOVEL/DOCUMENT
-%%~hash: 377a72ba340ff458a00d98af745e9fa0c79fb26c
-%%~date: Unknown/2024-10-25 19:16:49
+%%~hash: d43324a30d3f1e5608711ca71515dee429b30925
+%%~date: Unknown/2025-06-19 21:01:07
 ##! Prologue
 
-% Synopsis: Explanation from the lipsum.com website.
+%Synopsis: Explanation from the lipsum.com website.
+%Note.Purpose: Introduction
 
 _Lorem Ipsum_ is simply dummy text[footnote:f9kgf] of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
 
diff --git a/tests/lipsum/content/eb103bc70c90c.nwd b/tests/lipsum/content/eb103bc70c90c.nwd
index bdfac437..3c126692 100644
--- a/tests/lipsum/content/eb103bc70c90c.nwd
+++ b/tests/lipsum/content/eb103bc70c90c.nwd
@@ -1,15 +1,15 @@
 %%~name: Scene Three
 %%~path: 6bd935d2490cd/eb103bc70c90c
 %%~kind: NOVEL/DOCUMENT
-%%~hash: c4eda49e4fe81dc450d547eee0bdabe77fdaaa98
-%%~date: Unknown/Unknown
+%%~hash: 59eeb405f5b26cbe1056d1f7684f7ed40ed6685a
+%%~date: Unknown/2025-06-19 21:01:52
 ### Scene Three
 
 @pov: Bod
 @plot: Main
 @location: Europe
 
-% Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
+%Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
 
 Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean tincidunt lacus vitae nibh elementum eleifend. Sed rutrum condimentum sem quis blandit. Duis imperdiet libero metus, quis convallis quam faucibus a. Nulla ligula est, semper quis sollicitudin et, pretium id justo. Curabitur pharetra risus eget consectetur commodo. Duis mattis arcu non est condimentum, id venenatis risus volutpat. Pellentesque aliquet mauris non mauris porttitor ultrices. Phasellus ut vestibulum mi. Suspendisse malesuada metus lorem, a malesuada orci rhoncus a. Praesent euismod convallis ante, lacinia tincidunt ex egestas id. Praesent sit amet efficitur sapien. Morbi tincidunt volutpat nunc sed dictum. Aliquam ultrices metus id fermentum lobortis.
 
diff --git a/tests/lipsum/content/f8c0562e50f1b.nwd b/tests/lipsum/content/f8c0562e50f1b.nwd
index 73bedd5f..890a7e06 100644
--- a/tests/lipsum/content/f8c0562e50f1b.nwd
+++ b/tests/lipsum/content/f8c0562e50f1b.nwd
@@ -1,15 +1,15 @@
 %%~name: Scene Four
 %%~path: 6bd935d2490cd/f8c0562e50f1b
 %%~kind: NOVEL/DOCUMENT
-%%~hash: 9461a279b9fb6ef005ee4d432fcda77ff5bfbd42
-%%~date: Unknown/Unknown
+%%~hash: f4848b56d1f41a04de1579d772a4d1ddd3e28e55
+%%~date: Unknown/2025-06-19 21:01:55
 ### Scene Four
 
 @pov: Bod
 @plot: Main
 @location: Europe
 
-% Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.
+%Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.
 
 Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. Nullam viverra dui et auctor pretium. Ut ullamcorper velit urna, sed imperdiet massa convallis a. Suspendisse efficitur, ipsum nec cursus pulvinar, eros urna posuere diam, nec elementum mi felis vitae sapien.
 
diff --git a/tests/lipsum/content/f96ec11c6a3da.nwd b/tests/lipsum/content/f96ec11c6a3da.nwd
index b6434395..a71ad88a 100644
--- a/tests/lipsum/content/f96ec11c6a3da.nwd
+++ b/tests/lipsum/content/f96ec11c6a3da.nwd
@@ -1,15 +1,15 @@
 %%~name: Scene Two
 %%~path: 45e6b01ca35c1/f96ec11c6a3da
 %%~kind: NOVEL/DOCUMENT
-%%~hash: ebe3fbaa16d9d81bc1a139822e3bf39bb357866d
-%%~date: Unknown/Unknown
+%%~hash: e95ff5b633e74c9cab8dc32b6a77b3e40d265f2b
+%%~date: Unknown/2025-06-19 21:01:41
 ### Scene Two
 
 @pov: Bod
 @plot: Main
 @location: Europe
 
-% Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. 
+%Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. 
 
 Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. Vestibulum facilisis bibendum aliquam. Aliquam posuere, turpis ac bibendum varius, sem tellus venenatis risus, in elementum massa enim ac lorem. Integer in sem ac diam blandit ultricies ut in nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet erat est. Curabitur vitae cursus justo, sit amet placerat dolor. Vivamus eu felis hendrerit, tincidunt massa rutrum, maximus arcu. Pellentesque commodo justo odio, vel rutrum nulla tincidunt eu. Integer non neque condimentum, convallis diam non, varius ligula. Aliquam eget sapien mauris. Aenean pharetra nunc nisi, vel maximus ante tristique sit amet. Aliquam risus metus, interdum non odio eu, consectetur lacinia sapien.
 
diff --git a/tests/lipsum/content/fb609cd8319dc.nwd b/tests/lipsum/content/fb609cd8319dc.nwd
index 10e465ae..ff643fb1 100644
--- a/tests/lipsum/content/fb609cd8319dc.nwd
+++ b/tests/lipsum/content/fb609cd8319dc.nwd
@@ -1,14 +1,14 @@
 %%~name: Chapter One
 %%~path: 45e6b01ca35c1/fb609cd8319dc
 %%~kind: NOVEL/DOCUMENT
-%%~hash: 5dabeaa7a58238a6ad99ce73176b1bdfad1a71b7
-%%~date: Unknown/2024-01-30 21:35:57
+%%~hash: 73a1008ed17a84a48b14b41109a842a6ed300eec
+%%~date: Unknown/2025-06-19 21:01:19
 ## Chapter One
 
 @pov: Bod
 @plot: Main
 @location: Europe
 
-% Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.
+%Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. Praesent magna nunc, lacinia sit amet quam eget, aliquet ultrices justo. Morbi ornare enim et lorem rutrum finibus ut eu dolor. Aliquam a orci odio. Ut ultrices sem quis massa placerat, eget mollis nisl cursus. Cras vel sagittis justo. Ut non ultricies leo. Maecenas rutrum velit in est varius, et egestas massa pulvinar.
diff --git a/tests/lipsum/nwProject.nwx b/tests/lipsum/nwProject.nwx
index f2c7e31c..a403da4a 100644
--- a/tests/lipsum/nwProject.nwx
+++ b/tests/lipsum/nwProject.nwx
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.8a0" hexVersion="0x020800a0" fileVersion="1.5" fileRevision="6" timeStamp="2025-06-12 19:19:46">
-  <project id="5ac0df12-8b8b-476b-9905-21d33685687c" saveCount="54" autoCount="29" editTime="2469">
+<novelWriterXML appVersion="2.8a1" hexVersion="0x020800a1" fileVersion="1.5" fileRevision="6" timeStamp="2025-06-19 21:05:02">
+  <project id="5ac0df12-8b8b-476b-9905-21d33685687c" saveCount="55" autoCount="33" editTime="2746">
     <name>Lorem Ipsum</name>
     <author>lipsum.com</author>
   </project>
@@ -9,7 +9,7 @@
     <language>en_GB</language>
     <spellChecking auto="no">None</spellChecking>
     <lastHandle>
-      <entry key="editor">7a992350f3eb6</entry>
+      <entry key="editor">04468803b92e1</entry>
       <entry key="viewer">None</entry>
       <entry key="novel">b3643d0f92e32</entry>
       <entry key="outline">None</entry>
@@ -19,16 +19,16 @@
       <entry key="Rep2">Replace Text 2</entry>
     </autoReplace>
     <status>
-      <entry key="sbaa94f" count="3" color="#646464" shape="SQUARE">New</entry>
-      <entry key="s27bf7c" count="0" color="#c83200" shape="SQUARE">Note</entry>
-      <entry key="s92a87b" count="5" color="#c89600" shape="SQUARE">Draft</entry>
-      <entry key="sedd043" count="7" color="#32c800" shape="SQUARE">Finished</entry>
+      <entry key="sbaa94f" count="3" color="base" shape="CIRCLE">New</entry>
+      <entry key="s27bf7c" count="0" color="red" shape="CIRCLE">Note</entry>
+      <entry key="s92a87b" count="5" color="yellow" shape="CIRCLE">Draft</entry>
+      <entry key="sedd043" count="7" color="green" shape="CIRCLE">Finished</entry>
     </status>
     <importance>
-      <entry key="i613591" count="7" color="#646464" shape="SQUARE">New</entry>
-      <entry key="i560cbf" count="0" color="#c83200" shape="SQUARE">Minor</entry>
-      <entry key="i37861c" count="0" color="#c89600" shape="SQUARE">Major</entry>
-      <entry key="id6b1d0" count="0" color="#32c800" shape="SQUARE">Main</entry>
+      <entry key="i613591" count="4" color="base" shape="SQUARE">New</entry>
+      <entry key="i560cbf" count="0" color="red" shape="SQUARE">Minor</entry>
+      <entry key="i37861c" count="1" color="yellow" shape="SQUARE">Major</entry>
+      <entry key="id6b1d0" count="2" color="green" shape="SQUARE">Main</entry>
     </importance>
   </settings>
   <content items="22" novelWords="3115" notesWords="738" novelChars="20774" notesChars="5003">
@@ -45,7 +45,7 @@
       <name status="sedd043" import="i613591" active="yes">Front Matter</name>
     </item>
     <item handle="88d59a277361b" parent="b3643d0f92e32" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H2" charCount="605" wordCount="94" paraCount="2" cursorPos="47" />
+      <meta expanded="no" heading="H2" charCount="605" wordCount="94" paraCount="2" cursorPos="94" />
       <name status="s92a87b" import="i613591" active="yes">Prologue</name>
     </item>
     <item handle="db7e733775d4d" parent="b3643d0f92e32" root="b3643d0f92e32" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
@@ -57,7 +57,7 @@
       <name status="s92a87b" import="i613591">Chapter One</name>
     </item>
     <item handle="fb609cd8319dc" parent="45e6b01ca35c1" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H2" charCount="419" wordCount="67" paraCount="1" cursorPos="59" />
+      <meta expanded="no" heading="H2" charCount="419" wordCount="67" paraCount="1" cursorPos="155" />
       <name status="s92a87b" import="i613591" active="yes">Chapter One</name>
     </item>
     <item handle="88243afbe5ed8" parent="45e6b01ca35c1" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
@@ -65,7 +65,7 @@
       <name status="sedd043" import="i613591" active="yes">Scene One</name>
     </item>
     <item handle="f96ec11c6a3da" parent="45e6b01ca35c1" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H3" charCount="4043" wordCount="600" paraCount="6" cursorPos="2335" />
+      <meta expanded="no" heading="H3" charCount="4043" wordCount="600" paraCount="6" cursorPos="57" />
       <name status="sedd043" import="i613591" active="yes">Scene Two</name>
     </item>
     <item handle="846352075de7d" parent="b3643d0f92e32" root="b3643d0f92e32" order="5" type="FILE" class="NOVEL" layout="DOCUMENT">
@@ -77,19 +77,19 @@
       <name status="s92a87b" import="i613591">Chapter Two</name>
     </item>
     <item handle="441420a886d82" parent="6bd935d2490cd" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H2" charCount="477" wordCount="70" paraCount="1" cursorPos="56" />
+      <meta expanded="no" heading="H2" charCount="477" wordCount="70" paraCount="1" cursorPos="58" />
       <name status="s92a87b" import="i613591" active="yes">Chapter Two</name>
     </item>
     <item handle="eb103bc70c90c" parent="6bd935d2490cd" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H3" charCount="3006" wordCount="439" paraCount="4" cursorPos="57" />
+      <meta expanded="no" heading="H3" charCount="3006" wordCount="439" paraCount="4" cursorPos="59" />
       <name status="sedd043" import="i613591" active="yes">Scene Three</name>
     </item>
     <item handle="f8c0562e50f1b" parent="6bd935d2490cd" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H3" charCount="3839" wordCount="563" paraCount="6" cursorPos="56" />
+      <meta expanded="no" heading="H3" charCount="3839" wordCount="563" paraCount="6" cursorPos="58" />
       <name status="sedd043" import="i613591" active="yes">Scene Four</name>
     </item>
     <item handle="47666c91c7ccf" parent="6bd935d2490cd" root="b3643d0f92e32" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H3" charCount="3644" wordCount="543" paraCount="5" cursorPos="351" />
+      <meta expanded="no" heading="H3" charCount="3644" wordCount="543" paraCount="5" cursorPos="58" />
       <name status="sedd043" import="i613591" active="yes">Scene Five</name>
     </item>
     <item handle="67a8707f2f249" parent="None" root="67a8707f2f249" order="1" type="ROOT" class="CHARACTER">
@@ -97,24 +97,24 @@
       <name status="sbaa94f" import="i613591">Characters</name>
     </item>
     <item handle="4c4f28287af27" parent="67a8707f2f249" root="67a8707f2f249" order="0" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta expanded="no" heading="H1" charCount="1864" wordCount="284" paraCount="3" cursorPos="40" />
-      <name status="sbaa94f" import="i613591" active="yes">Mr. Nobody</name>
+      <meta expanded="no" heading="H1" charCount="1864" wordCount="284" paraCount="3" cursorPos="70" />
+      <name status="sbaa94f" import="id6b1d0" active="yes">Mr. Nobody</name>
     </item>
     <item handle="6c6afb1247750" parent="None" root="6c6afb1247750" order="2" type="ROOT" class="PLOT">
       <meta expanded="yes" />
       <name status="sbaa94f" import="i613591">Plot</name>
     </item>
     <item handle="2426c6f0ca922" parent="6c6afb1247750" root="6c6afb1247750" order="0" type="FILE" class="PLOT" layout="NOTE">
-      <meta expanded="no" heading="H1" charCount="1369" wordCount="195" paraCount="2" cursorPos="1387" />
-      <name status="sbaa94f" import="i613591" active="yes">Main</name>
+      <meta expanded="no" heading="H1" charCount="1369" wordCount="195" paraCount="2" cursorPos="53" />
+      <name status="sbaa94f" import="id6b1d0" active="yes">Main</name>
     </item>
     <item handle="60bdf227455cc" parent="None" root="60bdf227455cc" order="3" type="ROOT" class="WORLD">
       <meta expanded="yes" />
       <name status="sbaa94f" import="i613591">World</name>
     </item>
     <item handle="04468803b92e1" parent="60bdf227455cc" root="60bdf227455cc" order="0" type="FILE" class="WORLD" layout="NOTE">
-      <meta expanded="no" heading="H1" charCount="1770" wordCount="259" paraCount="3" cursorPos="47" />
-      <name status="sbaa94f" import="i613591" active="yes">Ancient Europe</name>
+      <meta expanded="no" heading="H1" charCount="1770" wordCount="259" paraCount="3" cursorPos="1119" />
+      <name status="sbaa94f" import="i37861c" active="yes">Ancient Europe</name>
     </item>
     <item handle="1ace7ab1a0fc6" parent="None" root="1ace7ab1a0fc6" order="4" type="ROOT" class="TRASH">
       <meta expanded="no" />

From 0d94a84724859768ae795f53bbc7be6c1d9d619b Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Thu, 19 Jun 2025 21:32:11 +0200
Subject: [PATCH 5/7] Fix tests

---
 .../coreIndex_LoadSave_tagsIndex.json         | 12 ++-
 .../reference/fmtToDocX_SaveDocument_app.xml  |  6 +-
 .../reference/fmtToDocX_SaveDocument_core.xml |  6 +-
 .../fmtToDocX_SaveDocument_document.xml       | 70 +++++++++++++++-
 .../fmtToDocX_SaveDocument_settings.xml       |  6 +-
 .../reference/guiOutline_Content_outline.csv  | 26 +++---
 ...dDocBuild_Extended_Markdown_Lorem_Ipsum.md | 10 ++-
 .../mBuildDocBuild_HTML5_Lorem_Ipsum.htm      |  7 +-
 .../mBuildDocBuild_HTML5_Lorem_Ipsum.json     | 11 ++-
 .../mBuildDocBuild_NWD_Lorem_Ipsum.json       | 27 ++++---
 .../mBuildDocBuild_NWD_Lorem_Ipsum.txt        | 23 ++++--
 ...uildDocBuild_OpenDocument_Lorem_Ipsum.fodt | 19 +++--
 ...dDocBuild_Standard_Markdown_Lorem_Ipsum.md | 10 ++-
 tests/test_gui/test_gui_doceditor.py          | 42 +++++-----
 tests/test_gui/test_gui_mainmenu.py           | 79 ++++++++++---------
 15 files changed, 230 insertions(+), 124 deletions(-)

diff --git a/tests/reference/coreIndex_LoadSave_tagsIndex.json b/tests/reference/coreIndex_LoadSave_tagsIndex.json
index 99201a13..c8365601 100644
--- a/tests/reference/coreIndex_LoadSave_tagsIndex.json
+++ b/tests/reference/coreIndex_LoadSave_tagsIndex.json
@@ -18,7 +18,8 @@
     "88d59a277361b": {
       "T0001": {
         "meta": {"level": "H2", "title": "Prologue", "line": 1, "tag": "", "counts": [605, 94, 2]},
-        "summary": "Explanation from the lipsum.com website."
+        "summary": "Explanation from the lipsum.com website.",
+        "note.Purpose": "Introduction"
       },
       "document": {
         "footnotes": ["f9kgf"]
@@ -92,17 +93,20 @@
     "4c4f28287af27": {
       "T0001": {
         "meta": {"level": "H1", "title": "Nobody Owens", "line": 1, "tag": "bod", "counts": [1864, 284, 3]},
-        "refs": {"main": "@plot"}
+        "refs": {"main": "@plot"},
+        "summary": "The Hero"
       }
     },
     "2426c6f0ca922": {
       "T0001": {
-        "meta": {"level": "H1", "title": "Main Plot", "line": 1, "tag": "main", "counts": [1369, 195, 2]}
+        "meta": {"level": "H1", "title": "Main Plot", "line": 1, "tag": "main", "counts": [1369, 195, 2]},
+        "summary": "Where it all happens"
       }
     },
     "04468803b92e1": {
       "T0001": {
-        "meta": {"level": "H1", "title": "Ancient Europe", "line": 1, "tag": "europe", "counts": [1770, 259, 3]}
+        "meta": {"level": "H1", "title": "Ancient Europe", "line": 1, "tag": "europe", "counts": [1770, 259, 3]},
+        "summary": "A strange place"
       }
     }
   }
diff --git a/tests/reference/fmtToDocX_SaveDocument_app.xml b/tests/reference/fmtToDocX_SaveDocument_app.xml
index 43e25401..0e99320a 100644
--- a/tests/reference/fmtToDocX_SaveDocument_app.xml
+++ b/tests/reference/fmtToDocX_SaveDocument_app.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <ns0:Properties xmlns:ns0="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties">
-  <ns0:TotalTime>41</ns0:TotalTime>
-  <ns0:Application>novelWriter/2.7b1</ns0:Application>
-  <ns0:Words>4035</ns0:Words>
+  <ns0:TotalTime>45</ns0:TotalTime>
+  <ns0:Application>novelWriter/2.8a1</ns0:Application>
+  <ns0:Words>4050</ns0:Words>
   <ns0:Characters>21296</ns0:Characters>
   <ns0:CharactersWithSpaces>24964</ns0:CharactersWithSpaces>
   <ns0:Paragraphs>45</ns0:Paragraphs>
diff --git a/tests/reference/fmtToDocX_SaveDocument_core.xml b/tests/reference/fmtToDocX_SaveDocument_core.xml
index 25a58621..35597dc5 100644
--- a/tests/reference/fmtToDocX_SaveDocument_core.xml
+++ b/tests/reference/fmtToDocX_SaveDocument_core.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <dcterms:created xsi:type="dcterms:W3CDTF">2025-06-12T19:20:06</dcterms:created>
-  <dcterms:modified xsi:type="dcterms:W3CDTF">2025-06-12T19:20:06</dcterms:modified>
+  <dcterms:created xsi:type="dcterms:W3CDTF">2025-06-19T21:08:59</dcterms:created>
+  <dcterms:modified xsi:type="dcterms:W3CDTF">2025-06-19T21:08:59</dcterms:modified>
   <dc:creator>lipsum.com</dc:creator>
   <dc:title>Lorem Ipsum</dc:title>
   <dc:language>en_GB</dc:language>
-  <cp:revision>54</cp:revision>
+  <cp:revision>55</cp:revision>
   <cp:lastModifiedBy>lipsum.com</cp:lastModifiedBy>
 </cp:coreProperties>
diff --git a/tests/reference/fmtToDocX_SaveDocument_document.xml b/tests/reference/fmtToDocX_SaveDocument_document.xml
index 68bd89f3..3e631895 100644
--- a/tests/reference/fmtToDocX_SaveDocument_document.xml
+++ b/tests/reference/fmtToDocX_SaveDocument_document.xml
@@ -34,7 +34,7 @@
       </w:r>
       <w:r>
         <w:rPr />
-        <w:t>4,035</w:t>
+        <w:t>4,050</w:t>
       </w:r>
     </w:p>
     <w:p>
@@ -48,7 +48,7 @@
       </w:r>
       <w:r>
         <w:rPr />
-        <w:t>27,064</w:t>
+        <w:t>27,164</w:t>
       </w:r>
     </w:p>
     <w:p>
@@ -1250,6 +1250,28 @@
         <w:t>Main</w:t>
       </w:r>
     </w:p>
+    <w:p>
+      <w:pPr>
+        <w:pStyle w:val="MetaText" />
+      </w:pPr>
+      <w:r>
+        <w:rPr>
+          <w:b />
+          <w:color w:val="813709" />
+        </w:rPr>
+        <w:t>Short Description:</w:t>
+      </w:r>
+      <w:r>
+        <w:rPr />
+        <w:t xml:space="preserve"> </w:t>
+      </w:r>
+      <w:r>
+        <w:rPr>
+          <w:color w:val="813709" />
+        </w:rPr>
+        <w:t>The Hero</w:t>
+      </w:r>
+    </w:p>
     <w:p>
       <w:pPr>
         <w:pStyle w:val="Normal" />
@@ -1323,6 +1345,28 @@
         <w:t>Main</w:t>
       </w:r>
     </w:p>
+    <w:p>
+      <w:pPr>
+        <w:pStyle w:val="MetaText" />
+      </w:pPr>
+      <w:r>
+        <w:rPr>
+          <w:b />
+          <w:color w:val="813709" />
+        </w:rPr>
+        <w:t>Short Description:</w:t>
+      </w:r>
+      <w:r>
+        <w:rPr />
+        <w:t xml:space="preserve"> </w:t>
+      </w:r>
+      <w:r>
+        <w:rPr>
+          <w:color w:val="813709" />
+        </w:rPr>
+        <w:t>Where it all happens</w:t>
+      </w:r>
+    </w:p>
     <w:p>
       <w:pPr>
         <w:pStyle w:val="Normal" />
@@ -1396,6 +1440,28 @@
         <w:t>Ancient Europe</w:t>
       </w:r>
     </w:p>
+    <w:p>
+      <w:pPr>
+        <w:pStyle w:val="MetaText" />
+      </w:pPr>
+      <w:r>
+        <w:rPr>
+          <w:b />
+          <w:color w:val="813709" />
+        </w:rPr>
+        <w:t>Short Description:</w:t>
+      </w:r>
+      <w:r>
+        <w:rPr />
+        <w:t xml:space="preserve"> </w:t>
+      </w:r>
+      <w:r>
+        <w:rPr>
+          <w:color w:val="813709" />
+        </w:rPr>
+        <w:t>A strange place</w:t>
+      </w:r>
+    </w:p>
     <w:p>
       <w:pPr>
         <w:pStyle w:val="Normal" />
diff --git a/tests/reference/fmtToDocX_SaveDocument_settings.xml b/tests/reference/fmtToDocX_SaveDocument_settings.xml
index 10913023..c1622522 100644
--- a/tests/reference/fmtToDocX_SaveDocument_settings.xml
+++ b/tests/reference/fmtToDocX_SaveDocument_settings.xml
@@ -9,13 +9,13 @@
   <w:docVars>
     <w:docVar w:name="ManuscriptTitleCount" w:val="11" />
     <w:docVar w:name="ManuscriptParagraphCount" w:val="45" />
-    <w:docVar w:name="ManuscriptAllWords" w:val="4035" />
+    <w:docVar w:name="ManuscriptAllWords" w:val="4050" />
     <w:docVar w:name="ManuscriptTextWords" w:val="3711" />
     <w:docVar w:name="ManuscriptTitleWords" w:val="21" />
-    <w:docVar w:name="ManuscriptAllChars" w:val="27064" />
+    <w:docVar w:name="ManuscriptAllChars" w:val="27164" />
     <w:docVar w:name="ManuscriptTextChars" w:val="24964" />
     <w:docVar w:name="ManuscriptTitleChars" w:val="123" />
-    <w:docVar w:name="ManuscriptAllWordChars" w:val="23120" />
+    <w:docVar w:name="ManuscriptAllWordChars" w:val="23208" />
     <w:docVar w:name="ManuscriptTextWordChars" w:val="21296" />
     <w:docVar w:name="ManuscriptTitleWordChars" w:val="113" />
   </w:docVars>
diff --git a/tests/reference/guiOutline_Content_outline.csv b/tests/reference/guiOutline_Content_outline.csv
index 62edb467..22bc5537 100644
--- a/tests/reference/guiOutline_Content_outline.csv
+++ b/tests/reference/guiOutline_Content_outline.csv
@@ -1,13 +1,13 @@
-"H","Title","Document","Line","Status","Chars","Words","Pars","POV","Focus","Characters","Plot","Timeline","Locations","Objects","Entities","Custom","Story","Mentions","Synopsis"
-"H1","Lorem Ipsum","Lorem Ipsum","1","Finished","259","44","5","","","","","","","","","","","",""
-"H2","Prologue","Prologue","1","Draft","605","94","2","","","","","","","","","","","","Explanation from the lipsum.com website."
-"H1","Act One","Act One","1","New","35","6","1","","","","","","","","","","","",""
-"H2","Chapter One","Chapter One","1","Draft","419","67","1","Bod","","","Main","","Europe","","","","","","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam."
-"H3","Scene One","Scene One","1","Finished","1197","174","2","Bod","","","Main","","Europe","","","","","","Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur."
-"H4","Scene One, Section Two","Scene One","13","Finished","1561","230","2","","","","","","","","","","","",""
-"H3","Scene Two","Scene Two","1","Finished","2034","299","3","Bod","","","Main","","Europe","","","","","","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci."
-"H4","Scene Two, Section Two","Scene Two","15","Finished","2009","301","3","","","","","","","","","","","",""
-"H2","Chapter Two","Chapter Two","1","Draft","477","70","1","Bod","","","Main","","Europe","","","","","","Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue."
-"H3","Scene Three","Scene Three","1","Finished","3006","439","4","Bod","","","Main","","Europe","","","","","","Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
-"H3","Scene Four","Scene Four","1","Finished","3839","563","6","Bod","","","Main","","Europe","","","","","","Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo."
-"H3","Scene Five","Scene Five","1","Finished","3644","543","5","Bod","","","Main","","Europe","","","","","","Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus."
+"H","Title","Document","Line","Status","Chars","Words","Pars","POV","Focus","Characters","Plot","Timeline","Locations","Objects","Entities","Custom","Story","Mentions","Synopsis","Note (Purpose)"
+"H1","Lorem Ipsum","Lorem Ipsum","1","Finished","259","44","5","","","","","","","","","","","","",""
+"H2","Prologue","Prologue","1","Draft","605","94","2","","","","","","","","","","","","Explanation from the lipsum.com website.","Introduction"
+"H1","Act One","Act One","1","New","35","6","1","","","","","","","","","","","","",""
+"H2","Chapter One","Chapter One","1","Draft","419","67","1","Bod","","","Main","","Europe","","","","","","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.",""
+"H3","Scene One","Scene One","1","Finished","1197","174","2","Bod","","","Main","","Europe","","","","","","Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.",""
+"H4","Scene One, Section Two","Scene One","13","Finished","1561","230","2","","","","","","","","","","","","",""
+"H3","Scene Two","Scene Two","1","Finished","2034","299","3","Bod","","","Main","","Europe","","","","","","Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci.",""
+"H4","Scene Two, Section Two","Scene Two","15","Finished","2009","301","3","","","","","","","","","","","","",""
+"H2","Chapter Two","Chapter Two","1","Draft","477","70","1","Bod","","","Main","","Europe","","","","","","Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.",""
+"H3","Scene Three","Scene Three","1","Finished","3006","439","4","Bod","","","Main","","Europe","","","","","","Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.",""
+"H3","Scene Four","Scene Four","1","Finished","3839","563","6","Bod","","","Main","","Europe","","","","","","Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.",""
+"H3","Scene Five","Scene Five","1","Finished","3644","543","5","Bod","","","Main","","Europe","","","","","","Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.",""
diff --git a/tests/reference/mBuildDocBuild_Extended_Markdown_Lorem_Ipsum.md b/tests/reference/mBuildDocBuild_Extended_Markdown_Lorem_Ipsum.md
index 96b1fc07..329eeaea 100644
--- a/tests/reference/mBuildDocBuild_Extended_Markdown_Lorem_Ipsum.md
+++ b/tests/reference/mBuildDocBuild_Extended_Markdown_Lorem_Ipsum.md
@@ -3,9 +3,9 @@ Lorem Ipsum
 
 **By lipsum.com**
 
-Word Count: 4,169
+Word Count: 4,184
 
-Character Count: 27,898
+Character Count: 27,998
 
 “Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”
 
@@ -162,6 +162,8 @@ Notes: Characters
 **Tag:** Bod | Nobody Owens  
 **Plot:** Main
 
+**Short Description:** The Hero
+
 Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.
 
 Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.
@@ -175,6 +177,8 @@ Notes: Plot
 
 **Tag:** Main
 
+**Short Description:** Where it all happens
+
 Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.
 
 Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.
@@ -186,6 +190,8 @@ Notes: World
 
 **Tag:** Europe | Ancient Europe
 
+**Short Description:** A strange place
+
 Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.
 
 Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.
diff --git a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
index 92482cd8..646a7c05 100644
--- a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
+++ b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm
@@ -21,8 +21,8 @@ h4 {font-size: 1.25em; margin-top: 1.20em; margin-bottom: 0.60em;}
 <body>
 <h1 class='title' style='text-align: center;'>Lorem Ipsum</h1>
 <p style='text-align: center;'><strong>By lipsum.com</strong></p>
-<p style='text-align: center;'>Word Count: 4,169</p>
-<p style='text-align: center;'>Character Count: 27,898</p>
+<p style='text-align: center;'>Word Count: 4,184</p>
+<p style='text-align: center;'>Character Count: 27,998</p>
 <p style='text-align: center;'>“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”</p>
 <p style='text-align: center;'>“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…”</p>
 <p class='comment' style='text-align: justify; page-break-before: always;'><strong><span style='color: #646464'>Comment:</span></strong> <span style='color: #646464'>Exctracted from the lipsum.com website.</span></p>
@@ -107,17 +107,20 @@ h4 {font-size: 1.25em; margin-top: 1.20em; margin-bottom: 0.60em;}
 <h1>Nobody Owens</h1>
 <p class='meta meta-tag' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_bod'>Bod</a></span> | <span style='color: #4271ae'>Nobody Owens</span></p>
 <p class='meta meta-plot' style='margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Short Description:</span></strong> <span style='color: #813709'>The Hero</span></p>
 <p style='text-align: justify;'>Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Nullam scelerisque velit et tortor congue vestibulum a at nisi. Vivamus sodales ut turpis a convallis. In dignissim nibh at luctus sodales. Etiam sit amet rhoncus massa. Phasellus ligula magna, sollicitudin non imperdiet sit amet, volutpat vel magna. Nunc vestibulum tempor lectus, sit amet porta nunc hendrerit in. Curabitur non odio sit amet massa tincidunt facilisis. Integer et luctus nunc, eget euismod leo. Praesent faucibus metus sed purus convallis scelerisque. Fusce viverra lorem et placerat malesuada. In at elit malesuada, ullamcorper risus vitae, sodales dolor. Donec quis elementum lectus. Quisque eu eros at dui imperdiet euismod ut id neque.</p>
 <h1 class='title' style='text-align: center; page-break-before: always;'>Notes: Plot</h1>
 <h1>Main Plot</h1>
 <p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_main'>Main</a></span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Short Description:</span></strong> <span style='color: #813709'>Where it all happens</span></p>
 <p style='text-align: justify;'>Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.</p>
 <h1 class='title' style='text-align: center; page-break-before: always;'>Notes: World</h1>
 <h1>Ancient Europe</h1>
 <p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_europe'>Europe</a></span> | <span style='color: #4271ae'>Ancient Europe</span></p>
+<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Short Description:</span></strong> <span style='color: #813709'>A strange place</span></p>
 <p style='text-align: justify;'>Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.</p>
 <p style='text-align: justify; text-indent: 1.40em;'>Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim.</p>
diff --git a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
index 7a4134ef..3c1ce845 100644
--- a/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
+++ b/tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json
@@ -2,8 +2,8 @@
   "meta": {
     "projectName": "Lorem Ipsum",
     "novelAuthor": "lipsum.com",
-    "buildTime": 1737835371,
-    "buildTimeStr": "2025-01-25 21:02:51"
+    "buildTime": 1750360261,
+    "buildTimeStr": "2025-06-19 21:11:01"
   },
   "text": {
     "css": [
@@ -23,8 +23,8 @@
       [
         "<h1 class='title' style='text-align: center;'>Lorem Ipsum</h1>",
         "<p style='text-align: center;'><strong>By lipsum.com</strong></p>",
-        "<p style='text-align: center;'>Word Count: 4,169</p>",
-        "<p style='text-align: center;'>Character Count: 27,898</p>",
+        "<p style='text-align: center;'>Word Count: 4,184</p>",
+        "<p style='text-align: center;'>Character Count: 27,998</p>",
         "<p style='text-align: center;'>\u201cNeque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit\u2026\u201d</p>",
         "<p style='text-align: center;'>\u201cThere is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain\u2026\u201d</p>"
       ],
@@ -135,6 +135,7 @@
         "<h1>Nobody Owens</h1>",
         "<p class='meta meta-tag' style='margin-bottom: 0;'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_bod'>Bod</a></span> | <span style='color: #4271ae'>Nobody Owens</span></p>",
         "<p class='meta meta-plot' style='margin-top: 0;'><strong><span style='color: #f5871f'>Plot:</span></strong> <span style='color: #4271ae'><a href='#tag_main'>Main</a></span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Short Description:</span></strong> <span style='color: #813709'>The Hero</span></p>",
         "<p style='text-align: justify;'>Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Nullam scelerisque velit et tortor congue vestibulum a at nisi. Vivamus sodales ut turpis a convallis. In dignissim nibh at luctus sodales. Etiam sit amet rhoncus massa. Phasellus ligula magna, sollicitudin non imperdiet sit amet, volutpat vel magna. Nunc vestibulum tempor lectus, sit amet porta nunc hendrerit in. Curabitur non odio sit amet massa tincidunt facilisis. Integer et luctus nunc, eget euismod leo. Praesent faucibus metus sed purus convallis scelerisque. Fusce viverra lorem et placerat malesuada. In at elit malesuada, ullamcorper risus vitae, sodales dolor. Donec quis elementum lectus. Quisque eu eros at dui imperdiet euismod ut id neque.</p>"
@@ -145,6 +146,7 @@
       [
         "<h1>Main Plot</h1>",
         "<p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_main'>Main</a></span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Short Description:</span></strong> <span style='color: #813709'>Where it all happens</span></p>",
         "<p style='text-align: justify;'>Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.</p>"
       ],
@@ -154,6 +156,7 @@
       [
         "<h1>Ancient Europe</h1>",
         "<p class='meta meta-tag'><strong><span style='color: #f5871f'>Tag:</span></strong> <span style='color: #4271ae'><a name='tag_europe'>Europe</a></span> | <span style='color: #4271ae'>Ancient Europe</span></p>",
+        "<p class='comment' style='text-align: justify;'><strong><span style='color: #813709'>Short Description:</span></strong> <span style='color: #813709'>A strange place</span></p>",
         "<p style='text-align: justify;'>Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.</p>",
         "<p style='text-align: justify; text-indent: 1.40em;'>Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim.</p>"
diff --git a/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.json b/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.json
index f1fd3415..8a08e557 100644
--- a/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.json
+++ b/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.json
@@ -2,8 +2,8 @@
   "meta": {
     "projectName": "Lorem Ipsum",
     "novelAuthor": "lipsum.com",
-    "buildTime": 1731001720,
-    "buildTimeStr": "2024-11-07 18:48:40"
+    "buildTime": 1750360135,
+    "buildTimeStr": "2025-06-19 21:08:55"
   },
   "text": {
     "nwd": [
@@ -32,7 +32,8 @@
       [
         "##! Prologue",
         "",
-        "% Synopsis: Explanation from the lipsum.com website.",
+        "%Synopsis: Explanation from the lipsum.com website.",
+        "%Note.Purpose: Introduction",
         "",
         "_Lorem Ipsum_ is simply dummy text[footnote:f9kgf] of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
         "",
@@ -52,7 +53,7 @@
         "@plot: Main",
         "@location: Europe",
         "",
-        "% Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.",
+        "%Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.",
         "",
         "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. Praesent magna nunc, lacinia sit amet quam eget, aliquet ultrices justo. Morbi ornare enim et lorem rutrum finibus ut eu dolor. Aliquam a orci odio. Ut ultrices sem quis massa placerat, eget mollis nisl cursus. Cras vel sagittis justo. Ut non ultricies leo. Maecenas rutrum velit in est varius, et egestas massa pulvinar."
       ],
@@ -63,7 +64,7 @@
         "@plot: Main",
         "@location: Europe",
         "",
-        "% Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.",
+        "%Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.",
         "",
         "Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. Donec quis ante nunc. Mauris ut leo ipsum. Vestibulum est neque, hendrerit nec neque a, ullamcorper lobortis tellus. Fusce sollicitudin purus quis congue bibendum. Aliquam condimentum ipsum tristique blandit tristique. Donec pulvinar neque ac suscipit malesuada.",
         "",
@@ -82,7 +83,7 @@
         "@plot: Main",
         "@location: Europe",
         "",
-        "% Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. ",
+        "%Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. ",
         "",
         "Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. Vestibulum facilisis bibendum aliquam. Aliquam posuere, turpis ac bibendum varius, sem tellus venenatis risus, in elementum massa enim ac lorem. Integer in sem ac diam blandit ultricies ut in nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet erat est. Curabitur vitae cursus justo, sit amet placerat dolor. Vivamus eu felis hendrerit, tincidunt massa rutrum, maximus arcu. Pellentesque commodo justo odio, vel rutrum nulla tincidunt eu. Integer non neque condimentum, convallis diam non, varius ligula. Aliquam eget sapien mauris. Aenean pharetra nunc nisi, vel maximus ante tristique sit amet. Aliquam risus metus, interdum non odio eu, consectetur lacinia sapien.",
         "",
@@ -116,7 +117,7 @@
         "@plot: Main",
         "@location: Europe",
         "",
-        "% Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.",
+        "%Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.",
         "",
         "Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. Vestibulum pharetra fermentum leo, sed faucibus eros placerat quis. In hac habitasse platea dictumst. Donec metus massa, rutrum quis consequat et, tincidunt ac felis. Duis mollis metus ac nunc tincidunt blandit. Ut aliquet velit eu odio pharetra condimentum. Integer rutrum lacus orci, id venenatis libero accumsan at."
       ],
@@ -127,7 +128,7 @@
         "@plot: Main",
         "@location: Europe",
         "",
-        "% Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.",
+        "%Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.",
         "",
         "Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean tincidunt lacus vitae nibh elementum eleifend. Sed rutrum condimentum sem quis blandit. Duis imperdiet libero metus, quis convallis quam faucibus a. Nulla ligula est, semper quis sollicitudin et, pretium id justo. Curabitur pharetra risus eget consectetur commodo. Duis mattis arcu non est condimentum, id venenatis risus volutpat. Pellentesque aliquet mauris non mauris porttitor ultrices. Phasellus ut vestibulum mi. Suspendisse malesuada metus lorem, a malesuada orci rhoncus a. Praesent euismod convallis ante, lacinia tincidunt ex egestas id. Praesent sit amet efficitur sapien. Morbi tincidunt volutpat nunc sed dictum. Aliquam ultrices metus id fermentum lobortis.",
         "",
@@ -144,7 +145,7 @@
         "@plot: Main",
         "@location: Europe",
         "",
-        "% Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.",
+        "%Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.",
         "",
         "Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. Nullam viverra dui et auctor pretium. Ut ullamcorper velit urna, sed imperdiet massa convallis a. Suspendisse efficitur, ipsum nec cursus pulvinar, eros urna posuere diam, nec elementum mi felis vitae sapien.",
         "",
@@ -165,7 +166,7 @@
         "@plot: Main",
         "@location: Europe",
         "",
-        "% Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.",
+        "%Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.",
         "",
         "Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In sed felis auctor, rhoncus dui ac, consequat dolor. Integer volutpat libero sed nisl aliquet varius. Suspendisse et lorem sapien. Proin id ultrices nibh, ac suscipit diam. Suspendisse placerat varius porttitor. Curabitur elementum sed enim ultrices imperdiet.",
         "",
@@ -186,6 +187,8 @@
         "@tag: Bod | Nobody Owens",
         "@plot: Main",
         "",
+        "%Short: The Hero",
+        "",
         "Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.",
         "",
         "Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.",
@@ -200,6 +203,8 @@
         "",
         "@tag: Main",
         "",
+        "%Short: Where it all happens",
+        "",
         "Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.",
         "",
         "Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur."
@@ -212,6 +217,8 @@
         "",
         "@tag: Europe | Ancient Europe",
         "",
+        "%Short: A strange place",
+        "",
         "Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.",
         "",
         "Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.",
diff --git a/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.txt b/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.txt
index 21935188..96df15ab 100644
--- a/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.txt
+++ b/tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.txt
@@ -20,7 +20,8 @@ The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for t
 
 ##! Prologue
 
-% Synopsis: Explanation from the lipsum.com website.
+%Synopsis: Explanation from the lipsum.com website.
+%Note.Purpose: Introduction
 
 _Lorem Ipsum_ is simply dummy text[footnote:f9kgf] of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
 
@@ -38,7 +39,7 @@ See http://lipsum.com
 @plot: Main
 @location: Europe
 
-% Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.
+%Synopsis: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam.
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam. Praesent magna nunc, lacinia sit amet quam eget, aliquet ultrices justo. Morbi ornare enim et lorem rutrum finibus ut eu dolor. Aliquam a orci odio. Ut ultrices sem quis massa placerat, eget mollis nisl cursus. Cras vel sagittis justo. Ut non ultricies leo. Maecenas rutrum velit in est varius, et egestas massa pulvinar.
 
@@ -48,7 +49,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam
 @plot: Main
 @location: Europe
 
-% Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.
+%Synopsis: Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur.
 
 Aenean ut placerat velit. Etiam laoreet ullamcorper risus, eget lobortis enim scelerisque non. Suspendisse id maximus nunc, et mollis sapien. Curabitur vel semper sapien, non pulvinar dolor. Etiam finibus nisi vel mi molestie consectetur. Donec quis ante nunc. Mauris ut leo ipsum. Vestibulum est neque, hendrerit nec neque a, ullamcorper lobortis tellus. Fusce sollicitudin purus quis congue bibendum. Aliquam condimentum ipsum tristique blandit tristique. Donec pulvinar neque ac suscipit malesuada.
 
@@ -66,7 +67,7 @@ Curabitur congue, justo quis interdum fermentum, tellus nulla imperdiet sapien,
 @plot: Main
 @location: Europe
 
-% Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. 
+%Synopsis: Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. 
 
 Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Integer sapien nulla, dictum at lacus a, dignissim consectetur dolor. Nunc vel eleifend lacus, eu dapibus orci. Vestibulum facilisis bibendum aliquam. Aliquam posuere, turpis ac bibendum varius, sem tellus venenatis risus, in elementum massa enim ac lorem. Integer in sem ac diam blandit ultricies ut in nulla. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sit amet erat est. Curabitur vitae cursus justo, sit amet placerat dolor. Vivamus eu felis hendrerit, tincidunt massa rutrum, maximus arcu. Pellentesque commodo justo odio, vel rutrum nulla tincidunt eu. Integer non neque condimentum, convallis diam non, varius ligula. Aliquam eget sapien mauris. Aenean pharetra nunc nisi, vel maximus ante tristique sit amet. Aliquam risus metus, interdum non odio eu, consectetur lacinia sapien.
 
@@ -98,7 +99,7 @@ Ut et consequat enim, quis ornare nibh. In lectus neque, mollis et suscipit et,
 @plot: Main
 @location: Europe
 
-% Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.
+%Synopsis: Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue.
 
 Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis pharetra sem vitae dapibus. Curabitur varius lorem non pulvinar congue. Vestibulum pharetra fermentum leo, sed faucibus eros placerat quis. In hac habitasse platea dictumst. Donec metus massa, rutrum quis consequat et, tincidunt ac felis. Duis mollis metus ac nunc tincidunt blandit. Ut aliquet velit eu odio pharetra condimentum. Integer rutrum lacus orci, id venenatis libero accumsan at.
 
@@ -108,7 +109,7 @@ Curabitur a elit posuere, varius ex et, convallis neque. Phasellus sagittis phar
 @plot: Main
 @location: Europe
 
-% Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
+%Synopsis: Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
 
 Aenean ut libero ut lectus porttitor rhoncus vel et massa. Nam pretium, nibh et varius vehicula, urna metus blandit eros, euismod pharetra diam diam et libero. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean tincidunt lacus vitae nibh elementum eleifend. Sed rutrum condimentum sem quis blandit. Duis imperdiet libero metus, quis convallis quam faucibus a. Nulla ligula est, semper quis sollicitudin et, pretium id justo. Curabitur pharetra risus eget consectetur commodo. Duis mattis arcu non est condimentum, id venenatis risus volutpat. Pellentesque aliquet mauris non mauris porttitor ultrices. Phasellus ut vestibulum mi. Suspendisse malesuada metus lorem, a malesuada orci rhoncus a. Praesent euismod convallis ante, lacinia tincidunt ex egestas id. Praesent sit amet efficitur sapien. Morbi tincidunt volutpat nunc sed dictum. Aliquam ultrices metus id fermentum lobortis.
 
@@ -124,7 +125,7 @@ Aenean dapibus vulputate purus, sit amet tempor nunc suscipit consequat. Orci va
 @plot: Main
 @location: Europe
 
-% Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.
+%Synopsis: Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo.
 
 Nam tempor blandit magna laoreet aliquet. Vestibulum auctor posuere leo, ac gravida nisi rhoncus varius. Aenean posuere dolor vitae condimentum volutpat. Donec egestas volutpat risus, quis luctus justo. Nullam viverra dui et auctor pretium. Ut ullamcorper velit urna, sed imperdiet massa convallis a. Suspendisse efficitur, ipsum nec cursus pulvinar, eros urna posuere diam, nec elementum mi felis vitae sapien.
 
@@ -144,7 +145,7 @@ Phasellus eu nunc ut nunc faucibus laoreet. Aliquam at magna risus. Praesent lob
 @plot: Main
 @location: Europe
 
-% Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
+%Synopsis: Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
 
 Praesent eget est porta, dictum ante in, egestas risus. Mauris risus mauris, consequat aliquam mauris et, feugiat iaculis ipsum. Aliquam arcu ipsum, fermentum ut arcu sed, lobortis euismod sem. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In sed felis auctor, rhoncus dui ac, consequat dolor. Integer volutpat libero sed nisl aliquet varius. Suspendisse et lorem sapien. Proin id ultrices nibh, ac suscipit diam. Suspendisse placerat varius porttitor. Curabitur elementum sed enim ultrices imperdiet.
 
@@ -163,6 +164,8 @@ Integer egestas maximus leo eu facilisis. Nunc rhoncus dignissim lectus eu lacin
 @tag: Bod | Nobody Owens
 @plot: Main
 
+%Short: The Hero
+
 Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.
 
 Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.
@@ -175,6 +178,8 @@ Nullam scelerisque velit et tortor congue vestibulum a at nisi. Vivamus sodales
 
 @tag: Main
 
+%Short: Where it all happens
+
 Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.
 
 Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.
@@ -185,6 +190,8 @@ Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam.
 
 @tag: Europe | Ancient Europe
 
+%Short: A strange place
+
 Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.
 
 Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.
diff --git a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
index ffb82ce7..5a5ec9db 100644
--- a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
+++ b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <office:document xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
   <office:meta>
-    <meta:creation-date>2025-01-25T16:15:30</meta:creation-date>
-    <meta:generator>novelWriter/2.6rc1</meta:generator>
+    <meta:creation-date>2025-06-19T21:05:16</meta:creation-date>
+    <meta:generator>novelWriter/2.8a1</meta:generator>
     <meta:initial-creator>lipsum.com</meta:initial-creator>
-    <meta:editing-cycles>51</meta:editing-cycles>
-    <meta:editing-duration>P0DT0H40M56S</meta:editing-duration>
+    <meta:editing-cycles>55</meta:editing-cycles>
+    <meta:editing-duration>P0DT0H45M46S</meta:editing-duration>
     <dc:title>Lorem Ipsum</dc:title>
-    <dc:date>2025-01-25T16:15:30</dc:date>
+    <dc:date>2025-06-19T21:05:16</dc:date>
     <dc:creator>lipsum.com</dc:creator>
   </office:meta>
   <office:font-face-decls>
@@ -152,13 +152,13 @@
       <text:user-field-decls>
         <text:user-field-decl office:value-type="float" office:value="19" text:name="ManuscriptTitleCount" />
         <text:user-field-decl office:value-type="float" office:value="48" text:name="ManuscriptParagraphCount" />
-        <text:user-field-decl office:value-type="float" office:value="4169" text:name="ManuscriptAllWords" />
+        <text:user-field-decl office:value-type="float" office:value="4184" text:name="ManuscriptAllWords" />
         <text:user-field-decl office:value-type="float" office:value="3815" text:name="ManuscriptTextWords" />
         <text:user-field-decl office:value-type="float" office:value="54" text:name="ManuscriptTitleWords" />
-        <text:user-field-decl office:value-type="float" office:value="27898" text:name="ManuscriptAllChars" />
+        <text:user-field-decl office:value-type="float" office:value="27998" text:name="ManuscriptAllChars" />
         <text:user-field-decl office:value-type="float" office:value="25578" text:name="ManuscriptTextChars" />
         <text:user-field-decl office:value-type="float" office:value="310" text:name="ManuscriptTitleChars" />
-        <text:user-field-decl office:value-type="float" office:value="23826" text:name="ManuscriptAllWordChars" />
+        <text:user-field-decl office:value-type="float" office:value="23914" text:name="ManuscriptAllWordChars" />
         <text:user-field-decl office:value-type="float" office:value="21806" text:name="ManuscriptTextWordChars" />
         <text:user-field-decl office:value-type="float" office:value="275" text:name="ManuscriptTitleWordChars" />
       </text:user-field-decls>
@@ -255,17 +255,20 @@
       <text:h text:style-name="Heading_20_1" text:outline-level="1">Nobody Owens</text:h>
       <text:p text:style-name="P8"><text:span text:style-name="T8">Tag:</text:span> <text:span text:style-name="T9">Bod</text:span> | <text:span text:style-name="T10">Nobody Owens</text:span></text:p>
       <text:p text:style-name="Text_20_Meta"><text:span text:style-name="T8">Plot:</text:span> <text:span text:style-name="T9">Main</text:span></text:p>
+      <text:p text:style-name="P5"><text:span text:style-name="T4">Short Description:</text:span> <text:span text:style-name="T5">The Hero</text:span></text:p>
       <text:p text:style-name="P6">Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.</text:p>
       <text:p text:style-name="P3">Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.</text:p>
       <text:p text:style-name="P3">Nullam scelerisque velit et tortor congue vestibulum a at nisi. Vivamus sodales ut turpis a convallis. In dignissim nibh at luctus sodales. Etiam sit amet rhoncus massa. Phasellus ligula magna, sollicitudin non imperdiet sit amet, volutpat vel magna. Nunc vestibulum tempor lectus, sit amet porta nunc hendrerit in. Curabitur non odio sit amet massa tincidunt facilisis. Integer et luctus nunc, eget euismod leo. Praesent faucibus metus sed purus convallis scelerisque. Fusce viverra lorem et placerat malesuada. In at elit malesuada, ullamcorper risus vitae, sodales dolor. Donec quis elementum lectus. Quisque eu eros at dui imperdiet euismod ut id neque.</text:p>
       <text:p text:style-name="P7">Notes: Plot</text:p>
       <text:h text:style-name="Heading_20_1" text:outline-level="1">Main Plot</text:h>
       <text:p text:style-name="Text_20_Meta"><text:span text:style-name="T8">Tag:</text:span> <text:span text:style-name="T9">Main</text:span></text:p>
+      <text:p text:style-name="P5"><text:span text:style-name="T4">Short Description:</text:span> <text:span text:style-name="T5">Where it all happens</text:span></text:p>
       <text:p text:style-name="P6">Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.</text:p>
       <text:p text:style-name="P3">Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.</text:p>
       <text:p text:style-name="P7">Notes: World</text:p>
       <text:h text:style-name="Heading_20_1" text:outline-level="1">Ancient Europe</text:h>
       <text:p text:style-name="Text_20_Meta"><text:span text:style-name="T8">Tag:</text:span> <text:span text:style-name="T9">Europe</text:span> | <text:span text:style-name="T10">Ancient Europe</text:span></text:p>
+      <text:p text:style-name="P5"><text:span text:style-name="T4">Short Description:</text:span> <text:span text:style-name="T5">A strange place</text:span></text:p>
       <text:p text:style-name="P6">Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.</text:p>
       <text:p text:style-name="P3">Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.</text:p>
       <text:p text:style-name="P3">Nunc ullamcorper magna quis elit condimentum rhoncus. Aenean dictum pulvinar dolor suscipit interdum. Aliquam elit massa, elementum nec cursus eu, maximus nec ipsum. Donec ullamcorper iaculis dolor eu commodo. Nunc eget tortor quis turpis consectetur varius. Vestibulum nec justo vel tellus venenatis condimentum. Duis auctor iaculis massa. Nunc risus magna, rutrum vitae eros non, tristique mollis enim.</text:p>
diff --git a/tests/reference/mBuildDocBuild_Standard_Markdown_Lorem_Ipsum.md b/tests/reference/mBuildDocBuild_Standard_Markdown_Lorem_Ipsum.md
index 96b1fc07..329eeaea 100644
--- a/tests/reference/mBuildDocBuild_Standard_Markdown_Lorem_Ipsum.md
+++ b/tests/reference/mBuildDocBuild_Standard_Markdown_Lorem_Ipsum.md
@@ -3,9 +3,9 @@ Lorem Ipsum
 
 **By lipsum.com**
 
-Word Count: 4,169
+Word Count: 4,184
 
-Character Count: 27,898
+Character Count: 27,998
 
 “Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”
 
@@ -162,6 +162,8 @@ Notes: Characters
 **Tag:** Bod | Nobody Owens  
 **Plot:** Main
 
+**Short Description:** The Hero
+
 Pellentesque nec erat ut nulla posuere commodo. Curabitur nisi augue, imperdiet et porta imperdiet, efficitur id leo. Cras finibus arcu at nibh commodo congue. Proin suscipit placerat condimentum. Aenean ante enim, cursus id lorem a, blandit venenatis nibh. Maecenas suscipit porta elit, sit amet porta felis porttitor eu. Sed a dui nibh. Phasellus sed faucibus dui. Pellentesque felis nulla, ultrices non efficitur quis, rutrum id mi. Mauris tempus auctor nisl, in bibendum enim pellentesque sit amet. Proin nunc lacus, imperdiet nec posuere ac, interdum non lectus.
 
 Suspendisse faucibus est auctor orci mollis luctus. Praesent quis sodales neque. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec sodales rutrum mattis. In in sem ornare, consequat nulla ac, convallis arcu. Duis ac metus id felis commodo commodo sit amet eget diam. Curabitur rhoncus lacinia leo at sodales. Etiam finibus porta diam a viverra. Praesent nisi urna, volutpat sit amet odio at, vehicula vehicula leo. In non enim eget nisl luctus commodo. Pellentesque pellentesque at lectus at luctus. Quisque nec felis bibendum, lacinia libero ut, lacinia eros. Integer finibus ultricies nibh sit amet placerat.
@@ -175,6 +177,8 @@ Notes: Plot
 
 **Tag:** Main
 
+**Short Description:** Where it all happens
+
 Suspendisse vulputate malesuada pellentesque. Aenean sollicitudin cursus mi, vitae ultricies felis ullamcorper eu. Duis luctus risus mi, in accumsan velit cursus ut. Vestibulum eleifend leo in magna eleifend fermentum. Proin nec ornare elit. Phasellus nec interdum risus. In a volutpat augue, quis egestas justo. Morbi porta mauris mattis bibendum imperdiet.
 
 Mauris ut erat eu lorem malesuada egestas vel vel urna. Maecenas ac semper quam. Maecenas aliquet metus non interdum mattis. Proin consectetur molestie ligula. Aliquam sollicitudin pulvinar urna a pellentesque. Suspendisse ultrices, est mattis scelerisque porta, nisi nisi laoreet nisl, non condimentum quam ante a velit. Proin scelerisque justo augue, nec laoreet ligula egestas at. Etiam enim quam, ultrices non accumsan hendrerit, elementum vel ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nam efficitur odio libero, in vestibulum arcu aliquam at. Cras non vehicula augue. Integer lobortis, est vitae aliquam facilisis, metus ligula aliquet eros, at porttitor sem tortor eget massa. Aliquam varius scelerisque neque sed gravida. Aenean eleifend lorem id ante elementum sollicitudin. Proin commodo massa a quam volutpat, mollis fermentum turpis efficitur.
@@ -186,6 +190,8 @@ Notes: World
 
 **Tag:** Europe | Ancient Europe
 
+**Short Description:** A strange place
+
 Vivamus sodales risus ac accumsan posuere. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nunc vel enim felis. Vestibulum dignissim massa nunc, a auctor magna eleifend et. Proin dignissim sodales erat vitae convallis. Aliquam id tellus dui. Curabitur sollicitudin scelerisque ex sit amet posuere. Nam rutrum felis id rhoncus feugiat. Duis sagittis quam quis purus efficitur, quis rutrum odio iaculis. Maecenas semper ante turpis, at vulputate mi consectetur non. Sed rutrum nibh turpis, quis rhoncus purus ornare quis. Vestibulum at rutrum mauris. Integer dolor nisi, tincidunt eget vehicula ac, ultricies at ligula.
 
 Aenean semper turpis quis varius rhoncus. Vivamus ac mi eget felis euismod vulputate. Nam eu tempus velit. Etiam ut est porta, finibus erat sit amet, consectetur felis. Nullam consequat felis ut lacus pharetra, in lobortis urna mollis. Nulla varius eros nec lorem rhoncus, sed venenatis risus ultrices. Phasellus pellentesque laoreet neque, ut ultricies lacus vulputate quis. In malesuada dui sit amet est interdum, eget consectetur mi gravida. Cras vel bibendum purus. Quisque commodo tempor arcu, non lacinia sem blandit eleifend. Quisque at neque gravida, porttitor metus a, suscipit diam. Quisque convallis sodales lacus et condimentum. Donec a suscipit diam. Pellentesque eget cursus neque.
diff --git a/tests/test_gui/test_gui_doceditor.py b/tests/test_gui/test_gui_doceditor.py
index ea8f86dd..52cd8826 100644
--- a/tests/test_gui/test_gui_doceditor.py
+++ b/tests/test_gui/test_gui_doceditor.py
@@ -2074,7 +2074,7 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     origText = docEditor.getText()
 
     # Select the Word "est"
-    docEditor.setCursorPosition(645)
+    docEditor.setCursorPosition(663)
     docEditor._makeSelection(QTextCursor.SelectionType.WordUnderCursor)
     cursor = docEditor.textCursor()
     assert cursor.selectedText() == "est"
@@ -2087,11 +2087,11 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     # Find next by enter key
     monkeypatch.setattr(docSearch.searchBox, "hasFocus", lambda: True)
     qtbot.keyClick(docSearch.searchBox, Qt.Key.Key_Return, delay=KEY_DELAY)
-    assert abs(docEditor.getCursorPosition() - 1299) < 3
+    assert abs(docEditor.getCursorPosition() - 1317) < 3
 
     # Find next by button
     qtbot.mouseClick(docSearch.searchButton, QtMouseLeft, delay=KEY_DELAY)
-    assert abs(docEditor.getCursorPosition() - 1513) < 3
+    assert abs(docEditor.getCursorPosition() - 1531) < 3
 
     # Activate loop search
     docSearch.toggleLoop.activate(QAction.ActionEvent.Trigger)
@@ -2100,7 +2100,7 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
 
     # Find next by menu Search > Find Next
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 647) < 3
+    assert abs(docEditor.getCursorPosition() - 665) < 3
 
     # Close search
     docSearch.cancelSearch.activate(QAction.ActionEvent.Trigger)
@@ -2139,13 +2139,13 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     # Set valid RegEx
     docSearch.setSearchText(r"\bSus")
     qtbot.mouseClick(docSearch.searchButton, QtMouseLeft, delay=KEY_DELAY)
-    assert abs(docEditor.getCursorPosition() - 223) < 3
+    assert abs(docEditor.getCursorPosition() - 241) < 3
 
     # Find next and then prev
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 324) < 3
+    assert abs(docEditor.getCursorPosition() - 342) < 3
     nwGUI.mainMenu.aFindPrev.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 223) < 3
+    assert abs(docEditor.getCursorPosition() - 241) < 3
 
     # Make RegEx case sensitive
     docSearch.toggleCase.activate(QAction.ActionEvent.Trigger)
@@ -2154,11 +2154,11 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
 
     # Find next/prev (one result)
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 626) < 3
+    assert abs(docEditor.getCursorPosition() - 644) < 3
     nwGUI.mainMenu.aFindPrev.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 626) < 3
+    assert abs(docEditor.getCursorPosition() - 644) < 3
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 626) < 3
+    assert abs(docEditor.getCursorPosition() - 644) < 3
 
     # Trigger replace
     nwGUI.mainMenu.aReplace.activate(QAction.ActionEvent.Trigger)
@@ -2175,22 +2175,22 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     assert CONFIG.searchMatchCap is True
 
     # Replace "Sus" with "Foo" via menu
-    docEditor.setCursorPosition(605)
+    docEditor.setCursorPosition(623)
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
     nwGUI.mainMenu.aReplaceNext.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[623:634] == "Foopendisse"
+    assert docEditor.getText()[641:652] == "Foopendisse"
 
     # Find next/prev to loop file
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 223) < 3
+    assert abs(docEditor.getCursorPosition() - 241) < 3
     nwGUI.mainMenu.aFindPrev.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 1805) < 3
+    assert abs(docEditor.getCursorPosition() - 1823) < 3
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 223) < 3
+    assert abs(docEditor.getCursorPosition() - 241) < 3
 
     # Replace "sus" with "foo" via replace button
     qtbot.mouseClick(docSearch.replaceButton, QtMouseLeft, delay=KEY_DELAY)
-    assert docEditor.getText()[220:228] == "foocipit"
+    assert docEditor.getText()[238:246] == "foocipit"
 
     # Revert last two replaces
     assert docEditor.docAction(nwDocAction.UNDO)
@@ -2204,7 +2204,7 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
 
     # Close search and select "est" again
     docSearch.cancelSearch.activate(QAction.ActionEvent.Trigger)
-    docEditor.setCursorPosition(645)
+    docEditor.setCursorPosition(663)
     docEditor._makeSelection(QTextCursor.SelectionType.WordUnderCursor)
     cursor = docEditor.textCursor()
     assert cursor.selectedText() == "est"
@@ -2221,9 +2221,9 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
 
     # Only one match
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 647) < 3
+    assert abs(docEditor.getCursorPosition() - 665) < 3
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 647) < 3
+    assert abs(docEditor.getCursorPosition() - 665) < 3
 
     # Enable next doc search
     docSearch.toggleProject.activate(QAction.ActionEvent.Trigger)
@@ -2234,9 +2234,9 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
     assert docEditor.docHandle == "2426c6f0ca922"  # Next document
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 620) < 3
+    assert abs(docEditor.getCursorPosition() - 651) < 3
     nwGUI.mainMenu.aFindNext.activate(QAction.ActionEvent.Trigger)
-    assert abs(docEditor.getCursorPosition() - 1127) < 3
+    assert abs(docEditor.getCursorPosition() - 1157) < 3
 
     # Next doc, no match
     assert CONFIG.searchNextFile is True
diff --git a/tests/test_gui/test_gui_mainmenu.py b/tests/test_gui/test_gui_mainmenu.py
index f63f588a..b13b18a1 100644
--- a/tests/test_gui/test_gui_mainmenu.py
+++ b/tests/test_gui/test_gui_mainmenu.py
@@ -68,154 +68,155 @@ def testGuiMainMenu_EditFormat(qtbot, monkeypatch, nwGUI, prjLipsum):
     assert docEditor.docAction(nwDocAction.COPY) is False
 
     assert nwGUI.openProject(prjLipsum) is True
+    x = 72
 
     # Split By Chapter
     assert nwGUI.openDocument("4c4f28287af27") is True
-    docEditor.setCursorPosition(57)
-    cleanText = docEditor.getText()[54:101]
+    docEditor.setCursorPosition(x+3)
+    cleanText = docEditor.getText()[x:x+47]
 
     # Bold
     mainMenu.aFmtBold.activate(QAction.ActionEvent.Trigger)
     fmtStr = "**Pellentesque** nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:105] == fmtStr
+    assert docEditor.getText()[x:x+51] == fmtStr
     mainMenu.aFmtBold.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Italic
     mainMenu.aFmtItalic.activate(QAction.ActionEvent.Trigger)
     fmtStr = "_Pellentesque_ nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:103] == fmtStr
+    assert docEditor.getText()[x:x+49] == fmtStr
     mainMenu.aFmtItalic.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Strikethrough
     mainMenu.aFmtStrike.activate(QAction.ActionEvent.Trigger)
     fmtStr = "~~Pellentesque~~ nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:105] == fmtStr
+    assert docEditor.getText()[x:x+51] == fmtStr
     mainMenu.aFmtStrike.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Should get us back to plain
     mainMenu.aFmtBold.activate(QAction.ActionEvent.Trigger)
     mainMenu.aFmtItalic.activate(QAction.ActionEvent.Trigger)
     mainMenu.aFmtItalic.activate(QAction.ActionEvent.Trigger)
     mainMenu.aFmtBold.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Double Quotes
     mainMenu.aFmtDQuote.activate(QAction.ActionEvent.Trigger)
     fmtStr = "“Pellentesque” nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:103] == fmtStr
+    assert docEditor.getText()[x:x+49] == fmtStr
     mainMenu.aEditUndo.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Single Quotes
     mainMenu.aFmtSQuote.activate(QAction.ActionEvent.Trigger)
     fmtStr = "‘Pellentesque’ nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:103] == fmtStr
+    assert docEditor.getText()[x:x+49] == fmtStr
     mainMenu.aEditUndo.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Block Formats
     # =============
     # cSpell:ignore Pellentesque erat nulla posuere commodo
-    docEditor.setCursorPosition(57)
+    docEditor.setCursorPosition(x+3)
 
     # Header 1
     mainMenu.aFmtHead1.activate(QAction.ActionEvent.Trigger)
     fmtStr = "# Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:103] == fmtStr
+    assert docEditor.getText()[x:x+49] == fmtStr
 
     # Header 2
     mainMenu.aFmtHead2.activate(QAction.ActionEvent.Trigger)
     fmtStr = "## Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:104] == fmtStr
+    assert docEditor.getText()[x:x+50] == fmtStr
 
     # Header 3
     mainMenu.aFmtHead3.activate(QAction.ActionEvent.Trigger)
     fmtStr = "### Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:105] == fmtStr
+    assert docEditor.getText()[x:x+51] == fmtStr
 
     # Header 4
     mainMenu.aFmtHead4.activate(QAction.ActionEvent.Trigger)
     fmtStr = "#### Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:106] == fmtStr
+    assert docEditor.getText()[x:x+52] == fmtStr
 
     # Title Format
     mainMenu.aFmtTitle.activate(QAction.ActionEvent.Trigger)
     fmtStr = "#! Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:104] == fmtStr
+    assert docEditor.getText()[x:x+50] == fmtStr
 
     # Unnumbered Chapter
     mainMenu.aFmtUnNum.activate(QAction.ActionEvent.Trigger)
     fmtStr = "##! Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:105] == fmtStr
+    assert docEditor.getText()[x:x+51] == fmtStr
 
     # Hard Scene
     mainMenu.aFmtHardSc.activate(QAction.ActionEvent.Trigger)
     fmtStr = "###! Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:106] == fmtStr
+    assert docEditor.getText()[x:x+52] == fmtStr
 
     # Clear Format
     mainMenu.aFmtNoFormat.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Comment On
     mainMenu.aFmtComment.activate(QAction.ActionEvent.Trigger)
     fmtStr = "% Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:103] == fmtStr
+    assert docEditor.getText()[x:x+49] == fmtStr
 
     # Comment Off
     mainMenu.aFmtComment.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Check comment with no space before text
-    docEditor.setCursorPosition(54)
+    docEditor.setCursorPosition(x)
     docEditor.insertText("%")
     fmtStr = "%Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:102] == fmtStr
+    assert docEditor.getText()[x:x+48] == fmtStr
 
     mainMenu.aFmtNoFormat.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Undo/Redo
     mainMenu.aEditUndo.activate(QAction.ActionEvent.Trigger)
     fmtStr = "%Pellentesque nec erat ut nulla posuere commodo."
-    assert docEditor.getText()[54:102] == fmtStr
+    assert docEditor.getText()[x:x+48] == fmtStr
     mainMenu.aEditRedo.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:101] == cleanText
+    assert docEditor.getText()[x:x+47] == cleanText
 
     # Cut, Copy and Paste
-    docEditor.setCursorPosition(54)
+    docEditor.setCursorPosition(x)
     docEditor._makeSelection(QTextCursor.SelectionType.WordUnderCursor)
 
     mainMenu.aEditCut.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:104] == (
+    assert docEditor.getText()[x:x+50] == (
         " nec erat ut nulla posuere commodo. Curabitur nisi"
     )
 
     mainMenu.aEditPaste.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:104] == (
+    assert docEditor.getText()[x:x+50] == (
         "Pellentesque nec erat ut nulla posuere commodo. Cu"
     )
 
-    docEditor.setCursorPosition(54)
+    docEditor.setCursorPosition(x)
     docEditor._makeSelection(QTextCursor.SelectionType.WordUnderCursor)
 
     mainMenu.aEditCopy.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:104] == (
+    assert docEditor.getText()[x:x+50] == (
         "Pellentesque nec erat ut nulla posuere commodo. Cu"
     )
 
-    docEditor.setCursorPosition(54)
+    docEditor.setCursorPosition(x)
     mainMenu.aEditPaste.activate(QAction.ActionEvent.Trigger)
-    assert docEditor.getText()[54:104] == (
+    assert docEditor.getText()[x:x+50] == (
         "PellentesquePellentesque nec erat ut nulla posuere"
     )
     mainMenu.aEditUndo.activate(QAction.ActionEvent.Trigger)
 
     # Select Paragraph/All
-    docEditor.setCursorPosition(57)
+    docEditor.setCursorPosition(x+3)
     mainMenu.aSelectPar.activate(QAction.ActionEvent.Trigger)
     cursor = docEditor.textCursor()
     assert cursor.selectedText() == (
@@ -228,10 +229,10 @@ def testGuiMainMenu_EditFormat(qtbot, monkeypatch, nwGUI, prjLipsum):
         "nunc lacus, imperdiet nec posuere ac, interdum non lectus."
     )
 
-    docEditor.setCursorPosition(57)
+    docEditor.setCursorPosition(x+3)
     mainMenu.aSelectAll.activate(QAction.ActionEvent.Trigger)
     cursor = docEditor.textCursor()
-    assert len(cursor.selectedText()) == 1910
+    assert len(cursor.selectedText()) == 1928
 
     # Clear the Text
     docEditor.clear()

From 8d2551e0b6d1b708136a779be0a596b264ae8fa4 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Thu, 19 Jun 2025 21:35:39 +0200
Subject: [PATCH 6/7] Add notes toggle test coverage

---
 tests/test_gui/test_gui_docviewer.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/test_gui/test_gui_docviewer.py b/tests/test_gui/test_gui_docviewer.py
index 65c31a24..8890df22 100644
--- a/tests/test_gui/test_gui_docviewer.py
+++ b/tests/test_gui/test_gui_docviewer.py
@@ -223,17 +223,23 @@ def testGuiViewer_Main(qtbot, monkeypatch, nwGUI, prjLipsum):
     CONFIG.showFullPath = True
 
     # Document footer show/hide synopsis
-    assert nwGUI.viewDocument("f96ec11c6a3da") is True
+    nwGUI.viewDocument("f96ec11c6a3da")
     assert len(docViewer.toPlainText()) == 4314
     docViewer.docFooter._doToggleSynopsis(False)
     assert len(docViewer.toPlainText()) == 4098
 
     # Document footer show/hide comments
-    assert nwGUI.viewDocument("846352075de7d") is True
+    nwGUI.viewDocument("846352075de7d")
     assert len(docViewer.toPlainText()) == 683
     docViewer.docFooter._doToggleComments(False)
     assert len(docViewer.toPlainText()) == 634
 
+    # Document footer show/hide notes
+    nwGUI.viewDocument("88d59a277361b")
+    assert len(docViewer.toPlainText()) == 900
+    docViewer.docFooter._doToggleNotes(False)
+    assert len(docViewer.toPlainText()) == 871
+
     # Crash the HTML rendering
     with monkeypatch.context() as mp:
         mp.setattr(ToQTextDocument, "doConvert", causeException)

From 32091ffd94fc408af98a577b974901aebc20f573 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Thu, 19 Jun 2025 21:49:33 +0200
Subject: [PATCH 7/7] Add test for story comment tokenizer

---
 tests/test_formats/test_fmt_tokenizer.py | 39 ++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/test_formats/test_fmt_tokenizer.py b/tests/test_formats/test_fmt_tokenizer.py
index 2b589ccc..4f65e44c 100644
--- a/tests/test_formats/test_fmt_tokenizer.py
+++ b/tests/test_formats/test_fmt_tokenizer.py
@@ -807,6 +807,45 @@ def testFmtToken_MetaFormat(mockGUI):
         ], BlockFmt.NONE
     )]
 
+    # Story Comments
+    tokens.setCommentType(nwComment.STORY, False)
+    tokens.setCommentType(nwComment.NOTE, False)
+    tokens._text = (
+        "%Story.Stuff: Stuff happens\n"
+        "%Note.More: That stuff that happened\n"
+        "%Note.Other: That other stuff that happened\n"
+    )
+    tokens.tokenizeText()
+    assert tokens._blocks == []
+
+    tokens.setCommentType(nwComment.STORY, True)
+    tokens.setCommentType(nwComment.NOTE, True)
+    tokens._text = (
+        "%Story.Stuff: Stuff happens\n"
+        "%Note.More: That stuff that happened\n"
+        "%Note.Other: That other stuff that happened\n"
+    )
+    tokens.tokenizeText()
+    assert tokens._blocks == [(
+        BlockTyp.NOTE, "", "Story Structure (Stuff): Stuff happens", [
+            (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"),
+            (24, TextFmt.COL_E, ""), (24, TextFmt.B_E, ""),
+            (25, TextFmt.COL_B, "note"), (38, TextFmt.COL_E, "")
+        ], BlockFmt.Z_BTM
+    ), (
+        BlockTyp.NOTE, "", "Note (More): That stuff that happened", [
+            (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"),
+            (12, TextFmt.COL_E, ""), (12, TextFmt.B_E, ""),
+            (13, TextFmt.COL_B, "note"), (37, TextFmt.COL_E, "")
+        ], BlockFmt.Z_TOP | BlockFmt.Z_BTM
+    ), (
+        BlockTyp.NOTE, "", "Note (Other): That other stuff that happened", [
+            (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"),
+            (13, TextFmt.COL_E, ""), (13, TextFmt.B_E, ""),
+            (14, TextFmt.COL_B, "note"), (44, TextFmt.COL_E, "")
+        ], BlockFmt.Z_TOP
+    )]
+
     # Keyword
     tokens.setKeywords(False)
     tokens._text = "@char: Bod\n"