upd: Scintilla Lib v5.6.1

scintilla/doc/ScintillaDownload.html

@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla560.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla561.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla560.tgz">
+	<a href="https://www.scintilla.org/scintilla561.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.6.0
+       Release 5.6.1
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla560.zip">zip format</a> (1.8M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla560.tgz">tgz format</a> (1.7M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla561.zip">zip format</a> (1.8M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla561.tgz">tgz format</a> (1.7M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>

scintilla/doc/ScintillaHistory.html

@@ -603,7 +603,7 @@
     </h3>
     <ul>
 	<li>
-	Released 25 February 2026.
+	Released 26 March 2026.
 	</li>
 	<li>
 	Add mode to draw tabs as [HT] blobs with SCI_SETTABDRAWMODE(SCTD_CONTROLCHAR).

scintilla/doc/index.html

@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20260225" />
+    <meta name="Date.Modified" content="20260326" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         .logo {
@@ -61,8 +61,8 @@
           GTK, and macOS</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 5.6.0<br />
-           Site last modified February 25 2026</font>
+          <font color="#FFCC99" size="3"> Release version 5.6.1<br />
+           Site last modified March 26 2026</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,12 +77,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.6.1 adds mode to draw tabs as HT blobs and fixes a regression in SCI_CONVERTEOLS.</li>
       <li>Version 5.6.0 fixes crash when window is too narrow to show any text.</li>
       <li>Version 5.5.9 adds an option to disable drag &amp; drop. Fixes colour after line end.</li>
       <li>Version 5.5.8 changes format of SCI_GETSELECTIONSERIALIZED and fixes redraw after undo.</li>
       <li>Version 5.5.7 can prevent storing scroll position in undo selection history and adds a wrap-aware SCI_SCROLLVERTICAL API.</li>
-      <li>Version 5.5.6 improves DBCS and autocompletion drawing on Win32 and improves dwell, encoding and text clipping on Qt.</li>
-      <li>Version 5.5.5 can remember selection with undo and redo. Update to use DirectWrite 1.1.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>

scintilla/scripts/CheckMentioned.py

@@ -35,13 +35,13 @@ def depunctuate(s):
 
 symbols = {}
 with open(incFileName, "rt") as incFile:
-	for line in incFile.readlines():
+	for line in incFile:
 		if line.startswith("#define"):
 			identifier = line.split()[1]
 			symbols[identifier] = 0
 
 with open(docFileName, "rt") as docFile:
-	for line in docFile.readlines():
+	for line in docFile:
 		for word in depunctuate(line).split():
 			if word in symbols.keys():
 				symbols[word] = 1

scintilla/scripts/Dependencies.py

@@ -17,9 +17,10 @@
 # Only tested with ASCII file names.
 # Copyright 2019 by Neil Hodgson <neilh@scintilla.org>
 # The License.txt file describes the conditions under which this software may be distributed.
-# Requires Python 2.7 or later
+# Requires Python 3.6 or later
 
 import codecs, glob, os, sys
+from functools import cache
 
 if __name__ == "__main__":
 	import FileGenerator
@@ -28,6 +29,7 @@ else:
 
 continuationLineEnd = " \\"
 
+@cache
 def FindPathToHeader(header, includePath):
 	for incDir in includePath:
 		relPath = os.path.join(incDir, header)
@@ -35,27 +37,25 @@ def FindPathToHeader(header, includePath):
 			return relPath
 	return ""
 
-fhifCache = {}	# Remember the includes in each file. ~5x speed up.
+@cache
 def FindHeadersInFile(filePath):
-	if filePath not in fhifCache:
-		headers = []
-		with codecs.open(filePath, "r", "utf-8") as f:
-			for line in f:
-				if line.strip().startswith("#include"):
-					parts = line.split()
-					if len(parts) > 1:
-						header = parts[1]
-						if header[0] != '<':	# No system headers
-							headers.append(header.strip('"'))
-		fhifCache[filePath] = headers
-	return fhifCache[filePath]
+	headers = []
+	with codecs.open(filePath, "r", "utf-8") as f:
+		for line in f:
+			if line.strip().startswith("#include"):
+				parts = line.split()
+				if len(parts) > 1:
+					header = parts[1]
+					if header[0] != '<':	# No system headers
+						headers.append(header.strip('"'))
+	return headers
 
 def FindHeadersInFileRecursive(filePath, includePath, renames):
 	headerPaths = []
 	for header in FindHeadersInFile(filePath):
 		if header in renames:
 			header = renames[header]
-		relPath = FindPathToHeader(header, includePath)
+		relPath = FindPathToHeader(header, tuple(includePath))
 		if relPath and relPath not in headerPaths:
 				headerPaths.append(relPath)
 				subHeaders = FindHeadersInFileRecursive(relPath, includePath, renames)

scintilla/scripts/Face.py

@@ -2,7 +2,7 @@
 # Face.py - module for reading and parsing Scintilla.iface file
 # Implemented 2000 by Neil Hodgson neilh@scintilla.org
 # Released to the public domain.
-# Requires Python 2.7 or later
+# Requires Python 3.6 or later
 
 def sanitiseLine(line):
 	line = line.rstrip('\n')
@@ -72,7 +72,7 @@ class Face:
 		currentComment = []
 		currentCommentFinished = 0
 		file = open(name)
-		for line in file.readlines():
+		for line in file:
 			line = sanitiseLine(line)
 			if line:
 				if line[0] == "#":

scintilla/scripts/FileGenerator.py

@@ -4,7 +4,7 @@
 
 # Generate or regenerate source files based on comments in those files.
 # May be modified in-place or a template may be generated into a complete file.
-# Requires Python 2.7 or later
+# Requires Python 3.6 or later
 # The files are copied to a string apart from sections between a
 # ++Autogenerated comment and a --Autogenerated comment which is
 # generated by the CopyWithInsertion function. After the whole string is
@@ -143,7 +143,7 @@ def UpdateLineInPlistFile(path, key, value):
     lines = []
     keyCurrent = ""
     with codecs.open(path, "rb", "utf-8") as f:
-        for line in f.readlines():
+        for line in f:
             ls = line.strip()
             if ls.startswith("<key>"):
                 keyCurrent = ls.replace("<key>", "").replace("</key>", "")
@@ -160,7 +160,7 @@ def UpdateLineInFile(path, linePrefix, lineReplace):
     lines = []
     updated = False
     with codecs.open(path, "r", "utf-8") as f:
-        for line in f.readlines():
+        for line in f:
             line = line.rstrip()
             if not updated and line.startswith(linePrefix):
                 lines.append(lineReplace)

scintilla/scripts/GenerateCharacterCategory.py

@@ -2,7 +2,7 @@
 # Script to generate scintilla/src/CharacterCategoryMap.cxx and lexilla/lexlib/CharacterCategory.cxx
 # from Python's Unicode data
 # Should be run rarely when a Python with a new version of Unicode data is available.
-# Requires Python 3.3 or later
+# Requires Python 3.6 or later
 # Should not be run with old versions of Python.
 
 import pathlib, platform, sys, unicodedata
@@ -11,7 +11,7 @@ from FileGenerator import Regenerate
 
 def findCategories(filename):
     with filename.open(encoding="UTF-8") as infile:
-        lines = [x.strip() for x in infile.readlines() if "\tcc" in x]
+        lines = [x.strip() for x in infile if "\tcc" in x]
     values = "".join(lines).replace(" ","").split(",")
     print("Categrories:", values)
     return [v[2:] for v in values]

scintilla/scripts/ScintillaData.py

@@ -25,19 +25,20 @@
 import datetime, pathlib, sys
 
 def FindCredits(historyFile, removeLinks=True):
+    """ Return a list of contributors in a history file. """
     credits = []
     stage = 0
     with historyFile.open(encoding="utf-8") as f:
-        for line in f.readlines():
-            line = line.strip()
-            if stage == 0 and line == "<table>":
+        for line in f:
+            s = line.strip()
+            if stage == 0 and s == "<table>":
                 stage = 1
-            elif stage == 1 and line == "</table>":
+            elif stage == 1 and s == "</table>":
                 stage = 2
-            if stage == 1 and line.startswith("<td>"):
-                credit = line[4:-5]
-                if removeLinks and "<a" in line:
-                    title, _a, rest = credit.partition("<a href=")
+            if stage == 1 and s.startswith("<td>"):
+                credit = s[4:-5]
+                if removeLinks and "<a" in s:
+                    title, _, rest = credit.partition("<a href=")
                     urlplus, _bracket, end = rest.partition(">")
                     name = end.split("<")[0]
                     url = urlplus[1:-1]
@@ -57,14 +58,14 @@ class ScintillaData:
         self.versionCommad = self.versionDotted.replace(".", ", ") + ', 0'
 
         with (scintillaRoot / "doc" / "index.html").open() as f:
-            self.dateModified = [d for d in f.readlines() if "Date.Modified" in d]\
+            self.dateModified = [d for d in f if "Date.Modified" in d]\
                 [0].split('\"')[3]
             # 20130602
             # index.html, SciTE.html
             dtModified = datetime.datetime.strptime(self.dateModified, "%Y%m%d")
             self.yearModified = self.dateModified[0:4]
             monthModified = dtModified.strftime("%B")
-            dayModified = "%d" % dtModified.day
+            dayModified = f"{dtModified.day}"
             self.mdyModified = monthModified + " " + dayModified + " " + self.yearModified
             # May 22 2013
             # index.html, SciTE.html

scintilla/version.txt

@@ -1 +1 @@
-560
+561

scintilla/win32/ScintRes.rc

@@ -6,8 +6,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "5.6.0"
-#define VERSION_WORDS 5, 6, 0, 0
+#define VERSION_SCINTILLA "5.6.1"
+#define VERSION_WORDS 5, 6, 1, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS