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

Allow titles in notes as well

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-03-02 00:32:42 +01:00
parent 82349d39b7
commit c6cbe4cc0d
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/tokenizer.py
+4 -12
View File
@@ -570,24 +570,16 @@ class Tokenizer(ABC):
elif aLine[:3] == "#! ": elif aLine[:3] == "#! ":
nHead += 1 nHead += 1
if self._isNovel:
tStyle = self.T_TITLE
else:
tStyle = self.T_HEAD1
self._tokens.append(( self._tokens.append((
tStyle, nHead, aLine[3:].strip(), [], self.A_PBB | self.A_CENTRE self.T_TITLE, nHead, aLine[3:].strip(), [], self.A_PBB | self.A_CENTRE
)) ))
if self._keepMarkdown: if self._keepMarkdown:
tmpMarkdown.append("%s\n" % aLine) tmpMarkdown.append("%s\n" % aLine)
elif aLine[:4] == "##! ": elif aLine[:4] == "##! ":
nHead += 1 nHead += 1
if self._isNovel: # If we're not in a novel section, we just treat this as a regular H2
tStyle = self.T_UNNUM tStyle = self.T_UNNUM if self._isNovel else self.T_HEAD2
else:
tStyle = self.T_HEAD2
self._tokens.append(( self._tokens.append((
tStyle, nHead, aLine[4:].strip(), [], self.A_NONE tStyle, nHead, aLine[4:].strip(), [], self.A_NONE
)) ))
@@ -641,7 +633,7 @@ class Tokenizer(ABC):
# If we have content, turn off the first page flag # If we have content, turn off the first page flag
if self._isFirst and self._tokens: if self._isFirst and self._tokens:
self._isFirst = False # First document has been processed self._isFirst = False # First document has been processed
self._noBreak = True # Checks again after headers are processed self._noBreak = True # Check again after headers are processed
# Make sure the token array doesn't start with a page break # Make sure the token array doesn't start with a page break
# on the very first page, adding a blank first page. # on the very first page, adding a blank first page.
tests/test_core/test_core_tohtml.py
+1 -1
View File
@@ -131,7 +131,7 @@ def testCoreToHtml_ConvertHeaders(mockGUI):
html.doHeaders() html.doHeaders()
html.doConvert() html.doConvert()
assert html.result == ( assert html.result == (
"<h1 style='text-align: center; page-break-before: always;'>" "<h1 class='title' style='text-align: center; page-break-before: always;'>"
"<a name='T0001'></a>Heading One</h1>\n" "<a name='T0001'></a>Heading One</h1>\n"
) )
tests/test_core/test_core_tokenizer.py
+2 -2
View File
@@ -261,7 +261,7 @@ def testCoreToken_HeaderFormat(mockGUI):
tokens.tokenizeText() tokens.tokenizeText()
assert tokens._tokens == [ assert tokens._tokens == [
(Tokenizer.T_HEAD1, 1, "Note Title", [], Tokenizer.A_CENTRE), (Tokenizer.T_TITLE, 1, "Note Title", [], Tokenizer.A_CENTRE),
(Tokenizer.T_EMPTY, 1, "", [], Tokenizer.A_NONE), (Tokenizer.T_EMPTY, 1, "", [], Tokenizer.A_NONE),
] ]
assert tokens.allMarkdown[-1] == "#! Note Title\n\n" assert tokens.allMarkdown[-1] == "#! Note Title\n\n"
@@ -411,7 +411,7 @@ def testCoreToken_HeaderFormat(mockGUI):
tokens.tokenizeText() tokens.tokenizeText()
tokens.doHeaders() tokens.doHeaders()
assert tokens._tokens == [ assert tokens._tokens == [
(Tokenizer.T_HEAD1, 1, "Title", [], Tokenizer.A_PBB | Tokenizer.A_CENTRE), (Tokenizer.T_TITLE, 1, "Title", [], Tokenizer.A_PBB | Tokenizer.A_CENTRE),
(Tokenizer.T_EMPTY, 1, "", [], Tokenizer.A_NONE), (Tokenizer.T_EMPTY, 1, "", [], Tokenizer.A_NONE),
] ]
assert tokens.allMarkdown[-1] == "#! Title\n\n" assert tokens.allMarkdown[-1] == "#! Title\n\n"