- update to N++ interfaces for 8.4.6 with scintilla 5.3.0 and lexilla…

… 5.1.9 (#246)

- still open issue: handling of colouralpha and related calls, currently just handled like colour, so alpha info is missing

NppPlugin/include/Notepad_plus_msgs.h

@@ -39,7 +39,7 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
 enum class ExternalLexerAutoIndentMode { Standard, C_Like, Custom };
 enum class MacroStatus { Idle, RecordInProgress, RecordingStopped, PlayingBack };
 
-enum winVer { WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7, WV_WIN8, WV_WIN81, WV_WIN10 };
+enum winVer { WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7, WV_WIN8, WV_WIN81, WV_WIN10, WV_WIN11 };
 enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };
 
 

NppPlugin/include/NppDarkMode.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <Windows.h>
+#include <windows.h>
 
 constexpr COLORREF HEXRGB(DWORD rrggbb) {
 	// from 0xRRGGBB like natural #RRGGBB
@@ -133,6 +133,8 @@ namespace NppDarkMode
 	HPEN getHotEdgePen();
 	HPEN getDisabledEdgePen();
 
+	COLORREF getIndividualTabColour(int colourIndex, bool themeDependant, bool saturated);
+
 	void setBackgroundColor(COLORREF c);
 	void setSofterBackgroundColor(COLORREF c);
 	void setHotBackgroundColor(COLORREF c);

NppPlugin/include/Scintilla.h

@@ -152,7 +152,12 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SC_MARK_RGBAIMAGE 30
 #define SC_MARK_BOOKMARK 31
 #define SC_MARK_VERTICALBOOKMARK 32
+#define SC_MARK_BAR 33
 #define SC_MARK_CHARACTER 10000
+#define SC_MARKNUM_HISTORY_REVERTED_TO_ORIGIN 21
+#define SC_MARKNUM_HISTORY_SAVED 22
+#define SC_MARKNUM_HISTORY_MODIFIED 23
+#define SC_MARKNUM_HISTORY_REVERTED_TO_MODIFIED 24
 #define SC_MARKNUM_FOLDEREND 25
 #define SC_MARKNUM_FOLDEROPENMID 26
 #define SC_MARKNUM_FOLDERMIDTAIL 27
@@ -353,15 +358,24 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define INDIC_POINTCHARACTER 19
 #define INDIC_GRADIENT 20
 #define INDIC_GRADIENTCENTRE 21
-#define INDIC_EXPLORERLINK 22
+#define INDIC_POINT_TOP 22
+#define INDIC_EXPLORERLINK 23
 #define INDIC_CONTAINER 8
 #define INDIC_IME 32
 #define INDIC_IME_MAX 35
 #define INDIC_MAX 35
 #define INDICATOR_CONTAINER 8
 #define INDICATOR_IME 32
 #define INDICATOR_IME_MAX 35
-#define INDICATOR_MAX 35
+#define INDICATOR_HISTORY_REVERTED_TO_ORIGIN_INSERTION 36
+#define INDICATOR_HISTORY_REVERTED_TO_ORIGIN_DELETION 37
+#define INDICATOR_HISTORY_SAVED_INSERTION 38
+#define INDICATOR_HISTORY_SAVED_DELETION 39
+#define INDICATOR_HISTORY_MODIFIED_INSERTION 40
+#define INDICATOR_HISTORY_MODIFIED_DELETION 41
+#define INDICATOR_HISTORY_REVERTED_TO_MODIFIED_INSERTION 42
+#define INDICATOR_HISTORY_REVERTED_TO_MODIFIED_DELETION 43
+#define INDICATOR_MAX 43
 #define SCI_INDICSETSTYLE 2080
 #define SCI_INDICGETSTYLE 2081
 #define SCI_INDICSETFORE 2082
@@ -478,6 +492,12 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SCI_FINDTEXTFULL 2196
 #define SCI_FORMATRANGE 2151
 #define SCI_FORMATRANGEFULL 2777
+#define SC_CHANGE_HISTORY_DISABLED 0
+#define SC_CHANGE_HISTORY_ENABLED 1
+#define SC_CHANGE_HISTORY_MARKERS 2
+#define SC_CHANGE_HISTORY_INDICATORS 4
+#define SCI_SETCHANGEHISTORY 2780
+#define SCI_GETCHANGEHISTORY 2781
 #define SCI_GETFIRSTVISIBLELINE 2152
 #define SCI_GETLINE 2153
 #define SCI_GETLINECOUNT 2154
@@ -492,6 +512,7 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SCI_GETTEXTRANGE 2162
 #define SCI_GETTEXTRANGEFULL 2039
 #define SCI_HIDESELECTION 2163
+#define SCI_GETSELECTIONHIDDEN 2088
 #define SCI_POINTXFROMPOSITION 2164
 #define SCI_POINTYFROMPOSITION 2165
 #define SCI_LINEFROMPOSITION 2166
@@ -578,6 +599,7 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SC_FOLDACTION_CONTRACT 0
 #define SC_FOLDACTION_EXPAND 1
 #define SC_FOLDACTION_TOGGLE 2
+#define SC_FOLDACTION_CONTRACT_EVERY_LEVEL 4
 #define SCI_FOLDLINE 2237
 #define SCI_FOLDCHILDREN 2238
 #define SCI_EXPANDCHILDREN 2239

NppPlugin/include/menuCmdID.h

@@ -68,7 +68,7 @@
 //10  Rename...
 //11  Close
 //12  Close All
-//13  Close More
+//13  Close Multiple Documents
 //14  Move to Recycle Bin
 //15  --------
 //16  Load Session...
@@ -302,7 +302,7 @@
     #define    IDM_VIEW_HIDELINES                 (IDM_VIEW + 42)
     #define    IDM_VIEW_DRAWTABBAR_VERTICAL       (IDM_VIEW + 43)
     #define    IDM_VIEW_DRAWTABBAR_MULTILINE      (IDM_VIEW + 44)
-    #define    IDM_VIEW_DOCCHANGEMARGIN           (IDM_VIEW + 45)
+    //#define    IDM_VIEW_DOCCHANGEMARGIN           (IDM_VIEW + 45)
     #define    IDM_VIEW_LWDEF                     (IDM_VIEW + 46)
     #define    IDM_VIEW_LWALIGN                   (IDM_VIEW + 47)
     #define    IDM_VIEW_LWINDENT                  (IDM_VIEW + 48)
@@ -367,6 +367,13 @@
     #define    IDM_VIEW_SWITCHTO_FUNC_LIST        (IDM_VIEW + 108)
     #define    IDM_VIEW_SWITCHTO_DOCLIST          (IDM_VIEW + 109)
 
+    #define    IDM_VIEW_TAB_COLOUR_NONE           (IDM_VIEW + 110)
+    #define    IDM_VIEW_TAB_COLOUR_1              (IDM_VIEW + 111)
+    #define    IDM_VIEW_TAB_COLOUR_2              (IDM_VIEW + 112)
+    #define    IDM_VIEW_TAB_COLOUR_3              (IDM_VIEW + 113)
+    #define    IDM_VIEW_TAB_COLOUR_4              (IDM_VIEW + 114)
+    #define    IDM_VIEW_TAB_COLOUR_5              (IDM_VIEW + 115)
+
     #define    IDM_VIEW_GOTO_ANOTHER_VIEW        10001
     #define    IDM_VIEW_CLONE_TO_ANOTHER_VIEW    10002
     #define    IDM_VIEW_GOTO_NEW_INSTANCE        10003

PythonScript/src/CreateWrapper.py

@@ -106,6 +106,7 @@
 	'RepresentationAppearance'	: 'int',
 	'Supports'	: 'int',
 	'Element'	: 'int',
+	'ChangeHistoryOption'	: 'int',
 }
 
 castsL = {

PythonScript/src/Enums.h

@@ -286,11 +286,16 @@ enum MarkerSymbol
 	PYSCR_SC_MARK_RGBAIMAGE = SC_MARK_RGBAIMAGE,
 	PYSCR_SC_MARK_BOOKMARK = SC_MARK_BOOKMARK,
 	PYSCR_SC_MARK_VERTICALBOOKMARK = SC_MARK_VERTICALBOOKMARK,
+	PYSCR_SC_MARK_BAR = SC_MARK_BAR,
 	PYSCR_SC_MARK_CHARACTER = SC_MARK_CHARACTER
 };
 
 enum MarkerOutline
 {
+	PYSCR_SC_MARKNUM_HISTORY_REVERTED_TO_ORIGIN = SC_MARKNUM_HISTORY_REVERTED_TO_ORIGIN,
+	PYSCR_SC_MARKNUM_HISTORY_SAVED = SC_MARKNUM_HISTORY_SAVED,
+	PYSCR_SC_MARKNUM_HISTORY_MODIFIED = SC_MARKNUM_HISTORY_MODIFIED,
+	PYSCR_SC_MARKNUM_HISTORY_REVERTED_TO_MODIFIED = SC_MARKNUM_HISTORY_REVERTED_TO_MODIFIED,
 	PYSCR_SC_MARKNUM_FOLDEREND = SC_MARKNUM_FOLDEREND,
 	PYSCR_SC_MARKNUM_FOLDEROPENMID = SC_MARKNUM_FOLDEROPENMID,
 	PYSCR_SC_MARKNUM_FOLDERMIDTAIL = SC_MARKNUM_FOLDERMIDTAIL,
@@ -422,6 +427,7 @@ enum IndicatorStyle
 	PYSCR_INDIC_POINTCHARACTER = INDIC_POINTCHARACTER,
 	PYSCR_INDIC_GRADIENT = INDIC_GRADIENT,
 	PYSCR_INDIC_GRADIENTCENTRE = INDIC_GRADIENTCENTRE,
+	PYSCR_INDIC_POINT_TOP = INDIC_POINT_TOP,
 	PYSCR_INDIC_CONTAINER = INDIC_CONTAINER,
 	PYSCR_INDIC_IME = INDIC_IME,
 	PYSCR_INDIC_IME_MAX = INDIC_IME_MAX,
@@ -433,6 +439,14 @@ enum IndicatorNumbers
 	PYSCR_INDICATOR_CONTAINER = INDICATOR_CONTAINER,
 	PYSCR_INDICATOR_IME = INDICATOR_IME,
 	PYSCR_INDICATOR_IME_MAX = INDICATOR_IME_MAX,
+	PYSCR_INDICATOR_HISTORY_REVERTED_TO_ORIGIN_INSERTION = INDICATOR_HISTORY_REVERTED_TO_ORIGIN_INSERTION,
+	PYSCR_INDICATOR_HISTORY_REVERTED_TO_ORIGIN_DELETION = INDICATOR_HISTORY_REVERTED_TO_ORIGIN_DELETION,
+	PYSCR_INDICATOR_HISTORY_SAVED_INSERTION = INDICATOR_HISTORY_SAVED_INSERTION,
+	PYSCR_INDICATOR_HISTORY_SAVED_DELETION = INDICATOR_HISTORY_SAVED_DELETION,
+	PYSCR_INDICATOR_HISTORY_MODIFIED_INSERTION = INDICATOR_HISTORY_MODIFIED_INSERTION,
+	PYSCR_INDICATOR_HISTORY_MODIFIED_DELETION = INDICATOR_HISTORY_MODIFIED_DELETION,
+	PYSCR_INDICATOR_HISTORY_REVERTED_TO_MODIFIED_INSERTION = INDICATOR_HISTORY_REVERTED_TO_MODIFIED_INSERTION,
+	PYSCR_INDICATOR_HISTORY_REVERTED_TO_MODIFIED_DELETION = INDICATOR_HISTORY_REVERTED_TO_MODIFIED_DELETION,
 	PYSCR_INDICATOR_MAX = INDICATOR_MAX
 };
 
@@ -483,6 +497,14 @@ enum FindOption
 	PYSCR_SCFIND_CXX11REGEX = SCFIND_CXX11REGEX
 };
 
+enum ChangeHistoryOption
+{
+	PYSCR_SC_CHANGE_HISTORY_DISABLED = SC_CHANGE_HISTORY_DISABLED,
+	PYSCR_SC_CHANGE_HISTORY_ENABLED = SC_CHANGE_HISTORY_ENABLED,
+	PYSCR_SC_CHANGE_HISTORY_MARKERS = SC_CHANGE_HISTORY_MARKERS,
+	PYSCR_SC_CHANGE_HISTORY_INDICATORS = SC_CHANGE_HISTORY_INDICATORS
+};
+
 enum FoldLevel
 {
 	PYSCR_SC_FOLDLEVELNONE = SC_FOLDLEVELNONE,
@@ -503,7 +525,8 @@ enum FoldAction
 {
 	PYSCR_SC_FOLDACTION_CONTRACT = SC_FOLDACTION_CONTRACT,
 	PYSCR_SC_FOLDACTION_EXPAND = SC_FOLDACTION_EXPAND,
-	PYSCR_SC_FOLDACTION_TOGGLE = SC_FOLDACTION_TOGGLE
+	PYSCR_SC_FOLDACTION_TOGGLE = SC_FOLDACTION_TOGGLE,
+	PYSCR_SC_FOLDACTION_CONTRACT_EVERY_LEVEL = SC_FOLDACTION_CONTRACT_EVERY_LEVEL
 };
 
 enum AutomaticFold
@@ -1275,6 +1298,8 @@ enum ScintillaMessage
 	PYSCR_SCI_FINDTEXTFULL = SCI_FINDTEXTFULL,
 	PYSCR_SCI_FORMATRANGE = SCI_FORMATRANGE,
 	PYSCR_SCI_FORMATRANGEFULL = SCI_FORMATRANGEFULL,
+	PYSCR_SCI_SETCHANGEHISTORY = SCI_SETCHANGEHISTORY,
+	PYSCR_SCI_GETCHANGEHISTORY = SCI_GETCHANGEHISTORY,
 	PYSCR_SCI_GETFIRSTVISIBLELINE = SCI_GETFIRSTVISIBLELINE,
 	PYSCR_SCI_GETLINE = SCI_GETLINE,
 	PYSCR_SCI_GETLINECOUNT = SCI_GETLINECOUNT,
@@ -1289,6 +1314,7 @@ enum ScintillaMessage
 	PYSCR_SCI_GETTEXTRANGE = SCI_GETTEXTRANGE,
 	PYSCR_SCI_GETTEXTRANGEFULL = SCI_GETTEXTRANGEFULL,
 	PYSCR_SCI_HIDESELECTION = SCI_HIDESELECTION,
+	PYSCR_SCI_GETSELECTIONHIDDEN = SCI_GETSELECTIONHIDDEN,
 	PYSCR_SCI_POINTXFROMPOSITION = SCI_POINTXFROMPOSITION,
 	PYSCR_SCI_POINTYFROMPOSITION = SCI_POINTYFROMPOSITION,
 	PYSCR_SCI_LINEFROMPOSITION = SCI_LINEFROMPOSITION,

PythonScript/src/EnumsWrapper.cpp

@@ -269,9 +269,14 @@ void export_enums()
 		.value("RGBAIMAGE", PYSCR_SC_MARK_RGBAIMAGE)
 		.value("BOOKMARK", PYSCR_SC_MARK_BOOKMARK)
 		.value("VERTICALBOOKMARK", PYSCR_SC_MARK_VERTICALBOOKMARK)
+		.value("BAR", PYSCR_SC_MARK_BAR)
 		.value("CHARACTER", PYSCR_SC_MARK_CHARACTER);
 
 	boost::python::enum_<MarkerOutline>("MARKEROUTLINE")
+		.value("HISTORY_REVERTED_TO_ORIGIN", PYSCR_SC_MARKNUM_HISTORY_REVERTED_TO_ORIGIN)
+		.value("HISTORY_SAVED", PYSCR_SC_MARKNUM_HISTORY_SAVED)
+		.value("HISTORY_MODIFIED", PYSCR_SC_MARKNUM_HISTORY_MODIFIED)
+		.value("HISTORY_REVERTED_TO_MODIFIED", PYSCR_SC_MARKNUM_HISTORY_REVERTED_TO_MODIFIED)
 		.value("FOLDEREND", PYSCR_SC_MARKNUM_FOLDEREND)
 		.value("FOLDEROPENMID", PYSCR_SC_MARKNUM_FOLDEROPENMID)
 		.value("FOLDERMIDTAIL", PYSCR_SC_MARKNUM_FOLDERMIDTAIL)
@@ -387,6 +392,7 @@ void export_enums()
 		.value("POINTCHARACTER", PYSCR_INDIC_POINTCHARACTER)
 		.value("GRADIENT", PYSCR_INDIC_GRADIENT)
 		.value("GRADIENTCENTRE", PYSCR_INDIC_GRADIENTCENTRE)
+		.value("POINT_TOP", PYSCR_INDIC_POINT_TOP)
 		.value("CONTAINER", PYSCR_INDIC_CONTAINER)
 		.value("IME", PYSCR_INDIC_IME)
 		.value("IME_MAX", PYSCR_INDIC_IME_MAX)
@@ -396,6 +402,14 @@ void export_enums()
 		.value("CONTAINER", PYSCR_INDICATOR_CONTAINER)
 		.value("IME", PYSCR_INDICATOR_IME)
 		.value("IME_MAX", PYSCR_INDICATOR_IME_MAX)
+		.value("HISTORY_REVERTED_TO_ORIGIN_INSERTION", PYSCR_INDICATOR_HISTORY_REVERTED_TO_ORIGIN_INSERTION)
+		.value("HISTORY_REVERTED_TO_ORIGIN_DELETION", PYSCR_INDICATOR_HISTORY_REVERTED_TO_ORIGIN_DELETION)
+		.value("HISTORY_SAVED_INSERTION", PYSCR_INDICATOR_HISTORY_SAVED_INSERTION)
+		.value("HISTORY_SAVED_DELETION", PYSCR_INDICATOR_HISTORY_SAVED_DELETION)
+		.value("HISTORY_MODIFIED_INSERTION", PYSCR_INDICATOR_HISTORY_MODIFIED_INSERTION)
+		.value("HISTORY_MODIFIED_DELETION", PYSCR_INDICATOR_HISTORY_MODIFIED_DELETION)
+		.value("HISTORY_REVERTED_TO_MODIFIED_INSERTION", PYSCR_INDICATOR_HISTORY_REVERTED_TO_MODIFIED_INSERTION)
+		.value("HISTORY_REVERTED_TO_MODIFIED_DELETION", PYSCR_INDICATOR_HISTORY_REVERTED_TO_MODIFIED_DELETION)
 		.value("MAX", PYSCR_INDICATOR_MAX);
 
 	boost::python::enum_<IndicValue>("INDICVALUE")
@@ -433,6 +447,12 @@ void export_enums()
 		.value("POSIX", PYSCR_SCFIND_POSIX)
 		.value("CXX11REGEX", PYSCR_SCFIND_CXX11REGEX);
 
+	boost::python::enum_<ChangeHistoryOption>("CHANGEHISTORYOPTION")
+		.value("DISABLED", PYSCR_SC_CHANGE_HISTORY_DISABLED)
+		.value("ENABLED", PYSCR_SC_CHANGE_HISTORY_ENABLED)
+		.value("MARKERS", PYSCR_SC_CHANGE_HISTORY_MARKERS)
+		.value("INDICATORS", PYSCR_SC_CHANGE_HISTORY_INDICATORS);
+
 	boost::python::enum_<FoldLevel>("FOLDLEVEL")
 		.value("NONE", PYSCR_SC_FOLDLEVELNONE)
 		.value("BASE", PYSCR_SC_FOLDLEVELBASE)
@@ -448,7 +468,8 @@ void export_enums()
 	boost::python::enum_<FoldAction>("FOLDACTION")
 		.value("CONTRACT", PYSCR_SC_FOLDACTION_CONTRACT)
 		.value("EXPAND", PYSCR_SC_FOLDACTION_EXPAND)
-		.value("TOGGLE", PYSCR_SC_FOLDACTION_TOGGLE);
+		.value("TOGGLE", PYSCR_SC_FOLDACTION_TOGGLE)
+		.value("CONTRACT_EVERY_LEVEL", PYSCR_SC_FOLDACTION_CONTRACT_EVERY_LEVEL);
 
 	boost::python::enum_<AutomaticFold>("AUTOMATICFOLD")
 		.value("NONE", PYSCR_SC_AUTOMATICFOLD_NONE)
@@ -1157,6 +1178,8 @@ void export_enums()
 		.value("SCI_FINDTEXTFULL", PYSCR_SCI_FINDTEXTFULL)
 		.value("SCI_FORMATRANGE", PYSCR_SCI_FORMATRANGE)
 		.value("SCI_FORMATRANGEFULL", PYSCR_SCI_FORMATRANGEFULL)
+		.value("SCI_SETCHANGEHISTORY", PYSCR_SCI_SETCHANGEHISTORY)
+		.value("SCI_GETCHANGEHISTORY", PYSCR_SCI_GETCHANGEHISTORY)
 		.value("SCI_GETFIRSTVISIBLELINE", PYSCR_SCI_GETFIRSTVISIBLELINE)
 		.value("SCI_GETLINE", PYSCR_SCI_GETLINE)
 		.value("SCI_GETLINECOUNT", PYSCR_SCI_GETLINECOUNT)
@@ -1171,6 +1194,7 @@ void export_enums()
 		.value("SCI_GETTEXTRANGE", PYSCR_SCI_GETTEXTRANGE)
 		.value("SCI_GETTEXTRANGEFULL", PYSCR_SCI_GETTEXTRANGEFULL)
 		.value("SCI_HIDESELECTION", PYSCR_SCI_HIDESELECTION)
+		.value("SCI_GETSELECTIONHIDDEN", PYSCR_SCI_GETSELECTIONHIDDEN)
 		.value("SCI_POINTXFROMPOSITION", PYSCR_SCI_POINTXFROMPOSITION)
 		.value("SCI_POINTYFROMPOSITION", PYSCR_SCI_POINTYFROMPOSITION)
 		.value("SCI_LINEFROMPOSITION", PYSCR_SCI_LINEFROMPOSITION)

PythonScript/src/HFacer.py

@@ -1,23 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # HFacer.py - regenerate the Scintilla.h and SciLexer.h files from the Scintilla.iface interface
 # definition file.
 # Implemented 2000 by Neil Hodgson neilh@scintilla.org
-# Requires Python 2.5 or later
+# Requires Python 3.6 or later
 
-import sys
-import os
+import pathlib
 import Face
-
-from FileGenerator import UpdateFile, Generate, Regenerate, UpdateLineInFile, lineEnd
-
-def printLexHFile(f):
-	out = []
-	for name in f.order:
-		v = f.features[name]
-		if v["FeatureType"] in ["val"]:
-			if "SCE_" in name or "SCLEX_" in name:
-				out.append("#define " + name + " " + v["Value"])
-	return out
+import FileGenerator
 
 def printHFile(f):
 	out = []
@@ -37,25 +26,31 @@ def printHFile(f):
 				featureDefineName = "SCN_" + name.upper()
 				out.append("#define " + featureDefineName + " " + v["Value"])
 			elif v["FeatureType"] in ["val"]:
-				if not ("SCE_" in name or "SCLEX_" in name):
-					out.append("#define " + name + " " + v["Value"])
+				out.append("#define " + name + " " + v["Value"])
 	if anyProvisional:
 		out.append("#endif")
 	return out
 
 def RegenerateAll(root, showMaxID):
 	f = Face.Face()
-	f.ReadFromFile(root + "include/Scintilla.iface")
-	Regenerate(root + "include/Scintilla.h", "/* ", printHFile(f))
-	Regenerate(root + "include/SciLexer.h", "/* ", printLexHFile(f))
+	f.ReadFromFile(root / "include/Scintilla.iface")
+	FileGenerator.Regenerate(root / "include/Scintilla.h", "/* ", printHFile(f))
 	if showMaxID:
 		valueSet = set(int(x) for x in f.values if int(x) < 3000)
 		maximumID = max(valueSet)
 		print("Maximum ID is %d" % maximumID)
 		#~ valuesUnused = sorted(x for x in range(2001,maximumID) if x not in valueSet)
 		#~ print("\nUnused values")
+		#~ valueToName = {}
+		#~ for name, feature in f.features.items():
+			#~ try:
+				#~ value = int(feature["Value"])
+				#~ valueToName[value] = name
+			#~ except ValueError:
+				#~ pass
 		#~ for v in valuesUnused:
-			#~ print(v)
+			#~ prev = valueToName.get(v-1, "")
+			#~ print(v, prev)
 
 if __name__ == "__main__":
-	RegenerateAll("../", True)
+	RegenerateAll(pathlib.Path(__file__).resolve().parent.parent, True)

PythonScript/src/NotepadPlusWrapper.h

@@ -355,7 +355,6 @@ enum MenuCommands
 	NPPIDM_VIEW_HIDELINES = IDM_VIEW_HIDELINES,
 	NPPIDM_VIEW_DRAWTABBAR_VERTICAL = IDM_VIEW_DRAWTABBAR_VERTICAL,
 	NPPIDM_VIEW_DRAWTABBAR_MULTILINE = IDM_VIEW_DRAWTABBAR_MULTILINE,
-	NPPIDM_VIEW_DOCCHANGEMARGIN = IDM_VIEW_DOCCHANGEMARGIN,
 	NPPIDM_VIEW_LWDEF = IDM_VIEW_LWDEF,
 	NPPIDM_VIEW_LWALIGN = IDM_VIEW_LWALIGN,
 	NPPIDM_VIEW_LWINDENT = IDM_VIEW_LWINDENT,
@@ -411,6 +410,12 @@ enum MenuCommands
 	NPPIDM_VIEW_SWITCHTO_FILEBROWSER = IDM_VIEW_SWITCHTO_FILEBROWSER,
 	NPPIDM_VIEW_SWITCHTO_FUNC_LIST = IDM_VIEW_SWITCHTO_FUNC_LIST,
 	NPPIDM_VIEW_SWITCHTO_DOCLIST = IDM_VIEW_SWITCHTO_DOCLIST,
+	NPPIDM_VIEW_TAB_COLOUR_NONE = IDM_VIEW_TAB_COLOUR_NONE,
+	NPPIDM_VIEW_TAB_COLOUR_1 = IDM_VIEW_TAB_COLOUR_1,
+	NPPIDM_VIEW_TAB_COLOUR_2 = IDM_VIEW_TAB_COLOUR_2,
+	NPPIDM_VIEW_TAB_COLOUR_3 = IDM_VIEW_TAB_COLOUR_3,
+	NPPIDM_VIEW_TAB_COLOUR_4 = IDM_VIEW_TAB_COLOUR_4,
+	NPPIDM_VIEW_TAB_COLOUR_5 = IDM_VIEW_TAB_COLOUR_5,
 	NPPIDM_VIEW_GOTO_ANOTHER_VIEW = IDM_VIEW_GOTO_ANOTHER_VIEW,
 	NPPIDM_VIEW_CLONE_TO_ANOTHER_VIEW = IDM_VIEW_CLONE_TO_ANOTHER_VIEW,
 	NPPIDM_VIEW_GOTO_NEW_INSTANCE = IDM_VIEW_GOTO_NEW_INSTANCE,