From a85222fdb8f1cf9ded971a9858eb2437178b33d5 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 13 Jun 2020 22:59:31 +0200
Subject: [PATCH] Updated rendering of preview text to include synopsis

---
 nw/core/tohtml.py   | 15 ++++++++-------
 nw/gui/docviewer.py |  9 ++++++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/nw/core/tohtml.py b/nw/core/tohtml.py
index 61541f42..845f355c 100644
--- a/nw/core/tohtml.py
+++ b/nw/core/tohtml.py
@@ -66,7 +66,7 @@ class ToHtml(Tokenizer):
     #  Setters
     ##
 
-    def setPreview(self, forPreview, doComments):
+    def setPreview(self, forPreview, doComments, doSynopsis):
         """If we're using this class to generate markdown preview, we
         need to make a few changes to formatting, which is managed by
         these flags.
@@ -75,6 +75,7 @@ class ToHtml(Tokenizer):
             self.genMode    = self.M_PREVIEW
             self.doKeywords = True
             self.doComments = doComments
+            self.doSynopsis = doSynopsis
             self.repDict["\t"] = "&nbsp;"*8
             self._buildRegEx()
         return
@@ -287,18 +288,18 @@ class ToHtml(Tokenizer):
     def _formatSynopsis(self, tText):
         """Apply HTML formatting to synopsis.
         """
-        if self.genMode == self.M_EXPORT:
-            return "<p class='synopsis'><strong>Synopsis: </strong>%s</p>\n" % tText
+        if self.genMode == self.M_PREVIEW:
+            return "<p class='comment'><span class='synopsis'>Synopsis: </span>%s</p>\n" % tText
         else:
-            return "<p class='comment'>%s</p>\n" % tText
+            return "<p class='synopsis'><strong>Synopsis: </strong>%s</p>\n" % tText
 
     def _formatComments(self, tText):
         """Apply HTML formatting to comments.
         """
-        if self.genMode == self.M_EXPORT:
-            return "<p class='comment'><strong>Comment: </strong>%s</p>\n" % tText
-        else:
+        if self.genMode == self.M_PREVIEW:
             return "<p class='comment'>%s</p>\n" % tText
+        else:
+            return "<p class='comment'><strong>Comment: </strong>%s</p>\n" % tText
 
     def _formatKeywords(self, tText):
         """Apply HTML formatting to keywords.
diff --git a/nw/gui/docviewer.py b/nw/gui/docviewer.py
index a2884dab..1059c277 100644
--- a/nw/gui/docviewer.py
+++ b/nw/gui/docviewer.py
@@ -136,7 +136,7 @@ class GuiDocViewer(QTextBrowser):
         logger.debug("Generating preview for item %s" % tHandle)
         sPos = self.verticalScrollBar().value()
         aDoc = ToHtml(self.theProject, self.theParent)
-        aDoc.setPreview(True, self.mainConf.viewComments)
+        aDoc.setPreview(True, self.mainConf.viewComments, self.mainConf.viewSynopsis)
         aDoc.setLinkHeaders(True)
 
         # Be extra careful here to prevent crashes when first opening a
@@ -366,6 +366,10 @@ class GuiDocViewer(QTextBrowser):
             "  margin-left: 1em;"
             "  margin-right: 1em;"
             "}}\n"
+            ".synopsis {{"
+            "  color: rgb({mColR},{mColG},{mColB});"
+            "  font-wright: bold;"
+            "}}\n"
         ).format(
             textSize = self.mainConf.textSize,
             preSize  = self.mainConf.textSize*0.9,
@@ -387,6 +391,9 @@ class GuiDocViewer(QTextBrowser):
             kColR = self.theTheme.colKey[0],
             kColG = self.theTheme.colKey[1],
             kColB = self.theTheme.colKey[2],
+            mColR = self.theTheme.colMod[0],
+            mColG = self.theTheme.colMod[1],
+            mColB = self.theTheme.colMod[2],
         )
         self.qDocument.setDefaultStyleSheet(styleSheet)