novelWriter 2.4.3__py3-none-any.whl → 2.5__py3-none-any.whl

novelwriter/assets/syntax/snazzy.conf

@@ -0,0 +1,42 @@
+[Main]
+name       = Snazzy Light
+author     = Veronica Berglyd Olsen (adaptation)
+credit     = Florian Reuschel (color theme)
+url        = https://github.com/loilo/vscode-snazzy-light
+license    = MIT License
+licenseurl = https://github.com/loilo/vscode-snazzy-light/blob/master/LICENSE
+
+##
+# Colours:
+# Background   = fafbfc : 250, 251, 252
+# Foreground   = 565869 :  86,  88, 105
+# Comment      = 9194a2 : 145, 148, 162
+# Yellow       = cf9c00 : 207, 156,   0
+# Red          = ff5c57 : 255,  92,  87
+# Pink         = f767bb : 247, 103, 187
+# Blue         = 09a1ed :   9, 161, 237
+# Cyan         = 13bbb7 :  19, 187, 183
+# Green        = 2dae58 :  45, 174,  88
+##
+
+[Syntax]
+background     = 250, 251, 252
+text           =  86,  88, 105
+link           =   9, 161, 237
+headertext     =  45, 174,  88
+headertag      =  45, 174,  88, 160
+emphasis       =  19, 187, 183
+dialog         = 207, 156,   0
+altdialog      = 207, 156,   0
+note           = 120, 187, 185
+hidden         = 145, 148, 162
+shortcode      = 247, 103, 187
+keyword        =   9, 161, 237
+tag            =  45, 174,  88
+value          =   9, 161, 237
+optional       = 207, 156,   0
+spellcheckline = 255,  92,  87
+errorline      =  45, 174,  88
+replacetag     =  19, 187, 183
+modifier       = 247, 103, 187
+texthighlight  = 207, 156,   0, 96

novelwriter/assets/syntax/solarized_dark.conf

@@ -13,12 +13,13 @@ link           =  38, 139, 210
 headertext     = 147, 161, 161
 headertag      =  42, 161, 152
 emphasis       =  38, 139, 210
-straightquotes =  211, 54, 130
-doublequotes   =  42, 161, 152
-singlequotes   =  42, 161, 152
+dialog         =  42, 161, 152
+altdialog      =  42, 161, 152
+note           = 101, 161, 156
 hidden         = 147, 161, 161
 shortcode      = 147, 161, 161
 keyword        = 133, 153,   0
+tag            = 203,  75,  22
 value          = 203,  75,  22
 optional       = 147, 161, 161
 spellcheckline = 203,  75,  22

novelwriter/assets/syntax/solarized_light.conf

@@ -13,12 +13,13 @@ link           =  38, 139, 210
 headertext     =  88, 110, 117
 headertag      =  42, 161, 152
 emphasis       =  38, 139, 210
-straightquotes =  211, 54, 130
-doublequotes   =  42, 161, 152
-singlequotes   =  42, 161, 152
+dialog         =  42, 161, 152
+altdialog      =  42, 161, 152
+note           =  27, 102,  96
 hidden         =  88, 110, 117
 shortcode      =  88, 110, 117
 keyword        = 133, 153,   0
+tag            = 203,  75,  22
 value          = 203,  75,  22
 optional       =  88, 110, 117
 spellcheckline = 203,  75,  22

novelwriter/assets/syntax/tango.conf

@@ -2,22 +2,38 @@
 name   = Tango
 author = Veronica Berglyd Olsen (adaptation)
 
+##
+# Colours:
+# Background   = 30302f :  48,  48,  47
+# Foreground   = eeeeec : 238, 238, 236
+# Comment      = 8f8f8d : 143, 143, 141
+# Red          = ef2929 : 239,  41,  41
+# Orange       = c4a000 : 196, 160,   0
+# Yellow       = fce94f : 252, 233,  79
+# Green        = 8ae234 : 138, 226,  52
+# Cyan         = 34e2e2 :  52, 226, 226
+# Blue         = 3465a4 : 114, 159, 207
+# Purple       = ad7fa8 : 173, 127, 168
+##
+
 [Syntax]
 background     =  48,  48,  47
 text           = 238, 238, 236
-link           = 115, 159, 207
-headertext     = 115, 159, 207
-headertag      =  52, 101, 164
+link           = 114, 159, 207
+headertext     = 114, 159, 207
+headertag      = 114, 159, 207, 160
 emphasis       = 196, 160,   0
-straightquotes = 239,  41,  41
-doublequotes   = 138, 226,  52
-singlequotes   = 252, 233,  79
+dialog         = 138, 226,  52
+altdialog      = 252, 233,  79
+note           = 252, 242, 164
 hidden         = 143, 143, 141
-shortcode      = 115, 159, 207
+shortcode      = 114, 159, 207
 keyword        = 239,  41,  41
-value          = 173, 127, 168
-optional       = 115, 159, 207
+tag            = 173, 127, 168
+value          = 239,  41,  41
+optional       = 114, 159, 207
 spellcheckline = 239,  41,  41
 errorline      = 138, 226,  52
-replacetag     =  51, 226, 226
-modifier       = 196, 160,   0
+replacetag     =  52, 226, 226
+modifier       = 114, 159, 207
+texthighlight  = 252, 233,  79, 96

novelwriter/assets/syntax/tomorrow.conf

@@ -31,15 +31,16 @@ background     = 255, 255, 255
 text           =  77,  77,  76
 link           =  66, 113, 174
 headertext     =  66, 113, 174
-headertag      =  66, 113, 174
+headertag      =  66, 113, 174, 160
 emphasis       = 245, 135,  31
-straightquotes = 240,  40,  41
-doublequotes   = 113, 140,   0
-singlequotes   = 234, 183,   0
+dialog         = 113, 140,   0
+altdialog      = 234, 183,   0
+note           = 115,  90,   0
 hidden         = 142, 144, 140
 shortcode      =  66, 113, 174
 keyword        = 240,  40,  41
-value          = 137,  89, 168
+tag            = 137,  89, 168
+value          = 234, 183,   0
 optional       =  66, 113, 174
 spellcheckline = 240,  40,  41
 errorline      = 113, 140,   0

novelwriter/assets/syntax/tomorrow_night.conf

@@ -29,17 +29,18 @@ licenseurl = https://github.com/chriskempson/tomorrow-theme/blob/master/LICENSE.
 [Syntax]
 background     =  29,  31,  33
 text           = 197, 200, 198
-link           = 129, 162, 190
+link           = 197, 200, 198, 160
 headertext     = 129, 162, 190
-headertag      = 129, 162, 190
+headertag      =  94, 119, 139
 emphasis       = 222, 147,  95
-straightquotes = 204, 102, 102
-doublequotes   = 181, 189, 104
-singlequotes   = 240, 198, 116
+dialog         = 181, 189, 104
+altdialog      = 240, 198, 116
+note           = 240, 219, 178
 hidden         = 150, 152, 150
 shortcode      = 129, 162, 190
 keyword        = 204, 102, 102
-value          = 178, 148, 187
+tag            = 178, 148, 187
+value          = 240, 198, 116
 optional       = 129, 162, 190
 spellcheckline = 204, 102, 102
 errorline      = 181, 189, 104

novelwriter/assets/syntax/tomorrow_night_blue.conf

@@ -31,15 +31,16 @@ background     =   0,  36,  81
 text           = 255, 255, 255
 link           = 187, 218, 255
 headertext     = 187, 218, 255
-headertag      = 187, 218, 255
+headertag      = 187, 218, 255, 160
 emphasis       = 255, 197, 143
-straightquotes = 255, 157, 164
-doublequotes   = 209, 241, 169
-singlequotes   = 255, 238, 173
+dialog         = 209, 241, 169
+altdialog      = 255, 238, 173
+note           = 255, 247, 214
 hidden         = 114, 133, 183
 shortcode      = 187, 218, 255
 keyword        = 255, 157, 164
-value          = 235, 187, 255
+tag            = 235, 187, 255
+value          = 255, 238, 173
 optional       = 187, 218, 255
 spellcheckline = 255, 157, 164
 errorline      = 209, 241, 169

novelwriter/assets/syntax/tomorrow_night_bright.conf

@@ -31,15 +31,16 @@ background     =   0,   0,   0
 text           = 234, 234, 234
 link           = 122, 166, 218
 headertext     = 122, 166, 218
-headertag      = 122, 166, 218
+headertag      = 122, 166, 218, 160
 emphasis       = 231, 140,  69
-straightquotes = 213,  78,  83
-doublequotes   = 185, 202,  74
-singlequotes   = 231, 197,  71
+dialog         = 185, 202,  74
+altdialog      = 231, 197,  71
+note           = 231, 214, 150
 hidden         = 150, 152, 150
 shortcode      = 122, 166, 218
 keyword        = 213,  78,  83
-value          = 195, 151, 216
+tag            = 195, 151, 216
+value          = 231, 197,  71
 optional       = 122, 166, 218
 spellcheckline = 213,  78,  83
 errorline      = 185, 202,  74

novelwriter/assets/syntax/tomorrow_night_eighties.conf

@@ -31,15 +31,16 @@ background     =  45,  45,  45
 text           = 204, 204, 204
 link           = 102, 153, 204
 headertext     = 102, 153, 204
-headertag      = 102, 153, 204
+headertag      = 102, 153, 204, 160
 emphasis       = 249, 145,  57
-straightquotes = 242, 119, 122
-doublequotes   = 153, 204, 153
-singlequotes   = 255, 204, 102
+dialog         = 153, 204, 153
+altdialog      = 255, 204, 102
+note           = 255, 230, 179
 hidden         = 153, 153, 153
 shortcode      = 102, 153, 204
 keyword        = 242, 119, 122
-value          = 204, 153, 204
+tag            = 204, 153, 204
+value          = 255, 204, 102
 optional       = 102, 153, 204
 spellcheckline = 242, 119, 122
 errorline      = 153, 204, 153

novelwriter/assets/text/credits_en.htm

@@ -1,81 +1,92 @@
-<!DOCTYPE html public "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <body>
 
 <h3>Main Developer</h3>
-<p>Veronica Berglyd Olsen (<a href="https://github.com/vkbo">@vkbo</a>)</p>
+
+<p>Veronica Berglyd Olsen</p>
 
 <h3>Contributors</h3>
 
-<p>
-&nbsp;&bull;&nbsp;<b>Concept:</b> Marian Lückhof (<a href="https://github.com/Number042">@Number042</a>)<br>
-&nbsp;&bull;&nbsp;<b>Internationalisation:</b> Bruno Meneguello (<a href="https://github.com/bkmeneguello">@bkmeneguello</a>)<br>
-&nbsp;&bull;&nbsp;<b>Setup and Packaging:</b> Rachel Powers (<a href="https://github.com/Ryex">@Ryex</a>)
-</p>
+<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 <a href="https://louisdurrant.art">Louis Durrant</a>.</p>
+<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>
-<p>
-&nbsp;&bull;&nbsp;<b>Dutch:</b> Martijn van der Kleijn (<a href="https://github.com/mvdkleijn">@mvdkleijn</a>)<br>
-&nbsp;&bull;&nbsp;<b>French:</b> Jan Lüdke (<a href="https://github.com/jyhelle">@jyhelle</a>)<br>
-&nbsp;&bull;&nbsp;<b>German:</b> Myian (<a href="https://github.com/heymyian">@heymyian</a>)<br>
-&nbsp;&bull;&nbsp;<b>Italian:</b> Riccardo Mangili<br>
-&nbsp;&bull;&nbsp;<b>Japanese:</b> hebekeg (<a href="https://github.com/hebekeg">@hebekeg</a>)<br>
-&nbsp;&bull;&nbsp;<b>Latin American Spanish:</b> Tommy Marplatt (<a href="https://github.com/tmarplatt">@tmarplatt</a>)<br>
-&nbsp;&bull;&nbsp;<b>Norwegian:</b> Veronica Berglyd Olsen (<a href="https://github.com/vkbo">@vkbo</a>)<br>
-&nbsp;&bull;&nbsp;<b>Portuguese:</b> Bruno Meneguello (<a href="https://github.com/bkmeneguello">@bkmeneguello</a>)<br>
-&nbsp;&bull;&nbsp;<b>Simplified Chinese:</b> Qianzhi Long (<a href="https://github.com/longqzh">@longqzh</a>)
-</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>
-<p>
-&nbsp;&bull;&nbsp;<b>French:</b> Albert Aribaud (<a href="https://github.com/aaribaud">@aaribaud</a>)
-</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 <a href="https://crowdin.com/project/novelwriter/members">Members</a> page.</p>
+more contributions are listed on the project's Members page.</p>
 
 <h3>Libraries</h3>
 
 <p>The following libraries are dependencies of novelWriter:</p>
-<p>
-&nbsp;&bull;&nbsp;<a href="https://www.qt.io">Qt5</a> by Qt Company<br>
-&nbsp;&bull;&nbsp;<a href="https://www.riverbankcomputing.com/software/pyqt">PyQt5</a> by Riverbank Computing<br>
-&nbsp;&bull;&nbsp;<a href="https://abiword.github.io/enchant">Enchant</a> by Dom Lachowicz<br>
-&nbsp;&bull;&nbsp;<a href="https://pyenchant.github.io/pyenchant">PyEnchant</a> by Dimitri Merejkowsky
-</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>
-<p>
-&nbsp;&bull;&nbsp;<a href="https://github.com/stephenhutchings/typicons.font">Typicons</a> icons by Stephen Hutchings (CC BY-SA 4.0)<br>
-&nbsp;&bull;&nbsp;<a href="https://github.com/chriskempson/base16">Tomorrow</a> syntax themes by Chris Kempson (MIT License)<br>
-&nbsp;&bull;&nbsp;<a href="https://github.com/sdras/night-owl-vscode-theme">Owl</a> syntax themes by Sarah Drasner (MIT License)<br>
-&nbsp;&bull;&nbsp;<a href="https://github.com/altercation/solarized">Solarized</a> themes by Ethan Schoonover (MIT License)
-</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>
-<p>
-&nbsp;&bull;&nbsp;Pridi by Cadson Demak (Open Font License, Version 1.1)<br>
-&nbsp;&bull;&nbsp;Source Sans Pro by Paul D. Hunt (SIL Open Font License)
-</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 <a href="https://github.com/johnblommers">@johnblommers</a> who was an early user and who has provided a lot
-of very useful feedback over the years.</p>
+<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/assets/themes/cyberpunk_night.conf

@@ -24,6 +24,9 @@ link            =  77,  77, 255
 linkvisited     =  50,   0,  80
 
 [GUI]
+helptext        =  97,  97,  97
+fadedtext       =  97,  97,  97
+errortext       = 255,  77,  77
 statusnone      =  50,  50,  50
 statussaved     =  77, 255,  77
 statusunsaved   = 255,  77,  77

novelwriter/assets/themes/default_dark.conf

@@ -26,6 +26,8 @@ linkvisited     = 102, 153, 204
 
 [GUI]
 helptext        = 164, 164, 164
+fadedtext       = 148, 148, 148
+errortext       = 255, 164, 164
 statusnone      = 150, 152, 150
 statussaved     =  39, 135,  78
 statusunsaved   = 138,  32,  32

novelwriter/assets/themes/default_light.conf

@@ -26,6 +26,8 @@ linkvisited     =  66, 113, 174
 
 [GUI]
 helptext        =  92,  92,  92
+fadedtext       = 108, 108, 108
+errortext       = 255,  92,  92
 statusnone      = 120, 120, 120
 statussaved     = 200,  15,  39
 statusunsaved   =   2, 133,  37

novelwriter/assets/themes/dracula.conf

@@ -0,0 +1,48 @@
+[Main]
+name        = Dracula
+description = A dark theme with bright colours
+author      = Veronica Berglyd Olsen (adaptation)
+credit      = Zeno Rocha
+url         = https://draculatheme.com
+license     = MIT
+licenseurl  = https://github.com/dracula/dracula-theme/blob/main/LICENSE
+icontheme   = typicons_dark
+
+##
+# Colours:
+# Background   = 282a36 :  40,  42,  54
+# Foreground   = f8f8f2 : 248, 248, 242
+# Current Line = 44475A :  68,  71,  90
+# Comment      = 6272a4 :  98, 114, 164
+# Cyan         = 8be9fd : 139, 233, 253
+# Green        = 50fa7b :  80, 250, 123
+# Orange       = ffb86c : 255, 184, 108
+# Pink         = ff79c6 : 255, 121, 198
+# Purple       = bd93f9 : 189, 147, 249
+# Red          = ff5555 : 255,  85,  85
+# Yellow       = f1fa8c : 241, 250, 140
+##
+
+[Palette]
+window          =  68,  71,  90
+windowtext      = 248, 248, 242
+base            =  40,  42,  54
+alternatebase   =  51,  54,  69
+text            = 248, 248, 242
+tooltipbase     = 241, 250, 140
+tooltiptext     =  40,  42,  54
+button          =  80,  83, 105
+buttontext      = 248, 248, 242
+brighttext      =  68,  71,  90
+highlight       = 166, 129, 218
+highlightedtext = 248, 248, 242
+link            = 139, 233, 253
+linkvisited     = 139, 233, 253
+
+[GUI]
+helptext        = 204, 172, 249
+fadedtext       =  98, 114, 164
+errortext       = 255,  85,  85
+statusnone      =  98, 114, 164
+statussaved     =  80, 250, 123
+statusunsaved   = 255,  85,  85

novelwriter/assets/themes/solarized_dark.conf

@@ -25,6 +25,8 @@ linkvisited     =  38, 139, 210
 
 [GUI]
 helptext        = 166, 161, 149
+fadedtext       = 166, 161, 149
+errortext       = 255, 161, 149
 statusnone      =  88, 110, 117
 statussaved     =  42, 161, 152
 statusunsaved   = 203,  75,  22

novelwriter/assets/themes/solarized_light.conf

@@ -25,6 +25,8 @@ linkvisited     =  38, 139, 210
 
 [GUI]
 helptext        =  78,  91,  95
+fadedtext       =  78,  91,  95
+errortext       = 255,  91,  95
 statusnone      =  88, 110, 117
 statussaved     =  42, 161, 152
 statusunsaved   = 203,  75,  22

novelwriter/common.py

@@ -24,30 +24,32 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 from __future__ import annotations
 
 import json
-import uuid
 import logging
 import unicodedata
+import uuid
 import xml.etree.ElementTree as ET
 
-from typing import TYPE_CHECKING, Any, Literal
-from pathlib import Path
-from datetime import datetime
 from configparser import ConfigParser
+from datetime import datetime
+from pathlib import Path
+from typing import TYPE_CHECKING, Any, Literal, TypeVar
 from urllib.parse import urljoin
 from urllib.request import pathname2url
 
-from PyQt5.QtGui import QColor, QDesktopServices
 from PyQt5.QtCore import QCoreApplication, QUrl
+from PyQt5.QtGui import QColor, QDesktopServices, QFont, QFontInfo
 
-from novelwriter.enum import nwItemClass, nwItemType, nwItemLayout
-from novelwriter.error import logException
 from novelwriter.constants import nwConst, nwLabels, nwUnicode, trConst
+from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType
+from novelwriter.error import logException
 
 if TYPE_CHECKING:  # pragma: no cover
     from typing import TypeGuard  # Requires Python 3.10
 
 logger = logging.getLogger(__name__)
 
+_Type = TypeVar("_Type")
+
 
 ##
 #  Checker Functions
@@ -172,6 +174,11 @@ def isItemLayout(value: Any) -> TypeGuard[str]:
     return isinstance(value, str) and value in nwItemLayout.__members__
 
 
+def isListInstance(data: Any, check: type[_Type]) -> TypeGuard[list[_Type]]:
+    """Check that all items of a list is of a given type."""
+    return isinstance(data, list) and all(isinstance(item, check) for item in data)
+
+
 def hexToInt(value: Any, default: int = 0) -> int:
     """Convert a hex string to an integer."""
     if isinstance(value, str):
@@ -272,6 +279,13 @@ def simplified(text: str) -> str:
     return " ".join(str(text).strip().split())
 
 
+def elide(text: str, length: int) -> str:
+    """Elide a piece of text to a maximum length."""
+    if len(text) > (cut := max(4, length)):
+        return f"{text[:cut-4].rstrip()} ..."
+    return text
+
+
 def yesNo(value: int | bool | None) -> Literal["yes", "no"]:
     """Convert a boolean evaluated variable to a yes or no."""
     return "yes" if value else "no"
@@ -387,6 +401,16 @@ def cssCol(col: QColor, alpha: int | None = None) -> str:
     return f"rgba({col.red()}, {col.green()}, {col.blue()}, {alpha or col.alpha()})"
 
 
+def describeFont(font: QFont) -> str:
+    """Describe a font in a way that can be displayed on the GUI."""
+    if isinstance(font, QFont):
+        info = QFontInfo(font)
+        family = info.family()
+        styles = [v for v in info.styleName().split() if v not in family]
+        return " ".join([f"{info.pointSize()} pt", family] + styles)
+    return "Error"
+
+
 ##
 #  Encoder Functions
 ##
@@ -499,12 +523,11 @@ def readTextFile(path: str | Path) -> str:
 
 
 def makeFileNameSafe(text: str) -> str:
-    """Return a filename safe string.
+    """Return a filename-safe string.
     See: https://unicode.org/reports/tr15/#Norm_Forms
     """
     text = unicodedata.normalize("NFKC", text).strip()
-    allowed = (" ", ".", "-", "_")
-    return "".join(c for c in text if c.isalnum() or c in allowed)
+    return "".join(c for c in text if c.isprintable() and c not in r'\/:*?"<>|')
 
 
 def getFileSize(path: Path) -> int:
@@ -589,5 +612,3 @@ class NWConfigParser(ConfigParser):
             for i in range(min(len(data), len(result))):
                 result[i] = checkInt(data[i].strip(), result[i])
         return result
-
-# END Class NWConfigParser