novelWriter 2.6rc1__py3-none-any.whl → 2.6.2__py3-none-any.whl

novelwriter/config.py

@@ -32,6 +32,7 @@ import sys
 from datetime import datetime
 from pathlib import Path
 from time import time
+from typing import TYPE_CHECKING
 
 from PyQt5.QtCore import (
     PYQT_VERSION, PYQT_VERSION_STR, QT_VERSION, QT_VERSION_STR, QLibraryInfo,
@@ -47,6 +48,9 @@ from novelwriter.common import (
 from novelwriter.constants import nwFiles, nwUnicode
 from novelwriter.error import formatException, logException
 
+if TYPE_CHECKING:  # pragma: no cover
+    from novelwriter.core.projectdata import NWProjectData
+
 logger = logging.getLogger(__name__)
 
 
@@ -101,8 +105,11 @@ class Config:
         self._qtTrans = {}
 
         # PDF Manual
-        pdfDocs = self._appPath / "assets" / "manual.pdf"
-        self.pdfDocs = pdfDocs if pdfDocs.is_file() else None
+        self._manuals: dict[str, Path] = {}
+        if (assets := self._appPath / "assets").is_dir():
+            for item in assets.iterdir():
+                if item.is_file() and item.stem.startswith("manual") and item.suffix == ".pdf":
+                    self._manuals[item.stem] = item
 
         # User Settings
         # =============
@@ -112,7 +119,7 @@ class Config:
 
         # General GUI Settings
         self.guiLocale    = self._qLocale.name()
-        self.guiTheme     = "default"        # GUI theme
+        self.guiTheme     = "default_light"  # GUI theme
         self.guiSyntax    = "default_light"  # Syntax theme
         self.guiFont      = QFont()          # Main GUI font
         self.guiScale     = 1.0              # Set automatically by Theme class
@@ -135,6 +142,7 @@ class Config:
         self.emphLabels      = True   # Add emphasis to H1 and H2 item labels
         self.backupOnClose   = False  # Flag for running automatic backups
         self.askBeforeBackup = True   # Flag for asking before running automatic backup
+        self.askBeforeExit   = True   # Flag for asking before exiting the app
 
         # Text Editor Settings
         self.textFont        = QFont()  # Editor font
@@ -257,6 +265,10 @@ class Config:
     def hasError(self) -> bool:
         return self._hasError
 
+    @property
+    def pdfDocs(self) -> Path | None:
+        return self._manuals.get(f"manual_{self.locale.name()}", self._manuals.get("manual"))
+
     @property
     def locale(self) -> QLocale:
         return self._dLocale
@@ -628,6 +640,7 @@ class Config:
         self._backupPath     = conf.rdPath(sec, "backuppath", self._backupPath)
         self.backupOnClose   = conf.rdBool(sec, "backuponclose", self.backupOnClose)
         self.askBeforeBackup = conf.rdBool(sec, "askbeforebackup", self.askBeforeBackup)
+        self.askBeforeExit   = conf.rdBool(sec, "askbeforeexit", self.askBeforeExit)
 
         # Editor
         sec = "Editor"
@@ -739,6 +752,7 @@ class Config:
             "backuppath":      str(self._backupPath),
             "backuponclose":   str(self.backupOnClose),
             "askbeforebackup": str(self.askBeforeBackup),
+            "askbeforeexit":   str(self.askBeforeExit),
         }
 
         conf["Editor"] = {
@@ -842,29 +856,30 @@ class RecentProjects:
 
     def __init__(self, config: Config) -> None:
         self._conf = config
-        self._data = {}
+        self._data: dict[str, dict[str, str | int]] = {}
+        self._map: dict[str, str] = {}
         return
 
     def loadCache(self) -> bool:
         """Load the cache file for recent projects."""
         self._data = {}
-
+        self._map = {}
         cacheFile = self._conf.dataPath(nwFiles.RECENT_FILE)
         if cacheFile.is_file():
             try:
                 with open(cacheFile, mode="r", encoding="utf-8") as inFile:
                     data = json.load(inFile)
                 for path, entry in data.items():
-                    self._data[path] = {
-                        "title": entry.get("title", ""),
-                        "words": entry.get("words", 0),
-                        "time": entry.get("time", 0),
-                    }
+                    puuid = str(entry.get("uuid", ""))
+                    title = str(entry.get("title", ""))
+                    words = checkInt(entry.get("words", 0), 0)
+                    saved = checkInt(entry.get("time", 0), 0)
+                    if path and title:
+                        self._setEntry(puuid, path, title, words, saved)
             except Exception:
                 logger.error("Could not load recent project cache")
                 logException()
                 return False
-
         return True
 
     def saveCache(self) -> bool:
@@ -879,7 +894,6 @@ class RecentProjects:
             logger.error("Could not save recent project cache")
             logException()
             return False
-
         return True
 
     def listEntries(self) -> list[tuple[str, str, int, int]]:
@@ -889,14 +903,15 @@ class RecentProjects:
             for k, e in self._data.items()
         ]
 
-    def update(self, path: str | Path, title: str, words: int, saved: float | int) -> None:
+    def update(self, path: str | Path, data: NWProjectData, saved: float | int) -> None:
         """Add or update recent cache information on a given project."""
-        self._data[str(path)] = {
-            "title": title,
-            "words": int(words),
-            "time": int(saved),
-        }
-        self.saveCache()
+        try:
+            if (remove := self._map.get(data.uuid)) and (remove != str(path)):
+                self.remove(remove)
+            self._setEntry(data.uuid, str(path), data.name, sum(data.currCounts), int(saved))
+            self.saveCache()
+        except Exception:
+            pass
         return
 
     def remove(self, path: str | Path) -> None:
@@ -906,6 +921,13 @@ class RecentProjects:
             self.saveCache()
         return
 
+    def _setEntry(self, puuid: str, path: str, title: str, words: int, saved: int) -> None:
+        """Set an entry in the recent projects record."""
+        self._data[path] = {"uuid": puuid, "title": title, "words": words, "time": saved}
+        if puuid:
+            self._map[puuid] = path
+        return
+
 
 class RecentPaths:
 

novelwriter/constants.py

@@ -173,6 +173,10 @@ class nwKeyWords:
         TAG_KEY, POV_KEY, FOCUS_KEY, CHAR_KEY, PLOT_KEY, TIME_KEY, WORLD_KEY,
         OBJECT_KEY, ENTITY_KEY, CUSTOM_KEY, STORY_KEY, MENTION_KEY,
     ]
+    CAN_CREATE = [
+        POV_KEY, FOCUS_KEY, CHAR_KEY, PLOT_KEY, TIME_KEY, WORLD_KEY,
+        OBJECT_KEY, ENTITY_KEY, CUSTOM_KEY,
+    ]
 
     # Set of Valid Keys
     VALID_KEYS = set(ALL_KEYS)

novelwriter/core/buildsettings.py

@@ -159,6 +159,13 @@ SETTINGS_LABELS = {
     "format.indentFirstPar":   QT_TRANSLATE_NOOP("Builds", "Indent First Paragraph"),
 
     "format.grpMargins":       QT_TRANSLATE_NOOP("Builds", "Text Margins"),
+    "format.titleMargin":      QT_TRANSLATE_NOOP("Builds", "Title and Partition"),
+    "format.h1Margin":         QT_TRANSLATE_NOOP("Builds", "Heading 1 and Chapter"),
+    "format.h2Margin":         QT_TRANSLATE_NOOP("Builds", "Heading 2 and Scene"),
+    "format.h3Margin":         QT_TRANSLATE_NOOP("Builds", "Heading 3 and Section"),
+    "format.h4Margin":         QT_TRANSLATE_NOOP("Builds", "Heading 4"),
+    "format.textMargin":       QT_TRANSLATE_NOOP("Builds", "Text Paragraph"),
+    "format.sepMargin":        QT_TRANSLATE_NOOP("Builds", "Scene Separator"),
 
     "format.grpPage":          QT_TRANSLATE_NOOP("Builds", "Page Layout"),
     "format.pageUnit":         QT_TRANSLATE_NOOP("Builds", "Unit"),

novelwriter/core/itemmodel.py

@@ -328,7 +328,7 @@ class ProjectModel(QAbstractItemModel):
 
     def parent(self, index: QModelIndex) -> QModelIndex:
         """Get the parent model index of another index."""
-        if index.isValid() and (parent := index.internalPointer().parent()):
+        if index.isValid() and (node := index.internalPointer()) and (parent := node.parent()):
             return self.createIndex(parent.row(), 0, parent)
         return QModelIndex()
 
@@ -379,7 +379,9 @@ class ProjectModel(QAbstractItemModel):
         row: int, column: int, parent: QModelIndex
     ) -> bool:
         """Check if mime data can be dropped on the current location."""
-        return data.hasFormat(nwConst.MIME_HANDLE) and action == Qt.DropAction.MoveAction
+        if parent.isValid() and parent.internalPointer() is not self._root:
+            return data.hasFormat(nwConst.MIME_HANDLE) and action == Qt.DropAction.MoveAction
+        return False
 
     def dropMimeData(
         self, data: QMimeData, action: Qt.DropAction,

novelwriter/core/project.py

@@ -353,9 +353,7 @@ class NWProject:
 
         # Update recent projects
         if storePath := self._storage.storagePath:
-            CONFIG.recentProjects.update(
-                storePath, self._data.name, sum(self._data.initCounts), time()
-            )
+            CONFIG.recentProjects.update(storePath, self._data, time())
 
         # Check the project tree consistency
         # This also handles any orphaned files found
@@ -421,9 +419,7 @@ class NWProject:
 
         # Update recent projects
         if storagePath := self._storage.storagePath:
-            CONFIG.recentProjects.update(
-                storagePath, self._data.name, sum(self._data.currCounts), saveTime
-            )
+            CONFIG.recentProjects.update(storagePath, self._data, saveTime)
 
         SHARED.newStatusMessage(self.tr("Saved Project: {0}").format(self._data.name))
         self.setProjectChanged(False)

novelwriter/dialogs/docsplit.py

@@ -71,10 +71,10 @@ class GuiDocSplit(NDialog):
         vSp = CONFIG.pxInt(8)
         bSp = CONFIG.pxInt(12)
 
-        pOptions = SHARED.project.options
-        spLevel = pOptions.getInt("GuiDocSplit", "spLevel", 3)
-        intoFolder = pOptions.getBool("GuiDocSplit", "intoFolder", True)
-        docHierarchy = pOptions.getBool("GuiDocSplit", "docHierarchy", True)
+        options = SHARED.project.options
+        spLevel = options.getInt("GuiDocSplit", "spLevel", 3)
+        intoFolder = options.getBool("GuiDocSplit", "intoFolder", True)
+        docHierarchy = options.getBool("GuiDocSplit", "docHierarchy", True)
 
         # Heading Selection
         self.listBox = QListWidget(self)
@@ -171,10 +171,10 @@ class GuiDocSplit(NDialog):
         self._data["moveToTrash"] = moveToTrash
 
         logger.debug("Saving State: GuiDocSplit")
-        pOptions = SHARED.project.options
-        pOptions.setValue("GuiDocSplit", "spLevel", spLevel)
-        pOptions.setValue("GuiDocSplit", "intoFolder", intoFolder)
-        pOptions.setValue("GuiDocSplit", "docHierarchy", docHierarchy)
+        options = SHARED.project.options
+        options.setValue("GuiDocSplit", "spLevel", spLevel)
+        options.setValue("GuiDocSplit", "intoFolder", intoFolder)
+        options.setValue("GuiDocSplit", "docHierarchy", docHierarchy)
 
         return self._data, self._text
 
@@ -218,42 +218,46 @@ class GuiDocSplit(NDialog):
         if not self._text:
             self._text = SHARED.project.storage.getDocumentText(sHandle).splitlines()
 
-        for lineNo, aLine in enumerate(self._text):
-
-            onLine = -1
-            hLevel = 0
-            hLabel = aLine.strip()
-            if aLine.startswith("# ") and spLevel >= 1:
-                onLine = lineNo
-                hLevel = 1
-                hLabel = aLine[2:].strip()
-            elif aLine.startswith("## ") and spLevel >= 2:
-                onLine = lineNo
-                hLevel = 2
-                hLabel = aLine[3:].strip()
-            elif aLine.startswith("### ") and spLevel >= 3:
-                onLine = lineNo
-                hLevel = 3
-                hLabel = aLine[4:].strip()
-            elif aLine.startswith("#### ") and spLevel >= 4:
-                onLine = lineNo
-                hLevel = 4
-                hLabel = aLine[5:].strip()
-            elif aLine.startswith("#! ") and spLevel >= 1:
-                onLine = lineNo
-                hLevel = 1
-                hLabel = aLine[3:].strip()
-            elif aLine.startswith("##! ") and spLevel >= 2:
-                onLine = lineNo
-                hLevel = 2
-                hLabel = aLine[4:].strip()
-
-            if onLine >= 0 and hLevel > 0:
-                newItem = QListWidgetItem()
-                newItem.setText(aLine.strip())
-                newItem.setData(self.LINE_ROLE, onLine)
-                newItem.setData(self.LEVEL_ROLE, hLevel)
-                newItem.setData(self.LABEL_ROLE, hLabel)
-                self.listBox.addItem(newItem)
+        for i, line in enumerate(self._text):
+
+            pos = -1
+            level = 0
+            label = line.strip()
+            if line.startswith("# ") and spLevel >= 1:
+                pos = i
+                level = 1
+                label = line[2:].strip()
+            elif line.startswith("## ") and spLevel >= 2:
+                pos = i
+                level = 2
+                label = line[3:].strip()
+            elif line.startswith("### ") and spLevel >= 3:
+                pos = i
+                level = 3
+                label = line[4:].strip()
+            elif line.startswith("#### ") and spLevel >= 4:
+                pos = i
+                level = 4
+                label = line[5:].strip()
+            elif line.startswith("#! ") and spLevel >= 1:
+                pos = i
+                level = 1
+                label = line[3:].strip()
+            elif line.startswith("##! ") and spLevel >= 2:
+                pos = i
+                level = 2
+                label = line[4:].strip()
+            elif line.startswith("###! ") and spLevel >= 3:
+                pos = i
+                level = 3
+                label = line[5:].strip()
+
+            if pos >= 0 and level > 0:
+                trItem = QListWidgetItem()
+                trItem.setText(line.strip())
+                trItem.setData(self.LINE_ROLE, pos)
+                trItem.setData(self.LEVEL_ROLE, level)
+                trItem.setData(self.LABEL_ROLE, label)
+                self.listBox.addItem(trItem)
 
         return

novelwriter/dialogs/preferences.py

@@ -271,10 +271,10 @@ class GuiPreferences(NDialog):
             self.tr("Include project notes in status bar word count"), self.incNotesWCount
         )
 
-        # Auto Save
+        # Behaviour
         # =========
 
-        title = self.tr("Auto Save")
+        title = self.tr("Behaviour")
         section += 1
         self.sidebar.addButton(title, section)
         self.mainForm.addGroupLabel(title, section)
@@ -301,6 +301,14 @@ class GuiPreferences(NDialog):
             self.tr("How often the project is automatically saved."), unit=self.tr("seconds")
         )
 
+        # Ask before exiting novelWriter
+        self.askBeforeExit = NSwitch(self)
+        self.askBeforeExit.setChecked(CONFIG.askBeforeExit)
+        self.mainForm.addRow(
+            self.tr("Ask before exiting novelWriter"), self.askBeforeExit,
+            self.tr("Only applies when a project is open.")
+        )
+
         # Project Backup
         # ==============
 
@@ -927,9 +935,10 @@ class GuiPreferences(NDialog):
         CONFIG.incNotesWCount = self.incNotesWCount.isChecked()
         CONFIG.setTextFont(self._textFont)
 
-        # Auto Save
-        CONFIG.autoSaveDoc  = self.autoSaveDoc.value()
-        CONFIG.autoSaveProj = self.autoSaveProj.value()
+        # Behaviour
+        CONFIG.autoSaveDoc   = self.autoSaveDoc.value()
+        CONFIG.autoSaveProj  = self.autoSaveProj.value()
+        CONFIG.askBeforeExit = self.askBeforeExit.isChecked()
 
         # Project Backup
         CONFIG.setBackupPath(self.backupPath)

novelwriter/enum.py

@@ -68,13 +68,6 @@ class nwComment(Enum):
     STORY    = 7
 
 
-class nwTrinary(Enum):
-
-    NEGATIVE = -1
-    NEUTRAL  = 0
-    POSITIVE = 1
-
-
 class nwChange(Enum):
 
     CREATE = 0

novelwriter/extensions/novelselector.py

@@ -90,12 +90,13 @@ class NovelSelector(QComboBox):
     @pyqtSlot()
     def refreshNovelList(self) -> None:
         """Rebuild the list of novel items."""
+        cHandle = self.currentData()
+
         self._blockSignal = True
         self._firstHandle = None
         self.clear()
 
         icon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[nwItemClass.NOVEL])
-        handle = self.currentData()
         for tHandle, nwItem in SHARED.project.tree.iterRoots(nwItemClass.NOVEL):
             if self._listFormat:
                 name = self._listFormat.format(nwItem.itemName)
@@ -110,7 +111,7 @@ class NovelSelector(QComboBox):
             self.insertSeparator(self.count())
             self.addItem(icon, self.tr("All Novel Folders"), "")
 
-        self.setHandle(handle)
+        self.setHandle(cHandle)
         self.setEnabled(self.count() > 1)
         self._blockSignal = False
 

novelwriter/extensions/statusled.py

@@ -29,7 +29,6 @@ from PyQt5.QtGui import QColor, QPainter, QPaintEvent
 from PyQt5.QtWidgets import QAbstractButton, QWidget
 
 from novelwriter import CONFIG
-from novelwriter.enum import nwTrinary
 from novelwriter.types import QtBlack, QtPaintAntiAlias
 
 logger = logging.getLogger(__name__)
@@ -47,14 +46,14 @@ class StatusLED(QAbstractButton):
         self._postitve = QtBlack
         self._negative = QtBlack
         self._color = QtBlack
-        self._state = nwTrinary.NEUTRAL
+        self._state = None
         self._bPx = CONFIG.pxInt(1)
         self.setFixedWidth(sW)
         self.setFixedHeight(sH)
         return
 
     @property
-    def state(self) -> nwTrinary:
+    def state(self) -> bool | None:
         """The current state of the LED."""
         return self._state
 
@@ -66,11 +65,11 @@ class StatusLED(QAbstractButton):
         self.setState(self._state)
         return
 
-    def setState(self, state: nwTrinary) -> None:
+    def setState(self, state: bool | None) -> None:
         """Set the colour state."""
-        if state == nwTrinary.POSITIVE:
+        if state is True:
             self._color = self._postitve
-        elif state == nwTrinary.NEGATIVE:
+        elif state is False:
             self._color = self._negative
         else:
             self._color = self._neutral

novelwriter/formats/shared.py

@@ -104,17 +104,18 @@ class BlockTyp(IntEnum):
 
     EMPTY   = 1   # Empty line (new paragraph)
     TITLE   = 2   # Title
-    HEAD1   = 3   # Heading 1
-    HEAD2   = 4   # Heading 2
-    HEAD3   = 5   # Heading 3
-    HEAD4   = 6   # Heading 4
-    TEXT    = 7   # Text line
-    SEP     = 8   # Scene separator
-    SKIP    = 9   # Paragraph break
-    SUMMARY = 10  # Synopsis/short comment
-    NOTE    = 11  # Note
-    COMMENT = 12  # Comment
-    KEYWORD = 13  # Tag/reference keywords
+    PART    = 3   # Partition
+    HEAD1   = 4   # Heading 1 or Chapter
+    HEAD2   = 5   # Heading 2 or Scene
+    HEAD3   = 6   # Heading 3 or Section
+    HEAD4   = 7   # Heading 4
+    TEXT    = 8   # Text line
+    SEP     = 9   # Scene separator
+    SKIP    = 10  # Paragraph break
+    SUMMARY = 11  # Synopsis/short comment
+    NOTE    = 12  # Note
+    COMMENT = 13  # Comment
+    KEYWORD = 14  # Tag/reference keywords
 
 
 class BlockFmt(Flag):

novelwriter/formats/todocx.py

@@ -271,7 +271,7 @@ class ToDocX(Tokenizer):
             if tType == BlockTyp.TEXT:
                 self._processFragments(par, S_NORM, tText, tFormat)
 
-            elif tType == BlockTyp.TITLE:
+            elif tType in (BlockTyp.TITLE, BlockTyp.PART):
                 self._processFragments(par, S_TITLE, tText, tFormat)
 
             elif tType == BlockTyp.HEAD1:

novelwriter/formats/tohtml.py

@@ -30,7 +30,7 @@ from pathlib import Path
 from time import time
 
 from novelwriter.common import formatTimeStamp
-from novelwriter.constants import nwHtmlUnicode
+from novelwriter.constants import nwHtmlUnicode, nwStyles
 from novelwriter.core.project import NWProject
 from novelwriter.formats.shared import BlockFmt, BlockTyp, T_Formats, TextFmt, stripEscape
 from novelwriter.formats.tokenizer import Tokenizer
@@ -130,20 +130,6 @@ class ToHtml(Tokenizer):
 
     def doConvert(self) -> None:
         """Convert the list of text tokens into an HTML document."""
-        if self._isNovel:
-            # For story files, we bump the titles one level up
-            h1Cl = " class='title'"
-            h1 = "h1"
-            h2 = "h1"
-            h3 = "h2"
-            h4 = "h3"
-        else:
-            h1Cl = ""
-            h1 = "h1"
-            h2 = "h2"
-            h3 = "h3"
-            h4 = "h4"
-
         lines = []
         for tType, tMeta, tText, tFmt, tStyle in self._blocks:
 
@@ -213,25 +199,25 @@ class ToHtml(Tokenizer):
             if tType == BlockTyp.TEXT:
                 lines.append(f"<p{hStyle}>{self._formatText(tText, tFmt)}</p>\n")
 
-            elif tType == BlockTyp.TITLE:
+            elif tType in (BlockTyp.TITLE, BlockTyp.PART):
                 tHead = tText.replace("\n", "<br>")
                 lines.append(f"<h1 class='title'{hStyle}>{aNm}{tHead}</h1>\n")
 
             elif tType == BlockTyp.HEAD1:
                 tHead = tText.replace("\n", "<br>")
-                lines.append(f"<{h1}{h1Cl}{hStyle}>{aNm}{tHead}</{h1}>\n")
+                lines.append(f"<h1{hStyle}>{aNm}{tHead}</h1>\n")
 
             elif tType == BlockTyp.HEAD2:
                 tHead = tText.replace("\n", "<br>")
-                lines.append(f"<{h2}{hStyle}>{aNm}{tHead}</{h2}>\n")
+                lines.append(f"<h2{hStyle}>{aNm}{tHead}</h2>\n")
 
             elif tType == BlockTyp.HEAD3:
                 tHead = tText.replace("\n", "<br>")
-                lines.append(f"<{h3}{hStyle}>{aNm}{tHead}</{h3}>\n")
+                lines.append(f"<h3{hStyle}>{aNm}{tHead}</h3>\n")
 
             elif tType == BlockTyp.HEAD4:
                 tHead = tText.replace("\n", "<br>")
-                lines.append(f"<{h4}{hStyle}>{aNm}{tHead}</{h4}>\n")
+                lines.append(f"<h4{hStyle}>{aNm}{tHead}</h4>\n")
 
             elif tType == BlockTyp.SEP:
                 lines.append(f"<p class='sep'{hStyle}>{tText}</p>\n")
@@ -310,9 +296,7 @@ class ToHtml(Tokenizer):
                     "</style>\n"
                     "</head>\n"
                     "<body>\n"
-                    "<article>\n"
                     "{body:s}\n"
-                    "</article>\n"
                     "</body>\n"
                     "</html>\n"
                 ).format(
@@ -359,6 +343,12 @@ class ToHtml(Tokenizer):
         mtSP = self._marginSep[0]
         mbSP = self._marginSep[1]
 
+        fSz0 = nwStyles.H_SIZES[0]
+        fSz1 = nwStyles.H_SIZES[1]
+        fSz2 = nwStyles.H_SIZES[2]
+        fSz3 = nwStyles.H_SIZES[3]
+        fSz4 = nwStyles.H_SIZES[4]
+
         font = self._textFont
         fFam = font.family()
         fSz = font.pointSize()
@@ -379,12 +369,25 @@ class ToHtml(Tokenizer):
         styles.append(f"a {{color: {lColor};}}")
         styles.append(f"mark {{background: {mColor};}}")
         styles.append(f"h1, h2, h3, h4 {{color: {hColor}; page-break-after: avoid;}}")
-        styles.append(f"h1 {{margin-top: {mtH1:.2f}em; margin-bottom: {mbH1:.2f}em;}}")
-        styles.append(f"h2 {{margin-top: {mtH2:.2f}em; margin-bottom: {mbH2:.2f}em;}}")
-        styles.append(f"h3 {{margin-top: {mtH3:.2f}em; margin-bottom: {mbH3:.2f}em;}}")
-        styles.append(f"h4 {{margin-top: {mtH4:.2f}em; margin-bottom: {mbH4:.2f}em;}}")
         styles.append(
-            f".title {{font-size: 2.5em; margin-top: {mtH0:.2f}em; margin-bottom: {mbH0:.2f}em;}}"
+            f"h1 {{font-size: {fSz1:.2f}em; "
+            f"margin-top: {mtH1:.2f}em; margin-bottom: {mbH1:.2f}em;}}"
+        )
+        styles.append(
+            f"h2 {{font-size: {fSz2:.2f}em; "
+            f"margin-top: {mtH2:.2f}em; margin-bottom: {mbH2:.2f}em;}}"
+        )
+        styles.append(
+            f"h3 {{font-size: {fSz3:.2f}em; "
+            f"margin-top: {mtH3:.2f}em; margin-bottom: {mbH3:.2f}em;}}"
+        )
+        styles.append(
+            f"h4 {{font-size: {fSz4:.2f}em; "
+            f"margin-top: {mtH4:.2f}em; margin-bottom: {mbH4:.2f}em;}}"
+        )
+        styles.append(
+            f".title {{font-size: {fSz0:.2f}em; "
+            f"margin-top: {mtH0:.2f}em; margin-bottom: {mbH0:.2f}em;}}"
         )
         styles.append(
             f".sep {{text-align: center; margin-top: {mtSP:.2f}em; margin-bottom: {mbSP:.2f}em;}}"