Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix chapter numbering in refactored tokenizer and add test coverage

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-03-13 11:08:49 +01:00
parent 44a0d21b35
commit c7e953fc24
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/tokenizer.py
+21 -23
View File
@@ -573,20 +573,19 @@ class Tokenizer(ABC):
# Partition headings are only formatted in novel documents, and # Partition headings are only formatted in novel documents, and
# otherwise unchanged. Scene separators are disabled # otherwise unchanged. Scene separators are disabled
# immediately after partitions, and scene numbers are reset. # immediately after partitions, and scene numbers are reset.
isPart = aLine.startswith("# ") isPlain = aLine.startswith("# ")
nHead += 1 nHead += 1
nSkip = 2 if isPart else 3 tText = aLine[2:].strip()
tText = aLine[nSkip:].strip() tType = self.T_HEAD1 if isPlain else self.T_TITLE
tType = self.T_HEAD1 if isPart else self.T_TITLE tStyle = self.A_NONE if isPlain else (self.A_PBB | self.A_CENTRE)
tStyle = self.A_NONE if isPart else (self.A_PBB | self.A_CENTRE) if self._isNovel:
if self._isNovel and isPart: if isPlain:
tText = self._hFormatter.apply(self._fmtTitle, tText, nHead) tText = self._hFormatter.apply(self._fmtTitle, tText, nHead)
tStyle = self._titleStyle tStyle = self._titleStyle
self._hFormatter.resetScene() self._hFormatter.resetScene()
self._noSep = True else:
elif self._isNovel and not isPart: self._hFormatter.resetAll()
self._hFormatter.resetAll()
self._noSep = True self._noSep = True
self._tokens.append(( self._tokens.append((
@@ -604,18 +603,18 @@ class Tokenizer(ABC):
# immediately after chapter headings, and scene numbers are # immediately after chapter headings, and scene numbers are
# reset. Unnumbered chapters are only meaningful in Novel docs, # reset. Unnumbered chapters are only meaningful in Novel docs,
# so if we're in a note, we keep them as level 2 headings. # so if we're in a note, we keep them as level 2 headings.
isUnNum = aLine.startswith("##! ") isPlain = aLine.startswith("## ")
nHead += 1 nHead += 1
nSkip = 4 if isUnNum else 3 tText = aLine[3:].strip()
tText = aLine[nSkip:].strip()
tType = self.T_HEAD2 tType = self.T_HEAD2
tStyle = self.A_NONE tStyle = self.A_NONE
tFormat = self._fmtUnNum if isUnNum else self._fmtChapter tFormat = self._fmtChapter if isPlain else self._fmtUnNum
if self._isNovel: if self._isNovel:
self._hFormatter.incChapter() if isPlain:
self._hFormatter.incChapter()
tText = self._hFormatter.apply(tFormat, tText, nHead) tText = self._hFormatter.apply(tFormat, tText, nHead)
tType = self.T_UNNUM if isUnNum else tType tType = self.T_HEAD2 if isPlain else self.T_UNNUM
tStyle = self._chapterStyle tStyle = self._chapterStyle
self._noSep = True self._noSep = True
self._hFormatter.resetScene() self._hFormatter.resetScene()
@@ -637,15 +636,14 @@ class Tokenizer(ABC):
# separators immediately after other titles. Scene numbers are # separators immediately after other titles. Scene numbers are
# always incremented before formatting. For notes, the heading # always incremented before formatting. For notes, the heading
# is unchanged. # is unchanged.
isHard = aLine.startswith("###! ") isPlain = aLine.startswith("### ")
nHead += 1 nHead += 1
nSkip = 5 if isHard else 4 tText = aLine[4:].strip()
tText = aLine[nSkip:].strip()
tType = self.T_HEAD3 tType = self.T_HEAD3
tStyle = self.A_NONE tStyle = self.A_NONE
sHide = self._hideHScene if isHard else self._hideScene sHide = self._hideScene if isPlain else self._hideHScene
tFormat = self._fmtHScene if isHard else self._fmtScene tFormat = self._fmtScene if isPlain else self._fmtHScene
if self._isNovel: if self._isNovel:
self._hFormatter.incScene() self._hFormatter.incScene()
tText = self._hFormatter.apply(tFormat, tText, nHead) tText = self._hFormatter.apply(tFormat, tText, nHead)
tests/test_core/test_core_tokenizer.py
+9
View File
@@ -1843,9 +1843,12 @@ def testCoreToken_HeaderCounterAndVisibility(mockGUI):
# Counter Handling, Novel Titles # Counter Handling, Novel Titles
# ============================== # ==============================
# This also checks that only numbered chapters bump the counter
md._text = ( md._text = (
"#! Novel One\n\n" "#! Novel One\n\n"
"##! Prologue\n\n"
"Text\n\n"
"## Chapter One\n\n" "## Chapter One\n\n"
"### Scene One\n\n" "### Scene One\n\n"
"Text\n\n" "Text\n\n"
@@ -1857,6 +1860,8 @@ def testCoreToken_HeaderCounterAndVisibility(mockGUI):
"###! Scene Four\n\n" "###! Scene Four\n\n"
"Text\n\n" "Text\n\n"
"#! Novel Two\n\n" "#! Novel Two\n\n"
"##! Prologue\n\n"
"Text\n\n"
"## Chapter One\n\n" "## Chapter One\n\n"
"### Scene One\n\n" "### Scene One\n\n"
"Text\n\n" "Text\n\n"
@@ -1883,6 +1888,8 @@ def testCoreToken_HeaderCounterAndVisibility(mockGUI):
md.doConvert() md.doConvert()
assert md.result == ( assert md.result == (
"# Novel One\n\n" "# Novel One\n\n"
"## Prologue\n\n"
"Text\n\n"
"## C 1: Chapter One\n\n" "## C 1: Chapter One\n\n"
"### S 1.1 (1): Scene One\n\n" "### S 1.1 (1): Scene One\n\n"
"Text\n\n" "Text\n\n"
@@ -1894,6 +1901,8 @@ def testCoreToken_HeaderCounterAndVisibility(mockGUI):
"### H 2.2 (4): Scene Four\n\n" "### H 2.2 (4): Scene Four\n\n"
"Text\n\n" "Text\n\n"
"# Novel Two\n\n" "# Novel Two\n\n"
"## Prologue\n\n"
"Text\n\n"
"## C 1: Chapter One\n\n" "## C 1: Chapter One\n\n"
"### S 1.1 (1): Scene One\n\n" "### S 1.1 (1): Scene One\n\n"
"Text\n\n" "Text\n\n"