Merge pull request #778 from lmorg/develop

v5.3.6000

app/app.go

@@ -15,11 +15,11 @@ const (
 	version  = "%d.%d.%d"
 	Major    = 5
 	Minor    = 3
-	Revision = 5000
+	Revision = 6000
 )
 
 // Copyright is the copyright owner string
-const Copyright = "© 2018-2023 Laurence Morgan"
+const Copyright = "© 2018-2024 Laurence Morgan"
 
 // License is the projects software license
 const License = "License GPL v2"

docs/changelog/v5.3.md

@@ -6,6 +6,16 @@ Caching has been vastly improved in this release due to a new sqlite3-backed per
 
 None
 
+## v5.3.6000
+
+### Features
+
+* Copyright messages update for 2024
+
+### Bug Fixes
+
+* ANSI escape code for string terminations was updated to incorrect values in preview release. This has been fixed here
+
 ## v5.3.5000
 
 ### Features

gen/changelog/v5.3.inc.md

@@ -2,6 +2,16 @@
 
 None
 
+## v5.3.6000
+
+### Features
+
+* Copyright messages update for 2024
+
+### Bug Fixes
+
+* ANSI escape code for string terminations was updated to incorrect values in preview release. This has been fixed here
+
 ## v5.3.5000
 
 ### Features

utils/ansititle/ansititle_test.go

@@ -22,43 +22,43 @@ func TestFormatTitle(t *testing.T) {
 		},
 		{
 			Title:  "1",
-			Format: []byte{27, ']', '2', ';', '1', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', 27, '\\'},
 		},
 		{
 			Title:  "12",
-			Format: []byte{27, ']', '2', ';', '1', '2', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', '2', 27, '\\'},
 		},
 		{
 			Title:  "123",
-			Format: []byte{27, ']', '2', ';', '1', '2', '3', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', '2', '3', 27, '\\'},
 		},
 		{
 			Title:  "1234",
-			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', 27, '\\'},
 		},
 		{
 			Title:  "12345",
-			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', 27, '\\'},
 		},
 		{
 			Title:  "123456",
-			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', 27, '\\'},
 		},
 		{
 			Title:  "1234567",
-			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', '7', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', '7', 27, '\\'},
 		},
 		{
 			Title:  "12345678",
-			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', '7', '8', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', '7', '8', 27, '\\'},
 		},
 		{
 			Title:  "123456789",
-			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', '7', '8', '9', 27, '\\'},
 		},
 		{
 			Title:  "1234567890",
-			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'S', 'T'},
+			Format: []byte{27, ']', '2', ';', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 27, '\\'},
 		},
 		// TODO: test unicode
 	}
@@ -93,43 +93,43 @@ func TestFormatIcon(t *testing.T) {
 		},
 		{
 			Title:  "1",
-			Format: []byte{27, ']', '1', ';', '1', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', 27, '\\'},
 		},
 		{
 			Title:  "12",
-			Format: []byte{27, ']', '1', ';', '1', '2', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', '2', 27, '\\'},
 		},
 		{
 			Title:  "123",
-			Format: []byte{27, ']', '1', ';', '1', '2', '3', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', '2', '3', 27, '\\'},
 		},
 		{
 			Title:  "1234",
-			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', 27, '\\'},
 		},
 		{
 			Title:  "12345",
-			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', 27, '\\'},
 		},
 		{
 			Title:  "123456",
-			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', 27, '\\'},
 		},
 		{
 			Title:  "1234567",
-			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', '7', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', '7', 27, '\\'},
 		},
 		{
 			Title:  "12345678",
-			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', '7', '8', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', '7', '8', 27, '\\'},
 		},
 		{
 			Title:  "123456789",
-			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', '7', '8', '9', 27, '\\'},
 		},
 		{
 			Title:  "1234567890",
-			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'S', 'T'},
+			Format: []byte{27, ']', '1', ';', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 27, '\\'},
 		},
 		// TODO: test unicode
 	}

utils/ansititle/ansititle_unix.go

@@ -32,8 +32,8 @@ func formatTitle(title []byte) []byte {
 	copy(ansi[0:4], []byte{27, ']', '2', ';'})
 	copy(ansi[4:len(title)+4], title)
 	//ansi[len(ansi)-1] = 7
-	ansi[len(ansi)-2] = 'S'
-	ansi[len(ansi)-1] = 'T'
+	ansi[len(ansi)-2] = 27
+	ansi[len(ansi)-1] = '\\'
 
 	return ansi
 }
@@ -57,8 +57,8 @@ func formatIcon(title []byte) []byte {
 	copy(ansi[0:4], []byte{27, ']', '1', ';'})
 	copy(ansi[4:len(title)+4], title)
 	//ansi[len(ansi)-1] = 7
-	ansi[len(ansi)-2] = 'S'
-	ansi[len(ansi)-1] = 'T'
+	ansi[len(ansi)-2] = 27
+	ansi[len(ansi)-1] = '\\'
 
 	return ansi
 }

utils/docgen/main.go

@@ -14,7 +14,7 @@ const (
 	Version = "3.1.0"
 
 	// Copyright is the copyright owner string
-	Copyright = "(c) 2018-2023 Laurence Morgan"
+	Copyright = "(c) 2018-2024 Laurence Morgan"
 
 	// License is the projects software license
 	License = "Licence GPL v2"