novelWriter 2.5rc1__tar.gz → 2.5.1__tar.gz

{novelwriter-2.5rc1 → novelwriter-2.5.1}/CHANGELOG.md

@@ -1,5 +1,97 @@
 # novelWriter Changelog
 
+## Version 2.5.1 [2024-07-28]
+
+### Release Notes
+
+This is a patch release that fixes an issue with the lock file being left in the project when the
+project open is cancelled, a few issues with custom input boxes in Preferences, and a usability
+issue when selecting to edit a tag or reference from the Tags and References panel as well as fixed
+an issue with the Importance labels not being updated in the tabs for tags.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixes an issue where the project lock file was created before certain checks where the user could
+  cancel the project open process, leaving a lock file in the project folder behind. Issue #1977.
+  PR #1978.
+* Fixes an issue where the user could add spaces to the pad before and after Preference settings,
+  which would pad every space entered into the text. The Preferences settings no longer accept any
+  white spaces in these boxes (they are removed on save) and also strips duplicate character
+  entries. Issue #1985. PR #1986.
+* The narrator break and dialog symbol Preference text boxes will now be cleared if the settings is
+  a white space. PR #1986.
+* Fixed an issue where Importance labels were not updated in the viewer panel's tags tabs when they
+  where changed in Project Settings. Issue #1992. PR #1993.
+
+**Usability**
+
+* When selecting to edit a tag or reference from the panel below the Document Viewer, the editor
+  now scrolls to the relevant heading as it does in the viewer. Issue #1983. PR #1987.
+
+**Internationalisation**
+
+* Latin American Spanish translation updated by Tommy Marplatt (@tmarplatt). PR #1989.
+
+----
+
+## Version 2.5 [2024-07-10]
+
+### Release Notes
+
+The 2.5 release fixes a number of minor issues from the RC 1 pre-release, and updates most
+translation files. Polish has also been added.
+
+See the website for complete [Release Notes](https://novelwriter.io/releases/release_2_5.html).
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fix an issue with unresponsiveness when switching from Outline View to Tree View with a keyboard
+  shortcut. Issue #1949. PR #1954.
+* Fix an issue with switching focus between editor and viewer when the viewer is hidden.
+  Issue #1950. PR #1954.
+* Fix an issue with first line indentation where it would sometimes indent first paragraph when it
+  should not. Issue #1965. PR #1971.
+
+**Usability**
+
+* Remove the "Apply" button from Preferences as changing theme does not updated the Preferences
+  dialog, which is unexpected behaviour. The Preferences dialog is now also consistent with other
+  settings dialogs. Issue #1951. PR #1954.
+* Improved the error messages when opening a project fails. Issue #1944. PR #1956.
+* Make sure the Project Name is selected and in focus when switching to the New Project Form on the
+  Welcome dialog. Issue #1967. PR #1968.
+
+**Improvements**
+
+* Add first line indentation to Manuscript previews. Issue #1961. PR #1962.
+
+**Internationalisation**
+
+* Norwegian and US English translations updated by @vkbo. PR #1955.
+* German translation updated by Myian (@HeyMyian). PR #1955.
+* Italian translation updated by Lou Cyper (loucyper1). PR #1955.
+* Dutch translation updated by Martijn van der Kleijn (mvdkleijn). PR #1955.
+* Chinese translation updated by @longqzh. PR #1955.
+* Portuguese translation updated by Oli Maia. PR #1955.
+* Japanese translation updated by @hebekeg. PR #1955.
+* French translation updated by Albert Aribaud (@aaribaud). PR #1955.
+* Polish translation added by Anna Maria Polak (@Nauthiz). PR #1955.
+
+**Packaging**
+
+* Rewrote the packaging utilities script. Windows builds are now created in GitHub actions, which
+  is needed for signed packages when this is enabled. PRs #1958 and #1959.
+
+**Documentation**
+
+* Updated the documentation for 2.5. PR #1928.
+
+----
+
 ## Version 2.5 RC 1 [2024-06-22]
 
 ### Release Notes

novelwriter-2.5.1/CREDITS.md

@@ -0,0 +1,75 @@
+# Credits
+
+## Main Developer
+
+* Veronica Berglyd Olsen
+
+## Contributors
+
+* Early Concept: Marian Lückhof
+* Internationalisation: Bruno Meneguello
+* Setup and Packaging: Rachel Powers
+
+For other contributions, see the project's [Contributors](https://github.com/vkbo/novelWriter/graphs/contributors) page.
+
+## Artwork
+
+The artwork on the Welcome dialog was created by Louis Durrant.
+
+## Translations
+
+The default language is English (UK) with English (US) as an option. These are the original
+translators for the languages currently available:
+
+* **Dutch:** Martijn van der Kleijn (mvdkleijn)
+* **French:** Jan Lüdke (jyhelle)
+* **German:** Myian (HeyMyian)
+* **Italian:** Riccardo Mangili
+* **Japanese:** hebekeg
+* **Latin American Spanish:** Tommy Marplatt (tmarplatt)
+* **Norwegian:** Veronica Berglyd Olsen (vkbo)
+* **Polish:** Anna Maria Polak (Nauthiz)
+* **Portuguese:** Bruno Meneguello (bkmeneguello)
+* **Simplified Chinese:** Qianzhi Long (longqzh)
+
+Additional larger translation contributions:
+
+* **French:** Albert Aribaud (aaribaud)
+* **Portuguese:** Oli Maia (olimaia)
+
+Translations are managed on [Crowdin](https://crowdin.com/project/novelwriter), and more
+contributions are listed on the project's Members page.
+
+## Libraries
+
+The following libraries are dependencies of novelWriter:
+
+* **Qt5** by Qt Company
+* **PyQt5** by Riverbank Computing
+* **Enchant** by Dom Lachowicz
+* **PyEnchant** by Dimitri Merejkowsky
+
+## Assets
+
+Some of the assets bundled with novelWriter were adapted from the following sources:
+
+* **Typicons** icons by Stephen Hutchings (CC BY-SA 4.0)
+* **Tomorrow** syntax themes by Chris Kempson (MIT License)
+* **Owl** syntax themes by Sarah Drasner (MIT License)
+* **Solarized** themes by Ethan Schoonover (MIT License)
+* **Cyberpunk Night** theme by Anders Lemvigh (CC BY-SA 4.0)
+* **Dracula** theme by Zeno Rocha (MIT License)
+* **Snazzy Light** theme by Florian Reuschel (MIT License)
+
+## Fonts
+
+The font used for the main novelWriter logo, mimetype and text banners is Pridi. Other fonts are
+used on buttons and icons.
+
+* **Pridi** by Cadson Demak (Open Font License, Version 1.1)
+* **Source Sans Pro** by Paul D. Hunt (SIL Open Font License)
+
+## Special Mentions
+
+Additional thanks to John Blommers who was an early user and who has provided a lot of very useful
+feedback over the years.

{novelwriter-2.5rc1 → novelwriter-2.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.5rc1
+Version: 2.5.1
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelwriter-2.5rc1 → novelwriter-2.5.1}/novelWriter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelWriter
-Version: 2.5rc1
+Version: 2.5.1
 Summary: A markdown-like text editor for planning and writing novels
 Author-email: Veronica Berglyd Olsen <code@vkbo.net>
 License: GNU General Public License v3

{novelwriter-2.5rc1 → novelwriter-2.5.1}/novelWriter.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ novelwriter/assets/i18n/nw_it_IT.qm
 novelwriter/assets/i18n/nw_ja_JP.qm
 novelwriter/assets/i18n/nw_nb_NO.qm
 novelwriter/assets/i18n/nw_nl_NL.qm
+novelwriter/assets/i18n/nw_pl_PL.qm
 novelwriter/assets/i18n/nw_pt_BR.qm
 novelwriter/assets/i18n/nw_zh_CN.qm
 novelwriter/assets/i18n/project_de_DE.json
@@ -42,6 +43,7 @@ novelwriter/assets/i18n/project_ja_JP.json
 novelwriter/assets/i18n/project_nb_NO.json
 novelwriter/assets/i18n/project_nl_NL.json
 novelwriter/assets/i18n/project_nn_NO.json
+novelwriter/assets/i18n/project_pl_PL.json
 novelwriter/assets/i18n/project_pt_BR.json
 novelwriter/assets/i18n/project_ru_RU.json
 novelwriter/assets/i18n/project_zh_CN.json

{novelwriter-2.5rc1 → novelwriter-2.5.1}/novelwriter/__init__.py

@@ -47,9 +47,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.5rc1"
-__hexversion__ = "0x020500c1"
-__date__       = "2024-06-22"
+__version__    = "2.5.1"
+__hexversion__ = "0x020501f0"
+__date__       = "2024-07-28"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 

novelwriter-2.5.1/novelwriter/assets/i18n/project_pl_PL.json

@@ -0,0 +1,116 @@
+{
+  "Synopsis": "Streszczenie",
+  "Short Description": "Krótki opis",
+  "Comment": "Komentarz",
+  "Notes": "Notatki",
+  "Tag": "Znacznik",
+  "Point of View": "Punkt widzenia",
+  "Focus": "Skupienie",
+  "Characters": "Postacie",
+  "Plot": "Fabuła",
+  "Timeline": "Oś czasu",
+  "Locations": "Miejsca",
+  "Objects": "Obiekty",
+  "Entities": "Podmioty",
+  "Custom": "Różne",
+  "0": "zero",
+  "1": "pierwszy",
+  "2": "drugi",
+  "3": "trzeci",
+  "4": "czwarty",
+  "5": "piąty",
+  "6": "szósty",
+  "7": "siódmy",
+  "8": "ósmy",
+  "9": "dziewiąty",
+  "10": "dziesiąty",
+  "11": "jedenasty",
+  "12": "dwunasty",
+  "13": "trzynasty",
+  "14": "czternasty",
+  "15": "piętnasty",
+  "16": "szesnasty",
+  "17": "siedemnasty",
+  "18": "osiemnasty",
+  "19": "dziewiętnasty",
+  "20": "dwudziesty",
+  "21": "dwudziesty pierwszy",
+  "22": "dwudziesty drugi",
+  "23": "dwudziesty Trzeci",
+  "24": "dwudziesty czwarty",
+  "25": "dwudziesty piąty",
+  "26": "dwudziesty szósty",
+  "27": "dwudziesty siódmy",
+  "28": "dwudziesty ósmy",
+  "29": "dwudziesty dziewiąty",
+  "30": "trzydziesty",
+  "31": "trzydziesty pierwszy",
+  "32": "trzydziesty drugi",
+  "33": "trzydziesty trzeci",
+  "34": "trzydziesty czwarty",
+  "35": "trzydziesty piąty",
+  "36": "trzydziesty szósty",
+  "37": "trzydziesty siódmy",
+  "38": "trzydziesty ósmy",
+  "39": "trzydziesty dziewiaty",
+  "40": "czterdziesty",
+  "41": "czterdziesty pierwszy",
+  "42": "czterdziesty drugi",
+  "43": "czterdziesty Trzeci",
+  "44": "czterdziesty czwarty",
+  "45": "czterdziesty piąty",
+  "46": "czterdziesty szósty",
+  "47": "czterdziesty siódmy",
+  "48": "czterdziesty ósmy",
+  "49": "czterdziesty dziewiąty",
+  "50": "pięćdziesiąty",
+  "51": "pięćdziesiąty pierwszy",
+  "52": "pięćdziesiąty drugi",
+  "53": "pięćdziesiąty trzeci",
+  "54": "pięćdziesiąty czwarty",
+  "55": "pięćdziesiąty piąty",
+  "56": "pięćdziesiąty szósty",
+  "57": "pięćdziesiąty siódmy",
+  "58": "pięćdziesiąty ósmy",
+  "59": "pięćdziesiąty dziewiąty",
+  "60": "sześćdziesiąty",
+  "61": "sześćdziesiąty pierwszy",
+  "62": "sześćdziesiąty drugi",
+  "63": "sześćdziesiąty trzeci",
+  "64": "sześćdziesiąty czwarty",
+  "65": "sześćdziesiąty piąty",
+  "66": "sześćdziesiąty szósty",
+  "67": "sześćdziesiąty siódmy",
+  "68": "sześćdziesiąty ósmy",
+  "69": "sześćdziesiąty dziewiąty",
+  "70": "siedemdziesiąty",
+  "71": "siedemdziesiąty pierwszy",
+  "72": "siedemdziesiąty drugi",
+  "73": "siedemdziesiąty trzeci",
+  "74": "siedemdziesiąty czwarty",
+  "75": "siedemdziesiąty piąty",
+  "76": "siedemdziesiąty szósty",
+  "77": "siedemdziesiąty siódmy",
+  "78": "siedemdziesiąty ósmy",
+  "79": "siedemdziesiąty dziewiąty",
+  "80": "osiemdziesiąty",
+  "81": "osiemdziesiąty pierwszy",
+  "82": "osiemdziesiąty drugi",
+  "83": "osiemdziesiąty trzeci",
+  "84": "osiemdziesiąty czwarty",
+  "85": "osiemdziesiąty piąty",
+  "86": "osiemdziesiąty szósty",
+  "87": "osiemdziesiąty siódmy",
+  "88": "osiemdziesiąty ósmy",
+  "89": "osiemdziesiąty dziewiąty",
+  "90": "dziewięćdziesiąty",
+  "91": "dziewięćdziesiąty pierwszy",
+  "92": "dziewięćdziesiąty drugi",
+  "93": "dziewięćdziesiąty trzeci",
+  "94": "dziewięćdziesiąty czwarty",
+  "95": "dziewięćdziesiąty piąty",
+  "96": "dziewięćdziesiąty szósty",
+  "97": "dziewięćdziesiąty siódmy",
+  "98": "dziewięćdziesiąty ósmy",
+  "99": "dziewięćdziesiąty dziewiąty"
+}

novelwriter-2.5.1/novelwriter/assets/text/credits_en.htm

@@ -0,0 +1,92 @@
+<html>
+<body>
+
+<h3>Main Developer</h3>
+
+<p>Veronica Berglyd Olsen</p>
+
+<h3>Contributors</h3>
+
+<ul>
+  <li><b>Early Concept:</b> Marian Lückhof</li>
+  <li><b>Internationalisation:</b> Bruno Meneguello</li>
+  <li><b>Setup and Packaging:</b> Rachel Powers</li>
+</ul>
+
+<p>For other contributions, see the project's
+<a href="https://github.com/vkbo/novelWriter/graphs/contributors">Contributors</a> page.</p>
+
+<h3>Artwork</h3>
+
+<p>The artwork on the Welcome dialog was created by Louis Durrant.</p>
+
+<h3>Translations</h3>
+
+<p>The default language is English (UK) with English (US) as an option. These are the original
+translators for the languages currently available:</p>
+
+<ul>
+  <li><b>Dutch:</b> Martijn van der Kleijn (mvdkleijn)</li>
+  <li><b>French:</b> Jan Lüdke (jyhelle)</li>
+  <li><b>German:</b> Myian (HeyMyian)</li>
+  <li><b>Italian:</b> Riccardo Mangili</li>
+  <li><b>Japanese:</b> hebekeg</li>
+  <li><b>Latin American Spanish:</b> Tommy Marplatt (tmarplatt)</li>
+  <li><b>Norwegian:</b> Veronica Berglyd Olsen (vkbo)</li>
+  <li><b>Polish:</b> Anna Maria Polak (Nauthiz)</li>
+  <li><b>Portuguese:</b> Bruno Meneguello (bkmeneguello)</li>
+  <li><b>Simplified Chinese:</b> Qianzhi Long (longqzh)</li>
+</ul>
+
+<p>Additional larger translation contributions:</p>
+
+<ul>
+  <li><b>French:</b> Albert Aribaud (aaribaud)</li>
+  <li><b>Portuguese:</b> Oli Maia (olimaia)</li>
+</ul>
+
+<p>Translations are managed on <a href="https://crowdin.com/project/novelwriter">Crowdin</a>, and
+more contributions are listed on the project's Members page.</p>
+
+<h3>Libraries</h3>
+
+<p>The following libraries are dependencies of novelWriter:</p>
+
+<ul>
+  <li><b>Qt5</b> by Qt Company</li>
+  <li><b>PyQt5</b> by Riverbank Computing</li>
+  <li><b>Enchant</b> by Dom Lachowicz</li>
+  <li><b>PyEnchant</b> by Dimitri Merejkowsky</li>
+</ul>
+
+<h3>Assets</h3>
+
+<p>Some of the assets bundled with novelWriter were adapted from the following sources:</p>
+
+<ul>
+  <li><b>Typicons</b> icons by Stephen Hutchings (CC BY-SA 4.0)</li>
+  <li><b>Tomorrow</b> syntax themes by Chris Kempson (MIT License)</li>
+  <li><b>Owl</b> syntax themes by Sarah Drasner (MIT License)</li>
+  <li><b>Solarized</b> themes by Ethan Schoonover (MIT License)</li>
+  <li><b>Cyberpunk Night</b> theme by Anders Lemvigh (CC BY-SA 4.0)</li>
+  <li><b>Dracula</b> theme by Zeno Rocha (MIT License)</li>
+  <li><b>Snazzy Light</b> theme by Florian Reuschel (MIT License)</li>
+</ul>
+
+<h3>Fonts</h3>
+
+<p>The font used for the main novelWriter logo, mimetype and text banners is Pridi. Other fonts are
+used on buttons and icons.</p>
+
+<ul>
+  <li><b>Pridi</b> by Cadson Demak (Open Font License, Version 1.1)</li>
+  <li><b>Source Sans Pro</b> by Paul D. Hunt (SIL Open Font License)</li>
+</ul>
+
+<h3>Special Mentions</h3>
+
+<p>Additional thanks to John Blommers who was an early user and who has provided a lot of very
+useful feedback over the years.</p>
+
+</body>
+</html>

{novelwriter-2.5rc1 → novelwriter-2.5.1}/novelwriter/common.py

@@ -279,6 +279,16 @@ def simplified(text: str) -> str:
     return " ".join(str(text).strip().split())
 
 
+def compact(text: str) -> str:
+    """Compact a string by removing spaces."""
+    return "".join(str(text).split())
+
+
+def uniqueCompact(text: str) -> str:
+    """Return a unique, compact and sorted string."""
+    return "".join(sorted(set(compact(text))))
+
+
 def elide(text: str, length: int) -> str:
     """Elide a piece of text to a maximum length."""
     if len(text) > (cut := max(4, length)):

{novelwriter-2.5rc1 → novelwriter-2.5.1}/novelwriter/core/project.py

@@ -254,13 +254,23 @@ class NWProject:
         status = self._storage.initProjectStorage(projPath, clearLock)
         if status != NWStorageOpen.READY:
             if status == NWStorageOpen.UNKOWN:
-                SHARED.error(self.tr("Not a known project file format."))
+                SHARED.error(
+                    self.tr("Not a known project file format."),
+                    info=self.tr("Path: {0}").format(str(projPath))
+                )
             elif status == NWStorageOpen.NOT_FOUND:
-                SHARED.error(self.tr("Project file not found."))
+                SHARED.error(
+                    self.tr("Project file not found."),
+                    info=self.tr("Path: {0}").format(str(projPath))
+                )
+            elif status == NWStorageOpen.FAILED:
+                SHARED.error(
+                    self.tr("Failed to open project."),
+                    info=self.tr("Path: {0}").format(str(projPath)),
+                    exc=self._storage.exc
+                )
             elif status == NWStorageOpen.LOCKED:
                 self._state = NWProjectState.LOCKED
-            elif status == NWStorageOpen.FAILED:
-                SHARED.error(self.tr("Failed to open project."), exc=self._storage.exc)
             return False
 
         # Read Project XML
@@ -346,6 +356,7 @@ class NWProject:
         self.setProjectChanged(False)
         self._valid = True
         self._state = NWProjectState.READY
+        self._storage.lockSession()  # Lock only after a successful open. See issue #1977.
 
         SHARED.newStatusMessage(self.tr("Opened Project: {0}").format(self._data.name))
 

{novelwriter-2.5rc1 → novelwriter-2.5.1}/novelwriter/core/status.py

@@ -121,7 +121,7 @@ class NWStatus:
         return key
 
     def update(self, update: list[tuple[str | None, StatusEntry]]) -> None:
-        """Update the list of statuses, and from removed list."""
+        """Update the list of statuses."""
         self._store.clear()
         for key, entry in update:
             self._store[self._checkKey(key)] = entry
@@ -130,6 +130,9 @@ class NWStatus:
         if self._default not in self._store:
             self._default = next(iter(self._store)) if self._store else None
 
+        # Emit the change signal
+        SHARED.projectSingalProxy({"event": "statusLabels", "kind": self._prefix})
+
         return
 
     def check(self, value: str) -> str:

{novelwriter-2.5rc1 → novelwriter-2.5.1}/novelwriter/core/storage.py

@@ -235,7 +235,6 @@ class NWStorage:
             if child.is_dir() and child.name.startswith("data_"):
                 legacy.legacyDataFolder(basePath, child)
 
-        self._writeLockFile()
         self._ready = True
 
         return NWStorageOpen.READY
@@ -249,6 +248,12 @@ class NWStorage:
             return True
         return True
 
+    def lockSession(self) -> None:
+        """Lock the session when the project is successfully opened."""
+        if self._ready:
+            self._writeLockFile()
+        return
+
     def closeSession(self) -> None:
         """Run tasks related to closing the session."""
         self._clearLockFile()

{novelwriter-2.5rc1 → novelwriter-2.5.1}/novelwriter/core/tokenizer.py

@@ -198,6 +198,7 @@ class Tokenizer(ABC):
         # Instance Variables
         self._hFormatter = HeadingFormatter(self._project)
         self._noSep      = True   # Flag to indicate that we don't want a scene separator
+        self._noIndent   = False  # Flag to disable text indent on next paragraph
         self._showDialog = False  # Flag for dialogue highlighting
 
         # This File
@@ -873,7 +874,6 @@ class Tokenizer(ABC):
         pLines: list[T_Token] = []
 
         tCount = len(tokens)
-        pIndent = True
         for n, cToken in enumerate(tokens):
 
             if n > 0:
@@ -881,11 +881,11 @@ class Tokenizer(ABC):
             if n < tCount - 1:
                 nToken = tokens[n+1]  # Look ahead
 
-            if not self._indentFirst and cToken[0] in self.L_SKIP_INDENT:
+            if cToken[0] in self.L_SKIP_INDENT and not self._indentFirst:
                 # Unless the indentFirst flag is set, we set up the next
                 # paragraph to not be indented if we see a block of a
                 # specific type
-                pIndent = False
+                self._noIndent = True
 
             if cToken[0] == self.T_EMPTY:
                 # We don't need to keep the empty lines after this pass
@@ -910,7 +910,7 @@ class Tokenizer(ABC):
                     # Next token is not text, so we add the buffer to tokens
                     nLines = len(pLines)
                     cStyle = pLines[0][4]
-                    if self._firstIndent and pIndent and not cStyle & self.M_ALIGNED:
+                    if self._firstIndent and not (self._noIndent or cStyle & self.M_ALIGNED):
                         # If paragraph indentation is enabled, not temporarily
                         # turned off, and the block is not aligned, we add the
                         # text indentation flag
@@ -938,7 +938,7 @@ class Tokenizer(ABC):
 
                     # Reset buffer and make sure text indent is on for next pass
                     pLines = []
-                    pIndent = True
+                    self._noIndent = False
 
             else:
                 self._tokens.append(cToken)

{novelwriter-2.5rc1 → novelwriter-2.5.1}/novelwriter/core/toqdoc.py

@@ -26,7 +26,7 @@ from __future__ import annotations
 import logging
 
 from PyQt5.QtGui import (
-    QColor, QFont, QFontMetrics, QTextBlockFormat, QTextCharFormat,
+    QColor, QFont, QFontMetricsF, QTextBlockFormat, QTextCharFormat,
     QTextCursor, QTextDocument
 )
 
@@ -99,19 +99,19 @@ class ToQTextDocument(Tokenizer):
         self._document.clear()
         self._document.setDefaultFont(self._textFont)
 
-        qMetric = QFontMetrics(self._textFont)
-        mScale = qMetric.height()
+        qMetric = QFontMetricsF(self._textFont)
+        mPx = qMetric.ascent()  # 1 em in pixels
         fPt = self._textFont.pointSizeF()
 
         # Scaled Sizes
         # ============
 
         self._mHead = {
-            self.T_TITLE: (mScale * self._marginTitle[0], mScale * self._marginTitle[1]),
-            self.T_HEAD1: (mScale * self._marginHead1[0], mScale * self._marginHead1[1]),
-            self.T_HEAD2: (mScale * self._marginHead2[0], mScale * self._marginHead2[1]),
-            self.T_HEAD3: (mScale * self._marginHead3[0], mScale * self._marginHead3[1]),
-            self.T_HEAD4: (mScale * self._marginHead4[0], mScale * self._marginHead4[1]),
+            self.T_TITLE: (mPx * self._marginTitle[0], mPx * self._marginTitle[1]),
+            self.T_HEAD1: (mPx * self._marginHead1[0], mPx * self._marginHead1[1]),
+            self.T_HEAD2: (mPx * self._marginHead2[0], mPx * self._marginHead2[1]),
+            self.T_HEAD3: (mPx * self._marginHead3[0], mPx * self._marginHead3[1]),
+            self.T_HEAD4: (mPx * self._marginHead4[0], mPx * self._marginHead4[1]),
         }
 
         self._sHead = {
@@ -122,12 +122,12 @@ class ToQTextDocument(Tokenizer):
             self.T_HEAD4: nwHeaders.H_SIZES.get(4, 1.0) * fPt,
         }
 
-        self._mText = (mScale * self._marginText[0], mScale * self._marginText[1])
-        self._mMeta = (mScale * self._marginMeta[0], mScale * self._marginMeta[1])
-        self._mSep  = (mScale * self._marginSep[0], mScale * self._marginSep[1])
+        self._mText = (mPx * self._marginText[0], mPx * self._marginText[1])
+        self._mMeta = (mPx * self._marginMeta[0], mPx * self._marginMeta[1])
+        self._mSep  = (mPx * self._marginSep[0], mPx * self._marginSep[1])
 
-        self._mIndent = mScale * 2.0
-        self._tIndent = mScale * self._firstWidth
+        self._mIndent = mPx * 2.0
+        self._tIndent = mPx * self._firstWidth
 
         # Block Format
         # ============