From c537d0f3962acf90cb159f23bb8dc361d6f09243 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:37:00 +0200 Subject: [PATCH] Process comments in the Tokenizer --- novelwriter/assets/i18n/project_en_GB.json | 2 +- novelwriter/formats/shared.py | 40 +++---- novelwriter/formats/todocx.py | 72 +++++------- novelwriter/formats/tohtml.py | 22 +--- novelwriter/formats/tokenizer.py | 102 ++++++++++------- novelwriter/formats/tomarkdown.py | 13 +-- novelwriter/formats/toodt.py | 99 ++++++++--------- novelwriter/formats/toqdoc.py | 39 +++---- .../fmtToDocX_SaveDocument_document.xml | 81 ++++++++++++-- .../fmtToDocX_SaveDocument_styles.xml | 1 - .../reference/fmtToOdt_SaveFlat_document.fodt | 6 +- tests/reference/fmtToOdt_SaveFull_styles.xml | 2 +- ...uildDocBuild_OpenDocument_Lorem_Ipsum.fodt | 42 ++++--- tests/test_formats/test_fmt_todocx.py | 24 ++-- tests/test_formats/test_fmt_tohtml.py | 13 --- tests/test_formats/test_fmt_tokenizer.py | 103 +++++++++++++----- tests/test_formats/test_fmt_toodt.py | 65 +++++------ 17 files changed, 392 insertions(+), 334 deletions(-) diff --git a/novelwriter/assets/i18n/project_en_GB.json b/novelwriter/assets/i18n/project_en_GB.json index 39d52e6e..fe4be646 100644 --- a/novelwriter/assets/i18n/project_en_GB.json +++ b/novelwriter/assets/i18n/project_en_GB.json @@ -3,7 +3,7 @@ "Short Description": "Short Description", "Footnotes": "Footnotes", "Comment": "Comment", - "Notes": "Notes", + "Note": "Note", "Tag": "Tag", "Point of View": "Point of View", "Focus": "Focus", diff --git a/novelwriter/formats/shared.py b/novelwriter/formats/shared.py index 0c8fb701..70701e6f 100644 --- a/novelwriter/formats/shared.py +++ b/novelwriter/formats/shared.py @@ -84,12 +84,14 @@ class TextFmt(IntEnum): SUP_E = 12 # End superscript SUB_B = 13 # Begin subscript SUB_E = 14 # End subscript - DL_B = 15 # Begin dialogue - DL_E = 16 # End dialogue - ADL_B = 17 # Begin alt dialogue - ADL_E = 18 # End alt dialogue - FNOTE = 19 # Footnote marker - STRIP = 20 # Strip the format code + COL_B = 15 # Begin colour + COL_E = 16 # End colour + DL_B = 17 # Begin dialogue + DL_E = 18 # End dialogue + ADL_B = 19 # Begin alt dialogue + ADL_E = 20 # End alt dialogue + FNOTE = 21 # Footnote marker + STRIP = 22 # Strip the format code class BlockTyp(IntEnum): @@ -98,19 +100,19 @@ class BlockTyp(IntEnum): An enum indicating the type of a text block. """ - EMPTY = 1 # Empty line (new paragraph) - SYNOPSIS = 2 # Synopsis comment - SHORT = 3 # Short description comment - COMMENT = 4 # Comment line - KEYWORD = 5 # Command line - TITLE = 6 # Title - HEAD1 = 7 # Heading 1 - HEAD2 = 8 # Heading 2 - HEAD3 = 9 # Heading 3 - HEAD4 = 10 # Heading 4 - TEXT = 11 # Text line - SEP = 12 # Scene separator - SKIP = 13 # Paragraph break + EMPTY = 1 # Empty line (new paragraph) + TITLE = 2 # Title + HEAD1 = 3 # Heading 1 + HEAD2 = 4 # Heading 2 + HEAD3 = 5 # Heading 3 + HEAD4 = 6 # Heading 4 + TEXT = 7 # Text line + SEP = 8 # Scene separator + SKIP = 9 # Paragraph break + SUMMARY = 10 # Synopsis/short comment + NOTE = 11 # Note + COMMENT = 12 # Comment + KEYWORD = 13 # Tag/reference keywords class BlockFmt(Flag): diff --git a/novelwriter/formats/todocx.py b/novelwriter/formats/todocx.py index e5b4c0a6..b4af3dac 100644 --- a/novelwriter/formats/todocx.py +++ b/novelwriter/formats/todocx.py @@ -95,8 +95,9 @@ X_UND = 0x008 # Underline format X_MRK = 0x010 # Marked format X_SUP = 0x020 # Superscript X_SUB = 0x040 # Subscript -X_DLG = 0x080 # Dialogue -X_DLA = 0x100 # Alt. Dialogue +X_COL = 0x080 # Coloured text +X_DLG = 0x100 # Dialogue +X_DLA = 0x200 # Alt. Dialogue # Formatting Masks M_BLD = ~X_BLD @@ -106,6 +107,7 @@ M_UND = ~X_UND M_MRK = ~X_MRK M_SUP = ~X_SUP M_SUB = ~X_SUB +M_COL = ~X_COL M_DLG = ~X_DLG M_DLA = ~X_DLA @@ -214,6 +216,7 @@ class ToDocX(Tokenizer): def initDocument(self) -> None: """Initialises the DocX document structure.""" + super().initDocument() self._fontFamily = self._textFont.family() self._fontSize = self._textFont.pointSizeF() self._generateStyles() @@ -289,17 +292,8 @@ class ToDocX(Tokenizer): elif tType == BlockTyp.SKIP: self._processFragments(par, S_NORM, "") - elif tType == BlockTyp.SYNOPSIS and self._doSynopsis: - tTemp, tFmt = self._formatSynopsis(tText, tFormat, True) - self._processFragments(par, S_META, tTemp, tFmt) - - elif tType == BlockTyp.SHORT and self._doSynopsis: - tTemp, tFmt = self._formatSynopsis(tText, tFormat, False) - self._processFragments(par, S_META, tTemp, tFmt) - - elif tType == BlockTyp.COMMENT and self._doComments: - tTemp, tFmt = self._formatComments(tText, tFormat) - self._processFragments(par, S_META, tTemp, tFmt) + elif tType in self.L_NOTES: + self._processFragments(par, S_META, tText, tFormat) elif tType == BlockTyp.KEYWORD and self._doKeywords: tTemp, tFmt = self._formatKeywords(tText) @@ -379,24 +373,6 @@ class ToDocX(Tokenizer): # Internal Functions ## - def _formatSynopsis(self, text: str, fmt: T_Formats, synopsis: bool) -> tuple[str, T_Formats]: - """Apply formatting to synopsis lines.""" - name = self._localLookup("Synopsis" if synopsis else "Short Description") - shift = len(name) + 2 - rTxt = f"{name}: {text}" - rFmt: T_Formats = [(0, TextFmt.B_B, ""), (len(name) + 1, TextFmt.B_E, "")] - rFmt.extend((p + shift, f, d) for p, f, d in fmt) - return rTxt, rFmt - - def _formatComments(self, text: str, fmt: T_Formats) -> tuple[str, T_Formats]: - """Apply formatting to comments.""" - name = self._localLookup("Comment") - shift = len(name) + 2 - rTxt = f"{name}: {text}" - rFmt: T_Formats = [(0, TextFmt.B_B, ""), (len(name) + 1, TextFmt.B_E, "")] - rFmt.extend((p + shift, f, d) for p, f, d in fmt) - return rTxt, rFmt - def _formatKeywords(self, text: str) -> tuple[str, T_Formats]: """Apply formatting to keywords.""" valid, bits, _ = self._project.index.scanThis("@"+text) @@ -421,6 +397,7 @@ class ToDocX(Tokenizer): xFmt = 0x00 xNode = None fStart = 0 + fClass = "" for fPos, fFmt, fData in tFmt or []: if xNode is not None: @@ -428,7 +405,7 @@ class ToDocX(Tokenizer): xNode = None if temp := text[fStart:fPos]: - par.addContent(self._textRunToXml(temp, xFmt)) + par.addContent(self._textRunToXml(temp, xFmt, fClass)) if fFmt == TextFmt.B_B: xFmt |= X_BLD @@ -458,6 +435,12 @@ class ToDocX(Tokenizer): xFmt |= X_SUB elif fFmt == TextFmt.SUB_E: xFmt &= M_SUB + elif fFmt == TextFmt.COL_B: + xFmt |= X_COL + fClass = fData + elif fFmt == TextFmt.COL_E: + xFmt &= M_COL + fClass = "" elif fFmt == TextFmt.DL_B: xFmt |= X_DLG elif fFmt == TextFmt.DL_E: @@ -478,33 +461,35 @@ class ToDocX(Tokenizer): par.addContent(xNode) if temp := text[fStart:]: - par.addContent(self._textRunToXml(temp, xFmt)) + par.addContent(self._textRunToXml(temp, xFmt, fClass)) return - def _textRunToXml(self, text: str, fmt: int) -> ET.Element: + def _textRunToXml(self, text: str, fmt: int, fClass: str = "") -> ET.Element: """Encode the text run into XML.""" run = ET.Element(_wTag("r")) rPr = xmlSubElem(run, _wTag("rPr")) - if fmt & X_BLD == X_BLD: + if fmt & X_BLD: xmlSubElem(rPr, _wTag("b")) - if fmt & X_ITA == X_ITA: + if fmt & X_ITA: xmlSubElem(rPr, _wTag("i")) - if fmt & X_UND == X_UND: + if fmt & X_UND: xmlSubElem(rPr, _wTag("u"), attrib={_wTag("val"): "single"}) - if fmt & X_MRK == X_MRK: + if fmt & X_MRK: xmlSubElem(rPr, _wTag("shd"), attrib={ _wTag("fill"): COL_MARK_TXT, _wTag("val"): "clear", }) - if fmt & X_DEL == X_DEL: + if fmt & X_DEL: xmlSubElem(rPr, _wTag("strike")) - if fmt & X_SUP == X_SUP: + if fmt & X_SUP: xmlSubElem(rPr, _wTag("vertAlign"), attrib={_wTag("val"): "superscript"}) - if fmt & X_SUB == X_SUB: + if fmt & X_SUB: xmlSubElem(rPr, _wTag("vertAlign"), attrib={_wTag("val"): "subscript"}) - if fmt & X_DLG == X_DLG: + if fmt & X_COL and (color := self._classes.get(fClass)): + xmlSubElem(rPr, _wTag("color"), attrib={_wTag("val"): _docXCol(color)}) + if fmt & X_DLG: xmlSubElem(rPr, _wTag("color"), attrib={_wTag("val"): COL_DIALOG_M}) - if fmt & X_DLA == X_DLA: + if fmt & X_DLA: xmlSubElem(rPr, _wTag("color"), attrib={_wTag("val"): COL_DIALOG_A}) for segment in RX_TEXT.split(text): @@ -659,7 +644,6 @@ class ToDocX(Tokenizer): before=fSz * self._marginMeta[0], after=fSz * self._marginMeta[1], line=fSz * self._lineHeight, - color=COL_META_TXT, )) # Header diff --git a/novelwriter/formats/tohtml.py b/novelwriter/formats/tohtml.py index b00a95b8..4efbd1f5 100644 --- a/novelwriter/formats/tohtml.py +++ b/novelwriter/formats/tohtml.py @@ -251,14 +251,11 @@ class ToHtml(Tokenizer): elif tType == BlockTyp.SKIP: lines.append(f"

 

\n") - elif tType == BlockTyp.SYNOPSIS and self._doSynopsis: - lines.append(self._formatSynopsis(self._formatText(tText, tFormat), True)) - - elif tType == BlockTyp.SHORT and self._doSynopsis: - lines.append(self._formatSynopsis(self._formatText(tText, tFormat), False)) + elif tType == BlockTyp.SUMMARY: + lines.append(f"

{self._formatText(tText, tFormat)}

\n") elif tType == BlockTyp.COMMENT and self._doComments: - lines.append(self._formatComments(self._formatText(tText, tFormat))) + lines.append(f"

{self._formatText(tText, tFormat)}

\n") elif tType == BlockTyp.KEYWORD and self._doKeywords: tag, text = self._formatKeywords(tText) @@ -499,19 +496,6 @@ class ToHtml(Tokenizer): return stripEscape(temp) - def _formatSynopsis(self, text: str, synopsis: bool) -> str: - """Apply HTML formatting to synopsis.""" - if synopsis: - sSynop = self._localLookup("Synopsis") - else: - sSynop = self._localLookup("Short Description") - return f"

{sSynop}: {text}

\n" - - def _formatComments(self, text: str) -> str: - """Apply HTML formatting to comments.""" - sComm = self._localLookup("Comment") - return f"

{sComm}: {text}

\n" - def _formatKeywords(self, text: str) -> tuple[str, str]: """Apply HTML formatting to keywords.""" valid, bits, _ = self._project.index.scanThis("@"+text) diff --git a/novelwriter/formats/tokenizer.py b/novelwriter/formats/tokenizer.py index 74f271b5..c50f1f16 100644 --- a/novelwriter/formats/tokenizer.py +++ b/novelwriter/formats/tokenizer.py @@ -32,9 +32,10 @@ from abc import ABC, abstractmethod from functools import partial from pathlib import Path from time import time +from typing import NamedTuple from PyQt5.QtCore import QCoreApplication -from PyQt5.QtGui import QFont +from PyQt5.QtGui import QColor, QFont from novelwriter import CONFIG from novelwriter.common import checkInt, formatTimeStamp, numberToRoman @@ -52,6 +53,26 @@ from novelwriter.text.patterns import REGEX_PATTERNS logger = logging.getLogger(__name__) +class ComStyle(NamedTuple): + + label: str = "" + labelClass: str = "" + textClass: str = "" + blockType: BlockTyp = BlockTyp.TEXT + + +COMMENT_STYLE = { + nwComment.PLAIN: ComStyle("Comment", "comment", "comment", BlockTyp.COMMENT), + nwComment.IGNORE: ComStyle(), + nwComment.SYNOPSIS: ComStyle("Synopsis", "modifier", "synopsis", BlockTyp.SUMMARY), + nwComment.SHORT: ComStyle("Short Description", "modifier", "synopsis", BlockTyp.SUMMARY), + nwComment.NOTE: ComStyle("Note", "modifier", "note", BlockTyp.NOTE), + nwComment.FOOTNOTE: ComStyle("", "modifier", "note"), + nwComment.COMMENT: ComStyle(), + nwComment.STORY: ComStyle("", "modifier", "note", BlockTyp.NOTE), +} + + class Tokenizer(ABC): """Core: Text Tokenizer Abstract Base Class @@ -72,7 +93,7 @@ class Tokenizer(ABC): BlockTyp.TITLE, BlockTyp.HEAD1, BlockTyp.HEAD2, BlockTyp.HEAD2, BlockTyp.HEAD3, BlockTyp.HEAD4, BlockTyp.SEP, BlockTyp.SKIP, ] - L_SUMMARY = [BlockTyp.SYNOPSIS, BlockTyp.SHORT] + L_NOTES = [BlockTyp.SUMMARY, BlockTyp.NOTE, BlockTyp.COMMENT] def __init__(self, project: NWProject) -> None: @@ -114,6 +135,7 @@ class Tokenizer(ABC): # Other Setting self._theme = TextDocumentTheme() + self._classes: dict[str, QColor] = {} # Margins self._marginTitle = nwStyles.T_MARGIN["H0"] @@ -433,6 +455,13 @@ class Tokenizer(ABC): def saveDocument(self, path: Path) -> None: raise NotImplementedError + def initDocument(self) -> None: + """Initialise data after settings.""" + self._classes["modifier"] = self._theme.modifier + self._classes["synopsis"] = self._theme.note + self._classes["comment"] = self._theme.comment + return + def addRootHeading(self, tHandle: str) -> None: """Add a heading at the start of a new root folder.""" self._text = "" @@ -569,36 +598,29 @@ class Tokenizer(ABC): if aLine.startswith("%~"): continue + cStyle, cKey, cText, _, _ = processComment(aLine) + if cStyle in (nwComment.SYNOPSIS, nwComment.SHORT) and not self._doSynopsis: + continue + if cStyle == nwComment.PLAIN and not self._doComments: + continue + if self._doJustify and not sAlign & self.M_ALIGNED: sAlign |= BlockFmt.JUSTIFY - cStyle, cKey, cText, _, _ = processComment(aLine) - if cStyle == nwComment.SYNOPSIS: - tLine, tFmt = self._extractFormats(cText) - blocks.append(( - BlockTyp.SYNOPSIS, nHead, tLine, tFmt, sAlign - )) - if self._doSynopsis and self._keepRaw: - tmpMarkdown.append(f"{aLine}\n") - elif cStyle == nwComment.SHORT: - tLine, tFmt = self._extractFormats(cText) - blocks.append(( - BlockTyp.SHORT, nHead, tLine, tFmt, sAlign - )) - if self._doSynopsis and self._keepRaw: + if cStyle in (nwComment.SYNOPSIS, nwComment.SHORT, nwComment.PLAIN): + bStyle = COMMENT_STYLE[cStyle] + tLine, tFmt = self._formatNote(bStyle, cKey, cText) + blocks.append((bStyle.blockType, nHead, tLine, tFmt, sAlign)) + if self._keepRaw: tmpMarkdown.append(f"{aLine}\n") + elif cStyle == nwComment.FOOTNOTE: tLine, tFmt = self._extractFormats(cText, skip=TextFmt.FNOTE) self._footnotes[f"{tHandle}:{cKey}"] = (tLine, tFmt) if self._keepRaw: tmpMarkdown.append(f"{aLine}\n") else: - tLine, tFmt = self._extractFormats(cText) - blocks.append(( - BlockTyp.COMMENT, nHead, tLine, tFmt, sAlign - )) - if self._doComments and self._keepRaw: - tmpMarkdown.append(f"{aLine}\n") + continue elif aLine.startswith("@"): # Keywords @@ -992,25 +1014,10 @@ class Tokenizer(ABC): allChars += nChars allWordChars += nWChars - elif tType == BlockTyp.SYNOPSIS and self._doSynopsis: - text = "{0}: {1}".format(self._localLookup("Synopsis"), tText) - words = text.split() + elif tType in self.L_NOTES: + words = tText.split() allWords += len(words) - allChars += len(text) - allWordChars += len("".join(words)) - - elif tType == BlockTyp.SHORT and self._doSynopsis: - text = "{0}: {1}".format(self._localLookup("Short Description"), tText) - words = text.split() - allWords += len(words) - allChars += len(text) - allWordChars += len("".join(words)) - - elif tType == BlockTyp.COMMENT and self._doComments: - text = "{0}: {1}".format(self._localLookup("Comment"), tText) - words = text.split() - allWords += len(words) - allChars += len(text) + allChars += len(tText) allWordChars += len("".join(words)) elif tType == BlockTyp.KEYWORD and self._doKeywords: @@ -1071,6 +1078,21 @@ class Tokenizer(ABC): # Internal Functions ## + def _formatNote(self, style: ComStyle, key: str, text: str) -> tuple[str, T_Formats]: + """Apply formatting to comments and notes.""" + tTxt, tFmt = self._extractFormats(text) + tFmt.insert(0, (0, TextFmt.COL_B, style.textClass)) + tFmt.append((len(tTxt), TextFmt.COL_E, "")) + if label := (self._localLookup(style.label) + (f" ({key})" if key else "")).strip(): + shift = len(label) + 2 + tTxt = f"{label}: {tTxt}" + rFmt = [(0, TextFmt.B_B, ""), (shift - 1, TextFmt.B_E, "")] + if style.labelClass: + rFmt.insert(1, (0, TextFmt.COL_B, style.labelClass)) + rFmt.append((shift - 1, TextFmt.COL_E, "")) + rFmt.extend((p + shift, f, d) for p, f, d in tFmt) + return tTxt, rFmt + def _extractFormats( self, text: str, skip: int = 0, hDialog: bool = False ) -> tuple[str, T_Formats]: diff --git a/novelwriter/formats/tomarkdown.py b/novelwriter/formats/tomarkdown.py index 2f9ccc93..2d44ea77 100644 --- a/novelwriter/formats/tomarkdown.py +++ b/novelwriter/formats/tomarkdown.py @@ -150,17 +150,8 @@ class ToMarkdown(Tokenizer): elif tType == BlockTyp.SKIP: lines.append(f"{cSkip}\n\n") - elif tType == BlockTyp.SYNOPSIS and self._doSynopsis: - label = self._localLookup("Synopsis") - lines.append(f"**{label}:** {self._formatText(tText, tFormat, mTags)}\n\n") - - elif tType == BlockTyp.SHORT and self._doSynopsis: - label = self._localLookup("Short Description") - lines.append(f"**{label}:** {self._formatText(tText, tFormat, mTags)}\n\n") - - elif tType == BlockTyp.COMMENT and self._doComments: - label = self._localLookup("Comment") - lines.append(f"**{label}:** {self._formatText(tText, tFormat, mTags)}\n\n") + elif tType in self.L_NOTES: + lines.append(f"{self._formatText(tText, tFormat, mTags)}\n\n") elif tType == BlockTyp.KEYWORD and self._doKeywords: lines.append(self._formatKeywords(tText, tStyle)) diff --git a/novelwriter/formats/toodt.py b/novelwriter/formats/toodt.py index 9f680814..325f929c 100644 --- a/novelwriter/formats/toodt.py +++ b/novelwriter/formats/toodt.py @@ -90,8 +90,9 @@ X_UND = 0x008 # Underline format X_MRK = 0x010 # Marked format X_SUP = 0x020 # Superscript X_SUB = 0x040 # Subscript -X_DLG = 0x080 # Dialogue -X_DLA = 0x100 # Alt. Dialogue +X_COL = 0x080 # Coloured text +X_DLG = 0x100 # Dialogue +X_DLA = 0x200 # Alt. Dialogue # Formatting Masks M_BLD = ~X_BLD @@ -101,6 +102,7 @@ M_UND = ~X_UND M_MRK = ~X_MRK M_SUP = ~X_SUP M_SUB = ~X_SUB +M_COL = ~X_COL M_DLG = ~X_DLG M_DLA = ~X_DLA @@ -152,7 +154,7 @@ class ToOdt(Tokenizer): self._mainPara: dict[str, ODTParagraphStyle] = {} # User-accessible paragraph styles self._autoPara: dict[str, ODTParagraphStyle] = {} # Auto-generated paragraph styles - self._autoText: dict[int, ODTTextStyle] = {} # Auto-generated text styles + self._autoText: dict[str, ODTTextStyle] = {} # Auto-generated text styles # Footnotes self._nNote = 0 @@ -264,6 +266,8 @@ class ToOdt(Tokenizer): def initDocument(self) -> None: """Initialises a new open document XML tree.""" + super().initDocument() + # Initialise Variables # ==================== @@ -480,17 +484,8 @@ class ToOdt(Tokenizer): elif tType == BlockTyp.SKIP: self._addTextPar(xText, S_TEXT, oStyle, "") - elif tType == BlockTyp.SYNOPSIS and self._doSynopsis: - tTemp, tFmt = self._formatSynopsis(tText, tFormat, True) - self._addTextPar(xText, S_META, oStyle, tTemp, tFmt=tFmt) - - elif tType == BlockTyp.SHORT and self._doSynopsis: - tTemp, tFmt = self._formatSynopsis(tText, tFormat, False) - self._addTextPar(xText, S_META, oStyle, tTemp, tFmt=tFmt) - - elif tType == BlockTyp.COMMENT and self._doComments: - tTemp, tFmt = self._formatComments(tText, tFormat) - self._addTextPar(xText, S_META, oStyle, tTemp, tFmt=tFmt) + elif tType in self.L_NOTES: + self._addTextPar(xText, S_META, oStyle, tText, tFmt=tFormat) elif tType == BlockTyp.KEYWORD and self._doKeywords: tTemp, tFmt = self._formatKeywords(tText) @@ -562,24 +557,6 @@ class ToOdt(Tokenizer): # Internal Functions ## - def _formatSynopsis(self, text: str, fmt: T_Formats, synopsis: bool) -> tuple[str, T_Formats]: - """Apply formatting to synopsis lines.""" - name = self._localLookup("Synopsis" if synopsis else "Short Description") - shift = len(name) + 2 - rTxt = f"{name}: {text}" - rFmt: T_Formats = [(0, TextFmt.B_B, ""), (len(name) + 1, TextFmt.B_E, "")] - rFmt.extend((p + shift, f, d) for p, f, d in fmt) - return rTxt, rFmt - - def _formatComments(self, text: str, fmt: T_Formats) -> tuple[str, T_Formats]: - """Apply formatting to comments.""" - name = self._localLookup("Comment") - shift = len(name) + 2 - rTxt = f"{name}: {text}" - rFmt: T_Formats = [(0, TextFmt.B_B, ""), (len(name) + 1, TextFmt.B_E, "")] - rFmt.extend((p + shift, f, d) for p, f, d in fmt) - return rTxt, rFmt - def _formatKeywords(self, text: str) -> tuple[str, T_Formats]: """Apply formatting to keywords.""" valid, bits, _ = self._project.index.scanThis("@"+text) @@ -630,6 +607,7 @@ class ToOdt(Tokenizer): tFrag = "" fLast = 0 xNode = None + fClass = "" for fPos, fFmt, fData in tFmt or []: # Add any extra nodes @@ -642,7 +620,7 @@ class ToOdt(Tokenizer): if xFmt == 0x00: parProc.appendText(tFrag) else: - parProc.appendSpan(tFrag, self._textStyle(xFmt)) + parProc.appendSpan(tFrag, self._textStyle(xFmt, fClass)) # Calculate the change of format if fFmt == TextFmt.B_B: @@ -673,6 +651,12 @@ class ToOdt(Tokenizer): xFmt |= X_SUB elif fFmt == TextFmt.SUB_E: xFmt &= M_SUB + elif fFmt == TextFmt.COL_B: + xFmt |= X_COL + fClass = fData + elif fFmt == TextFmt.COL_E: + xFmt &= M_COL + fClass = "" elif fFmt == TextFmt.DL_B: xFmt |= X_DLG elif fFmt == TextFmt.DL_E: @@ -697,7 +681,7 @@ class ToOdt(Tokenizer): if xFmt == 0x00: parProc.appendText(tFrag) else: - parProc.appendSpan(tFrag, self._textStyle(xFmt)) + parProc.appendSpan(tFrag, self._textStyle(xFmt, fClass)) if pErr > 0: self._errData.append("Unknown format tag encountered") @@ -731,10 +715,14 @@ class ToOdt(Tokenizer): return modStyle.name - def _textStyle(self, hFmt: int) -> str: + def _textStyle(self, hFmt: int, fClass: str = "") -> str: """Return a text style for a given style code.""" - if hFmt in self._autoText: - return self._autoText[hFmt].name + tKey = str(hFmt) + if fClass and (color := self._classes.get(fClass)): + tKey = f"{tKey}:{fClass}" + + if tKey in self._autoText: + return self._autoText[tKey].name style = ODTTextStyle(f"T{len(self._autoText)+1:d}") if hFmt & X_BLD: @@ -747,18 +735,20 @@ class ToOdt(Tokenizer): if hFmt & X_UND: style.setUnderlineStyle("solid") style.setUnderlineWidth("auto") - style.setUnderlineColour("font-color") + style.setUnderlineColor("font-color") if hFmt & X_MRK: - style.setBackgroundColour(self._markText) + style.setBackgroundColor(self._markText) if hFmt & X_SUP: style.setTextPosition("super") if hFmt & X_SUB: style.setTextPosition("sub") - if hFmt & X_DLG: - style.setColour(self._colDialogM) - if hFmt & X_DLA: - style.setColour(self._colDialogA) - self._autoText[hFmt] = style + if hFmt & X_COL and color: + style.setColor(color) + # if hFmt & X_DLG: + # style.setColour(self._colDialogM) + # if hFmt & X_DLA: + # style.setColour(self._colDialogA) + self._autoText[tKey] = style return style.name @@ -923,7 +913,6 @@ class ToOdt(Tokenizer): style.setFontFamily(self._fontFamily) style.setFontSize(self._fSizeText) style.setFontWeight(self._fontWeight) - style.setColour(self._theme.note) style.packXML(self._xStyl) self._mainPara[style.name] = style @@ -973,7 +962,7 @@ class ToOdt(Tokenizer): style.setFontFamily(self._fontFamily) style.setFontSize(self._fSizeHead1) style.setFontWeight(self._headWeight) - style.setColour(hColor) + style.setColor(hColor) style.packXML(self._xStyl) self._mainPara[style.name] = style @@ -990,7 +979,7 @@ class ToOdt(Tokenizer): style.setFontFamily(self._fontFamily) style.setFontSize(self._fSizeHead2) style.setFontWeight(self._headWeight) - style.setColour(hColor) + style.setColor(hColor) style.packXML(self._xStyl) self._mainPara[style.name] = style @@ -1007,7 +996,7 @@ class ToOdt(Tokenizer): style.setFontFamily(self._fontFamily) style.setFontSize(self._fSizeHead3) style.setFontWeight(self._headWeight) - style.setColour(hColor) + style.setColor(hColor) style.packXML(self._xStyl) self._mainPara[style.name] = style @@ -1024,7 +1013,7 @@ class ToOdt(Tokenizer): style.setFontFamily(self._fontFamily) style.setFontSize(self._fSizeHead4) style.setFontWeight(self._headWeight) - style.setColour(hColor) + style.setColor(hColor) style.packXML(self._xStyl) self._mainPara[style.name] = style @@ -1285,7 +1274,7 @@ class ODTParagraphStyle: self._tAttr["font-weight"][1] = None return - def setColour(self, value: QColor | None) -> None: + def setColor(self, value: QColor | None) -> None: """Set text colour.""" if isinstance(value, QColor): self._tAttr["color"][1] = value.name(QColor.NameFormat.HexRgb) @@ -1393,15 +1382,15 @@ class ODTTextStyle: self._tAttr["font-style"][1] = None return - def setColour(self, value: str | None) -> None: + def setColor(self, value: QColor | None) -> None: """Set text colour.""" - if value and len(value) == 7 and value[0] == "#": - self._tAttr["color"][1] = value + if isinstance(value, QColor): + self._tAttr["color"][1] = value.name(QColor.NameFormat.HexRgb) else: self._tAttr["color"][1] = None return - def setBackgroundColour(self, value: str | None) -> None: + def setBackgroundColor(self, value: str | None) -> None: """Set text background colour.""" if value and len(value) == 7 and value[0] == "#": self._tAttr["background-color"][1] = value @@ -1449,7 +1438,7 @@ class ODTTextStyle: self._tAttr["text-underline-width"][1] = None return - def setUnderlineColour(self, value: str | None) -> None: + def setUnderlineColor(self, value: str | None) -> None: """Set text underline colour.""" if value in self.VALID_LCOL: self._tAttr["text-underline-color"][1] = value diff --git a/novelwriter/formats/toqdoc.py b/novelwriter/formats/toqdoc.py index 1a48a562..ba17eeb2 100644 --- a/novelwriter/formats/toqdoc.py +++ b/novelwriter/formats/toqdoc.py @@ -108,6 +108,8 @@ class ToQTextDocument(Tokenizer): def initDocument(self) -> None: """Initialise all computed values of the document.""" + super().initDocument() + self._document.setUndoRedoEnabled(False) self._document.blockSignals(True) self._document.clear() @@ -162,23 +164,9 @@ class ToQTextDocument(Tokenizer): self._cText.setBackground(QtTransparent) self._cText.setForeground(self._theme.text) - self._cComment = QTextCharFormat(self._cText) - self._cComment.setForeground(self._theme.comment) - - self._cCommentMod = QTextCharFormat(self._cText) - self._cCommentMod.setForeground(self._theme.comment) - self._cCommentMod.setFontWeight(self._bold) - - self._cNote = QTextCharFormat(self._cText) - self._cNote.setForeground(self._theme.note) - self._cCode = QTextCharFormat(self._cText) self._cCode.setForeground(self._theme.code) - self._cModifier = QTextCharFormat(self._cText) - self._cModifier.setForeground(self._theme.modifier) - self._cModifier.setFontWeight(self._bold) - self._cKeyword = QTextCharFormat(self._cText) self._cKeyword.setForeground(self._theme.keyword) @@ -252,19 +240,9 @@ class ToQTextDocument(Tokenizer): newBlock(cursor, bFmt) cursor.insertText(nwUnicode.U_NBSP, self._cText) - elif tType in self.L_SUMMARY and self._doSynopsis: + elif tType in self.L_NOTES: newBlock(cursor, bFmt) - modifier = self._localLookup( - "Short Description" if tType == BlockTyp.SHORT else "Synopsis" - ) - cursor.insertText(f"{modifier}: ", self._cModifier) - self._insertFragments(tText, tFormat, cursor, self._cNote) - - elif tType == BlockTyp.COMMENT and self._doComments: - newBlock(cursor, bFmt) - modifier = self._localLookup("Comment") - cursor.insertText(f"{modifier}: ", self._cCommentMod) - self._insertFragments(tText, tFormat, cursor, self._cComment) + self._insertFragments(tText, tFormat, cursor, self._cText) elif tType == BlockTyp.KEYWORD and self._doKeywords: newBlock(cursor, bFmt) @@ -359,6 +337,15 @@ class ToQTextDocument(Tokenizer): cFmt.setVerticalAlignment(QtVAlignSub) elif fmt == TextFmt.SUB_E: cFmt.setVerticalAlignment(QtVAlignNormal) + elif fmt == TextFmt.SUB_B: + cFmt.setVerticalAlignment(QtVAlignSub) + elif fmt == TextFmt.SUB_E: + cFmt.setVerticalAlignment(QtVAlignNormal) + elif fmt == TextFmt.COL_B: + if color := self._classes.get(data): + cFmt.setForeground(color) + elif fmt == TextFmt.COL_E: + cFmt.setForeground(self._theme.text) elif fmt == TextFmt.DL_B: cFmt.setForeground(self._theme.dialog) elif fmt == TextFmt.DL_E: diff --git a/tests/reference/fmtToDocX_SaveDocument_document.xml b/tests/reference/fmtToDocX_SaveDocument_document.xml index 91dabb46..0ec28de5 100644 --- a/tests/reference/fmtToDocX_SaveDocument_document.xml +++ b/tests/reference/fmtToDocX_SaveDocument_document.xml @@ -53,12 +53,19 @@ + Comment: - Exctracted from the lipsum.com website. + + + + + + + Exctracted from the lipsum.com website. @@ -100,12 +107,19 @@ + Synopsis: - Explanation from the lipsum.com website. + + + + + + + Explanation from the lipsum.com website. @@ -223,12 +237,19 @@ + 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. @@ -295,12 +316,19 @@ + 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. @@ -408,12 +436,19 @@ + 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. @@ -542,12 +577,19 @@ + 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. @@ -614,12 +656,19 @@ + 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. @@ -727,12 +776,19 @@ + 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. @@ -859,12 +915,19 @@ + 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. diff --git a/tests/reference/fmtToDocX_SaveDocument_styles.xml b/tests/reference/fmtToDocX_SaveDocument_styles.xml index 0fb4e06b..53408329 100644 --- a/tests/reference/fmtToDocX_SaveDocument_styles.xml +++ b/tests/reference/fmtToDocX_SaveDocument_styles.xml @@ -121,7 +121,6 @@ - diff --git a/tests/reference/fmtToOdt_SaveFlat_document.fodt b/tests/reference/fmtToOdt_SaveFlat_document.fodt index 6280be49..3beacd02 100644 --- a/tests/reference/fmtToOdt_SaveFlat_document.fodt +++ b/tests/reference/fmtToOdt_SaveFlat_document.fodt @@ -1,13 +1,13 @@ - 2024-10-22T11:39:53 + 2024-10-22T14:19:48 novelWriter/2.6a1 Jane Smith 1234 P42DT12H34M56S Test Project - 2024-10-22T11:39:53 + 2024-10-22T14:19:48 Jane Smith @@ -35,7 +35,7 @@ - + diff --git a/tests/reference/fmtToOdt_SaveFull_styles.xml b/tests/reference/fmtToOdt_SaveFull_styles.xml index e66e2d7e..aa1f8a94 100644 --- a/tests/reference/fmtToOdt_SaveFull_styles.xml +++ b/tests/reference/fmtToOdt_SaveFull_styles.xml @@ -25,7 +25,7 @@ - + diff --git a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt index 43e7a3ca..e76458fc 100644 --- a/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt +++ b/tests/reference/mBuildDocBuild_OpenDocument_Lorem_Ipsum.fodt @@ -1,13 +1,13 @@ - 2024-10-22T11:39:52 + 2024-10-22T17:00:59 novelWriter/2.6a1 lipsum.com 45 P0DT0H36M8S Lorem Ipsum - 2024-10-22T11:39:52 + 2024-10-22T17:00:59 lipsum.com @@ -35,7 +35,7 @@ - + @@ -110,6 +110,18 @@ + + + + + + + + + + + + @@ -142,15 +154,15 @@ By lipsum.com “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…” - Comment: Exctracted from the lipsum.com website. + Comment: Exctracted from the lipsum.com website. Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of “de Finibus Bonorum et Malorum” (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, “Lorem ipsum dolor sit amet..”, comes from a line in section 1.10.32. The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from “de Finibus Bonorum et Malorum” by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. Prologue - Synopsis: Explanation from the lipsum.com website. - Lorem Ipsum is simply dummy text + Synopsis: Explanation from the lipsum.com website. + Lorem Ipsum is simply dummy text 1 - Lorem ipsum is typically a corrupted version of De finibus bonorum et malorum, a 1st-century BC text by the Roman statesman and philosopher Cicero, with words altered, added, and removed to make it nonsensical and improper Latin. (Source: Wikipedia) + Lorem ipsum is typically a corrupted version of De finibus bonorum et malorum, a 1st-century BC text by the Roman statesman and philosopher Cicero, with words altered, added, and removed to make it nonsensical and improper Latin. (Source: Wikipedia) 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. Part: Act One @@ -159,13 +171,13 @@ Point of View: Bod Plot: Main Locations: 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. Scene: Scene One Point of View: Bod Plot: Main Locations: 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. Aliquam ut nisl arcu. Ut ultricies, lorem dignissim rutrum convallis, risus orci tempus lectus, congue feugiat sem lectus vitae odio. Duis sit amet justo finibus, hendrerit nulla at, ullamcorper enim. Praesent vel tellus sit amet tellus vulputate bibendum. Morbi eleifend sagittis sem, ac volutpat ante congue non. In hac habitasse platea dictumst. Morbi lobortis fermentum elit, dignissim sagittis ligula volutpat lacinia. Vestibulum eu interdum odio. Integer ac purus commodo metus congue tempor non at urna. Sed eget tortor vel quam viverra egestas. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec non convallis mauris, ac feugiat ex. Section: Scene One, Section Two @@ -175,7 +187,7 @@ Point of View: Bod Plot: Main Locations: 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. Proin vitae gravida nisl. Integer viverra orci turpis, sit amet pretium ligula facilisis consequat. Nulla interdum commodo metus, mollis consequat dui tincidunt et. Proin consequat bibendum justo id commodo. Fusce fermentum nunc turpis, eu vestibulum risus feugiat ut. Sed scelerisque vel ligula ut interdum. Suspendisse ac blandit ligula, sagittis fringilla dolor. In tincidunt convallis diam et ornare. Aenean id dignissim est, ut rhoncus quam. Donec vitae nisl velit. In convallis nibh ut augue dignissim, eu elementum quam cursus. Phasellus in lectus lorem. Curabitur in pellentesque nisi, at gravida sapien. Sed cursus justo volutpat lacus placerat, sit amet dignissim turpis commodo. Aliquam vitae orci eget nulla posuere condimentum in ut felis. Nulla accumsan ante in pulvinar efficitur. Nulla non velit quis urna hendrerit bibendum. Suspendisse ultrices ante eu justo malesuada, sed fermentum enim rutrum. Nunc fermentum pharetra felis, vitae sollicitudin quam rutrum porta. Aliquam fringilla velit a mi laoreet, et luctus est rutrum. In gravida non ipsum sit amet tempus. Curabitur et eleifend purus. Nulla facilisi. @@ -184,7 +196,7 @@ Vivamus ut venenatis lectus. Phasellus nec elit id sem dictum ornare. Quisque feugiat, diam eget sagittis ultricies, orci turpis efficitur nisi, et fringilla justo odio nec nibh. In hac habitasse platea dictumst. Sed tempus bibendum feugiat. Etiam luctus mauris arcu, non interdum ipsum ultrices id. Vivamus blandit urna sit amet scelerisque vulputate. Quisque in metus eget massa rutrum dictum sit amet sed nulla. Vivamus vel efficitur dolor. Ut et consequat enim, quis ornare nibh. In lectus neque, mollis et suscipit et, vestibulum vitae augue. Praesent id ante sit amet odio venenatis placerat a at erat. Sed sed metus sed nisi dictum varius. Integer tincidunt fermentum purus ac porta. Fusce porttitor non risus eget tristique. Donec augue nunc, maximus at fermentum vel, varius et neque. Ut sed consectetur mauris. Quisque ipsum enim, porttitor vitae imperdiet sit amet, tempor et mauris. Aliquam malesuada tincidunt lectus quis blandit. Sed commodo orci felis, quis ultrices tellus facilisis sed. Nunc vel varius est. Duis ullamcorper eu metus in pulvinar. Morbi at sapien dictum, rutrum mauris eget, interdum tellus. Why do we use it? - Comment: Exctracted from the lipsum.com website. + Comment: Exctracted from the lipsum.com website. It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like). @@ -192,13 +204,13 @@ Point of View: Bod Plot: Main Locations: 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. Scene: Scene Three Point of View: Bod Plot: Main Locations: 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. Pellentesque id sagittis dui. Praesent ut nisi sit amet libero euismod ornare. Vestibulum vehicula, lorem eget aliquet imperdiet, eros nulla iaculis mi, vel bibendum est dui sed orci. Nullam vitae lorem rutrum, euismod lacus id, ullamcorper lectus. Duis nec commodo mi, a fringilla diam. Vestibulum molestie nibh tristique, viverra augue non, aliquet metus. Phasellus a tellus ac nisl tempor aliquet. Nulla vitae sapien rutrum augue ornare ultrices a quis nisi. Sed pulvinar tincidunt ex. Fusce vel sem vitae ante pellentesque lobortis. Maecenas ullamcorper lacus nec turpis finibus aliquet eget rutrum augue. Integer lorem erat, faucibus non lacus lacinia, pulvinar egestas felis. Proin rutrum nunc eget nulla varius, id blandit mauris tincidunt. Donec sit amet ullamcorper nisi, ut efficitur mi. Aliquam aliquet, nulla eget rhoncus tristique, justo lorem consectetur dui, id ornare leo odio sed tellus. Curabitur interdum velit a turpis condimentum venenatis. Nunc rhoncus sem ac augue auctor, nec malesuada ex fringilla. Vestibulum egestas diam sed leo consectetur vulputate quis eget enim. Nam tincidunt metus sit amet maximus ullamcorper. Sed placerat velit vitae massa efficitur viverra. Etiam eleifend dignissim ante, sed luctus nisl tristique a. In vestibulum pharetra dolor in molestie. Vivamus auctor massa ac magna imperdiet, sit amet iaculis turpis finibus. @@ -207,7 +219,7 @@ Point of View: Bod Plot: Main Locations: 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. Duis efficitur metus pulvinar, molestie magna eget, feugiat dui. Fusce convallis vehicula ipsum convallis blandit. Duis eros risus, malesuada eu imperdiet in, hendrerit ac metus. Vestibulum id justo gravida, dignissim nibh non, iaculis diam. Fusce accumsan est ut massa porta ultricies. Nulla vitae justo in tortor laoreet mollis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin eu libero justo. Vivamus aliquet placerat est, et auctor eros posuere venenatis. Nunc quam diam, tincidunt ac aliquet in, fermentum sit amet lectus. Proin commodo tincidunt blandit. Quisque erat arcu, semper nec dui non, consectetur gravida ipsum. Nullam pretium consectetur elit at condimentum. Etiam sagittis, erat vitae accumsan tempor, neque augue scelerisque nulla, ut ultrices justo urna sit amet augue. Interdum et malesuada fames ac ante ipsum primis in faucibus. Aenean at pulvinar tortor. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Cras vel porta quam. Nullam eu mauris mollis, vehicula justo vel, placerat sapien. Phasellus viverra elit et vestibulum pharetra. Vestibulum commodo fermentum leo, eu porta nisi aliquam eget. Nulla tempus porttitor nisi nec mollis. Nam non mollis turpis. Nam finibus leo a bibendum tincidunt. Donec commodo velit magna, ac semper sapien mattis id. Proin sem velit, lobortis quis ultricies id, pharetra et lectus. Vestibulum condimentum neque vitae mi dapibus mollis. Mauris luctus vel sapien vitae hendrerit. @@ -218,7 +230,7 @@ Point of View: Bod Plot: Main Locations: 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. In ut lobortis lacus, nec luctus arcu. Vivamus condimentum sapien a ipsum malesuada sodales. Donec et vestibulum risus. Integer dictum euismod eros id tincidunt. Aliquam sagittis leo vitae consequat fermentum. Donec maximus ex eu ex iaculis porta. Praesent pharetra lacinia risus, et eleifend diam commodo non. Sed feugiat ipsum ut orci sagittis, quis faucibus lectus blandit. Sed tellus quam, gravida vitae laoreet quis, tempus lobortis dui. Vivamus semper accumsan ullamcorper. Praesent tempus pretium eros, non elementum risus. Pellentesque odio quam, auctor quis ex non, vulputate egestas dolor. Nunc luctus enim ut justo sodales consectetur. Sed aliquet a mauris vel posuere. Donec luctus lectus efficitur, blandit nisi vitae, dignissim tellus. Pellentesque euismod pharetra augue gravida hendrerit. Quisque nisi mi, mattis ac nisi non, maximus malesuada ante. Nulla lobortis, diam eu ornare ornare, tellus enim feugiat arcu, non vestibulum tortor nunc eu justo. Integer blandit felis justo, eu semper est scelerisque vel. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nam ultricies, nisi vel elementum commodo, nisl dolor tincidunt magna, sed varius est nunc at lectus. Aliquam dolor tortor, sodales placerat ultricies quis, sodales quis sapien. Duis ullamcorper sollicitudin risus at mattis. Integer consequat et nunc at condimentum. Pellentesque cursus congue augue, non suscipit lectus sodales ut. Nam a mi bibendum, blandit nisl eu, accumsan nunc. Aliquam a ex mauris. Sed nec sem quis arcu dignissim tempus eget et turpis. Ut sed ex nec ipsum ultrices lobortis. diff --git a/tests/test_formats/test_fmt_todocx.py b/tests/test_formats/test_fmt_todocx.py index cd64b55e..357b9a76 100644 --- a/tests/test_formats/test_fmt_todocx.py +++ b/tests/test_formats/test_fmt_todocx.py @@ -150,37 +150,43 @@ def testFmtToDocX_ParagraphStyles(mockGUI): # Synopsis xTest = ET.Element(_wTag("body")) - doc._blocks = [(BlockTyp.SYNOPSIS, 0, "Hello World", [], BlockFmt.NONE)] + doc._text = "%Synopsis: Hello World\n\n" + doc.tokenizeText() doc.doConvert() doc._pars[-1].toXml(xTest) assert xmlToText(xTest) == ( f'' - 'Synopsis:' - ' Hello World' + 'Synopsis:' + ' ' + 'Hello World' '' ) # Short xTest = ET.Element(_wTag("body")) - doc._blocks = [(BlockTyp.SHORT, 0, "Hello World", [], BlockFmt.NONE)] + doc._text = "%Short: Hello World\n\n" + doc.tokenizeText() doc.doConvert() doc._pars[-1].toXml(xTest) assert xmlToText(xTest) == ( f'' - 'Short Description:' - ' Hello World' + 'Short Description:' + ' ' + 'Hello World' '' ) # Comment xTest = ET.Element(_wTag("body")) - doc._blocks = [(BlockTyp.COMMENT, 0, "Hello World", [], BlockFmt.NONE)] + doc._text = "% Hello World\n\n" + doc.tokenizeText() doc.doConvert() doc._pars[-1].toXml(xTest) assert xmlToText(xTest) == ( f'' - 'Comment:' - ' Hello World' + 'Comment:' + ' ' + 'Hello World' '' ) diff --git a/tests/test_formats/test_fmt_tohtml.py b/tests/test_formats/test_fmt_tohtml.py index 71863338..891f6aa3 100644 --- a/tests/test_formats/test_fmt_tohtml.py +++ b/tests/test_formats/test_fmt_tohtml.py @@ -708,19 +708,6 @@ def testFmtToHtml_Format(mockGUI): project = NWProject() html = ToHtml(project) - # Export Mode - # =========== - - assert html._formatSynopsis("synopsis text", True) == ( - "

Synopsis: synopsis text

\n" - ) - assert html._formatSynopsis("short text", False) == ( - "

Short Description: short text

\n" - ) - assert html._formatComments("comment text") == ( - "

Comment: comment text

\n" - ) - assert html._formatKeywords("") == ("", "") assert html._formatKeywords("tag: Jane") == ( "tag", "Tag: Jane" diff --git a/tests/test_formats/test_fmt_tokenizer.py b/tests/test_formats/test_fmt_tokenizer.py index 10809b67..2ac1e672 100644 --- a/tests/test_formats/test_fmt_tokenizer.py +++ b/tests/test_formats/test_fmt_tokenizer.py @@ -29,8 +29,9 @@ from PyQt5.QtGui import QFont from novelwriter import CONFIG from novelwriter.constants import nwHeadFmt, nwStyles from novelwriter.core.project import NWProject +from novelwriter.enum import nwComment from novelwriter.formats.shared import BlockFmt, BlockTyp, TextFmt, stripEscape -from novelwriter.formats.tokenizer import HeadingFormatter, Tokenizer +from novelwriter.formats.tokenizer import COMMENT_STYLE, HeadingFormatter, Tokenizer from novelwriter.formats.tomarkdown import ToMarkdown from novelwriter.formats.toraw import ToRaw @@ -700,52 +701,64 @@ def testFmtToken_MetaFormat(mockGUI): project = NWProject() tokens = ToRaw(project) - # Comment - tokens._text = "% A comment\n" - tokens.tokenizeText() - assert tokens._blocks == [ - (BlockTyp.COMMENT, 0, "A comment", [], BlockFmt.NONE), - ] - assert tokens.allMarkdown[-1] == "\n" - - tokens.setComments(True) - tokens.tokenizeText() - assert tokens.allMarkdown[-1] == "% A comment\n\n" - # Ignore Text tokens._text = "%~ Some text\n" tokens.tokenizeText() assert tokens._blocks == [] assert tokens.allMarkdown[-1] == "\n" + # Comment + tokens.setComments(False) + tokens._text = "% A comment\n" + tokens.tokenizeText() + assert tokens._blocks == [] + assert tokens.allMarkdown[-1] == "\n" + + tokens.setComments(True) + tokens._text = "% A comment\n" + tokens.tokenizeText() + assert tokens._blocks == [( + BlockTyp.COMMENT, 0, "Comment: A comment", [ + (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "comment"), (8, TextFmt.B_E, ""), + (8, TextFmt.COL_E, ""), (9, TextFmt.COL_B, "comment"), (18, TextFmt.COL_E, ""), + ], BlockFmt.NONE + )] + assert tokens.allMarkdown[-1] == "% A comment\n\n" + # Synopsis + tokens.setSynopsis(False) tokens._text = "%synopsis: The synopsis\n" tokens.tokenizeText() - assert tokens._blocks == [ - (BlockTyp.SYNOPSIS, 0, "The synopsis", [], BlockFmt.NONE), - ] - tokens._text = "% synopsis: The synopsis\n" - tokens.tokenizeText() - assert tokens._blocks == [ - (BlockTyp.SYNOPSIS, 0, "The synopsis", [], BlockFmt.NONE), - ] + assert tokens._blocks == [] assert tokens.allMarkdown[-1] == "\n" tokens.setSynopsis(True) + tokens._text = "% synopsis: The synopsis\n" tokens.tokenizeText() + assert tokens._blocks == [( + BlockTyp.SUMMARY, 0, "Synopsis: The synopsis", [ + (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"), (9, TextFmt.B_E, ""), + (9, TextFmt.COL_E, ""), (10, TextFmt.COL_B, "synopsis"), (22, TextFmt.COL_E, "") + ], BlockFmt.NONE + )] assert tokens.allMarkdown[-1] == "% synopsis: The synopsis\n\n" # Short tokens.setSynopsis(False) tokens._text = "% short: A short description\n" tokens.tokenizeText() - assert tokens._blocks == [ - (BlockTyp.SHORT, 0, "A short description", [], BlockFmt.NONE), - ] + assert tokens._blocks == [] assert tokens.allMarkdown[-1] == "\n" tokens.setSynopsis(True) + tokens._text = "% short: A short description\n" tokens.tokenizeText() + assert tokens._blocks == [( + BlockTyp.SUMMARY, 0, "Short Description: A short description", [ + (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"), (18, TextFmt.B_E, ""), + (18, TextFmt.COL_E, ""), (19, TextFmt.COL_B, "synopsis"), (38, TextFmt.COL_E, ""), + ], BlockFmt.NONE + )] assert tokens.allMarkdown[-1] == "% short: A short description\n\n" # Keyword @@ -1355,6 +1368,7 @@ def testFmtToken_TextIndent(mockGUI): """Test the handling of text indent in the Tokenizer class.""" project = NWProject() tokens = BareTokenizer(project) + tokens.setSynopsis(True) # No First Indent tokens.setFirstLineIndent(True, 1.0, False) @@ -1388,9 +1402,13 @@ def testFmtToken_TextIndent(mockGUI): "%Synopsis: Stuff happens.\n\n" ) tokens.tokenizeText() + tFmt = [ + (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"), (9, TextFmt.B_E, ""), + (9, TextFmt.COL_E, ""), (10, TextFmt.COL_B, "synopsis"), (24, TextFmt.COL_E, ""), + ] assert tokens._blocks == [ (BlockTyp.HEAD3, 1, "Scene Two", [], BlockFmt.NONE), - (BlockTyp.SYNOPSIS, 1, "Stuff happens.", [], BlockFmt.NONE), + (BlockTyp.SUMMARY, 1, "Synopsis: Stuff happens.", tFmt, BlockFmt.NONE), ] assert tokens._noIndent is True @@ -1622,6 +1640,35 @@ def testFmtToken_ProcessHeaders(mockGUI): assert tokens._noSep is False +@pytest.mark.core +def testFmtToken_FormatNote(mockGUI, ipsumText): + """Test note and comment formatting.""" + project = NWProject() + project.data.setLanguage("en") + project._loadProjectLocalisation() + tokens = BareTokenizer(project) + + # Comment, No Formatting + style = COMMENT_STYLE[nwComment.PLAIN] + assert tokens._formatNote(style, "", "Hello world!") == ( + "Comment: Hello world!", [ + (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "comment"), + (8, TextFmt.B_E, ""), (8, TextFmt.COL_E, ""), + (9, TextFmt.COL_B, "comment"), (21, TextFmt.COL_E, ""), + ] + ) + + # Synopsis, No Formatting + style = COMMENT_STYLE[nwComment.SYNOPSIS] + assert tokens._formatNote(style, "", "Hello world!") == ( + "Synopsis: Hello world!", [ + (0, TextFmt.B_B, ""), (0, TextFmt.COL_B, "modifier"), + (9, TextFmt.B_E, ""), (9, TextFmt.COL_E, ""), + (10, TextFmt.COL_B, "synopsis"), (22, TextFmt.COL_E, ""), + ] + ) + + @pytest.mark.core def testFmtToken_BuildOutline(mockGUI, ipsumText): """Test stats counter of the Tokenizer class.""" @@ -1763,7 +1810,7 @@ def testFmtToken_CountStats(mockGUI, ipsumText): tokens.setSynopsis(True) tokens.tokenizeText() tokens.countStats() - assert [t[2] for t in tokens._blocks] == ["Chapter", "Stuff", "Text"] + assert [t[2] for t in tokens._blocks] == ["Chapter", "Synopsis: Stuff", "Text"] assert tokens.textStats == { "titleCount": 1, "paragraphCount": 1, "allWords": 4, "textWords": 1, "titleWords": 1, @@ -1780,7 +1827,7 @@ def testFmtToken_CountStats(mockGUI, ipsumText): tokens.setSynopsis(True) tokens.tokenizeText() tokens.countStats() - assert [t[2] for t in tokens._blocks] == ["Chapter", "Stuff", "Text"] + assert [t[2] for t in tokens._blocks] == ["Chapter", "Short Description: Stuff", "Text"] assert tokens.textStats == { "titleCount": 1, "paragraphCount": 1, "allWords": 5, "textWords": 1, "titleWords": 1, @@ -1797,7 +1844,7 @@ def testFmtToken_CountStats(mockGUI, ipsumText): tokens.setComments(True) tokens.tokenizeText() tokens.countStats() - assert [t[2] for t in tokens._blocks] == ["Chapter", "Stuff", "Text"] + assert [t[2] for t in tokens._blocks] == ["Chapter", "Comment: Stuff", "Text"] assert tokens.textStats == { "titleCount": 1, "paragraphCount": 1, "allWords": 4, "textWords": 1, "titleWords": 1, diff --git a/tests/test_formats/test_fmt_toodt.py b/tests/test_formats/test_fmt_toodt.py index 971cddda..c9abd3b6 100644 --- a/tests/test_formats/test_fmt_toodt.py +++ b/tests/test_formats/test_fmt_toodt.py @@ -523,12 +523,15 @@ def testFmtToOdt_ConvertParagraphs(mockGUI): 'Scene' '' 'Point of View: Jane' - '' - 'Synopsis: So it begins' - '' - 'Short Description: Then what' - '' - 'Comment: A plain comment' + '' + 'Synopsis: ' + 'So it begins' + '' + 'Short Description: ' + 'Then what' + '' + 'Comment: ' + 'A plain comment' '' ) @@ -703,7 +706,7 @@ def testFmtToOdt_ConvertParagraphs(mockGUI): assert odt.errData == [] assert xmlToText(odt._xText) == ( '' - 'Test text **' + 'Test text **' 'bold** and more.' '' ) @@ -897,22 +900,6 @@ def testFmtToOdt_SpecialFormats(mockGUI): project = NWProject() odt = ToOdt(project, isFlat=True) - assert odt._formatSynopsis("synopsis text", [(9, TextFmt.STRIP, "")], True) == ( - "Synopsis: synopsis text", [ - (0, TextFmt.B_B, ""), (9, TextFmt.B_E, ""), (19, TextFmt.STRIP, "") - ] - ) - assert odt._formatSynopsis("short text", [(6, TextFmt.STRIP, "")], False) == ( - "Short Description: short text", [ - (0, TextFmt.B_B, ""), (18, TextFmt.B_E, ""), (25, TextFmt.STRIP, "") - ] - ) - assert odt._formatComments("comment text", [(8, TextFmt.STRIP, "")]) == ( - "Comment: comment text", [ - (0, TextFmt.B_B, ""), (8, TextFmt.B_E, ""), (17, TextFmt.STRIP, "") - ] - ) - assert odt._formatKeywords("") == ("", []) assert odt._formatKeywords("tag: Jane") == ( "Tag: Jane", [(0, TextFmt.B_B, ""), (4, TextFmt.B_E, "")] @@ -1108,12 +1095,12 @@ def testFmtToOdt_ODTParagraphStyle(): assert parStyle._tAttr["color"] == ["fo", None] assert parStyle._tAttr["opacity"] == ["loext", None] - parStyle.setColour(QColor(0, 0, 0, 128)) + parStyle.setColor(QColor(0, 0, 0, 128)) assert parStyle._tAttr["color"] == ["fo", "#000000"] assert parStyle._tAttr["opacity"] == ["loext", "50%"] - parStyle.setColour(None) + parStyle.setColor(None) assert parStyle._tAttr["color"] == ["fo", None] assert parStyle._tAttr["opacity"] == ["loext", None] @@ -1157,8 +1144,8 @@ def testFmtToOdt_ODTParagraphStyle(): aStyle = ODTParagraphStyle("test") oStyle = ODTParagraphStyle("test") - aStyle.setColour(QColor(0, 0, 0)) - oStyle.setColour(QColor(42, 42, 42)) + aStyle.setColor(QColor(0, 0, 0)) + oStyle.setColor(QColor(42, 42, 42)) assert aStyle.checkNew(oStyle) is True assert aStyle.getID() != oStyle.getID() @@ -1212,24 +1199,22 @@ def testFmtToOdt_ODTTextStyle(): # Text Color assert txtStyle._tAttr["color"] == ["fo", None] - txtStyle.setColour("stuff") + txtStyle.setColor("#012345") # type: ignore assert txtStyle._tAttr["color"] == ["fo", None] - txtStyle.setColour("012345") - assert txtStyle._tAttr["color"] == ["fo", None] - txtStyle.setColour("#012345") - assert txtStyle._tAttr["color"] == ["fo", "#012345"] - txtStyle.setColour("stuff") + txtStyle.setColor(QColor(255, 128, 0)) + assert txtStyle._tAttr["color"] == ["fo", "#ff8000"] + txtStyle.setColor(None) assert txtStyle._tAttr["color"] == ["fo", None] # Background Color assert txtStyle._tAttr["background-color"] == ["fo", None] - txtStyle.setBackgroundColour("stuff") + txtStyle.setBackgroundColor("stuff") assert txtStyle._tAttr["background-color"] == ["fo", None] - txtStyle.setBackgroundColour("012345") + txtStyle.setBackgroundColor("012345") assert txtStyle._tAttr["background-color"] == ["fo", None] - txtStyle.setBackgroundColour("#012345") + txtStyle.setBackgroundColor("#012345") assert txtStyle._tAttr["background-color"] == ["fo", "#012345"] - txtStyle.setBackgroundColour("stuff") + txtStyle.setBackgroundColor("stuff") assert txtStyle._tAttr["background-color"] == ["fo", None] # Text Position @@ -1289,11 +1274,11 @@ def testFmtToOdt_ODTTextStyle(): # Underline Colour assert txtStyle._tAttr["text-underline-color"] == ["style", None] - txtStyle.setUnderlineColour("stuff") + txtStyle.setUnderlineColor("stuff") assert txtStyle._tAttr["text-underline-color"] == ["style", None] - txtStyle.setUnderlineColour("font-color") + txtStyle.setUnderlineColor("font-color") assert txtStyle._tAttr["text-underline-color"] == ["style", "font-color"] - txtStyle.setUnderlineColour("stuff") + txtStyle.setUnderlineColor("stuff") assert txtStyle._tAttr["text-underline-color"] == ["style", None] # Pack XML