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

Add formatted comments for ODT

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-04-15 18:49:49 +02:00
parent c65dee1df9
commit 0729dd798b
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/toodt.py
+22 -18
View File
@@ -444,11 +444,11 @@ class ToOdt(Tokenizer):
if len(pText) > 0 and pStyle is not None: if len(pText) > 0 and pStyle is not None:
tTxt = "" tTxt = ""
tFmt: list[tuple[int, int]] = [] tFmt: T_Formats = []
for nText, nFmt in zip(pText, pFmt): for nText, nFmt in zip(pText, pFmt):
tLen = len(tTxt) tLen = len(tTxt)
tTxt += f"{nText}\n" tTxt += f"{nText}\n"
tFmt.extend((p+tLen, fmt) for p, fmt, _ in nFmt) tFmt.extend((p+tLen, fmt, key) for p, fmt, key in nFmt)
# Don't indent a paragraph if it has alignment set # Don't indent a paragraph if it has alignment set
tIndent = self._firstIndent and pIndent and pStyle.isUnaligned() tIndent = self._firstIndent and pIndent and pStyle.isUnaligned()
@@ -495,20 +495,20 @@ class ToOdt(Tokenizer):
pFmt.append(tFormat) pFmt.append(tFormat)
elif tType == self.T_SYNOPSIS and self._doSynopsis: elif tType == self.T_SYNOPSIS and self._doSynopsis:
tTemp, fTemp = self._formatSynopsis(tText, True) tTemp, tFmt = self._formatSynopsis(tText, tFormat, True)
self._addTextPar("Text_20_Meta", oStyle, tTemp, tFmt=fTemp) self._addTextPar("Text_20_Meta", oStyle, tTemp, tFmt=tFmt)
elif tType == self.T_SHORT and self._doSynopsis: elif tType == self.T_SHORT and self._doSynopsis:
tTemp, fTemp = self._formatSynopsis(tText, False) tTemp, tFmt = self._formatSynopsis(tText, tFormat, False)
self._addTextPar("Text_20_Meta", oStyle, tTemp, tFmt=fTemp) self._addTextPar("Text_20_Meta", oStyle, tTemp, tFmt=tFmt)
elif tType == self.T_COMMENT and self._doComments: elif tType == self.T_COMMENT and self._doComments:
tTemp, fTemp = self._formatComments(tText) tTemp, tFmt = self._formatComments(tText, tFormat)
self._addTextPar("Text_20_Meta", oStyle, tTemp, tFmt=fTemp) self._addTextPar("Text_20_Meta", oStyle, tTemp, tFmt=tFmt)
elif tType == self.T_KEYWORD and self._doKeywords: elif tType == self.T_KEYWORD and self._doKeywords:
tTemp, fTemp = self._formatKeywords(tText) tTemp, tFmt = self._formatKeywords(tText)
self._addTextPar("Text_20_Meta", oStyle, tTemp, tFmt=fTemp) self._addTextPar("Text_20_Meta", oStyle, tTemp, tFmt=tFmt)
return return
@@ -569,28 +569,32 @@ class ToOdt(Tokenizer):
# Internal Functions # Internal Functions
## ##
def _formatSynopsis(self, text: str, synopsis: bool) -> tuple[str, list[tuple[int, int]]]: def _formatSynopsis(self, text: str, fmt: T_Formats, synopsis: bool) -> tuple[str, T_Formats]:
"""Apply formatting to synopsis lines.""" """Apply formatting to synopsis lines."""
name = self._localLookup("Synopsis" if synopsis else "Short Description") name = self._localLookup("Synopsis" if synopsis else "Short Description")
shift = len(name) + 2
rTxt = f"{name}: {text}" rTxt = f"{name}: {text}"
rFmt = [(0, self.FMT_B_B), (len(name) + 1, self.FMT_B_E)] rFmt: T_Formats = [(0, self.FMT_B_B, ""), (len(name) + 1, self.FMT_B_E, "")]
rFmt.extend((p + shift, f, d) for p, f, d in fmt)
return rTxt, rFmt return rTxt, rFmt
def _formatComments(self, text: str) -> tuple[str, list[tuple[int, int]]]: def _formatComments(self, text: str, fmt: T_Formats) -> tuple[str, T_Formats]:
"""Apply formatting to comments.""" """Apply formatting to comments."""
name = self._localLookup("Comment") name = self._localLookup("Comment")
shift = len(name) + 2
rTxt = f"{name}: {text}" rTxt = f"{name}: {text}"
rFmt = [(0, self.FMT_B_B), (len(name) + 1, self.FMT_B_E)] rFmt: T_Formats = [(0, self.FMT_B_B, ""), (len(name) + 1, self.FMT_B_E, "")]
rFmt.extend((p + shift, f, d) for p, f, d in fmt)
return rTxt, rFmt return rTxt, rFmt
def _formatKeywords(self, text: str) -> tuple[str, list[tuple[int, int]]]: def _formatKeywords(self, text: str) -> tuple[str, T_Formats]:
"""Apply formatting to keywords.""" """Apply formatting to keywords."""
valid, bits, _ = self._project.index.scanThis("@"+text) valid, bits, _ = self._project.index.scanThis("@"+text)
if not valid or not bits or bits[0] not in nwLabels.KEY_NAME: if not valid or not bits or bits[0] not in nwLabels.KEY_NAME:
return "", [] return "", []
rTxt = f"{self._localLookup(nwLabels.KEY_NAME[bits[0]])}: " rTxt = f"{self._localLookup(nwLabels.KEY_NAME[bits[0]])}: "
rFmt = [(0, self.FMT_B_B), (len(rTxt) - 1, self.FMT_B_E)] rFmt: T_Formats = [(0, self.FMT_B_B, ""), (len(rTxt) - 1, self.FMT_B_E, "")]
if len(bits) > 1: if len(bits) > 1:
if bits[0] == nwKeyWords.TAG_KEY: if bits[0] == nwKeyWords.TAG_KEY:
rTxt += bits[1] rTxt += bits[1]
@@ -601,7 +605,7 @@ class ToOdt(Tokenizer):
def _addTextPar( def _addTextPar(
self, styleName: str, oStyle: ODTParagraphStyle, tText: str, self, styleName: str, oStyle: ODTParagraphStyle, tText: str,
tFmt: Sequence[tuple[int, int]] = [], isHead: bool = False, oLevel: str | None = None tFmt: Sequence[tuple[int, int, str]] = [], isHead: bool = False, oLevel: str | None = None
) -> None: ) -> None:
"""Add a text paragraph to the text XML element.""" """Add a text paragraph to the text XML element."""
tAttr = {_mkTag("text", "style-name"): self._paraStyle(styleName, oStyle)} tAttr = {_mkTag("text", "style-name"): self._paraStyle(styleName, oStyle)}
@@ -627,7 +631,7 @@ class ToOdt(Tokenizer):
xFmt = 0x00 xFmt = 0x00
tFrag = "" tFrag = ""
fLast = 0 fLast = 0
for fPos, fFmt in tFmt: for fPos, fFmt, _ in tFmt:
# Add the text up to the current fragment # Add the text up to the current fragment
if tFrag := tText[fLast:fPos]: if tFrag := tText[fLast:fPos]: