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

Merge patch 1.4.2

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2021-08-31 00:04:40 +02:00
parent f6845a9820 30f0e82fba
commit bbed05b273
6 changed files with 87 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/assets/text/release_notes_1.4.htm
+11 -2
View File
@@ -2,14 +2,23 @@
<html>
<body>
<h2>Release Notes for 1.4.2</h2>
<p><i>Released on 30 August 2021</i></p>
<p>This is a patch release fixing an issue with the auto-replace feature for single and double
quotes. The issue appears when using the new indent and text alignment codes followed by a quote
symbol, and quotes following a tab or non-breaking space.</p>
<p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
<hr/>
<h2>Release Notes for 1.4.1</h2>
<p><i>Released on 27 July 2021</i></p>
<p>This release fixes a couple of minor issue with some of the dialog boxes. The fix was
accidentally left out of release 1.4.</p>
<p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
<hr/>
<h2>Release Notes for 1.4</h2>
novelwriter/gui/doceditor.py
+10 -2
View File
@@ -1807,7 +1807,7 @@ class GuiDocEditor(QTextEdit):
nDelete = 0
tInsert = theOne
if self.mainConf.doReplaceDQuote and theTwo == ' "':
if self.mainConf.doReplaceDQuote and theTwo[:1].isspace() and theTwo.endswith('"'):
nDelete = 1
tInsert = self._typDQOpen
@@ -1815,10 +1815,14 @@ class GuiDocEditor(QTextEdit):
nDelete = 1
if thePos == 1:
tInsert = self._typDQOpen
elif thePos == 2 and theTwo == '>"':
tInsert = self._typDQOpen
elif thePos == 3 and theThree == '>>"':
tInsert = self._typDQOpen
else:
tInsert = self._typDQClose
elif self.mainConf.doReplaceSQuote and theTwo == " '":
elif self.mainConf.doReplaceSQuote and theTwo[:1].isspace() and theTwo.endswith("'"):
nDelete = 1
tInsert = self._typSQOpen
@@ -1826,6 +1830,10 @@ class GuiDocEditor(QTextEdit):
nDelete = 1
if thePos == 1:
tInsert = self._typSQOpen
elif thePos == 2 and theTwo == ">'":
tInsert = self._typSQOpen
elif thePos == 3 and theThree == ">>'":
tInsert = self._typSQOpen
else:
tInsert = self._typSQClose