diff --git a/novelwriter/core/tohtml.py b/novelwriter/core/tohtml.py
index 8137150b..fad2bc3b 100644
--- a/novelwriter/core/tohtml.py
+++ b/novelwriter/core/tohtml.py
@@ -29,9 +29,7 @@ import logging
from time import time
from pathlib import Path
-from PyQt5.QtGui import QColor
-
-from novelwriter import CONFIG, SHARED
+from novelwriter import CONFIG
from novelwriter.common import formatTimeStamp
from novelwriter.constants import nwHeadFmt, nwKeyWords, nwLabels, nwHtmlUnicode
from novelwriter.core.project import NWProject
@@ -126,7 +124,6 @@ class ToHtml(Tokenizer):
def doConvert(self) -> None:
"""Convert the list of text tokens into an HTML document."""
if self._genMode == self.M_PREVIEW:
- colMark = SHARED.theme.colMark.name(QColor.NameFormat.HexArgb)
htmlTags = { # HTML4 + CSS2 (for Qt)
self.FMT_B_B: "",
self.FMT_B_E: "",
@@ -136,8 +133,8 @@ class ToHtml(Tokenizer):
self.FMT_D_E: "",
self.FMT_U_B: "",
self.FMT_U_E: "",
- self.FMT_M_B: f"",
- self.FMT_M_E: "",
+ self.FMT_M_B: "",
+ self.FMT_M_E: "",
}
else:
htmlTags = { # HTML5 (for export)
diff --git a/novelwriter/gui/docviewer.py b/novelwriter/gui/docviewer.py
index b6ca8480..52a07f12 100644
--- a/novelwriter/gui/docviewer.py
+++ b/novelwriter/gui/docviewer.py
@@ -466,48 +466,30 @@ class GuiDocViewer(QTextBrowser):
colText = SHARED.theme.colText
colHead = SHARED.theme.colHead
colVals = SHARED.theme.colVal
- colEmph = SHARED.theme.colEmph
+ colMark = SHARED.theme.colMark
colKeys = SHARED.theme.colKey
colHide = SHARED.theme.colHidden
colMods = SHARED.theme.colMod
colOpts = SHARED.theme.colOpt
styleSheet = (
- "body {{"
- " color: rgb({tColR}, {tColG}, {tColB});"
- "}}\n"
- "h1, h2, h3, h4 {{"
- " color: rgb({hColR}, {hColG}, {hColB});"
- "}}\n"
- "a {{"
- " color: rgb({aColR}, {aColG}, {aColB});"
- "}}\n"
- "mark {{"
- " color: rgb({eColR}, {eColG}, {eColB});"
- "}}\n"
- ".tags {{"
- " color: rgb({kColR}, {kColG}, {kColB});"
- "}}\n"
- ".optional {{"
- " color: rgb({oColR}, {oColG}, {oColB});"
- "}}\n"
- ".comment {{"
- " color: rgb({cColR}, {cColG}, {cColB});"
- "}}\n"
- ".synopsis {{"
- " color: rgb({mColR}, {mColG}, {mColB});"
- "}}\n"
- ".title {{"
- " text-align: center;"
- "}}\n"
+ "body {{color: rgb({rT}, {gT}, {bT});}}\n"
+ "h1, h2, h3, h4 {{color: rgb({rH}, {gH}, {bH});}}\n"
+ "a {{color: rgb({rA}, {gA}, {bA});}}\n"
+ "mark {{background-color: rgba({rE}, {gE}, {bE}, {aE});}}\n"
+ ".tags {{color: rgb({rK}, {gK}, {bK});}}\n"
+ ".optional {{color: rgb({rO}, {gO}, {bO});}}\n"
+ ".comment {{color: rgb({rC}, {gC}, {bC});}}\n"
+ ".synopsis {{color: rgb({rM}, {gM}, {bM});}}\n"
+ ".title {{text-align: center;}}\n"
).format(
- tColR=colText.red(), tColG=colText.green(), tColB=colText.blue(),
- hColR=colHead.red(), hColG=colHead.green(), hColB=colHead.blue(),
- aColR=colVals.red(), aColG=colVals.green(), aColB=colVals.blue(),
- eColR=colEmph.red(), eColG=colEmph.green(), eColB=colEmph.blue(),
- kColR=colKeys.red(), kColG=colKeys.green(), kColB=colKeys.blue(),
- cColR=colHide.red(), cColG=colHide.green(), cColB=colHide.blue(),
- mColR=colMods.red(), mColG=colMods.green(), mColB=colMods.blue(),
- oColR=colOpts.red(), oColG=colOpts.green(), oColB=colOpts.blue(),
+ rT=colText.red(), gT=colText.green(), bT=colText.blue(),
+ rH=colHead.red(), gH=colHead.green(), bH=colHead.blue(),
+ rA=colVals.red(), gA=colVals.green(), bA=colVals.blue(),
+ rE=colMark.red(), gE=colMark.green(), bE=colMark.blue(), aE=colMark.alpha(),
+ rK=colKeys.red(), gK=colKeys.green(), bK=colKeys.blue(),
+ rC=colHide.red(), gC=colHide.green(), bC=colHide.blue(),
+ rM=colMods.red(), gM=colMods.green(), bM=colMods.blue(),
+ rO=colOpts.red(), gO=colOpts.green(), bO=colOpts.blue(),
)
self.document().setDefaultStyleSheet(styleSheet)
diff --git a/tests/mocked.py b/tests/mocked.py
index 051b197e..1e9506ff 100644
--- a/tests/mocked.py
+++ b/tests/mocked.py
@@ -20,7 +20,7 @@ along with this program. If not, see .
"""
from __future__ import annotations
-from PyQt5.QtGui import QColor, QPixmap
+from PyQt5.QtGui import QPixmap
from PyQt5.QtWidgets import QWidget
@@ -76,7 +76,6 @@ class MockTheme:
def __init__(self):
self.baseIconSize = 10
- self.colMark = QColor(255, 255, 166, 128)
return
def getPixmap(self, *a):