From 2a629984793cf755bd18416dde59b3adeca35c21 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 15 Aug 2020 22:26:04 +0200
Subject: [PATCH 1/2] Use 1.0-beta1 as version number instead of 1.0b1

---
 docs/source/conf.py | 2 +-
 nw/__init__.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 87984125..b61862dd 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -28,7 +28,7 @@ author = "Veronica Berglyd Olsen"
 # The short X.Y version
 version = "1.0"
 # The full version, including alpha/beta/rc tags
-release = "1.0b1"
+release = "1.0-beta1"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/nw/__init__.py b/nw/__init__.py
index 7e6ad1ef..5367ed23 100644
--- a/nw/__init__.py
+++ b/nw/__init__.py
@@ -41,7 +41,7 @@ __package__    = "nw"
 __author__     = "Veronica Berglyd Olsen"
 __copyright__  = "Copyright 2018–2020, Veronica Berglyd Olsen"
 __license__    = "GPLv3"
-__version__    = "1.0b1"
+__version__    = "1.0-beta1"
 __hexversion__ = "0x010000b1"
 __date__       = "2020-08-23"
 __maintainer__ = "Veronica Berglyd Olsen"

From bb0bcdd406766c159eda3e17c41ae1a84f538050 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sun, 16 Aug 2020 10:35:07 +0200
Subject: [PATCH 2/2] Removed an additional comma in some of the insert menu
 items that changed the type to tuple

---
 nw/gui/doceditor.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/nw/gui/doceditor.py b/nw/gui/doceditor.py
index b382ec7e..0b2790cf 100644
--- a/nw/gui/doceditor.py
+++ b/nw/gui/doceditor.py
@@ -593,21 +593,21 @@ class GuiDocEditor(QTextEdit):
             theText = theInsert
         elif theInsert in nwDocInsert:
             if theInsert == nwDocInsert.NO_INSERT:
-                theText = "",
+                theText = ""
             elif theInsert == nwDocInsert.HARD_BREAK:
-                theText = "  \n",
+                theText = "  \n"
             elif theInsert == nwDocInsert.NB_SPACE:
-                theText = nwUnicode.U_NBSP,
+                theText = nwUnicode.U_NBSP
             elif theInsert == nwDocInsert.THIN_SPACE:
-                theText = nwUnicode.U_THNSP,
+                theText = nwUnicode.U_THNSP
             elif theInsert == nwDocInsert.THIN_NB_SPACE:
-                theText = nwUnicode.U_THNBSP,
+                theText = nwUnicode.U_THNBSP
             elif theInsert == nwDocInsert.SHORT_DASH:
-                theText = nwUnicode.U_ENDASH,
+                theText = nwUnicode.U_ENDASH
             elif theInsert == nwDocInsert.LONG_DASH:
-                theText = nwUnicode.U_EMDASH,
+                theText = nwUnicode.U_EMDASH
             elif theInsert == nwDocInsert.ELLIPSIS:
-                theText = nwUnicode.U_HELLIP,
+                theText = nwUnicode.U_HELLIP
             elif theInsert == nwDocInsert.QUOTE_LS:
                 theText = self.typSQOpen
             elif theInsert == nwDocInsert.QUOTE_RS:
@@ -620,10 +620,12 @@ class GuiDocEditor(QTextEdit):
                 return False
         else:
             return False
+
         theCursor = self.textCursor()
         theCursor.beginEditBlock()
         theCursor.insertText(theText)
         theCursor.endEditBlock()
+
         return True
 
     def closeSearch(self):