Merge branch 'main' into dev
This commit is contained in:
@@ -1,5 +1,34 @@
|
||||
# novelWriter Changelog
|
||||
|
||||
## Version 1.3.2 [2021-05-30]
|
||||
|
||||
### Release Notes
|
||||
|
||||
This is a patch release that fixes some minor issues. One issue was with the split tool, which
|
||||
would drop the last line from the source document during a split if it was missing a final line
|
||||
break. A minor issue with the display of word counts on the details panel under the project tree
|
||||
has also been fixed. In addition, the setup script commands for Linux have been improved a bit.
|
||||
|
||||
### Detailed Changelog
|
||||
|
||||
**Bugfixes**
|
||||
|
||||
* The details panel under the tree would sometimes show character, word and paragraph counts even
|
||||
when there was no document selected. This has now been fixed. Issue #781. PR #782.
|
||||
* The split document tool would drop the last line of the source document. This is generally not a
|
||||
problem if the last line has a line break after it, but if it doesn't, it is lost in the split.
|
||||
This was caused by an offset error when calculating the split positions in the file and has been
|
||||
resolved. Issue #795. PR #796.
|
||||
|
||||
**Installation**
|
||||
|
||||
* Due to an error in the setup script in the past, a desktop icon was created for novelWriter when
|
||||
running the `xdg-install` command. This is no longer the case, but the old icon was still left on
|
||||
some user's desktops. The setup script will now remove that icon if it exists when the
|
||||
`xdg-install` or `xdg-uninstall` commands are run. PR #784.
|
||||
|
||||
----
|
||||
|
||||
## Version 1.3.1 [2021-05-06]
|
||||
|
||||
### Release Notes
|
||||
|
||||
@@ -18,8 +18,8 @@ for comments, synopsis, and cross-referencing. It's designed to be a simple text
|
||||
for easy organisation of text and notes, using human readable text files as storage for robustness.
|
||||
|
||||
The project storage is suitable for version control software, and also well suited for file
|
||||
synchronisation tools. All text is saved as plain text files with a meta data header, the core
|
||||
project structure is stored in a single project XML file, and other meta data is primarily saved as
|
||||
synchronisation tools. All text is saved as plain text files with a meta data header. The core
|
||||
project structure is stored in a single project XML file. Other meta data is primarily saved as
|
||||
JSON files.
|
||||
|
||||
The full documentation is available on [readthedocs.io](https://novelwriter.readthedocs.io).
|
||||
@@ -32,13 +32,16 @@ met. It is regularly tested on Debian and Ubuntu Linux, Windows, and macOS.
|
||||
|
||||
## Project Contributions
|
||||
|
||||
Contributions to this project are welcome. However, please read the
|
||||
[Contributing Guide](https://github.com/vkbo/novelWriter/blob/main/CONTRIBUTING.md) before
|
||||
submitting larger additions or changes.
|
||||
The project isn't taking feature contributions at the moment. If you have an idea, please make a
|
||||
feature request in the issue tracker. Fixes and patches are welcome. So are new translations.
|
||||
Contributions related to packaging and installing novelWriter will also be appreciated.
|
||||
|
||||
If you want to help translating novelWriter into another language, please see the
|
||||
[README](https://github.com/vkbo/novelWriter/blob/main/i18n/README.md) in the `nw/assets/i18n`
|
||||
folder.
|
||||
folder for further details.
|
||||
|
||||
Before contributing any code, please read the full
|
||||
[Contributing Guide](https://github.com/vkbo/novelWriter/blob/main/CONTRIBUTING.md).
|
||||
|
||||
## Key Features
|
||||
|
||||
|
||||
@@ -2,6 +2,17 @@
|
||||
<html>
|
||||
<body>
|
||||
|
||||
<h2>Release Notes for 1.3.2</h2>
|
||||
<p><i>Released on 30 May 2021</i></p>
|
||||
<p>This is a patch release that fixes some minor issues. One issue was with the split tool, which
|
||||
would drop the last line from the source document during a split if it was missing a final line
|
||||
break. A minor issue with the display of word counts on the details panel under the project tree
|
||||
has also been fixed. In addition, the setup script commands for Linux have been improved a bit.</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.3.1</h2>
|
||||
<p><i>Released on 6 May 2021</i></p>
|
||||
<p>This is a patch release primarily to fix a problem with the Qt translation library used to make
|
||||
@@ -10,8 +21,6 @@ added recently, in Qt 5.15, which many users on Linux will not have installed on
|
||||
issue could be resolved by updating the library, but it's an unnecessary and inconvenient
|
||||
restriction.</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.3</h2>
|
||||
|
||||
+9
-11
@@ -52,7 +52,9 @@ class GuiDocSplit(QDialog):
|
||||
self.theParent = theParent
|
||||
self.theProject = theParent.theProject
|
||||
self.optState = theParent.theProject.optState
|
||||
|
||||
self.sourceItem = None
|
||||
self.sourceText = []
|
||||
|
||||
self.outerBox = QVBoxLayout()
|
||||
self.setWindowTitle(self.tr("Split Document"))
|
||||
@@ -139,9 +141,7 @@ class GuiDocSplit(QDialog):
|
||||
if theText is None:
|
||||
theText = ""
|
||||
|
||||
theLines = theText.splitlines()
|
||||
nLines = len(theLines)
|
||||
theLines.insert(0, "%Split Doc")
|
||||
nLines = len(self.sourceText)
|
||||
logger.debug(
|
||||
"Splitting document %s with %d lines" % (self.sourceItem, nLines)
|
||||
)
|
||||
@@ -218,11 +218,11 @@ class GuiDocSplit(QDialog):
|
||||
newItem.setStatus(srcItem.itemStatus)
|
||||
logger.verbose(
|
||||
"Creating new document %s with text from line %d to %d" % (
|
||||
nHandle, iStart, iEnd-1
|
||||
nHandle, iStart+1, iEnd
|
||||
)
|
||||
)
|
||||
|
||||
theText = "\n".join(theLines[iStart:iEnd])
|
||||
theText = "\n".join(self.sourceText[iStart:iEnd])
|
||||
theText = theText.rstrip("\n") + "\n\n"
|
||||
|
||||
outDoc = NWDoc(self.theProject, nHandle)
|
||||
@@ -284,12 +284,10 @@ class GuiDocSplit(QDialog):
|
||||
"Scanning document %s for headings level <= %d" % (self.sourceItem, spLevel)
|
||||
)
|
||||
|
||||
lineNo = 0
|
||||
for aLine in theText.splitlines():
|
||||
|
||||
lineNo += 1
|
||||
onLine = 0
|
||||
self.sourceText = theText.splitlines()
|
||||
for lineNo, aLine in enumerate(self.sourceText):
|
||||
|
||||
onLine = -1
|
||||
if aLine.startswith("# ") and spLevel >= 1:
|
||||
onLine = lineNo
|
||||
elif aLine.startswith("## ") and spLevel >= 2:
|
||||
@@ -299,7 +297,7 @@ class GuiDocSplit(QDialog):
|
||||
elif aLine.startswith("#### ") and spLevel >= 4:
|
||||
onLine = lineNo
|
||||
|
||||
if onLine > 0:
|
||||
if onLine >= 0:
|
||||
newItem = QListWidgetItem()
|
||||
newItem.setText(aLine.strip())
|
||||
newItem.setData(Qt.UserRole, onLine)
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<novelWriterXML appVersion="1.3.1" hexVersion="0x010301f0" fileVersion="1.2" timeStamp="2021-05-06 22:23:09">
|
||||
<novelWriterXML appVersion="1.3.2" hexVersion="0x010302f0" fileVersion="1.2" timeStamp="2021-05-30 12:14:18">
|
||||
<project>
|
||||
<name>Sample Project</name>
|
||||
<title>Sample Project</title>
|
||||
<author>Jane Smith</author>
|
||||
<author>Jay Doh</author>
|
||||
<saveCount>1061</saveCount>
|
||||
<saveCount>1062</saveCount>
|
||||
<autoCount>166</autoCount>
|
||||
<editTime>49821</editTime>
|
||||
<editTime>49870</editTime>
|
||||
</project>
|
||||
<settings>
|
||||
<doBackup>False</doBackup>
|
||||
|
||||
Reference in New Issue
Block a user