Add stats variables to Lipsum test project

tests/lipsum/content/7a992350f3eb6.nwd

@@ -1,12 +1,16 @@
 %%~name: Lorem Ipsum
 %%~path: b3643d0f92e32/7a992350f3eb6
 %%~kind: NOVEL/DOCUMENT
-%%~hash: 8efda028000b70be0d7dbe9647b6026082ef05c9
+%%~hash: 370be3057fb6c0e0b5e4858915a37da18ffc7675
-%%~date: Unknown/Unknown
+%%~date: Unknown/2024-10-28 18:18:37
 #! Lorem Ipsum
 
 >> **By lipsum.com** <<
 
+>> Word Count: [field:allWords] <<
+
+>> Character Count: [field:allChars] <<
+
 >> “Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…” <<
 
 >> “There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…” <<

tests/lipsum/nwProject.nwx

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.6a2" hexVersion="0x020600a2" fileVersion="1.5" fileRevision="4" timeStamp="2024-10-25 19:16:56">
+<novelWriterXML appVersion="2.6a3" hexVersion="0x020600a3" fileVersion="1.5" fileRevision="4" timeStamp="2024-10-28 18:19:29">
-  <project id="5ac0df12-8b8b-476b-9905-21d33685687c" saveCount="48" autoCount="28" editTime="2374">
+  <project id="5ac0df12-8b8b-476b-9905-21d33685687c" saveCount="50" autoCount="29" editTime="2448">
     <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">88d59a277361b</entry>
+      <entry key="editor">7a992350f3eb6</entry>
       <entry key="viewer">None</entry>
       <entry key="novelTree">b3643d0f92e32</entry>
       <entry key="outline">None</entry>
@@ -31,17 +31,17 @@
       <entry key="id6b1d0" count="0" red="50" green="200" blue="0" shape="SQUARE">Main</entry>
     </importance>
   </settings>
-  <content items="21" novelWords="3111" notesWords="738">
+  <content items="21" novelWords="3115" notesWords="738">
     <item handle="b3643d0f92e32" parent="None" root="b3643d0f92e32" order="0" type="ROOT" class="NOVEL">
       <meta expanded="yes" />
       <name status="sbaa94f" import="i613591">Novel</name>
     </item>
     <item handle="7a992350f3eb6" parent="b3643d0f92e32" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H1" charCount="230" wordCount="40" paraCount="3" cursorPos="14" />
+      <meta expanded="no" heading="H1" charCount="259" wordCount="44" paraCount="5" cursorPos="116" />
       <name status="sedd043" import="i613591" active="yes">Lorem Ipsum</name>
     </item>
     <item handle="8c58a65414c23" parent="b3643d0f92e32" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta expanded="no" heading="H0" charCount="1058" wordCount="176" paraCount="2" cursorPos="43" />
+      <meta expanded="no" heading="H0" charCount="1058" wordCount="176" paraCount="2" cursorPos="53" />
       <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">

tests/reference/coreIndex_LoadSave_tagsIndex.json

@@ -7,7 +7,7 @@
   "novelWriter.itemIndex": {
     "7a992350f3eb6": {
       "headings": {
-        "T0001": {"level": "H1", "title": "Lorem Ipsum", "line": 1, "tag": "", "cCount": 230, "wCount": 40, "pCount": 3, "synopsis": ""}
+        "T0001": {"level": "H1", "title": "Lorem Ipsum", "line": 1, "tag": "", "cCount": 259, "wCount": 44, "pCount": 5, "synopsis": ""}
       }
     },
     "8c58a65414c23": {

tests/reference/fmtToDocX_SaveDocument_app.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
 <ns0:Properties xmlns:ns0="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties">
-  <ns0:TotalTime>39</ns0:TotalTime>
+  <ns0:TotalTime>40</ns0:TotalTime>
-  <ns0:Application>novelWriter/2.6a2</ns0:Application>
+  <ns0:Application>novelWriter/2.6a3</ns0:Application>
-  <ns0:Words>4031</ns0:Words>
+  <ns0:Words>4035</ns0:Words>
-  <ns0:Characters>21271</ns0:Characters>
+  <ns0:Characters>21296</ns0:Characters>
-  <ns0:CharactersWithSpaces>24935</ns0:CharactersWithSpaces>
+  <ns0:CharactersWithSpaces>24964</ns0:CharactersWithSpaces>
-  <ns0:Paragraphs>43</ns0:Paragraphs>
+  <ns0:Paragraphs>45</ns0:Paragraphs>
 </ns0:Properties>

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">2024-10-26T17:01:14</dcterms:created>
+  <dcterms:created xsi:type="dcterms:W3CDTF">2024-10-28T18:23:43</dcterms:created>
-  <dcterms:modified xsi:type="dcterms:W3CDTF">2024-10-26T17:01:14</dcterms:modified>
+  <dcterms:modified xsi:type="dcterms:W3CDTF">2024-10-28T18:23:43</dcterms:modified>
   <dc:creator>lipsum.com</dc:creator>
   <dc:title>Lorem Ipsum</dc:title>
   <dc:language>en-GB</dc:language>
-  <cp:revision>48</cp:revision>
+  <cp:revision>50</cp:revision>
   <cp:lastModifiedBy>lipsum.com</cp:lastModifiedBy>
 </cp:coreProperties>

tests/reference/fmtToDocX_SaveDocument_document.xml

@@ -23,6 +23,32 @@
         <w:t>By lipsum.com</w:t>
       </w:r>
     </w:p>
+    <w:p>
+      <w:pPr>
+        <w:pStyle w:val="Normal" />
+        <w:jc w:val="center" />
+      </w:pPr>
+      <w:r>
+        <w:rPr />
+        <w:t xml:space="preserve">Word Count: </w:t>
+      </w:r>
+      <w:r>
+        <w:t>4,035</w:t>
+      </w:r>
+    </w:p>
+    <w:p>
+      <w:pPr>
+        <w:pStyle w:val="Normal" />
+        <w:jc w:val="center" />
+      </w:pPr>
+      <w:r>
+        <w:rPr />
+        <w:t xml:space="preserve">Character Count: </w:t>
+      </w:r>
+      <w:r>
+        <w:t>27,064</w:t>
+      </w:r>
+    </w:p>
     <w:p>
       <w:pPr>
         <w:pStyle w:val="Normal" />

tests/reference/fmtToDocX_SaveDocument_settings.xml

@@ -8,15 +8,15 @@
   </w:compat>
   <w:docVars>
     <w:docVar w:name="ManuscriptTitleCount" w:val="11" />
-    <w:docVar w:name="ManuscriptParagraphCount" w:val="43" />
+    <w:docVar w:name="ManuscriptParagraphCount" w:val="45" />
-    <w:docVar w:name="ManuscriptAllWords" w:val="4031" />
+    <w:docVar w:name="ManuscriptAllWords" w:val="4035" />
-    <w:docVar w:name="ManuscriptTextWords" w:val="3707" />
+    <w:docVar w:name="ManuscriptTextWords" w:val="3711" />
     <w:docVar w:name="ManuscriptTitleWords" w:val="21" />
-    <w:docVar w:name="ManuscriptAllChars" w:val="27035" />
+    <w:docVar w:name="ManuscriptAllChars" w:val="27064" />
-    <w:docVar w:name="ManuscriptTextChars" w:val="24935" />
+    <w:docVar w:name="ManuscriptTextChars" w:val="24964" />
     <w:docVar w:name="ManuscriptTitleChars" w:val="123" />
-    <w:docVar w:name="ManuscriptAllWordChars" w:val="23095" />
+    <w:docVar w:name="ManuscriptAllWordChars" w:val="23120" />
-    <w:docVar w:name="ManuscriptTextWordChars" w:val="21271" />
+    <w:docVar w:name="ManuscriptTextWordChars" w:val="21296" />
     <w:docVar w:name="ManuscriptTitleWordChars" w:val="113" />
   </w:docVars>
 </w:settings>

tests/reference/guiOutline_Content_outline.csv

@@ -1,5 +1,5 @@
 "Title","Document","Words","Pars","POV","Characters","Plot","Locations","Synopsis"
-"Lorem Ipsum","Lorem Ipsum","40","3","","","","",""
+"Lorem Ipsum","Lorem Ipsum","44","5","","","","",""
 "Prologue","Prologue","94","2","","","","","Explanation from the lipsum.com website."
 "Act One","Act One","6","1","","","","",""
 "Chapter One","Chapter One","67","1","Bod","","Main","Europe","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque at aliquam quam."

tests/reference/mBuildDocBuild_Extended_Markdown_Lorem_Ipsum.md

@@ -2,6 +2,10 @@
 
 **By lipsum.com**
 
+Word Count: 4,169
+
+Character Count: 27,898
+
 “Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”
 
 “There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…”

tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.htm

@@ -21,6 +21,8 @@ h4 {margin-top: 1.53em; margin-bottom: 0.65em;}
 <article>
 <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;'>“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>

tests/reference/mBuildDocBuild_HTML5_Lorem_Ipsum.json

@@ -2,8 +2,8 @@
   "meta": {
     "projectName": "Lorem Ipsum",
     "novelAuthor": "lipsum.com",
-    "buildTime": 1729877010,
+    "buildTime": 1730136403,
-    "buildTimeStr": "2024-10-25 19:23:30"
+    "buildTimeStr": "2024-10-28 18:26:43"
   },
   "text": {
     "css": [
@@ -23,6 +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;'>\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>"
       ],

tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.json

@@ -2,8 +2,8 @@
   "meta": {
     "projectName": "Lorem Ipsum",
     "novelAuthor": "lipsum.com",
-    "buildTime": 1729877010,
+    "buildTime": 1730136328,
-    "buildTimeStr": "2024-10-25 19:23:30"
+    "buildTimeStr": "2024-10-28 18:25:28"
   },
   "text": {
     "nwd": [
@@ -12,6 +12,10 @@
         "",
         ">> **By lipsum.com** <<",
         "",
+        ">> Word Count: [field:allWords] <<",
+        "",
+        ">> Character Count: [field:allChars] <<",
+        "",
         ">> \u201cNeque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit\u2026\u201d <<",
         "",
         ">> \u201cThere is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain\u2026\u201d <<"

tests/reference/mBuildDocBuild_NWD_Lorem_Ipsum.txt

@@ -2,6 +2,10 @@
 
 >> **By lipsum.com** <<
 
+>> Word Count: [field:allWords] <<
+
+>> Character Count: [field:allChars] <<
+
 >> “Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…” <<
 
 >> “There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…” <<

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: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>2024-10-25T19:19:43</meta:creation-date>
+    <meta:creation-date>2024-10-28T18:27:00</meta:creation-date>
-    <meta:generator>novelWriter/2.6a2</meta:generator>
+    <meta:generator>novelWriter/2.6a3</meta:generator>
     <meta:initial-creator>lipsum.com</meta:initial-creator>
-    <meta:editing-cycles>48</meta:editing-cycles>
+    <meta:editing-cycles>50</meta:editing-cycles>
-    <meta:editing-duration>P0DT0H39M34S</meta:editing-duration>
+    <meta:editing-duration>P0DT0H40M48S</meta:editing-duration>
     <dc:title>Lorem Ipsum</dc:title>
-    <dc:date>2024-10-25T19:19:43</dc:date>
+    <dc:date>2024-10-28T18:27:00</dc:date>
     <dc:creator>lipsum.com</dc:creator>
   </office:meta>
   <office:font-face-decls>
@@ -151,19 +151,21 @@
     <office:text>
       <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="46" text:name="ManuscriptParagraphCount" />
+        <text:user-field-decl office:value-type="float" office:value="48" text:name="ManuscriptParagraphCount" />
-        <text:user-field-decl office:value-type="float" office:value="4165" text:name="ManuscriptAllWords" />
+        <text:user-field-decl office:value-type="float" office:value="4169" text:name="ManuscriptAllWords" />
-        <text:user-field-decl office:value-type="float" office:value="3811" text:name="ManuscriptTextWords" />
+        <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="27869" text:name="ManuscriptAllChars" />
+        <text:user-field-decl office:value-type="float" office:value="27898" text:name="ManuscriptAllChars" />
-        <text:user-field-decl office:value-type="float" office:value="25549" text:name="ManuscriptTextChars" />
+        <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="23801" text:name="ManuscriptAllWordChars" />
+        <text:user-field-decl office:value-type="float" office:value="23826" text:name="ManuscriptAllWordChars" />
-        <text:user-field-decl office:value-type="float" office:value="21781" text:name="ManuscriptTextWordChars" />
+        <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>
       <text:p text:style-name="Title">Lorem Ipsum</text:p>
       <text:p text:style-name="P1"><text:span text:style-name="T1">By lipsum.com</text:span></text:p>
+      <text:p text:style-name="P1">Word Count: <text:user-field-get text:name="ManuscriptAllWords">0</text:user-field-get></text:p>
+      <text:p text:style-name="P1">Character Count: <text:user-field-get text:name="ManuscriptAllChars">0</text:user-field-get></text:p>
       <text:p text:style-name="P1">“Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”</text:p>
       <text:p text:style-name="P1">“There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…”</text:p>
       <text:p text:style-name="P2"><text:span text:style-name="T2">Comment:</text:span> <text:span text:style-name="T3">Exctracted from the lipsum.com website.</text:span></text:p>

tests/reference/mBuildDocBuild_Standard_Markdown_Lorem_Ipsum.md

@@ -2,6 +2,10 @@
 
 **By lipsum.com**
 
+Word Count: 4,169
+
+Character Count: 27,898
+
 “Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit…”
 
 “There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain…”

tests/test_gui/test_gui_doceditor.py

@@ -2167,15 +2167,15 @@ def testGuiEditor_Search(qtbot, monkeypatch, nwGUI, prjLipsum):
     docEditor._lastFind = None
     docEditor.replaceNext()
     assert docEditor.textCursor().selectedText() == "a"
-    assert docEditor.getCursorPosition() == 92
+    assert docEditor.getCursorPosition() == 83
 
     # Iterate through the rest
-    finds = [104, 123, 175, 197, 206, 211, 220, 238, 250, 250]
+    finds = [85, 105, 110, 141, 169, 181, 200, 252, 274, 283, 288, 297]
-    for i in range(10):
+    for i in range(len(finds)):
         docEditor.replaceNext()
         assert docEditor.textCursor().selectedText() == "a"
         assert docEditor.getCursorPosition() == finds[i]
-    assert docEditor._lastFind == (249, 250)
+    assert docEditor._lastFind == (296, 297)
 
     # Search for something that doesn't exist
     docSearch.searchBox.setText("x")

tests/test_gui/test_gui_outline.py

@@ -241,9 +241,9 @@ def testGuiOutline_Content(qtbot, monkeypatch, nwGUI, prjLipsum, fncPath, tstPat
     assert outlineData.fileValue.text() == "Lorem Ipsum"
     assert outlineData.itemValue.text() == "Finished"
 
-    assert outlineData.cCValue.text() == "230"
+    assert outlineData.cCValue.text() == "259"
-    assert outlineData.wCValue.text() == "40"
+    assert outlineData.wCValue.text() == "44"
-    assert outlineData.pCValue.text() == "3"
+    assert outlineData.pCValue.text() == "5"
 
     # Scene One
     selItem = outlineTree.topLevelItem(4)

tests/test_tools/test_tools_noveldetails.py

@@ -60,15 +60,15 @@ def testToolNovelDetails_Main(qtbot, nwGUI, prjLipsum, ipsumText):
 
     # Check project data
     assert overview.projName.text() == "Lorem Ipsum"
-    assert overview.projWords.text() == f"{4378:n}"
+    assert overview.projWords.text() == f"{4382:n}"
-    assert overview.projNovels.text() == f"{3640:n}"
+    assert overview.projNovels.text() == f"{3644:n}"
     assert overview.projNotes.text() == f"{738:n}"
     assert overview.projRevisions.text() != ""
     assert overview.projEditTime.text() != ""
 
     # Check novel data for "Novel"
     assert overview.novelName.text() == "Novel"
-    assert overview.novelWords.text() == f"{3002:n}"
+    assert overview.novelWords.text() == f"{3006:n}"
     assert overview.novelChapters.text() == f"{3:n}"
     assert overview.novelScenes.text() == f"{5:n}"
 
@@ -87,7 +87,7 @@ def testToolNovelDetails_Main(qtbot, nwGUI, prjLipsum, ipsumText):
     contents = details.contentsPage
 
     # Check defaults
-    words = [f"{v:n}" for v in [40, 176, 94, 6, 1071, 1615, 0]]
+    words = [f"{v:n}" for v in [44, 176, 94, 6, 1071, 1615, 0]]
     pages = [f"{v:n}" for v in [2, 2, 2, 2, 4, 6, 0]]
     page = [f"{v:n}" for v in [1, 3, 5, 7, 9, 13, 19]]
     for i in range(6):
@@ -100,7 +100,7 @@ def testToolNovelDetails_Main(qtbot, nwGUI, prjLipsum, ipsumText):
     # Change Settings
     contents.poValue.setValue(7)
     contents.wpValue.setValue(50)
-    words = [f"{v:n}" for v in [40, 176, 94, 6, 1071, 1615, 0]]
+    words = [f"{v:n}" for v in [44, 176, 94, 6, 1071, 1615, 0]]
     pages = [f"{v:n}" for v in [2, 4, 2, 2, 22, 34, 0]]
     page = ["i", "iii"] + [f"{v:n}" for v in [1, 3, 5, 27, 61]]
     for i in range(6):
@@ -114,7 +114,7 @@ def testToolNovelDetails_Main(qtbot, nwGUI, prjLipsum, ipsumText):
     contents.dblValue.setChecked(False)
     contents.poValue.setValue(0)
     contents.wpValue.setValue(100)
-    words = [f"{v:n}" for v in [40, 176, 94, 6, 1071, 1615, 0]]
+    words = [f"{v:n}" for v in [44, 176, 94, 6, 1071, 1615, 0]]
     pages = [f"{v:n}" for v in [1, 2, 1, 1, 11, 17, 0]]
     page = [f"{v:n}" for v in [1, 2, 4, 5, 6, 17, 34]]
     for i in range(6):