Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into font_matching

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-08-24 15:42:17 +02:00
committed by GitHub
parent 65d2a3b313 d1c3584651
commit c986b311fd
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/config.py
+1 -1
View File
@@ -202,7 +202,7 @@ class Config:
self.doJustify = False # Justify text self.doJustify = False # Justify text
self.showTabsNSpaces = False # Show tabs and spaces in editor self.showTabsNSpaces = False # Show tabs and spaces in editor
self.showLineEndings = False # Show line endings in editor self.showLineEndings = False # Show line endings in editor
self.showMultiSpaces = True # Highlight multiple spaces in the text self.showMultiSpaces = False # Highlight multiple spaces in the text
self.doReplace = True # Enable auto-replace as you type self.doReplace = True # Enable auto-replace as you type
self.doReplaceSQuote = True # Smart single quotes self.doReplaceSQuote = True # Smart single quotes
novelwriter/dialogs/preferences.py
+1 -1
View File
@@ -701,7 +701,7 @@ class GuiPreferences(NDialog):
self.showMultiSpaces = NSwitch(self) self.showMultiSpaces = NSwitch(self)
self.showMultiSpaces.setChecked(CONFIG.showMultiSpaces) self.showMultiSpaces.setChecked(CONFIG.showMultiSpaces)
self.mainForm.addRow( self.mainForm.addRow(
self.tr("Highlight multiple or trailing spaces"), self.showMultiSpaces, self.tr("Highlight multiple spaces between words"), self.showMultiSpaces,
self.tr("Applies to the document editor only.") self.tr("Applies to the document editor only.")
) )
novelwriter/gui/dochighlight.py
+4 -4
View File
@@ -141,7 +141,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
# Multiple or Trailing Spaces # Multiple or Trailing Spaces
if CONFIG.showMultiSpaces: if CONFIG.showMultiSpaces:
rxRule = re.compile(r"[ ]{2,}|[ ]*$", re.UNICODE) rxRule = re.compile(r"\s{2,}")
hlRule = { hlRule = {
0: self._hStyles["mspaces"], 0: self._hStyles["mspaces"],
} }
@@ -150,7 +150,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
self._cmnRules.append((rxRule, hlRule)) self._cmnRules.append((rxRule, hlRule))
# Non-Breaking Spaces # Non-Breaking Spaces
rxRule = re.compile(f"[{nwUnicode.U_NBSP}{nwUnicode.U_THNBSP}]+", re.UNICODE) rxRule = re.compile(f"[{nwUnicode.U_NBSP}{nwUnicode.U_THNBSP}]+")
hlRule = { hlRule = {
0: self._hStyles["nobreak"], 0: self._hStyles["nobreak"],
} }
@@ -239,7 +239,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
self._cmnRules.append((rxRule, hlRule)) self._cmnRules.append((rxRule, hlRule))
# Alignment Tags # Alignment Tags
rxRule = re.compile(r"(^>{1,2}|<{1,2}$)", re.UNICODE) rxRule = re.compile(r"(^>{1,2}|<{1,2}$)")
hlRule = { hlRule = {
1: self._hStyles["markup"], 1: self._hStyles["markup"],
} }
@@ -247,7 +247,7 @@ class GuiDocHighlighter(QSyntaxHighlighter):
self._txtRules.append((rxRule, hlRule)) self._txtRules.append((rxRule, hlRule))
# Auto-Replace Tags # Auto-Replace Tags
rxRule = re.compile(r"<(\S+?)>", re.UNICODE) rxRule = re.compile(r"<(\S+?)>")
hlRule = { hlRule = {
0: self._hStyles["replace"], 0: self._hStyles["replace"],
} }
tests/reference/baseConfig_novelwriter.conf
+2 -2
View File
@@ -1,5 +1,5 @@
[Meta] [Meta]
timestamp = 2025-06-14 17:03:01 timestamp = 2025-08-24 15:30:16
[Main] [Main]
font = font =
@@ -63,7 +63,7 @@ fmtpadthin = False
spellcheck = en spellcheck = en
showtabsnspaces = False showtabsnspaces = False
showlineendings = False showlineendings = False
showmultispaces = True showmultispaces = False
incnoteswcount = True incnoteswcount = True
showfullpath = True showfullpath = True
dialogstyle = 2 dialogstyle = 2
tests/test_dialogs/test_dlg_preferences.py
+3 -3
View File
@@ -279,7 +279,7 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, fncPath, tstPaths):
prefs.altDialogOpen.setText("%") # Symbol also tests for #2455 prefs.altDialogOpen.setText("%") # Symbol also tests for #2455
prefs.altDialogClose.setText("%") # Symbol also tests for #2455 prefs.altDialogClose.setText("%") # Symbol also tests for #2455
prefs.highlightEmph.setChecked(False) prefs.highlightEmph.setChecked(False)
prefs.showMultiSpaces.setChecked(False) prefs.showMultiSpaces.setChecked(True)
prefs._insertDialogLineSymbol(nwUnicode.U_ENDASH) prefs._insertDialogLineSymbol(nwUnicode.U_ENDASH)
assert prefs.dialogLine.text() == f"{nwUnicode.U_ENDASH} {nwUnicode.U_EMDASH}" assert prefs.dialogLine.text() == f"{nwUnicode.U_ENDASH} {nwUnicode.U_EMDASH}"
@@ -292,7 +292,7 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, fncPath, tstPaths):
assert CONFIG.altDialogOpen == "" assert CONFIG.altDialogOpen == ""
assert CONFIG.altDialogClose == "" assert CONFIG.altDialogClose == ""
assert CONFIG.highlightEmph is True assert CONFIG.highlightEmph is True
assert CONFIG.showMultiSpaces is True assert CONFIG.showMultiSpaces is False
# Text Automation # Text Automation
prefs.doReplaceSQuote.setChecked(False) prefs.doReplaceSQuote.setChecked(False)
@@ -413,7 +413,7 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, fncPath, tstPaths):
assert CONFIG.altDialogOpen == "%" assert CONFIG.altDialogOpen == "%"
assert CONFIG.altDialogClose == "%" assert CONFIG.altDialogClose == "%"
assert CONFIG.highlightEmph is False assert CONFIG.highlightEmph is False
assert CONFIG.showMultiSpaces is False assert CONFIG.showMultiSpaces is True
# Text Automation # Text Automation
assert CONFIG.doReplace is False assert CONFIG.doReplace is False