Clean up Markdown build code

novelwriter/core/buildsettings.py

@@ -97,7 +97,6 @@ SETTINGS_TEMPLATE = {
     "odt.addColours":          (bool, True),
     "odt.pageHeader":          (str, nwHeadFmt.ODT_AUTO),
     "odt.pageCountOffset":     (int, 0),
-    "md.preserveBreaks":       (bool, True),
     "html.addStyles":          (bool, True),
     "html.preserveTabs":       (bool, False),
 }
@@ -155,9 +154,6 @@ SETTINGS_LABELS = {
     "odt.pageHeader":          QT_TRANSLATE_NOOP("Builds", "Page Header"),
     "odt.pageCountOffset":     QT_TRANSLATE_NOOP("Builds", "Page Counter Offset"),
 
-    "md":                      QT_TRANSLATE_NOOP("Builds", "Markdown (.md)"),
-    "md.preserveBreaks":       QT_TRANSLATE_NOOP("Builds", "Preserve Hard Line Breaks"),
-
     "html":                    QT_TRANSLATE_NOOP("Builds", "HTML (.html)"),
     "html.addStyles":          QT_TRANSLATE_NOOP("Builds", "Add CSS Styles"),
     "html.preserveTabs":       QT_TRANSLATE_NOOP("Builds", "Preserve Tab Characters"),

novelwriter/core/docbuild.py

@@ -216,16 +216,10 @@ class NWBuildDocument:
         makeObj = ToMarkdown(self._project)
         filtered = self._setupBuild(makeObj)
 
-        if extendedMd:
-            makeObj.setExtendedMarkdown()
-        else:
-            makeObj.setStandardMarkdown()
-
+        makeObj.setExtendedMarkdown(extendedMd)
         if self._build.getBool("format.replaceTabs"):
             makeObj.replaceTabs(nSpaces=4, spaceChar=" ")
 
-        makeObj.setPreserveBreaks(self._build.getBool("md.preserveBreaks"))
-
         for i, tHandle in enumerate(self._queue):
             self._error = None
             if filtered.get(tHandle, (False, 0))[0]:
@@ -333,6 +327,7 @@ class NWBuildDocument:
         bldObj.setFont(fontFamily, textSize, textFixed)
         bldObj.setJustify(self._build.getBool("format.justifyText"))
         bldObj.setLineHeight(self._build.getFloat("format.lineHeight"))
+        bldObj.setKeepLineBreaks(self._build.getBool("format.keepBreaks"))
         bldObj.setFirstLineIndent(
             self._build.getBool("format.firstLineIndent"),
             self._build.getFloat("format.firstIndentWidth"),

novelwriter/core/tomarkdown.py

@@ -81,15 +81,11 @@ class ToMarkdown(Tokenizer):
     supports concatenating novelWriter markup files.
     """
 
-    M_STD = 0  # Standard Markdown
-    M_EXT = 1  # Extended Markdown
-
     def __init__(self, project: NWProject) -> None:
         super().__init__(project)
-        self._genMode = self.M_STD
         self._fullMD: list[str] = []
-        self._preserveBreaks = True
         self._usedNotes: dict[str, int] = {}
+        self._extended = True
         return
 
     ##
@@ -105,19 +101,9 @@ class ToMarkdown(Tokenizer):
     #  Setters
     ##
 
-    def setStandardMarkdown(self) -> None:
-        """Set the converter to use standard Markdown formatting."""
-        self._genMode = self.M_STD
-        return
-
-    def setExtendedMarkdown(self) -> None:
+    def setExtendedMarkdown(self, state: bool) -> None:
         """Set the converter to use Extended Markdown formatting."""
-        self._genMode = self.M_EXT
-        return
-
-    def setPreserveBreaks(self, state: bool) -> None:
-        """Preserve line breaks in paragraphs."""
-        self._preserveBreaks = state
+        self._extended = state
         return
 
     ##
@@ -132,12 +118,12 @@ class ToMarkdown(Tokenizer):
         """Convert the list of text tokens into a Markdown document."""
         self._result = ""
 
-        if self._genMode == self.M_STD:
-            mTags = STD_MD
-            cSkip = ""
-        else:
+        if self._extended:
             mTags = EXT_MD
             cSkip = nwUnicode.U_MMSP
+        else:
+            mTags = STD_MD
+            cSkip = ""
 
         lines = []
         for tType, _, tText, tFormat, tStyle in self._tokens:
@@ -195,7 +181,7 @@ class ToMarkdown(Tokenizer):
     def appendFootnotes(self) -> None:
         """Append the footnotes in the buffer."""
         if self._usedNotes:
-            tags = STD_MD if self._genMode == self.M_STD else EXT_MD
+            tags = EXT_MD if self._extended else STD_MD
             footnotes = self._localLookup("Footnotes")
 
             lines = []