novelWriter 2.3.1__py3-none-any.whl → 2.4__py3-none-any.whl

novelwriter/core/tomd.py

@@ -27,7 +27,7 @@ import logging
 
 from pathlib import Path
 
-from novelwriter.constants import nwHeadFmt, nwLabels
+from novelwriter.constants import nwHeadFmt, nwLabels, nwUnicode
 from novelwriter.core.project import NWProject
 from novelwriter.core.tokenizer import Tokenizer
 
@@ -49,6 +49,7 @@ class ToMarkdown(Tokenizer):
         super().__init__(project)
         self._genMode = self.M_STD
         self._fullMD: list[str] = []
+        self._preserveBreaks = True
         return
 
     ##
@@ -74,6 +75,11 @@ class ToMarkdown(Tokenizer):
         self._genMode = self.M_EXT
         return
 
+    def setPreserveBreaks(self, state: bool) -> None:
+        """Preserve line breaks in paragraphs."""
+        self._preserveBreaks = state
+        return
+
     ##
     #  Class Methods
     ##
@@ -95,11 +101,14 @@ class ToMarkdown(Tokenizer):
                 self.FMT_D_E: "",
                 self.FMT_U_B: "",
                 self.FMT_U_E: "",
+                self.FMT_M_B: "",
+                self.FMT_M_E: "",
                 self.FMT_SUP_B: "",
                 self.FMT_SUP_E: "",
                 self.FMT_SUB_B: "",
                 self.FMT_SUB_E: "",
             }
+            cSkip = ""
         else:
             # Extended Markdown
             mdTags = {
@@ -111,22 +120,26 @@ class ToMarkdown(Tokenizer):
                 self.FMT_D_E: "~~",
                 self.FMT_U_B: "",
                 self.FMT_U_E: "",
+                self.FMT_M_B: "==",
+                self.FMT_M_E: "==",
                 self.FMT_SUP_B: "^",
                 self.FMT_SUP_E: "^",
                 self.FMT_SUB_B: "~",
                 self.FMT_SUB_E: "~",
             }
+            cSkip = nwUnicode.U_MMSP
 
         self._result = ""
 
         para = []
         lines = []
+        lineSep = "  \n" if self._preserveBreaks else " "
 
         for tType, _, tText, tFormat, tStyle in self._tokens:
 
             if tType == self.T_EMPTY:
-                if len(para) > 0:
-                    tTemp = ("  \n".join(para)).rstrip(" ")
+                if para:
+                    tTemp = (lineSep.join(para)).rstrip(" ")
                     lines.append(f"{tTemp}\n\n")
                 para = []
 
@@ -134,10 +147,6 @@ class ToMarkdown(Tokenizer):
                 tHead = tText.replace(nwHeadFmt.BR, "\n")
                 lines.append(f"# {tHead}\n\n")
 
-            elif tType == self.T_UNNUM:
-                tHead = tText.replace(nwHeadFmt.BR, "\n")
-                lines.append(f"## {tHead}\n\n")
-
             elif tType == self.T_HEAD1:
                 tHead = tText.replace(nwHeadFmt.BR, "\n")
                 lines.append(f"# {tHead}\n\n")
@@ -158,7 +167,7 @@ class ToMarkdown(Tokenizer):
                 lines.append(f"{tText}\n\n")
 
             elif tType == self.T_SKIP:
-                lines.append("\n\n\n")
+                lines.append(f"{cSkip}\n\n")
 
             elif tType == self.T_TEXT:
                 tTemp = tText