novelWriter 2.6b1__py3-none-any.whl → 2.6b2__py3-none-any.whl

novelwriter/dialogs/docmerge.py

@@ -162,23 +162,13 @@ class GuiDocMerge(NDialog):
         self._data = {}
         self._data["sHandle"] = sHandle
         self._data["origItems"] = itemList
-
         self.listBox.clear()
         for tHandle in itemList:
-            nwItem = SHARED.project.tree[tHandle]
-            if nwItem is None or not nwItem.isFileType():
-                continue
-
-            itemIcon = SHARED.theme.getItemIcon(
-                nwItem.itemType, nwItem.itemClass, nwItem.itemLayout, nwItem.mainHeading
-            )
-
-            newItem = QListWidgetItem()
-            newItem.setIcon(itemIcon)
-            newItem.setText(nwItem.itemName)
-            newItem.setData(self.D_HANDLE, tHandle)
-            newItem.setCheckState(Qt.CheckState.Checked)
-
-            self.listBox.addItem(newItem)
-
+            if (nwItem := SHARED.project.tree[tHandle]) and nwItem.isFileType():
+                item = QListWidgetItem()
+                item.setIcon(nwItem.getMainIcon())
+                item.setText(nwItem.itemName)
+                item.setData(self.D_HANDLE, tHandle)
+                item.setCheckState(Qt.CheckState.Checked)
+                self.listBox.addItem(item)
         return

novelwriter/dialogs/preferences.py

@@ -574,7 +574,7 @@ class GuiPreferences(NDialog):
         self.dialogLine.setText(CONFIG.dialogLine)
         self.mainForm.addRow(
             self.tr("Dialogue line symbols"), self.dialogLine,
-            self.tr("Lines starting with these symbols are always dialogue.")
+            self.tr("Lines starting with any of these symbols are dialogue.")
         )
 
         self.narratorBreak = QLineEdit(self)
@@ -583,8 +583,8 @@ class GuiPreferences(NDialog):
         self.narratorBreak.setAlignment(QtAlignCenter)
         self.narratorBreak.setText(CONFIG.narratorBreak)
         self.mainForm.addRow(
-            self.tr("Dialogue narrator break symbol"), self.narratorBreak,
-            self.tr("Symbol to indicate injected narrator break in dialogue")
+            self.tr("Narrator break symbol"), self.narratorBreak,
+            self.tr("Symbol to indicate a narrator break in dialogue")
         )
 
         self.narratorDialog = QLineEdit(self)

novelwriter/dialogs/projectsettings.py

@@ -185,11 +185,11 @@ class GuiProjectSettings(NDialog):
 
         if self.statusPage.changed:
             logger.debug("Updating status labels")
-            project.data.itemStatus.update(self.statusPage.getNewList())
+            project.updateStatus("s", self.statusPage.getNewList())
 
         if self.importPage.changed:
             logger.debug("Updating importance labels")
-            project.data.itemImport.update(self.importPage.getNewList())
+            project.updateStatus("i", self.importPage.getNewList())
 
         if self.replacePage.changed:
             logger.debug("Updating auto-replace settings")

novelwriter/enum.py

@@ -75,6 +75,13 @@ class nwTrinary(Enum):
     POSITIVE = 1
 
 
+class nwChange(Enum):
+
+    CREATE = 0
+    UPDATE = 1
+    DELETE = 2
+
+
 class nwDocMode(Enum):
 
     VIEW = 0

novelwriter/extensions/configlayout.py

@@ -27,7 +27,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtGui import QColor, QFont, QPalette
+from PyQt5.QtGui import QColor, QFont, QPalette, QPixmap
 from PyQt5.QtWidgets import (
     QAbstractButton, QFrame, QHBoxLayout, QLabel, QLayout, QScrollArea,
     QVBoxLayout, QWidget
@@ -183,7 +183,7 @@ class NScrollableForm(QScrollArea):
     def addRow(
         self,
         label: str | None,
-        widget: QWidget | list[QWidget | str | int],
+        widget: QWidget | list[QWidget | QPixmap | int],
         helpText: str = "",
         unit: str | None = None,
         button: QWidget | None = None,
@@ -200,8 +200,10 @@ class NScrollableForm(QScrollArea):
             for item in widget:
                 if isinstance(item, QWidget):
                     wBox.addWidget(item)
-                elif isinstance(item, str):
-                    wBox.addWidget(QLabel(item, self))
+                elif isinstance(item, QPixmap):
+                    icon = QLabel(self)
+                    icon.setPixmap(item)
+                    wBox.addWidget(icon)
                 elif isinstance(item, int):
                     wBox.addSpacing(CONFIG.pxInt(item))
             qWidget = QWidget(self)

novelwriter/formats/todocx.py

@@ -33,7 +33,7 @@ from pathlib import Path
 from typing import NamedTuple
 from zipfile import ZIP_DEFLATED, ZipFile
 
-from PyQt5.QtCore import QMarginsF, QSizeF
+from PyQt5.QtCore import QMargins, QSize
 from PyQt5.QtGui import QColor
 
 from novelwriter import __version__
@@ -95,6 +95,11 @@ def _wText(parent: ET.Element, text: str) -> ET.Element:
     return xmlSubElem(parent, _wTag("t"), text, attrib=attrib)
 
 
+def _mmToSz(value: float) -> int:
+    """Convert millimetres to internal margin size units"""
+    return int(value*20.0*72.0/25.4)
+
+
 # Cached
 W_VAL = _wTag("val")
 
@@ -182,8 +187,8 @@ class ToDocX(Tokenizer):
         # Internal
         self._fontFamily  = "Liberation Serif"
         self._fontSize    = 12.0
-        self._pageSize    = QSizeF(210.0, 297.0)
-        self._pageMargins = QMarginsF(20.0, 20.0, 20.0, 20.0)
+        self._pageSize    = QSize(_mmToSz(210.0), _mmToSz(297.0))
+        self._pageMargins = QMargins(_mmToSz(20.0), _mmToSz(20.0), _mmToSz(20.0), _mmToSz(20.0))
 
         # Data Variables
         self._pars: list[DocXParagraph] = []
@@ -203,8 +208,8 @@ class ToDocX(Tokenizer):
         self, width: float, height: float, top: float, bottom: float, left: float, right: float
     ) -> None:
         """Set the document page size and margins in millimetres."""
-        self._pageSize = QSizeF(width, height)
-        self._pageMargins = QMarginsF(left, top, right, bottom)
+        self._pageSize = QSize(_mmToSz(width), _mmToSz(height))
+        self._pageMargins = QMargins(_mmToSz(left), _mmToSz(top), _mmToSz(right), _mmToSz(bottom))
         return
 
     def setHeaderFormat(self, format: str, offset: int) -> None:
@@ -521,12 +526,6 @@ class ToDocX(Tokenizer):
         hScale = self._scaleHeads
         hColor = _docXCol(self._theme.head) if self._colorHeads else None
         fSz = self._fontSize
-        fnSz = 0.8 * self._fontSize
-        fSz0 = (nwStyles.H_SIZES[0] * fSz) if hScale else fSz
-        fSz1 = (nwStyles.H_SIZES[1] * fSz) if hScale else fSz
-        fSz2 = (nwStyles.H_SIZES[2] * fSz) if hScale else fSz
-        fSz3 = (nwStyles.H_SIZES[3] * fSz) if hScale else fSz
-        fSz4 = (nwStyles.H_SIZES[4] * fSz) if hScale else fSz
 
         # Add Normal Style
         styles.append(DocXParStyle(
@@ -545,12 +544,12 @@ class ToDocX(Tokenizer):
         styles.append(DocXParStyle(
             name="Title",
             styleId=S_TITLE,
-            size=fSz0,
+            size=(nwStyles.H_SIZES[0] * fSz) if hScale else fSz,
             basedOn=S_NORM,
             nextStyle=S_NORM,
             before=fSz * self._marginTitle[0],
             after=fSz * self._marginTitle[1],
-            line=fSz0 * self._lineHeight,
+            line=fSz * self._lineHeight,
             level=0,
             bold=self._boldHeads,
         ))
@@ -559,12 +558,12 @@ class ToDocX(Tokenizer):
         styles.append(DocXParStyle(
             name="Heading 1",
             styleId=S_HEAD1,
-            size=fSz1,
+            size=(nwStyles.H_SIZES[1] * fSz) if hScale else fSz,
             basedOn=S_NORM,
             nextStyle=S_NORM,
             before=fSz * self._marginHead1[0],
             after=fSz * self._marginHead1[1],
-            line=fSz1 * self._lineHeight,
+            line=fSz * self._lineHeight,
             level=0,
             color=hColor,
             bold=self._boldHeads,
@@ -574,12 +573,12 @@ class ToDocX(Tokenizer):
         styles.append(DocXParStyle(
             name="Heading 2",
             styleId=S_HEAD2,
-            size=fSz2,
+            size=(nwStyles.H_SIZES[2] * fSz) if hScale else fSz,
             basedOn=S_NORM,
             nextStyle=S_NORM,
             before=fSz * self._marginHead2[0],
             after=fSz * self._marginHead2[1],
-            line=fSz2 * self._lineHeight,
+            line=fSz * self._lineHeight,
             level=1,
             color=hColor,
             bold=self._boldHeads,
@@ -589,12 +588,12 @@ class ToDocX(Tokenizer):
         styles.append(DocXParStyle(
             name="Heading 3",
             styleId=S_HEAD3,
-            size=fSz3,
+            size=(nwStyles.H_SIZES[3] * fSz) if hScale else fSz,
             basedOn=S_NORM,
             nextStyle=S_NORM,
             before=fSz * self._marginHead3[0],
             after=fSz * self._marginHead3[1],
-            line=fSz3 * self._lineHeight,
+            line=fSz * self._lineHeight,
             level=1,
             color=hColor,
             bold=self._boldHeads,
@@ -604,12 +603,12 @@ class ToDocX(Tokenizer):
         styles.append(DocXParStyle(
             name="Heading 4",
             styleId=S_HEAD4,
-            size=fSz4,
+            size=(nwStyles.H_SIZES[4] * fSz) if hScale else fSz,
             basedOn=S_NORM,
             nextStyle=S_NORM,
             before=fSz * self._marginHead4[0],
             after=fSz * self._marginHead4[1],
-            line=fSz4 * self._lineHeight,
+            line=fSz * self._lineHeight,
             level=1,
             color=hColor,
             bold=self._boldHeads,
@@ -653,12 +652,12 @@ class ToDocX(Tokenizer):
         styles.append(DocXParStyle(
             name="Footnote Text",
             styleId=S_FNOTE,
-            size=fnSz,
+            size=nwStyles.T_SMALL * fSz,
             basedOn=S_NORM,
             before=0.0,
-            after=fnSz * self._marginFoot[1],
-            left=fnSz * self._marginFoot[0],
-            line=fnSz * self._lineHeight,
+            after=fSz * self._marginFoot[1],
+            left=fSz * self._marginFoot[0],
+            line=fSz * self._lineHeight,
         ))
 
         # Add to Cache
@@ -795,6 +794,7 @@ class ToDocX(Tokenizer):
                 _wTag("before"): str(int(20.0 * firstFloat(style.before))),
                 _wTag("after"): str(int(20.0 * firstFloat(style.after))),
                 _wTag("line"): str(int(20.0 * firstFloat(style.line, size))),
+                _wTag("lineRule"): "auto",
             })
             if style.left is not None:
                 xmlSubElem(pPr, _wTag("ind"), attrib={
@@ -860,12 +860,10 @@ class ToDocX(Tokenizer):
             xR = xmlSubElem(xP, _wTag("r"))
             xmlSubElem(xR, _wTag("fldChar"), attrib={wFldCT: "begin"})
             xR = xmlSubElem(xP, _wTag("r"))
-            _wText(xR, " PAGE ")
+            xmlSubElem(xR, _wTag("instrText"), "PAGE", attrib={_mkTag("xml", "space"): "preserve"})
             xR = xmlSubElem(xP, _wTag("r"))
             xmlSubElem(xR, _wTag("fldChar"), attrib={wFldCT: "separate"})
             xR = xmlSubElem(xP, _wTag("r"))
-            _wText(xR, "0")
-            xR = xmlSubElem(xP, _wTag("r"))
             xmlSubElem(xR, _wTag("fldChar"), attrib={wFldCT: "end"})
         if post:
             xR = xmlSubElem(xP, _wTag("r"))
@@ -933,9 +931,6 @@ class ToDocX(Tokenizer):
         for par in pars:
             par.toXml(xBody)
 
-        def szScale(value: float) -> str:
-            return str(int(value*2.0*72.0/2.54))
-
         # Write Settings
         xSect = xmlSubElem(xBody, _wTag("sectPr"))
         if hFirst and hDefault:
@@ -952,16 +947,16 @@ class ToDocX(Tokenizer):
         })
 
         xmlSubElem(xSect, _wTag("pgSz"), attrib={
-            _wTag("w"): szScale(self._pageSize.width()),
-            _wTag("h"): szScale(self._pageSize.height()),
+            _wTag("w"): str(self._pageSize.width()),
+            _wTag("h"): str(self._pageSize.height()),
             _wTag("orient"): "portrait",
         })
         xmlSubElem(xSect, _wTag("pgMar"), attrib={
-            _wTag("top"): szScale(self._pageMargins.top()),
-            _wTag("right"): szScale(self._pageMargins.right()),
-            _wTag("bottom"): szScale(self._pageMargins.bottom()),
-            _wTag("left"): szScale(self._pageMargins.left()),
-            _wTag("header"): szScale(self._pageMargins.top()/2.0),
+            _wTag("top"): str(self._pageMargins.top()),
+            _wTag("right"): str(self._pageMargins.right()),
+            _wTag("bottom"): str(self._pageMargins.bottom()),
+            _wTag("left"): str(self._pageMargins.left()),
+            _wTag("header"): str(self._pageMargins.top() - int(35.0*self._fontSize)),
             _wTag("footer"): "0",
             _wTag("gutter"): "0",
         })
@@ -1171,6 +1166,7 @@ class DocXParagraph:
                     _wTag("before"): str(int(20.0 * firstFloat(self._topMargin, style.before))),
                     _wTag("after"): str(int(20.0 * firstFloat(self._bottomMargin, style.after))),
                     _wTag("line"): str(int(20.0 * firstFloat(style.line, style.size))),
+                    _wTag("lineRule"): "auto",
                 })
             if indent:
                 xmlSubElem(pPr, _wTag("ind"), attrib=indent)

novelwriter/formats/tohtml.py

@@ -339,26 +339,25 @@ class ToHtml(Tokenizer):
         if not self._cssStyles:
             return []
 
-        mScale = self._lineHeight/1.15
         tColor = self._theme.text.name(QtHexRgb)
         hColor = self._theme.head.name(QtHexRgb) if self._colorHeads else tColor
         lColor = self._theme.head.name(QtHexRgb)
         mColor = self._theme.highlight.name(QtHexRgb)
 
-        mtH0 = mScale * self._marginTitle[0]
-        mbH0 = mScale * self._marginTitle[1]
-        mtH1 = mScale * self._marginHead1[0]
-        mbH1 = mScale * self._marginHead1[1]
-        mtH2 = mScale * self._marginHead2[0]
-        mbH2 = mScale * self._marginHead2[1]
-        mtH3 = mScale * self._marginHead3[0]
-        mbH3 = mScale * self._marginHead3[1]
-        mtH4 = mScale * self._marginHead4[0]
-        mbH4 = mScale * self._marginHead4[1]
-        mtTT = mScale * self._marginText[0]
-        mbTT = mScale * self._marginText[1]
-        mtSP = mScale * self._marginSep[0]
-        mbSP = mScale * self._marginSep[1]
+        mtH0 = self._marginTitle[0]
+        mbH0 = self._marginTitle[1]
+        mtH1 = self._marginHead1[0]
+        mbH1 = self._marginHead1[1]
+        mtH2 = self._marginHead2[0]
+        mbH2 = self._marginHead2[1]
+        mtH3 = self._marginHead3[0]
+        mbH3 = self._marginHead3[1]
+        mtH4 = self._marginHead4[0]
+        mbH4 = self._marginHead4[1]
+        mtTT = self._marginText[0]
+        mbTT = self._marginText[1]
+        mtSP = self._marginSep[0]
+        mbSP = self._marginSep[1]
 
         font = self._textFont
         fFam = font.family()

novelwriter/formats/tokenizer.py

@@ -35,7 +35,7 @@ from PyQt5.QtCore import QLocale
 from PyQt5.QtGui import QColor, QFont
 
 from novelwriter import CONFIG
-from novelwriter.common import checkInt, numberToRoman
+from novelwriter.common import checkInt, fontMatcher, numberToRoman
 from novelwriter.constants import (
     nwHeadFmt, nwKeyWords, nwLabels, nwShortcode, nwStats, nwStyles, nwUnicode,
     trConst
@@ -302,9 +302,9 @@ class Tokenizer(ABC):
         self._sceneStyle |= BlockFmt.PBB if pageBreak else BlockFmt.NONE
         return
 
-    def setFont(self, font: QFont) -> None:
+    def setTextFont(self, font: QFont) -> None:
         """Set the build font."""
-        self._textFont = font
+        self._textFont = fontMatcher(font)
         return
 
     def setLineHeight(self, height: float) -> None:
@@ -490,22 +490,14 @@ class Tokenizer(ABC):
         return
 
     def doPreProcessing(self) -> None:
-        """Run trough the various replace dictionaries."""
+        """Run pre-processing jobs before the text is tokenized."""
         # Process the user's auto-replace dictionary
-        autoReplace = self._project.data.autoReplace
-        if len(autoReplace) > 0:
+        if autoReplace := self._project.data.autoReplace:
             repDict = {}
             for aKey, aVal in autoReplace.items():
                 repDict[f"<{aKey}>"] = aVal
             xRep = re.compile("|".join([re.escape(k) for k in repDict.keys()]), flags=re.DOTALL)
             self._text = xRep.sub(lambda x: repDict[x.group(0)], self._text)
-
-        # Process the translation map for placeholder characters
-        self._text = self._text.translate(str.maketrans({
-            nwUnicode.U_MAPOS: nwUnicode.U_RSQUO,
-            nwUnicode.U_HBAR: nwUnicode.U_EMDASH,
-        }))
-
         return
 
     def tokenizeText(self) -> None:
@@ -538,13 +530,25 @@ class Tokenizer(ABC):
         firstIndent = self._firstIndent
 
         # Replace all instances of [br] with a placeholder character
-        text = REGEX_PATTERNS.lineBreak.sub("\uffff", self._text)
+        text = REGEX_PATTERNS.lineBreak.sub(nwUnicode.U_NAC2, self._text)
+
+        # Translation Maps
+        transMapA = str.maketrans({
+            nwUnicode.U_NAC2:  "",  # Used when [br] is ignored
+            nwUnicode.U_MAPOS: nwUnicode.U_RSQUO,
+            nwUnicode.U_HBAR:  nwUnicode.U_EMDASH,
+        })
+        transMapB = str.maketrans({
+            nwUnicode.U_NAC2:  "\n",  # Used when [br] is not ignored
+            nwUnicode.U_MAPOS: nwUnicode.U_RSQUO,
+            nwUnicode.U_HBAR:  nwUnicode.U_EMDASH,
+        })
 
         nHead = 0
         tHandle = self._handle or ""
         tBlocks: list[T_Block] = [B_EMPTY]
         for bLine in text.splitlines():
-            aLine = bLine.replace("\uffff", "")  # Remove placeholder characters
+            aLine = bLine.translate(transMapA)
             sLine = aLine.strip().lower()
 
             # Check for blank lines
@@ -884,7 +888,7 @@ class Tokenizer(ABC):
                         if doJustify and not cStyle & BlockFmt.ALIGNED:
                             cStyle |= BlockFmt.JUSTIFY
 
-                        pTxt = pLines[0][2].replace("\uffff", "\n")
+                        pTxt = pLines[0][2].translate(transMapB)
                         sBlocks.append((
                             BlockTyp.TEXT, pLines[0][1], pTxt, pLines[0][3], cStyle
                         ))
@@ -901,7 +905,7 @@ class Tokenizer(ABC):
                             tFmt.extend((p+tLen, fmt, key) for p, fmt, key in aBlock[3])
                             cStyle |= aBlock[4]
 
-                        pTxt = tTxt[:-1].replace("\uffff", "\n")
+                        pTxt = tTxt[:-1].translate(transMapB)
                         sBlocks.append((
                             BlockTyp.TEXT, pLines[0][1], pTxt, tFmt, cStyle
                         ))