novelWriter 2.3.1__py3-none-any.whl → 2.4b1__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

novelwriter/core/toodt.py

@@ -84,14 +84,16 @@ X_BLD = 0x01  # Bold format
 X_ITA = 0x02  # Italic format
 X_DEL = 0x04  # Strikethrough format
 X_UND = 0x08  # Underline format
-X_SUP = 0x10  # Superscript
-X_SUB = 0x20  # Subscript
+X_MRK = 0x10  # Marked format
+X_SUP = 0x20  # Superscript
+X_SUB = 0x40  # Subscript
 
 # Formatting Masks
 M_BLD = ~X_BLD
 M_ITA = ~X_ITA
 M_DEL = ~X_DEL
 M_UND = ~X_UND
+M_MRK = ~X_MRK
 M_SUP = ~X_SUP
 M_SUB = ~X_SUB
 
@@ -136,6 +138,7 @@ class ToOdt(Tokenizer):
         self._textSize     = 12
         self._textFixed    = False
         self._colourHead   = False
+        self._firstIndent  = False
         self._headerFormat = ""
         self._pageOffset   = 0
 
@@ -151,6 +154,7 @@ class ToOdt(Tokenizer):
         self._fSizeText    = "12pt"
         self._fLineHeight  = "115%"
         self._fBlockIndent = "1.693cm"
+        self._fTextIndent  = "0.499cm"
         self._textAlign    = "left"
         self._dLanguage    = "en"
         self._dCountry     = "GB"
@@ -189,6 +193,7 @@ class ToOdt(Tokenizer):
         self._opaHead34 = None
         self._colMetaTx = None
         self._opaMetaTx = None
+        self._markText  = "#ffffa6"
 
         return
 
@@ -229,6 +234,11 @@ class ToOdt(Tokenizer):
         self._pageOffset = offset
         return
 
+    def setFirstLineIndent(self, state: bool) -> None:
+        """Enable or disable first line indent."""
+        self._firstIndent = state
+        return
+
     ##
     #  Class Methods
     ##
@@ -394,6 +404,7 @@ class ToOdt(Tokenizer):
         pFmt = []
         pText = []
         pStyle = None
+        pIndent = True
         for tType, _, tText, tFormat, tStyle in self._tokens:
 
             # Styles
@@ -424,6 +435,9 @@ class ToOdt(Tokenizer):
                 if tStyle & self.A_IND_R:
                     oStyle.setMarginRight(self._fBlockIndent)
 
+            if tType not in (self.T_EMPTY, self.T_TEXT):
+                pIndent = False
+
             # Process Text Types
             if tType == self.T_EMPTY:
                 if len(pText) > 1 and pStyle is not None:
@@ -437,7 +451,14 @@ class ToOdt(Tokenizer):
                         tLen = len(tTxt)
                         tTxt += f"{nText}\n"
                         tFmt.extend((p+tLen, fmt) for p, fmt in nFmt)
-                    self._addTextPar("Text_20_body", pStyle, tTxt.rstrip(), tFmt=tFmt)
+
+                    # Don't indent a paragraph if it has alignment set
+                    tIndent = self._firstIndent and pIndent and pStyle.isUnaligned()
+                    self._addTextPar(
+                        "First_20_line_20_indent" if tIndent else "Text_20_body",
+                        pStyle, tTxt.rstrip(), tFmt=tFmt
+                    )
+                    pIndent = True
 
                 pFmt = []
                 pText = []
@@ -447,10 +468,6 @@ class ToOdt(Tokenizer):
                 tHead = tText.replace(nwHeadFmt.BR, "\n")
                 self._addTextPar("Title", oStyle, tHead, isHead=False)  # Title must be text:p
 
-            elif tType == self.T_UNNUM:
-                tHead = tText.replace(nwHeadFmt.BR, "\n")
-                self._addTextPar("Heading_20_2", oStyle, tHead, isHead=True, oLevel="2")
-
             elif tType == self.T_HEAD1:
                 tHead = tText.replace(nwHeadFmt.BR, "\n")
                 self._addTextPar("Heading_20_1", oStyle, tHead, isHead=True, oLevel="1")
@@ -643,6 +660,10 @@ class ToOdt(Tokenizer):
                 xFmt |= X_UND
             elif fFmt == self.FMT_U_E:
                 xFmt &= M_UND
+            elif fFmt == self.FMT_M_B:
+                xFmt |= X_MRK
+            elif fFmt == self.FMT_M_E:
+                xFmt &= M_MRK
             elif fFmt == self.FMT_SUP_B:
                 xFmt |= X_SUP
             elif fFmt == self.FMT_SUP_E:
@@ -710,6 +731,8 @@ class ToOdt(Tokenizer):
             newStyle.setUnderlineStyle("solid")
             newStyle.setUnderlineWidth("auto")
             newStyle.setUnderlineColour("font-color")
+        if hFmt & X_MRK:
+            newStyle.setBackgroundColor(self._markText)
         if hFmt & X_SUP:
             newStyle.setTextPosition("super")
         if hFmt & X_SUB:
@@ -850,6 +873,18 @@ class ToOdt(Tokenizer):
 
         self._mainPara["Text_20_body"] = oStyle
 
+        # Add First Line Indent Style
+        # ===========================
+
+        oStyle = ODTParagraphStyle()
+        oStyle.setDisplayName("First line indent")
+        oStyle.setParentStyleName("Text_20_body")
+        oStyle.setClass("text")
+        oStyle.setTextIndent(self._fTextIndent)
+        oStyle.packXML(self._xStyl, "First_20_line_20_indent")
+
+        self._mainPara["First_20_line_20_indent"] = oStyle
+
         # Add Text Meta Style
         # ===================
 
@@ -1077,6 +1112,7 @@ class ODTParagraphStyle:
             "margin-bottom": ["fo", None],
             "margin-left":   ["fo", None],
             "margin-right":  ["fo", None],
+            "text-indent":   ["fo", None],
             "line-height":   ["fo", None],
             "text-align":    ["fo", None],
             "break-before":  ["fo", None],
@@ -1095,6 +1131,16 @@ class ODTParagraphStyle:
 
         return
 
+    ##
+    #  Checkers
+    ##
+
+    def isUnaligned(self) -> bool:
+        """Check if paragraph has any sort of alignment or margins."""
+        return all(
+            self._pAttr[n][1] is None for n in ["text-align", "margin-left", "margin-right"]
+        )
+
     ##
     #  Attribute Setters
     ##
@@ -1145,6 +1191,10 @@ class ODTParagraphStyle:
         self._pAttr["margin-right"][1] = value
         return
 
+    def setTextIndent(self, value: str | None) -> None:
+        self._pAttr["text-indent"][1] = value
+        return
+
     def setLineHeight(self, value: str | None) -> None:
         self._pAttr["line-height"][1] = value
         return
@@ -1279,6 +1329,7 @@ class ODTTextStyle:
         self._tAttr = {
             "font-weight":             ["fo",    None],
             "font-style":              ["fo",    None],
+            "background-color":        ["fo",    None],
             "text-position":           ["style", None],
             "text-line-through-style": ["style", None],
             "text-line-through-type":  ["style", None],
@@ -1306,6 +1357,13 @@ class ODTTextStyle:
             self._tAttr["font-style"][1] = None
         return
 
+    def setBackgroundColor(self, value: str | None) -> None:
+        if value and len(value) == 7 and value[0] == "#":
+            self._tAttr["background-color"][1] = value
+        else:
+            self._tAttr["background-color"][1] = None
+        return
+
     def setTextPosition(self, value: str | None) -> None:
         if value in self.VALID_POS:
             self._tAttr["text-position"][1] = f"{value} 58%"

novelwriter/core/tree.py

@@ -28,7 +28,7 @@ import logging
 
 from typing import TYPE_CHECKING, Literal, overload
 from pathlib import Path
-from collections.abc import Iterator
+from collections.abc import Iterable, Iterator
 
 from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType
 from novelwriter.error import logException
@@ -351,16 +351,16 @@ class NWTree:
             return False
         return tItem.itemType == itemType
 
-    def getItemPath(self, tHandle: str) -> list[str]:
+    def getItemPath(self, tHandle: str, asName: bool = False) -> list[str]:
         """Iterate upwards in the tree until we find the item with
-        parent None, the root item, and return the list of handles.
-        We do this with a for loop with a maximum depth to make
-        infinite loops impossible.
+        parent None, the root item, and return the list of handles, or
+        alternatively item names. We do this with a for loop with a
+        maximum depth to make infinite loops impossible.
         """
         tTree = []
         tItem = self.__getitem__(tHandle)
         if tItem is not None:
-            tTree.append(tHandle)
+            tTree.append(tItem.itemName if asName else tHandle)
             for _ in range(MAX_DEPTH):
                 if tItem.itemParent is None:
                     return tTree
@@ -370,7 +370,7 @@ class NWTree:
                     if tItem is None:
                         return tTree
                     else:
-                        tTree.append(tHandle)
+                        tTree.append(tItem.itemName if asName else tHandle)
             else:
                 raise RecursionError("Critical internal error")
 
@@ -387,7 +387,7 @@ class NWTree:
             rootClasses.add(nwItem.itemClass)
         return rootClasses
 
-    def iterRoots(self, itemClass: nwItemClass | None) -> Iterator[tuple[str, NWItem]]:
+    def iterRoots(self, itemClass: nwItemClass | None) -> Iterable[tuple[str, NWItem]]:
         """Iterate over all root items of a given class in order."""
         for tHandle in self._order:
             nwItem = self.__getitem__(tHandle)

novelwriter/dialogs/docsplit.py

@@ -57,7 +57,7 @@ class GuiDocSplit(QDialog):
 
         self.setWindowTitle(self.tr("Split Document"))
 
-        self.headLabel = QLabel("<b>{0}</b>".format(self.tr("Document Headers")))
+        self.headLabel = QLabel("<b>{0}</b>".format(self.tr("Document Headings")))
         self.helpLabel = NColourLabel(
             self.tr("Select the maximum level to split into files."),
             SHARED.theme.helpText, parent=self, wrap=True
@@ -74,17 +74,17 @@ class GuiDocSplit(QDialog):
         intoFolder = pOptions.getBool("GuiDocSplit", "intoFolder", True)
         docHierarchy = pOptions.getBool("GuiDocSplit", "docHierarchy", True)
 
-        # Header Selection
+        # Heading Selection
         self.listBox = QListWidget()
         self.listBox.setDragDropMode(QAbstractItemView.NoDragDrop)
         self.listBox.setMinimumWidth(CONFIG.pxInt(400))
         self.listBox.setMinimumHeight(CONFIG.pxInt(180))
 
         self.splitLevel = QComboBox(self)
-        self.splitLevel.addItem(self.tr("Split on Header Level 1 (Title)"),      1)
-        self.splitLevel.addItem(self.tr("Split up to Header Level 2 (Chapter)"), 2)
-        self.splitLevel.addItem(self.tr("Split up to Header Level 3 (Scene)"),   3)
-        self.splitLevel.addItem(self.tr("Split up to Header Level 4 (Section)"), 4)
+        self.splitLevel.addItem(self.tr("Split on Heading Level 1 (Partition)"),      1)
+        self.splitLevel.addItem(self.tr("Split up to Heading Level 2 (Chapter)"), 2)
+        self.splitLevel.addItem(self.tr("Split up to Heading Level 3 (Scene)"),   3)
+        self.splitLevel.addItem(self.tr("Split up to Heading Level 4 (Section)"), 4)
         spIndex = self.splitLevel.findData(spLevel)
         if spIndex != -1:
             self.splitLevel.setCurrentIndex(spIndex)
@@ -214,8 +214,7 @@ class GuiDocSplit(QDialog):
 
         spLevel = self.splitLevel.currentData()
         if not self._text:
-            inDoc = SHARED.project.storage.getDocument(sHandle)
-            self._text = (inDoc.readDocument() or "").splitlines()
+            self._text = SHARED.project.storage.getDocumentText(sHandle).splitlines()
 
         for lineNo, aLine in enumerate(self._text):
 

novelwriter/dialogs/preferences.py

@@ -151,8 +151,7 @@ class GuiPreferences(QDialog):
         self.guiLocale.setMinimumWidth(minWidth)
         for lang, name in CONFIG.listLanguages(CONFIG.LANG_NW):
             self.guiLocale.addItem(name, lang)
-        if (idx := self.guiLocale.findData(CONFIG.guiLocale)) != -1:
-            self.guiLocale.setCurrentIndex(idx)
+        self.guiLocale.setCurrentData(CONFIG.guiLocale, "en_GB")
 
         self.mainForm.addRow(
             self.tr("Display language"), self.guiLocale,
@@ -164,8 +163,7 @@ class GuiPreferences(QDialog):
         self.guiTheme.setMinimumWidth(minWidth)
         for theme, name in SHARED.theme.listThemes():
             self.guiTheme.addItem(name, theme)
-        if (idx := self.guiTheme.findData(CONFIG.guiTheme)) != -1:
-            self.guiTheme.setCurrentIndex(idx)
+        self.guiTheme.setCurrentData(CONFIG.guiTheme, "default")
 
         self.mainForm.addRow(
             self.tr("Colour theme"), self.guiTheme,
@@ -226,8 +224,7 @@ class GuiPreferences(QDialog):
         self.guiSyntax.setMinimumWidth(CONFIG.pxInt(200))
         for syntax, name in SHARED.theme.listSyntax():
             self.guiSyntax.addItem(name, syntax)
-        if (idx := self.guiSyntax.findData(CONFIG.guiSyntax)) != -1:
-            self.guiSyntax.setCurrentIndex(idx)
+        self.guiSyntax.setCurrentData(CONFIG.guiSyntax, "default_light")
 
         self.mainForm.addRow(
             self.tr("Document colour theme"), self.guiSyntax,

novelwriter/enum.py

@@ -112,20 +112,22 @@ class nwDocAction(Enum):
     BLOCK_TXT = 19
     BLOCK_TTL = 20
     BLOCK_UNN = 21
-    REPL_SNG  = 22
-    REPL_DBL  = 23
-    RM_BREAKS = 24
-    ALIGN_L   = 25
-    ALIGN_C   = 26
-    ALIGN_R   = 27
-    INDENT_L  = 28
-    INDENT_R  = 29
-    SC_ITALIC = 30
-    SC_BOLD   = 31
-    SC_STRIKE = 32
-    SC_ULINE  = 33
-    SC_SUP    = 34
-    SC_SUB    = 35
+    BLOCK_HSC = 22
+    REPL_SNG  = 23
+    REPL_DBL  = 24
+    RM_BREAKS = 25
+    ALIGN_L   = 26
+    ALIGN_C   = 27
+    ALIGN_R   = 28
+    INDENT_L  = 29
+    INDENT_R  = 30
+    SC_ITALIC = 31
+    SC_BOLD   = 32
+    SC_STRIKE = 33
+    SC_ULINE  = 34
+    SC_MARK   = 35
+    SC_SUP    = 36
+    SC_SUB    = 37
 
 # END Enum nwDocAction
 
@@ -153,6 +155,7 @@ class nwView(Enum):
     PROJECT = 1
     NOVEL   = 2
     OUTLINE = 3
+    SEARCH  = 4
 
 # END Enum nwView
 

novelwriter/extensions/modified.py

@@ -25,9 +25,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtCore import Qt
+from PyQt5.QtCore import QSize, Qt
 from PyQt5.QtGui import QWheelEvent
-from PyQt5.QtWidgets import QComboBox, QDoubleSpinBox, QSpinBox, QWidget
+from PyQt5.QtWidgets import QComboBox, QDoubleSpinBox, QSpinBox, QToolButton, QWidget
 
 
 class NComboBox(QComboBox):
@@ -44,6 +44,12 @@ class NComboBox(QComboBox):
             event.ignore()
         return
 
+    def setCurrentData(self, data: str, default: str) -> None:
+        """Set the current index from data, with a fallback."""
+        idx = self.findData(data)
+        self.setCurrentIndex(self.findData(default) if idx < 0 else idx)
+        return
+
 # END Class NComboBox
 
 
@@ -79,3 +85,15 @@ class NDoubleSpinBox(QDoubleSpinBox):
         return
 
 # END Class NDoubleSpinBox
+
+
+class NIconToolButton(QToolButton):
+
+    def __init__(self, parent: QWidget, iconSize: int) -> None:
+        super().__init__(parent=parent)
+        self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
+        self.setIconSize(QSize(iconSize, iconSize))
+        self.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
+        return
+
+# END Class NIconToolButton

novelwriter/extensions/versioninfo.py

@@ -57,7 +57,7 @@ class VersionInfoWidget(QWidget):
         # Labels
         self._lblInfo = QLabel("{0} {1} \u2013 {2} {3} \u2013 {4}".format(
             self.tr("Version"), formatVersion(__version__),
-            self.tr("Released on"), datetime.strptime(__date__, "%Y-%m-%d").strftime("%x"),
+            self.tr("Released on"), CONFIG.localDate(datetime.strptime(__date__, "%Y-%m-%d")),
             "<a href='#notes'>{0}</a>".format(self.tr("Release Notes")),
         ), self)
         self._lblInfo.linkActivated.connect(self._processLink)