From bb66541c818cffa58a9ceed804c312c813be3a54 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sun, 4 Oct 2020 17:20:54 +0200
Subject: [PATCH] Fix the formatting of white spaces on html export
---
nw/core/tohtml.py | 3 +--
nw/gui/build.py | 18 ++++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/nw/core/tohtml.py b/nw/core/tohtml.py
index 3e98fc1f..770505db 100644
--- a/nw/core/tohtml.py
+++ b/nw/core/tohtml.py
@@ -77,7 +77,6 @@ class ToHtml(Tokenizer):
self.doKeywords = True
self.doComments = doComments
self.doSynopsis = doSynopsis
- self._buildRegEx()
return
def setStyles(self, cssStyles):
@@ -316,7 +315,7 @@ class ToHtml(Tokenizer):
retText = ""
refTags = []
if theBits[0] in nwLabels.KEY_NAME:
- retText += "%s: " % nwLabels.KEY_NAME[theBits[0]]
+ retText += "%s: " % nwLabels.KEY_NAME[theBits[0]]
if len(theBits) > 1:
if theBits[0] == nwKeyWords.TAG_KEY:
retText += "%s" % (
diff --git a/nw/gui/build.py b/nw/gui/build.py
index cbad4f84..c7a558a2 100644
--- a/nw/gui/build.py
+++ b/nw/gui/build.py
@@ -349,28 +349,28 @@ class GuiBuildNovel(QDialog):
self.savePDF.triggered.connect(lambda: self._saveDocument(self.FMT_PDF))
self.saveMenu.addAction(self.savePDF)
- self.saveHTM = QAction("%s HTML (.htm)" % nw.__package__, self)
+ self.saveHTM = QAction("%s HTML (.htm)" % self.mainConf.appName, self)
self.saveHTM.triggered.connect(lambda: self._saveDocument(self.FMT_HTM))
self.saveMenu.addAction(self.saveHTM)
+ self.saveNWD = QAction("%s Markdown (.nwd)" % self.mainConf.appName, self)
+ self.saveNWD.triggered.connect(lambda: self._saveDocument(self.FMT_NWD))
+ self.saveMenu.addAction(self.saveNWD)
+
if self.mainConf.verQtValue >= 51400:
self.saveMD = QAction("Markdown (.md)", self)
self.saveMD.triggered.connect(lambda: self._saveDocument(self.FMT_MD))
self.saveMenu.addAction(self.saveMD)
- self.saveNWD = QAction("%s Markdown (.nwd)" % nw.__package__, self)
- self.saveNWD.triggered.connect(lambda: self._saveDocument(self.FMT_NWD))
- self.saveMenu.addAction(self.saveNWD)
-
self.saveTXT = QAction("Plain Text (.txt)", self)
self.saveTXT.triggered.connect(lambda: self._saveDocument(self.FMT_TXT))
self.saveMenu.addAction(self.saveTXT)
- self.saveJsonH = QAction("JSON + %s HTML (.json)" % nw.__package__, self)
+ self.saveJsonH = QAction("JSON + %s HTML (.json)" % self.mainConf.appName, self)
self.saveJsonH.triggered.connect(lambda: self._saveDocument(self.FMT_JSON_H))
self.saveMenu.addAction(self.saveJsonH)
- self.saveJsonM = QAction("JSON + %s Markdown (.json)" % nw.__package__, self)
+ self.saveJsonM = QAction("JSON + %s Markdown (.json)" % self.mainConf.appName, self)
self.saveJsonM.triggered.connect(lambda: self._saveDocument(self.FMT_JSON_M))
self.saveMenu.addAction(self.saveJsonM)
@@ -666,6 +666,8 @@ class GuiBuildNovel(QDialog):
# Write novelWriter HTML data
theStyle = self.htmlStyle.copy()
theStyle.append(r"article {width: 800px; margin: 40px auto;}")
+ bodyText = "".join(self.htmlText)
+ bodyText = bodyText.replace("\t", " ")
theHtml = (
"\n"
"\n"
@@ -685,7 +687,7 @@ class GuiBuildNovel(QDialog):
).format(
projTitle = self.theProject.projName,
htmlStyle = "\n".join(theStyle),
- bodyText = "".join(self.htmlText),
+ bodyText = bodyText,
)
outFile.write(theHtml)