From c1b073f40f29c2e734734c2044e8a014469c61cd Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 2 Jan 2022 10:40:32 +0000
Subject: [PATCH 001/264] Update 3rd party PJSysInfo to v5.8.0

Fixes #43
---
 Src/3rdParty/PJSysInfo.pas | 162 +++++++++++++++----------------------
 1 file changed, 63 insertions(+), 99 deletions(-)

diff --git a/Src/3rdParty/PJSysInfo.pas b/Src/3rdParty/PJSysInfo.pas
index 4b0a2dbd3..fa4cd593b 100644
--- a/Src/3rdParty/PJSysInfo.pas
+++ b/Src/3rdParty/PJSysInfo.pas
@@ -1,12 +1,12 @@
 {
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at https://mozilla.org/MPL/2.0/
+ * obtain one at http://mozilla.org/MPL/2.0/
  *
  * Copyright (C) 2001-2021, Peter Johnson (@delphidabbler).
  *
- * $Rev: 2079 $
- * $Date: 2021-11-27 14:29:47 +0000 (Sat, 27 Nov 2021) $
+ * $Rev: 2082 $
+ * $Date: 2022-01-01 10:12:03 +0000 (Sat, 01 Jan 2022) $
  *
  * This unit contains various static classes, constants, type definitions and
  * global variables for use in providing information about the host computer and
@@ -1247,6 +1247,18 @@ implementation
                                   //   - 10.0.22463.1000 (RSPRERELEASE)
   Win11v21H2PreRel5Build = 22468; // Windows 11 version 21H2
                                   //   - 10.0.22468.1000 (RSPRERELEASE)
+  Win11v21H2PreRel6Build = 22471; // Windows 11 version 21H2
+                                  //   - 10.0.22471.1000 (RSPRERELEASE)
+  Win11v21H2PreRel7Build = 22478; // Windows 11 version 21H2
+                                  //   - 10.0.22478.1000 (RSPRERELEASE)
+  Win11v21H2PreRel8Build = 22483; // Windows 11 version 21H2
+                                  //   - 10.0.22483.1000 (RSPRERELEASE)
+  Win11v21H2PreRel9Build = 22489; // Windows 11 version 21H2
+                                  //   - 10.0.22489.1000 (RSPRERELEASE)
+  Win11v21H2PreRel10Build = 22494;// Windows 11 version 21H2
+                                  //   - 10.0.22494.1000 (RSPRERELEASE)
+  Win11v21H2PreRel11Build = 22509;// Windows 11 version 21H2
+                                  //   - 10.0.22509.1000 (RSPRERELEASE)
 
   Win11FirstBuild = Win11DevBuild;  // First build number of Windows 11
 
@@ -1398,6 +1410,28 @@ function IsBuildNumber(BuildNumber: DWORD): Boolean;
   Result := VerifyVersionInfo(POSVI, VER_BUILDNUMBER, ConditionalMask);
 end;
 
+// Checks if any of the given build numbers match that of the current OS.
+// If current build number is in the list, FoundBN is set to the found build
+// number and True is returned. Otherwise False is returned and FoundBN is set
+// to zero.
+function FindBuildNumberFrom(const BNs: array of Integer; var FoundBN: Integer):
+  Boolean;
+var
+  I: Integer;
+begin
+  FoundBN := 0;
+  Result := False;
+  for I := Low(BNs) to High(BNs) do
+  begin
+    if IsBuildNumber(BNs[I]) then
+    begin
+      FoundBN := BNs[I];
+      Result := True;
+      Break;
+    end;
+  end;
+end;
+
 // Checks if the OS has the given product type.
 // Assumes VerifyVersionInfo & VerSetConditionMask APIs functions are available
 function IsWindowsProductType(ProductType: Byte): Boolean;
@@ -1631,13 +1665,6 @@ procedure InitPlatformIdEx;
   GetProductInfo: TGetProductInfo;  // pointer to GetProductInfo API function
   SI: TSystemInfo;                  // structure from GetSystemInfo API call
 
-  // Return name of Windows Server 2019 insider preview release for given build
-  // number. Build must be a valid insider preview release number
-  function Win2019IPExtra(const Build: Integer): string;
-  begin
-    Result := Format('Insider Preview Build %d', [Build]);
-  end;
-
   // Get OS's revision number from registry.
   function GetOSRevisionNumber(const IsNT: Boolean): Integer;
   begin
@@ -1824,8 +1851,8 @@ procedure InitPlatformIdEx;
               //     release of Win 11 -- well hidden eh?!
               InternalBuildNumber := Win11v21H2Build;
               case InternalBuildNumber of
-                194:
-                  // First public release of Windows 11
+                194..MaxInt:
+                  // Public releases of Windows 11 have build number >= 194
                   InternalExtraUpdateInfo := 'Version 21H2';
                 51, 65, 71, 100, 120, 132, 168:
                   InternalExtraUpdateInfo := Format(
@@ -1844,41 +1871,18 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
-            else if IsBuildNumber(Win11v21H2PreRel1Build) then
-            begin
-              InternalBuildNumber := Win11v21H2PreRel1Build;
-              InternalExtraUpdateInfo := Format(
-                'Version 21H2 [RSPRERELEASE v10.0.%d.%d]',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
-            end
-            else if IsBuildNumber(Win11v21H2PreRel2Build) then
-            begin
-              InternalBuildNumber := Win11v21H2PreRel2Build;
-              InternalExtraUpdateInfo := Format(
-                'Version 21H2 [RSPRERELEASE v10.0.%d.%d]',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
-            end
-            else if IsBuildNumber(Win11v21H2PreRel3Build) then
-            begin
-              InternalBuildNumber := Win11v21H2PreRel3Build;
-              InternalExtraUpdateInfo := Format(
-                'Version 21H2 [RSPRERELEASE v10.0.%d.%d]',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
-            end
-            else if IsBuildNumber(Win11v21H2PreRel4Build) then
-            begin
-              InternalBuildNumber := Win11v21H2PreRel4Build;
-              InternalExtraUpdateInfo := Format(
-                'Version 21H2 [RSPRERELEASE v10.0.%d.%d]',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
-            end
-            else if IsBuildNumber(Win11v21H2PreRel5Build) then
+            else if FindBuildNumberFrom(
+              [
+                Win11v21H2PreRel1Build, Win11v21H2PreRel2Build,
+                Win11v21H2PreRel3Build, Win11v21H2PreRel4Build,
+                Win11v21H2PreRel5Build, Win11v21H2PreRel6Build,
+                Win11v21H2PreRel7Build, Win11v21H2PreRel8Build,
+                Win11v21H2PreRel9Build, Win11v21H2PreRel10Build,
+                Win11v21H2PreRel11Build
+              ],
+              InternalBuildNumber
+            ) then
             begin
-              InternalBuildNumber := Win11v21H2PreRel5Build;
               InternalExtraUpdateInfo := Format(
                 'Version 21H2 [RSPRERELEASE v10.0.%d.%d]',
                 [InternalBuildNumber, InternalRevisionNumber]
@@ -1925,60 +1929,20 @@ procedure InitPlatformIdEx;
               InternalBuildNumber := Win2016v1803Build;
               InternalExtraUpdateInfo := 'Version 1803';
             end
-            else if IsBuildNumber(Win2019IP180320Build) then
-            begin
-              InternalBuildNumber := Win2019IP180320Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180320Build);
-            end
-            else if IsBuildNumber(Win2019IP180324Build) then
-            begin
-              InternalBuildNumber := Win2019IP180324Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180324Build);
-            end
-            else if IsBuildNumber(Win2019IP180515Build) then
-            begin
-              InternalBuildNumber := Win2019IP180515Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180515Build);
-            end
-            else if IsBuildNumber(Win2019IP180619Build) then
-            begin
-              InternalBuildNumber := Win2019IP180619Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180619Build);
-            end
-            else if IsBuildNumber(Win2019IP180710Build) then
+            else if FindBuildNumberFrom(
+              [
+                Win2019IP180320Build, Win2019IP180324Build,
+                Win2019IP180515Build, Win2019IP180619Build,
+                Win2019IP180710Build, Win2019IP180716Build,
+                Win2019IP180731Build, Win2019IP180814Build,
+                Win2019IP180821Build, Win2019IP180828Build
+              ],
+              InternalBuildNumber
+            ) then
             begin
-              InternalBuildNumber := Win2019IP180710Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180710Build);
-            end
-            else if IsBuildNumber(Win2019IP180716Build) then
-            begin
-              InternalBuildNumber := Win2019IP180716Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180716Build);
-            end
-            else if IsBuildNumber(Win2019IP180716Build) then
-            begin
-              InternalBuildNumber := Win2019IP180716Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180716Build);
-            end
-            else if IsBuildNumber(Win2019IP180731Build) then
-            begin
-              InternalBuildNumber := Win2019IP180731Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180731Build);
-            end
-            else if IsBuildNumber(Win2019IP180814Build) then
-            begin
-              InternalBuildNumber := Win2019IP180814Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180814Build);
-            end
-            else if IsBuildNumber(Win2019IP180821Build) then
-            begin
-              InternalBuildNumber := Win2019IP180821Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180821Build);
-            end
-            else if IsBuildNumber(Win2019IP180828Build) then
-            begin
-              InternalBuildNumber := Win2019IP180828Build;
-              InternalExtraUpdateInfo := Win2019IPExtra(Win2019IP180828Build);
+              InternalExtraUpdateInfo := Format(
+                'Insider Preview Build %d', [InternalBuildNumber]
+              );
             end
             else if IsBuildNumber(Win2019v1809Build) then
             begin

From 4887bd176baef2db74a20d13fb661abf8f7eb9e0 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 2 Jan 2022 16:27:50 +0000
Subject: [PATCH 002/264] Add new methods to get default font sizes.

---
 Src/UFontHelper.pas | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Src/UFontHelper.pas b/Src/UFontHelper.pas
index a149d6ada..5e40c0296 100644
--- a/Src/UFontHelper.pas
+++ b/Src/UFontHelper.pas
@@ -80,6 +80,8 @@   TFontHelper = class(TNoConstructObject)
         @return Handle to cloned font. Caller is responsible for releasing the
           handle.
       }
+    class function GetDefaultFontSize: Integer;
+    class function GetDefaultContentFontSize: Integer;
   strict private
     const
       FallbackFontName = 'Arial';                 // Fallback font name
@@ -158,6 +160,32 @@ class function TFontHelper.FontExists(const FontName: string): Boolean;
   Result := Screen.Fonts.IndexOf(FontName) >= 0;
 end;
 
+class function TFontHelper.GetDefaultContentFontSize: Integer;
+var
+  Font: TFont;
+begin
+  Font := TFont.Create;
+  try
+    SetContentFont(Font);
+    Result := Font.Size;
+  finally
+    Font.Free;
+  end;
+end;
+
+class function TFontHelper.GetDefaultFontSize: Integer;
+var
+  Font: TFont;
+begin
+  Font := TFont.Create;
+  try
+    SetDefaultFont(Font);
+    Result := Font.Size;
+  finally
+    Font.Free;
+  end;
+end;
+
 class function TFontHelper.IsInCommonFontSizeRange(
   const FontSize: Integer): Boolean;
 begin

From 042dd8a6f2c8ad7b1e7ac7b579681864915bdc0d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 2 Jan 2022 16:31:21 +0000
Subject: [PATCH 003/264] Add DetailFontSize preference & change font size
 defaults

Change font size defaults for overview pane and detail pane to get
defaults that apply to underlying OS, rather than hard wiring them.

Setting either detail pane or overview pane font size preferences to
an out of range value resets the preference to its default value.
---
 Src/UPreferences.pas | 63 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/Src/UPreferences.pas b/Src/UPreferences.pas
index dc843214f..59bd8e09a 100644
--- a/Src/UPreferences.pas
+++ b/Src/UPreferences.pas
@@ -183,6 +183,14 @@ interface
     property OverviewFontSize: Integer
       read GetOverviewFontSize write SetOverviewFontSize;
 
+    ///  <summary>Gets size of base font used in detail pane.</summary>
+    function GetDetailFontSize: Integer;
+    ///  <summary>Sets size of base font used in detail pane.</summary>
+    procedure SetDetailFontSize(const Value: Integer);
+    ///  <summary>Size of base font used in detail pane.</summary>
+    property DetailFontSize: Integer
+      read GetDetailFontSize write SetDetailFontSize;
+
     ///  <summary>Gets colour used for background of source code in main
     ///  display.</summary>
     function GetSourceCodeBGColour: TColor;
@@ -289,7 +297,7 @@ implementation
   SysUtils,
   // Project
   Hiliter.UAttrs, Hiliter.UPersist, IntfCommon, UExceptions, UColours,
-  USettings;
+  UFontHelper, USettings;
 
 
 type
@@ -342,6 +350,8 @@   TPreferences = class(TInterfacedObject,
       ///  <summary>Records size of font used in overview pane tree view.
       ///  </summary>
       fOverviewFontSize: Integer;
+      ///  <summary>Records size of font used in details pane.</summary>
+      fDetailFontSize: Integer;
       ///  <summary>Records colour used for background of source code in main
       ///  display.</summary>
       fSourceCodeBGColour: TColor;
@@ -366,6 +376,11 @@   TPreferences = class(TInterfacedObject,
       ///  <summary>Information describing snippet detail page customisations.
       ///  </summary>
       fPageStructures: TSnippetPageStructures;
+    ///  <summary>Returns default font size for overview pane tree view.
+    ///  </summary>
+    function DefaultOverviewFontSize: Integer;
+    ///  <summary>Returns default font size for details pane.</summary>
+    function DefaultDetailFontSize: Integer;
   public
     ///  <summary>Constructs a new object instance.</summary>
     constructor Create;
@@ -510,6 +525,14 @@   TPreferences = class(TInterfacedObject,
     ///  <remarks>Method of IPreferences.</remarks>
     procedure SetOverviewFontSize(const Value: Integer);
 
+    ///  <summary>Gets size of base font used in detail pane.</summary>
+    ///  <remarks>Method of IPreferences.</remarks>
+    function GetDetailFontSize: Integer;
+
+    ///  <summary>Sets size of base font used in detail pane.</summary>
+    ///  <remarks>Method of IPreferences.</remarks>
+    procedure SetDetailFontSize(const Value: Integer);
+
     ///  <summary>Gets colour used for background of source code in main
     ///  display.</summary>
     ///  <remarks>Method of IPreferences.</remarks>
@@ -677,6 +700,7 @@ procedure TPreferences.Assign(const Src: IInterface);
   Self.fDBHeadingColours[True] := SrcPref.DBHeadingColours[True];
   Self.fDBHeadingCustomColours[True] := SrcPref.DBHeadingCustomColours[True];
   Self.fOverviewFontSize := SrcPref.OverviewFontSize;
+  Self.fDetailFontSize := SrcPref.DetailFontSize;
   Self.fSourceCodeBGColour := SrcPref.SourceCodeBGColour;
   Self.fSourceCodeBGCustomColours := SrcPref.SourceCodeBGCustomColours;
   Self.fPrinterOptions := SrcPref.PrinterOptions;
@@ -701,6 +725,16 @@ constructor TPreferences.Create;
   TDefaultPageStructures.SetDefaults(fPageStructures);
 end;
 
+function TPreferences.DefaultDetailFontSize: Integer;
+begin
+  Result := TFontHelper.GetDefaultContentFontSize;
+end;
+
+function TPreferences.DefaultOverviewFontSize: Integer;
+begin
+  Result := TFontHelper.GetDefaultFontSize;
+end;
+
 destructor TPreferences.Destroy;
 begin
   fPageStructures.Free;
@@ -723,6 +757,11 @@ function TPreferences.GetDBHeadingCustomColours(
   Result := fDBHeadingCustomColours[UserDefined];
 end;
 
+function TPreferences.GetDetailFontSize: Integer;
+begin
+  Result := fDetailFontSize;
+end;
+
 function TPreferences.GetHiliteAttrs: IHiliteAttrs;
 begin
   Result := fHiliteAttrs;
@@ -830,6 +869,14 @@ procedure TPreferences.SetDBHeadingCustomColours(UserDefined: Boolean;
   fDBHeadingCustomColours[UserDefined] := Value;
 end;
 
+procedure TPreferences.SetDetailFontSize(const Value: Integer);
+begin
+  if TFontHelper.IsInCommonFontSizeRange(Value) then
+    fDetailFontSize := Value
+  else
+    fDetailFontSize := DefaultDetailFontSize;
+end;
+
 procedure TPreferences.SetHiliteAttrs(const Attrs: IHiliteAttrs);
 begin
   (fHiliteAttrs as IAssignable).Assign(Attrs);
@@ -852,7 +899,10 @@ procedure TPreferences.SetNamedHiliteAttrs(NamedHiliteAttrs: INamedHiliteAttrs);
 
 procedure TPreferences.SetOverviewFontSize(const Value: Integer);
 begin
-  fOverviewFontSize := Value;
+  if TFontHelper.IsInCommonFontSizeRange(Value) then
+    fOverviewFontSize := Value
+  else
+    fOverviewFontSize := DefaultOverviewFontSize;
 end;
 
 procedure TPreferences.SetOverviewStartState(const Value: TOverviewStartState);
@@ -945,6 +995,7 @@ function TPreferencesPersist.Clone: IInterface;
   NewPref.DBHeadingColours[True] := Self.fDBHeadingColours[True];
   NewPref.DBHeadingCustomColours[True] := Self.fDBHeadingCustomColours[True];
   NewPref.OverviewFontSize := Self.fOverviewFontSize;
+  NewPref.DetailFontSize := Self.fDetailFontSize;
   NewPref.SourceCodeBGColour := Self.fSourceCodeBGColour;
   NewPref.SourceCodeBGCustomColours := Self.fSourceCodeBGCustomColours;
   NewPref.PrinterOptions := Self.fPrinterOptions;
@@ -999,7 +1050,12 @@ constructor TPreferencesPersist.Create;
   fDBHeadingCustomColours[True] := Storage.GetStrings(
     'UserDBHeadingCustomColourCount', 'UserDBHeadingCustomColour%d'
   );
-  fOverviewFontSize := Storage.GetInteger('OverviewFontSize', 9);
+  fOverviewFontSize := Storage.GetInteger(
+    'OverviewFontSize', DefaultOverviewFontSize
+  );
+  fDetailFontSize := Storage.GetInteger(
+    'DetailFontSize', DefaultDetailFontSize
+  );
   fSourceCodeBGCustomColours := Storage.GetStrings(
     'SourceCodeBGCustomColourCount', 'SourceCodeBGCustomColour%d'
   );
@@ -1071,6 +1127,7 @@ destructor TPreferencesPersist.Destroy;
   Storage.SetInteger('MainDBHeadingColour', fDBHeadingColours[False]);
   Storage.SetInteger('UserDBHeadingColour', fDBHeadingColours[True]);
   Storage.SetInteger('OverviewFontSize', fOverviewFontSize);
+  Storage.SetInteger('DetailFontSize', fDetailFontSize);
   Storage.SetInteger('SourceCodeBGColour', fSourceCodeBGColour);
   Storage.SetStrings(
     'MainDBHeadingCustomColourCount',

From 410543eaa8a446a9a99aca9f227f8e94cff9f3d6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 2 Jan 2022 16:33:33 +0000
Subject: [PATCH 004/264] Add detail pane font size option & refactor font size
 code

OnChange event handler for font size combo boxes is now shared
between the two. This required that current font size was store in
each combo box's Tag property rather than in separate field of
frame.
---
 Src/FrDisplayPrefs.dfm |  18 ++++++-
 Src/FrDisplayPrefs.pas | 115 +++++++++++++++++++++++------------------
 2 files changed, 83 insertions(+), 50 deletions(-)

diff --git a/Src/FrDisplayPrefs.dfm b/Src/FrDisplayPrefs.dfm
index 5f060c451..e28212e79 100644
--- a/Src/FrDisplayPrefs.dfm
+++ b/Src/FrDisplayPrefs.dfm
@@ -40,6 +40,14 @@ inherited DisplayPrefsFrame: TDisplayPrefsFrame
     Caption = 'Overview tree view &font size: '
     FocusControl = cbOverviewFontSize
   end
+  object lblDetailFontSize: TLabel
+    Left = 16
+    Top = 232
+    Width = 105
+    Height = 13
+    Caption = 'Detail pane font si&ze: '
+    FocusControl = cbDetailFontSize
+  end
   object cbOverviewTree: TComboBox
     Left = 192
     Top = 2
@@ -80,6 +88,14 @@ inherited DisplayPrefsFrame: TDisplayPrefsFrame
     Width = 57
     Height = 21
     TabOrder = 4
-    OnChange = cbOverviewFontSizeChange
+    OnChange = FontSizeChange
+  end
+  object cbDetailFontSize: TComboBox
+    Left = 192
+    Top = 229
+    Width = 57
+    Height = 21
+    TabOrder = 5
+    OnChange = FontSizeChange
   end
 end
diff --git a/Src/FrDisplayPrefs.pas b/Src/FrDisplayPrefs.pas
index de3b90943..0109107c2 100644
--- a/Src/FrDisplayPrefs.pas
+++ b/Src/FrDisplayPrefs.pas
@@ -37,14 +37,15 @@   TDisplayPrefsFrame = class(TPrefsBaseFrame)
     lblSourceBGColour: TLabel;
     lblOverviewFontSize: TLabel;
     cbOverviewFontSize: TComboBox;
+    lblDetailFontSize: TLabel;
+    cbDetailFontSize: TComboBox;
     procedure chkHideEmptySectionsClick(Sender: TObject);
     procedure btnDefColoursClick(Sender: TObject);
-    procedure cbOverviewFontSizeChange(Sender: TObject);
+    procedure FontSizeChange(Sender: TObject);
   strict private
     var
       ///  <summary>Flag indicating if changes affect UI.</summary>
       fUIChanged: Boolean;
-      fOverviewFontSize: Integer;
       fMainColourBox: TColorBoxEx;
       fMainColourDlg: TColorDialogEx;
       fUserColourBox: TColorBoxEx;
@@ -63,7 +64,7 @@   TDisplayPrefsFrame = class(TPrefsBaseFrame)
     function CreateCustomColourBox(const ColourDlg: TColorDialogEx):
       TColorBoxEx;
     procedure ColourBoxChangeHandler(Sender: TObject);
-    procedure PopulateFontSizeCombo;
+    procedure PopulateFontSizeCombos;
   public
     constructor Create(AOwner: TComponent); override;
       {Class constructor. Sets up frame and populates controls.
@@ -137,8 +138,10 @@ procedure TDisplayPrefsFrame.Activate(const Prefs: IPreferences;
   Prefs.DBHeadingCustomColours[False].CopyTo(fMainColourDlg.CustomColors, True);
   Prefs.DBHeadingCustomColours[True].CopyTo(fUserColourDlg.CustomColors, True);
   Prefs.SourceCodeBGCustomColours.CopyTo(fSourceBGColourDlg.CustomColors, True);
-  fOverviewFontSize := Prefs.OverviewFontSize;
-  cbOverviewFontSize.Text := IntToStr(fOverviewFontSize);
+  cbOverviewFontSize.Tag := Prefs.OverviewFontSize; // store font size in .Tag
+  cbOverviewFontSize.Text := IntToStr(Prefs.OverviewFontSize);
+  cbDetailFontSize.Tag := Prefs.DetailFontSize;     // store font size in .Tag
+  cbDetailFontSize.Text := IntToStr(Prefs.DetailFontSize);
 end;
 
 procedure TDisplayPrefsFrame.ArrangeControls;
@@ -149,14 +152,14 @@ procedure TDisplayPrefsFrame.ArrangeControls;
     [
       lblOverviewTree, chkHideEmptySections, chkSnippetsInNewTab,
       lblMainColour, lblUserColour, lblSourceBGColour, btnDefColours,
-      lblOverviewFontSize
+      lblOverviewFontSize, lblDetailFontSize
     ],
     0
   );
   TCtrlArranger.AlignLefts(
     [
       cbOverviewTree, fMainColourBox, fUserColourBox, fSourceBGColourBox,
-      cbOverviewFontSize
+      cbOverviewFontSize, cbDetailFontSize
     ],
     TCtrlArranger.RightOf(
       [lblOverviewTree, lblMainColour, lblUserColour, lblSourceBGColour],
@@ -165,11 +168,11 @@ procedure TDisplayPrefsFrame.ArrangeControls;
   );
   TCtrlArranger.AlignVCentres(3, [lblOverviewTree, cbOverviewTree]);
   TCtrlArranger.MoveBelow(
-    [lblOverviewTree, cbOverviewTree], chkSnippetsInNewTab, 24
+    [lblOverviewTree, cbOverviewTree], chkSnippetsInNewTab, 12
   );
   TCtrlArranger.MoveBelow(chkSnippetsInNewTab, chkHideEmptySections, 8);
   TCtrlArranger.AlignVCentres(
-    TCtrlArranger.BottomOf(chkHideEmptySections, 24),
+    TCtrlArranger.BottomOf(chkHideEmptySections, 12),
     [lblMainColour, fMainColourBox]
   );
   TCtrlArranger.AlignVCentres(
@@ -187,6 +190,10 @@ procedure TDisplayPrefsFrame.ArrangeControls;
     TCtrlArranger.BottomOf(btnDefColours, 12),
     [lblOverviewFontSize, cbOverviewFontSize]
   );
+  TCtrlArranger.AlignVCentres(
+    TCtrlArranger.BottomOf(cbOverviewFontSize, 8),
+    [lblDetailFontSize, cbDetailFontSize]
+  );
   chkHideEmptySections.Width := Self.Width - 16;
   chkSnippetsInNewTab.Width := Self.Width - 16;
 end;
@@ -201,43 +208,6 @@ procedure TDisplayPrefsFrame.btnDefColoursClick(Sender: TObject);
   fUIChanged := True;
 end;
 
-procedure TDisplayPrefsFrame.cbOverviewFontSizeChange(Sender: TObject);
-var
-  Size: Integer;  // font size entered by user
-begin
-  inherited;
-  // Do nothing if combo box text field cleared
-  if cbOverviewFontSize.Text = '' then
-    Exit;
-  if TryStrToInt(cbOverviewFontSize.Text, Size) then
-  begin
-    if TFontHelper.IsInCommonFontSizeRange(Size) then
-    begin
-      // Combo has valid value entered: update
-      fOverviewFontSize := Size;
-      fUIChanged := True;
-    end
-    else
-    begin
-      // Font size out of range
-      TMessageBox.Error(
-        ParentForm,
-        Format(
-          sErrBadOverviewFontRange,
-          [TFontHelper.CommonFontSizes.Min, TFontHelper.CommonFontSizes.Max]
-        )
-      );
-      cbOverviewFontSize.Text := IntToStr(fOverviewFontSize);
-    end;
-  end
-  else
-  begin
-    // Combo has invalid value: say so
-    TMessageBox.Error(ParentForm, sErrBadOverviewFontSize);
-    cbOverviewFontSize.Text := IntToStr(fOverviewFontSize);
-  end;
-end;
-
 procedure TDisplayPrefsFrame.chkHideEmptySectionsClick(Sender: TObject);
   {Handles clicks on "Hide Empty Sections" check box. Flags UI preferences has
   having changed.
@@ -287,7 +257,7 @@ constructor TDisplayPrefsFrame.Create(AOwner: TComponent);
   fSourceBGColourBox.TabOrder := 5;
   lblSourceBGColour.FocusControl := fSourceBGColourBox;
 
-  PopulateFontSizeCombo;
+  PopulateFontSizeCombos;
 end;
 
 function TDisplayPrefsFrame.CreateCustomColourBox(
@@ -330,7 +300,10 @@ procedure TDisplayPrefsFrame.Deactivate(const Prefs: IPreferences);
   Prefs.SourceCodeBGCustomColours.CopyFrom(
     fSourceBGColourDlg.CustomColors, True
   );
-  Prefs.OverviewFontSize := StrToIntDef(cbOverviewFontSize.Text, 8);
+  // Setting following properties to -1 causes preferences object to use their
+  // default font size
+  Prefs.OverviewFontSize := StrToIntDef(cbOverviewFontSize.Text, -1);
+  Prefs.DetailFontSize := StrToIntDef(cbDetailFontSize.Text, -1);
 end;
 
 function TDisplayPrefsFrame.DisplayName: string;
@@ -344,6 +317,47 @@ function TDisplayPrefsFrame.DisplayName: string;
   Result := sDisplayName;
 end;
 
+procedure TDisplayPrefsFrame.FontSizeChange(Sender: TObject);
+var
+  Size: Integer;  // font size entered by user
+  CB: TComboBox;  // combo box that triggered event
+begin
+  inherited;
+  Assert(Sender is TComboBox,
+    ClassName + '.FontSizeChange: Sender not TComboBox');
+  CB := Sender as TComboBox;
+  // Do nothing if combo box text field cleared
+  if CB.Text = '' then
+    Exit;
+  if TryStrToInt(CB.Text, Size) then
+  begin
+    if TFontHelper.IsInCommonFontSizeRange(Size) then
+    begin
+      // Combo has valid value entered: update
+      CB.Tag := Size;
+      fUIChanged := True;
+    end
+    else
+    begin
+      // Font size out of range
+      TMessageBox.Error(
+        ParentForm,
+        Format(
+          sErrBadOverviewFontRange,
+          [TFontHelper.CommonFontSizes.Min, TFontHelper.CommonFontSizes.Max]
+        )
+      );
+      CB.Text := IntToStr(CB.Tag);
+    end;
+  end
+  else
+  begin
+    // Combo has invalid value: say so
+    TMessageBox.Error(ParentForm, sErrBadOverviewFontSize);
+    CB.Text := IntToStr(CB.Tag);
+  end;
+end;
+
 class function TDisplayPrefsFrame.Index: Byte;
   {Index number that determines the location of the tab containing this frame
   when displayed in the preferences dialog box.
@@ -372,9 +386,12 @@ function TDisplayPrefsFrame.OverviewTreeStateDesc(
   Result := cOTSStartStates[State];
 end;
 
-procedure TDisplayPrefsFrame.PopulateFontSizeCombo;
+procedure TDisplayPrefsFrame.PopulateFontSizeCombos;
 begin
+  cbOverviewFontSize.Clear;
   TFontHelper.ListCommonFontSizes(cbOverviewFontSize.Items);
+  cbDetailFontSize.Clear;
+  TFontHelper.ListCommonFontSizes(cbDetailFontSize.Items);
 end;
 
 procedure TDisplayPrefsFrame.SelectOverviewTreeState(

From c7a09ed992bbc5d72ba263bf05c3f8295019c627 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 2 Jan 2022 16:37:41 +0000
Subject: [PATCH 005/264] Modify CSS generation to enable user specified font
 size.

Adjustments had to be made to preserve ratio of sizes of baseline
content font in relation to heading a mono font styles.
---
 Src/FrDetailView.pas | 76 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 13 deletions(-)

diff --git a/Src/FrDetailView.pas b/Src/FrDetailView.pas
index 06da2e9bf..78d56a712 100644
--- a/Src/FrDetailView.pas
+++ b/Src/FrDetailView.pas
@@ -107,7 +107,7 @@ implementation
 
 uses
   // Delphi
-  SysUtils, Graphics, Menus,
+  SysUtils, Graphics, Menus, Math,
   // Project
   ActiveText.UHTMLRenderer, Browser.UHighlighter, Hiliter.UAttrs, Hiliter.UCSS,
   Hiliter.UGlobals, UColours, UCSSUtils, UFontHelper, UPreferences, UQuery,
@@ -119,27 +119,53 @@ implementation
 
 procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
 var
-  HiliteAttrs: IHiliteAttrs;  // syntax highlighter used to build CSS
-  CSSFont: TFont;             // font used to set CSS properties
+  HiliteAttrs: IHiliteAttrs;      // syntax highlighter used to build CSS
+  ContentFont: TFont;             // default content font sized per preferences
+  MonoFont: TFont;                // default mono font sized per preferences
+  CSSFont: TFont;                 // font used to set CSS properties
+  ContentFontScaleFactor: Single; // amount to increase font size by to get
+                                  // proportionally same increase as adding 1 to
+                                  // default content font size
+  MonoToContentFontRatio: Single; // ratio of size of mono font to content font
+  DefContentFontSize: Integer;    // default size of content font
+  DefMonoFontSize: Integer;       // default size of mono font
 begin
   // NOTE:
   // We only set CSS properties that may need to use system colours or fonts
   // that may be changed by user or changing program defaults. CSS that controls
   // layout remains in a CSS file embedded in resources.
   inherited;
+  ContentFont := nil;
+  MonoFont := nil;
   CSSFont := TFont.Create;
   try
+    MonoFont := TFont.Create;
+    ContentFont := TFont.Create;
+    TFontHelper.SetDefaultMonoFont(MonoFont);
+    TFontHelper.SetContentFont(ContentFont);
+    // Must do next two lines before changing content & mono font sizes
+    DefContentFontSize := ContentFont.Size;
+    DefMonoFontSize := MonoFont.Size;
+    ContentFontScaleFactor := 1.0 / DefContentFontSize;
+    MonoToContentFontRatio := DefMonoFontSize / DefContentFontSize;
+    ContentFont.Size := Preferences.DetailFontSize;
+    MonoFont.Size := Round(ContentFont.Size * MonoToContentFontRatio);
     // Set body style to use program's font and window colour
     with CSSBuilder.AddSelector('body') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
       AddProperty(TCSS.FontProps(CSSFont));
       AddProperty(TCSS.BackgroundColorProp(clWindow));
     end;
+    with CSSBuilder.Selectors['code'] do
+    begin
+      CSSFont.Assign(MonoFont);
+      AddProperty(TCSS.FontProps(CSSFont));
+    end;
     // Set table to use required font
     with CSSBuilder.AddSelector('table') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
       AddProperty(TCSS.FontProps(CSSFont));
       AddProperty(TCSS.BackgroundColorProp(clBorder));
     end;
@@ -149,8 +175,10 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
     // Sets H1 heading font size and border
     with CSSBuilder.AddSelector('h1') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
-      CSSFont.Size := CSSFont.Size + 2;
+      CSSFont.Assign(ContentFont);
+      CSSFont.Size := CSSFont.Size + Max(
+        Round(2 * ContentFontScaleFactor * CSSFont.Size), 2
+      );
       CSSFont.Style := [fsBold];
       AddProperty(TCSS.FontProps(CSSFont));
       AddProperty(TCSS.BorderProp(cssBottom, 1, cbsSolid, clBorder));
@@ -158,22 +186,42 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
     // Sets H2 heading font size and border
     with CSSBuilder.AddSelector('h2') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
       CSSFont.Style := [fsBold];
       AddProperty(TCSS.FontProps(CSSFont));
     end;
     // Set H2 heading font for use in rendered active text
     with CSSBuilder.AddSelector('.active-text h2') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
       CSSFont.Style := [fsBold];
-      CSSFont.Size := CSSFont.Size + 1;
+      CSSFont.Size := CSSFont.Size + Max(
+        Round(ContentFontScaleFactor * CSSFont.Size), 1
+      );
+      AddProperty(TCSS.FontProps(CSSFont));
+    end;
+    // Set CODE tag within H2 heading for use in rendered active text
+    with CSSBuilder.AddSelector('.active-text h2 code') do
+    begin
+      CSSFont.Assign(MonoFont);
+      CSSFont.Style := [fsBold];
+      CSSFont.Size := CSSFont.Size + Max(
+        Round(ContentFontScaleFactor * CSSFont.Size), 1
+      );
       AddProperty(TCSS.FontProps(CSSFont));
     end;
     // Set H2 heading font for use in rendered active text in snippet list table
     with CSSBuilder.AddSelector('.snippet-list .active-text h2') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
+      CSSFont.Assign(ContentFont);
+      CSSFont.Style := [fsBold];
+      AddProperty(TCSS.FontProps(CSSFont));
+    end;
+    // Set CODE within H2 heading font for use in rendered active text in
+    // snippet list table
+    with CSSBuilder.AddSelector('.snippet-list .active-text h2 code') do
+    begin
+      CSSFont.Assign(MonoFont);
       CSSFont.Style := [fsBold];
       AddProperty(TCSS.FontProps(CSSFont));
     end;
@@ -187,8 +235,8 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
     // Sets CSS for style of New Tab text
     with CSSBuilder.AddSelector('#newtab') do
     begin
-      TFontHelper.SetContentFont(CSSFont);
-      CSSFont.Size := 36;
+      CSSFont.Assign(ContentFont);
+      CSSFont.Size := 36 + Round(36 * ContentFontScaleFactor);
       CSSFont.Color := clNewTabText;
       AddProperty(TCSS.FontProps(CSSFont));
     end;
@@ -218,6 +266,8 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
       AddProperty(TCSS.FontWeightProp(cfwNormal));
     end;
   finally
+    ContentFont.Free;
+    MonoFont.Free;
     CSSFont.Free;
   end;
 end;

From 3771b42880e6962f33aa967b2868ef7aaf465a09 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 2 Jan 2022 17:19:21 +0000
Subject: [PATCH 006/264] Change to restore default font size when bad value
 assigned.

Setting highlighter font size preference to an out of range value
resets the preference to its default value.
---
 Src/Hiliter.UAttrs.pas | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Src/Hiliter.UAttrs.pas b/Src/Hiliter.UAttrs.pas
index b137e6f9e..24a91dd25 100644
--- a/Src/Hiliter.UAttrs.pas
+++ b/Src/Hiliter.UAttrs.pas
@@ -107,7 +107,11 @@   THiliteAttrs = class(TInterfacedObject,
     ///  <remarks>Method of IHiliteAttrs.</remarks>
     function GetFontSize: Integer;
     ///  <summary>Sets size of highlighter font.</summary>
-    ///  <remarks>Method of IHiliteAttrs.</remarks>
+    ///  <remarks>
+    ///  <para>If font size is out of range of supported sizes then the
+    ///  highlighter font is reset to its default value.</para>
+    ///  <para>Method of IHiliteAttrs.</para>
+    ///  </remarks>
     procedure SetFontSize(const AFontSize: Integer);
     ///  <summary>Resets highlighter font name and size to default values.
     ///  </summary>
@@ -307,7 +311,10 @@ procedure THiliteAttrs.SetFontName(const AFontName: string);
 
 procedure THiliteAttrs.SetFontSize(const AFontSize: Integer);
 begin
-  fFontSize := AFontSize;
+  if TFontHelper.IsInCommonFontSizeRange(AFontSize) then
+    fFontSize := AFontSize
+  else
+    fFontSize := cDefFontSize;
 end;
 
 { THiliteElemAttrs }

From 6d58923d2e5b773eee560a63e8c8ff73abcd406f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 2 Jan 2022 17:21:08 +0000
Subject: [PATCH 007/264] Condense dialogue controls & add info label

Add an information label explaining that Syntax Highlighter
preferences page must be used to set source code font size.
---
 Src/FrDisplayPrefs.dfm | 13 +++++++++++++
 Src/FrDisplayPrefs.pas | 14 ++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Src/FrDisplayPrefs.dfm b/Src/FrDisplayPrefs.dfm
index e28212e79..80a7370ef 100644
--- a/Src/FrDisplayPrefs.dfm
+++ b/Src/FrDisplayPrefs.dfm
@@ -48,6 +48,19 @@ inherited DisplayPrefsFrame: TDisplayPrefsFrame
     Caption = 'Detail pane font si&ze: '
     FocusControl = cbDetailFontSize
   end
+  object lblHiliterInfo: TLabel
+    Left = 16
+    Top = 256
+    Width = 370
+    Height = 36
+    Caption = 
+      'To change the size of the source code font use the the Syntax Hi' +
+      'ghlighter options page.'
+    Color = clBtnFace
+    ParentColor = False
+    Transparent = True
+    WordWrap = True
+  end
   object cbOverviewTree: TComboBox
     Left = 192
     Top = 2
diff --git a/Src/FrDisplayPrefs.pas b/Src/FrDisplayPrefs.pas
index 0109107c2..83ed29e2c 100644
--- a/Src/FrDisplayPrefs.pas
+++ b/Src/FrDisplayPrefs.pas
@@ -39,6 +39,7 @@   TDisplayPrefsFrame = class(TPrefsBaseFrame)
     cbOverviewFontSize: TComboBox;
     lblDetailFontSize: TLabel;
     cbDetailFontSize: TComboBox;
+    lblHiliterInfo: TLabel;
     procedure chkHideEmptySectionsClick(Sender: TObject);
     procedure btnDefColoursClick(Sender: TObject);
     procedure FontSizeChange(Sender: TObject);
@@ -152,7 +153,7 @@ procedure TDisplayPrefsFrame.ArrangeControls;
     [
       lblOverviewTree, chkHideEmptySections, chkSnippetsInNewTab,
       lblMainColour, lblUserColour, lblSourceBGColour, btnDefColours,
-      lblOverviewFontSize, lblDetailFontSize
+      lblOverviewFontSize, lblDetailFontSize, lblHiliterInfo
     ],
     0
   );
@@ -176,15 +177,15 @@ procedure TDisplayPrefsFrame.ArrangeControls;
     [lblMainColour, fMainColourBox]
   );
   TCtrlArranger.AlignVCentres(
-    TCtrlArranger.BottomOf([lblMainColour, fMainColourBox], 8),
+    TCtrlArranger.BottomOf([lblMainColour, fMainColourBox], 6),
     [lblUserColour, fUserColourBox]
   );
   TCtrlArranger.AlignVCentres(
-    TCtrlArranger.BottomOf([lblUserColour, fUserColourBox], 8),
+    TCtrlArranger.BottomOf([lblUserColour, fUserColourBox], 6),
     [lblSourceBGColour, fSourceBGColourBox]
   );
   TCtrlArranger.MoveBelow(
-    [lblSourceBGColour, fSourceBGColourBox], btnDefColours, 12
+    [lblSourceBGColour, fSourceBGColourBox], btnDefColours, 6
   );
   TCtrlArranger.AlignVCentres(
     TCtrlArranger.BottomOf(btnDefColours, 12),
@@ -194,6 +195,11 @@ procedure TDisplayPrefsFrame.ArrangeControls;
     TCtrlArranger.BottomOf(cbOverviewFontSize, 8),
     [lblDetailFontSize, cbDetailFontSize]
   );
+  TCtrlArranger.MoveBelow(
+    [lblDetailFontSize, cbDetailFontSize], lblHiliterInfo, 12
+  );
+  lblHiliterInfo.Width := Self.ClientWidth;
+  TCtrlArranger.SetLabelHeight(lblHiliterInfo);
   chkHideEmptySections.Width := Self.Width - 16;
   chkSnippetsInNewTab.Width := Self.Width - 16;
 end;

From f5a2b5f8ef268f935fbd0cddd56409f1951cc776 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 3 Jan 2022 10:37:46 +0000
Subject: [PATCH 008/264] Update help file re Display Preference Page changes

Noted new Display pane font size combo box
---
 Src/Help/HTML/dlg_prefs_display.htm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Src/Help/HTML/dlg_prefs_display.htm b/Src/Help/HTML/dlg_prefs_display.htm
index 425181740..0dbb43732 100644
--- a/Src/Help/HTML/dlg_prefs_display.htm
+++ b/Src/Help/HTML/dlg_prefs_display.htm
@@ -97,6 +97,21 @@ <h1>
         >overview pane</a>'s tree view using the <em>Overview tree font
         size</em> combo box.
       </li>
+      <li>
+        <p>
+          Similarly, the size of font used in the <a
+            href="detail_pane.htm"
+          >details pane</a> is set using the <em>Detail pane font size</em>
+          combo box.
+        </p>
+        <p>
+          <strong class="warning">Note:</strong> this combo box <strong>does
+          not</strong> affect the size of the font used to display source code
+          &ndash; this can be changed on the <a
+            href="dlg_prefs_hiliter.htm"
+          >Syntax Highlighter</a> Preferences page.
+        </p>
+      </li>
     </ul>
   </body>
 </html>

From c79be6c466d0dae01c20b8977a91c536e39ad998 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Jan 2022 09:52:46 +0000
Subject: [PATCH 009/264] Add feature to delete user database.

New dialogue box unit to get permission to delete, with associated
HTML frame contents.
Update UUserDBMgr to add new method to perform deletion.
Add new "Delete User Database" action and menu option to main form.

Fixes #15
---
 Src/CodeSnip.dpr               |   5 +-
 Src/CodeSnip.dproj             |   3 +
 Src/FmDeleteUserDBDlg.dfm      |  48 +++++++++++++++
 Src/FmDeleteUserDBDlg.pas      | 108 +++++++++++++++++++++++++++++++++
 Src/FmMain.dfm                 |  18 +++++-
 Src/FmMain.pas                 |  14 ++++-
 Src/HTML.hrc                   |   5 +-
 Src/Res/HTML/dlg-dbdelete.html |  48 +++++++++++++++
 Src/UUserDBMgr.pas             |  19 +++++-
 9 files changed, 258 insertions(+), 10 deletions(-)
 create mode 100644 Src/FmDeleteUserDBDlg.dfm
 create mode 100644 Src/FmDeleteUserDBDlg.pas
 create mode 100644 Src/Res/HTML/dlg-dbdelete.html

diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index da093abaa..d608babf8 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip application project file.
 }
@@ -369,7 +369,8 @@ uses
   UWindowSettings in 'UWindowSettings.pas',
   UXMLDocConsts in 'UXMLDocConsts.pas',
   UXMLDocHelper in 'UXMLDocHelper.pas',
-  UXMLDocumentEx in 'UXMLDocumentEx.pas';
+  UXMLDocumentEx in 'UXMLDocumentEx.pas',
+  FmDeleteUserDBDlg in 'FmDeleteUserDBDlg.pas' {DeleteUserDBDlg};
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index f1ccf4093..e1a91d26d 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -572,6 +572,9 @@
 			<DCCReference Include="UXMLDocConsts.pas"/>
 			<DCCReference Include="UXMLDocHelper.pas"/>
 			<DCCReference Include="UXMLDocumentEx.pas"/>
+			<DCCReference Include="FmDeleteUserDBDlg.pas">
+				<Form>DeleteUserDBDlg</Form>
+			</DCCReference>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
diff --git a/Src/FmDeleteUserDBDlg.dfm b/Src/FmDeleteUserDBDlg.dfm
new file mode 100644
index 000000000..9f30a2285
--- /dev/null
+++ b/Src/FmDeleteUserDBDlg.dfm
@@ -0,0 +1,48 @@
+inherited DeleteUserDBDlg: TDeleteUserDBDlg
+  Caption = 'DeleteUserDBDlg'
+  ExplicitWidth = 474
+  ExplicitHeight = 375
+  PixelsPerInch = 96
+  TextHeight = 13
+  inherited pnlBody: TPanel
+    object edConfirm: TEdit
+      Left = 0
+      Top = 216
+      Width = 201
+      Height = 21
+      TabOrder = 0
+    end
+    inline frmWarning: TFixedHTMLDlgFrame
+      Left = 0
+      Top = 0
+      Width = 369
+      Height = 210
+      Align = alTop
+      TabOrder = 1
+      TabStop = True
+      ExplicitWidth = 369
+      ExplicitHeight = 210
+      inherited pnlBrowser: TPanel
+        Width = 369
+        Height = 210
+        ExplicitWidth = 369
+        ExplicitHeight = 210
+        inherited wbBrowser: TWebBrowser
+          Width = 369
+          Height = 210
+          ExplicitWidth = 369
+          ExplicitHeight = 210
+          ControlData = {
+            4C00000023260000B41500000000000000000000000000000000000000000000
+            000000004C000000000000000000000001000000E0D057007335CF11AE690800
+            2B2E126208000000000000004C0000000114020000000000C000000000000046
+            8000000000000000000000000000000000000000000000000000000000000000
+            00000000000000000100000000000000000000000000000000000000}
+        end
+      end
+    end
+  end
+  inherited btnOK: TButton
+    OnClick = btnOKClick
+  end
+end
diff --git a/Src/FmDeleteUserDBDlg.pas b/Src/FmDeleteUserDBDlg.pas
new file mode 100644
index 000000000..3aee061a4
--- /dev/null
+++ b/Src/FmDeleteUserDBDlg.pas
@@ -0,0 +1,108 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Implements a dialogue box that asks user to confirm deletion of user-defined
+ * snippets database.
+}
+
+
+unit FmDeleteUserDBDlg;
+
+interface
+
+uses
+  // Delphi
+  Forms, StdCtrls, Controls, ExtCtrls, Classes,
+  // Project
+  FmGenericOKDlg,
+  FrBrowserBase, FrHTMLDlg, FrFixedHTMLDlg,
+  UBaseObjects;
+
+type
+  TDeleteUserDBDlg = class(TGenericOKDlg, INoPublicConstruct)
+    edConfirm: TEdit;
+    frmWarning: TFixedHTMLDlgFrame;
+    procedure btnOKClick(Sender: TObject);
+  strict private
+    const
+      cConfirmText = 'DELETE MY SNIPPETS';
+    var
+      fPermissionGranted: Boolean;
+  strict protected
+    ///  <summary>Protected constructor that sets up form.</summary>
+    constructor InternalCreate(AOwner: TComponent); override;
+    procedure ConfigForm; override;
+    procedure ArrangeForm; override;
+    function IsValidPassword: Boolean;
+  public
+    class function Execute(AOwner: TComponent): Boolean;
+  end;
+
+implementation
+
+uses
+  // Delphi
+  SysUtils,
+  // Project
+  UCtrlArranger, UMessageBox;
+
+{$R *.dfm}
+
+procedure TDeleteUserDBDlg.ArrangeForm;
+begin
+  frmWarning.Height := frmWarning.DocHeight;
+  edConfirm.Left := 0;
+  TCtrlArranger.MoveBelow(frmWarning, edConfirm, 12);
+  TCtrlArranger.AlignHCentresTo([frmWarning], [edConfirm]);
+  pnlBody.ClientHeight := TCtrlArranger.TotalControlHeight(pnlBody) + 8;
+  inherited;
+end;
+
+procedure TDeleteUserDBDlg.btnOKClick(Sender: TObject);
+resourcestring
+  sBadPassword = 'Invalid confirmation text entered: not deleting';
+begin
+  inherited;
+  fPermissionGranted := IsValidPassword;
+  if not fPermissionGranted then
+  begin
+    TMessageBox.Error(Self, sBadPassword);
+    ModalResult := mrNone;
+  end;
+end;
+
+procedure TDeleteUserDBDlg.ConfigForm;
+begin
+  inherited;
+//  frmWarning.OnBuildCSS := BuildCSS;
+  frmWarning.Initialise('dlg-dbdelete.html');
+end;
+
+class function TDeleteUserDBDlg.Execute(AOwner: TComponent): Boolean;
+begin
+  with InternalCreate(AOwner) do
+    try
+      ShowModal;
+      Result := fPermissionGranted;
+    finally
+      Free;
+    end;
+end;
+
+constructor TDeleteUserDBDlg.InternalCreate(AOwner: TComponent);
+begin
+  Assert(Supports(Self, INoPublicConstruct), ClassName + '.InternalCreate: '
+    + 'Form''s protected constructor can''t be called');
+  inherited InternalCreate(AOwner);
+end;
+
+function TDeleteUserDBDlg.IsValidPassword: Boolean;
+begin
+  Result := edConfirm.Text = cConfirmText;
+end;
+
+end.
diff --git a/Src/FmMain.dfm b/Src/FmMain.dfm
index 0128f4c4f..e2441f840 100644
--- a/Src/FmMain.dfm
+++ b/Src/FmMain.dfm
@@ -8,8 +8,8 @@ inherited MainForm: TMainForm
   Constraints.MinWidth = 480
   Menu = mnuMain
   OnResize = FormResize
-  ExplicitWidth = 613
-  ExplicitHeight = 495
+  ExplicitWidth = 621
+  ExplicitHeight = 503
   PixelsPerInch = 96
   TextHeight = 13
   object sbStatusBar: TStatusBar
@@ -866,6 +866,14 @@ inherited MainForm: TMainForm
         ' default web browser'
       ImageIndex = 6
     end
+    object actDeleteUserDatabase: TAction
+      Category = 'Database'
+      Caption = 'Delete User Database...'
+      Hint = 
+        'Delete User Database|Deletes the user'#39's snippets database - USE ' +
+        'WITH CAUTION'
+      OnExecute = actDeleteUserDatabaseExecute
+    end
   end
   object mnuMain: TMainMenu
     Images = ilMain
@@ -1093,6 +1101,12 @@ inherited MainForm: TMainForm
       object miMoveUserDatabase: TMenuItem
         Action = actMoveUserDatabase
       end
+      object miSpacer21: TMenuItem
+        Caption = '-'
+      end
+      object miDeleteUserDatabase: TMenuItem
+        Action = actDeleteUserDatabase
+      end
     end
     object miCompile: TMenuItem
       Caption = 'Compile'
diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index eb1ed4992..16a67871b 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Application's main form. Handles the program's main window display and user
  * interaction.
@@ -69,6 +69,7 @@   TMainForm = class(THelpAwareForm)
     actCopySource: TAction;
     actDeleteCategory: TAction;
     actDeleteSnippet: TAction;
+    actDeleteUserDatabase: TAction;
     actDuplicateSnippet: TAction;
     actEditSnippet: TAction;
     actExit: TFileExit;
@@ -138,6 +139,7 @@   TMainForm = class(THelpAwareForm)
     miDatabase: TMenuItem;
     miDeleteCategory: TMenuItem;
     miDeleteSnippet: TMenuItem;
+    miDeleteUserDatabase: TMenuItem;
     miDuplicateSnippet: TMenuItem;
     miEdit: TMenuItem;
     miEditSnippet: TMenuItem;
@@ -195,6 +197,7 @@   TMainForm = class(THelpAwareForm)
     miSpacer17: TMenuItem;
     miSpacer18: TMenuItem;
     miSpacer20: TMenuItem;
+    miSpacer21: TMenuItem;
     miSWAGImport: TMenuItem;
     miTestCompile: TMenuItem;
     miTools: TMenuItem;
@@ -294,6 +297,9 @@   TMainForm = class(THelpAwareForm)
     ///  <summary>Attempts to delete the current user defined snippet from the
     ///  database.</summary>
     procedure actDeleteSnippetExecute(Sender: TObject);
+    ///  <summary>Requests permission then attempts to delete the user defined
+    ///  snippets database.</summary>
+    procedure actDeleteUserDatabaseExecute(Sender: TObject);
     ///  <summary>Displays a dialogue box that can be used to duplicate the
     ///  selected snippet.</summary>
     procedure actDuplicateSnippetExecute(Sender: TObject);
@@ -713,6 +719,12 @@ procedure TMainForm.actDeleteSnippetExecute(Sender: TObject);
   // display update is handled by snippets change event handler
 end;
 
+procedure TMainForm.actDeleteUserDatabaseExecute(Sender: TObject);
+begin
+  if TUserDBMgr.DeleteDatabase then
+    ReloadDatabase;
+end;
+
 procedure TMainForm.actDuplicateSnippetExecute(Sender: TObject);
 begin
   TUserDBMgr.DuplicateSnippet(fMainDisplayMgr.CurrentView);
diff --git a/Src/HTML.hrc b/Src/HTML.hrc
index 8bae1d50b..a731c26f2 100644
--- a/Src/HTML.hrc
+++ b/Src/HTML.hrc
@@ -2,7 +2,7 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/
 #
-# Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+# Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
 #
 # Manifest file used to generate HTML.res resource file.
 
@@ -38,9 +38,10 @@ Res\HTML\dlg-dbupdate-load.html
 Res\HTML\dlg-dbupdate-finish.html
 
 # what's new dialogue
-# -------------------
 Res\HTML\dlg-whatsnew.html
 
+# delete database dialogue
+Res\HTML\dlg-dbdelete.html
 
 
 # Detail pane pages, scripts and CSS
diff --git a/Src/Res/HTML/dlg-dbdelete.html b/Src/Res/HTML/dlg-dbdelete.html
new file mode 100644
index 000000000..92e7f7c2f
--- /dev/null
+++ b/Src/Res/HTML/dlg-dbdelete.html
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<!--
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Warning information displayed in dialogue box used to confirm deletion on the
+ * user database.
+-->
+
+<html xmlns="https://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+  <head>
+    <title>dlg-dbdelete.html</title>
+  </head>
+
+  <body>
+
+    <h1>
+      ARE YOU SURE?
+    </h1>
+
+    <p>
+      Before going any further you are <strong>strongly advised</strong> to take a backup of your snippets database. Use the <em>Database | Backup User Database</em> menu option to do this.
+    </p>
+
+    <p>
+      <strong class="warning">This action cannot be undone: you will loose all your user-defined snippets.</strong>
+    </p>
+    
+    <p>
+      To confirm enter <code>DELETE MY SNIPPETS</code> (in capital letters) in the box below then click <em>OK</em>.
+    </p>
+    
+    <p>
+      <strong>There will be no further chances to change your mind.</strong>
+    </p>
+
+  </body>
+
+</html>
diff --git a/Src/UUserDBMgr.pas b/Src/UUserDBMgr.pas
index 84b43f8c3..48ce2ecd8 100644
--- a/Src/UUserDBMgr.pas
+++ b/Src/UUserDBMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a static class that manages user's interaction with user database.
 }
@@ -96,6 +96,8 @@   TUserDBMgr = class(TNoConstructObject)
     ///  <summary>Moves the user database to a new location specified by the
     ///  user.</summary>
     class procedure MoveDatabase;
+    ///  <summary>Deletes the user database, with permission.</summary>
+    class function DeleteDatabase: Boolean;
   end;
 
 
@@ -104,7 +106,7 @@ implementation
 
 uses
   // Delphi
-  SysUtils, Dialogs, Windows {for inlining},
+  SysUtils, Dialogs, Windows {for inlining}, IOUtils,
   // Project
   DB.UMain, DB.USnippet,
   FmAddCategoryDlg, FmDeleteCategoryDlg, FmDuplicateSnippetDlg,
@@ -112,7 +114,8 @@ implementation
   {$IFNDEF PORTABLE}
   FmUserDataPathDlg,
   {$ENDIF}
-  FmWaitDlg,
+  FmDeleteUserDBDlg, FmWaitDlg,
+  UAppInfo,
   UConsts, UExceptions, UIStringList, UMessageBox, UOpenDialogEx,
   UOpenDialogHelper, UReservedCategories, USaveDialogEx, USnippetIDs,
   UUserDBBackup, UWaitForThreadUI;
@@ -377,6 +380,16 @@ class procedure TUserDBMgr.DeleteACategory;
   end;
 end;
 
+class function TUserDBMgr.DeleteDatabase: Boolean;
+begin
+  if not TDeleteUserDBDlg.Execute(nil) then
+    Exit(False);
+  if not TDirectory.Exists(TAppInfo.UserDataDir) then
+    Exit(False);
+  TDirectory.Delete(TAppInfo.UserDataDir, True);
+  Result := True;
+end;
+
 class procedure TUserDBMgr.DeleteSnippet(ViewItem: IView);
 
   // Builds a list of snippet names from a given snippet ID list.

From 3616165e376523c6186a0d210d1fdff63a7d03b9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Jan 2022 09:53:09 +0000
Subject: [PATCH 010/264] Tidy main form published fields

---
 Src/FmMain.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 16a67871b..6e56de410 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -56,6 +56,7 @@   TMainForm = class(THelpAwareForm)
     actAddFavourite: TAction;
     actAddSnippet: TAction;
     actBackupDatabase: TAction;
+    actBlog: TBrowseURL;
     actBugReport: TAction;
     actCloseAllDetailsTabs: TAction;
     actCloseDetailsTab: TAction;
@@ -126,6 +127,7 @@   TMainForm = class(THelpAwareForm)
     miAddFavourite: TMenuItem;
     miAddSnippet: TMenuItem;
     miBackupDatabase: TMenuItem;
+    miBlog: TMenuItem;
     miCategories: TMenuItem;
     miCloseAllDetailsTabs: TMenuItem;
     miCloseDetailsTab: TMenuItem;
@@ -239,8 +241,6 @@   TMainForm = class(THelpAwareForm)
     tbSpacer7: TToolButton;
     tbSpacer8: TToolButton;
     tbTestCompile: TToolButton;
-    actBlog: TBrowseURL;
-    miBlog: TMenuItem;
     ///  <summary>Displays About Box.</summary>
     procedure actAboutExecute(Sender: TObject);
     ///  <summary>Gets a new category from user and adds to database.</summary>

From a2a0d2de886afe43b694bc3643a315c9e37ec722 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Jan 2022 10:07:46 +0000
Subject: [PATCH 011/264] Fix caption of "delete user database" dialogue box

---
 Src/FmDeleteUserDBDlg.dfm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/FmDeleteUserDBDlg.dfm b/Src/FmDeleteUserDBDlg.dfm
index 9f30a2285..1bd52b82a 100644
--- a/Src/FmDeleteUserDBDlg.dfm
+++ b/Src/FmDeleteUserDBDlg.dfm
@@ -1,5 +1,5 @@
 inherited DeleteUserDBDlg: TDeleteUserDBDlg
-  Caption = 'DeleteUserDBDlg'
+  Caption = 'Delete User Database'
   ExplicitWidth = 474
   ExplicitHeight = 375
   PixelsPerInch = 96

From 4040a56aa349f5b692e655ba0db43765b2ba7c82 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Jan 2022 11:24:44 +0000
Subject: [PATCH 012/264] Add new help topics re user database deletion

One new topic for Delete User Database dialogue box.
One new topic re related "common" task.
Update help index, TOC and project file as required.
---
 Src/Help/CodeSnip.hhp               |  2 +
 Src/Help/HTML/dlg_deleteuserdb.htm  | 82 +++++++++++++++++++++++++++++
 Src/Help/HTML/menu_database.htm     | 14 ++++-
 Src/Help/HTML/task_deleteuserdb.htm | 34 ++++++++++++
 Src/Help/Index.hhk                  |  7 +++
 Src/Help/TOC.hhc                    |  4 ++
 6 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 Src/Help/HTML/dlg_deleteuserdb.htm
 create mode 100644 Src/Help/HTML/task_deleteuserdb.htm

diff --git a/Src/Help/CodeSnip.hhp b/Src/Help/CodeSnip.hhp
index 272bac8f8..1bde50619 100644
--- a/Src/Help/CodeSnip.hhp
+++ b/Src/Help/CodeSnip.hhp
@@ -25,6 +25,7 @@ HTML\dlg_addcategory.htm
 HTML\dlg_backup.htm
 HTML\dlg_configcompilers.htm
 HTML\dlg_deletecategory.htm
+HTML\dlg_deleteuserdb.htm
 HTML\dlg_dependencies.htm
 HTML\dlg_dependencies_edit.htm
 HTML\dlg_duplicatesnippet.htm
@@ -96,6 +97,7 @@ HTML\task_addsnippets.htm
 HTML\task_backup.htm
 HTML\task_copysnippet.htm
 HTML\task_customise.htm
+HTML\task_deleteuserdb.htm
 HTML\task_export.htm
 HTML\task_generateunit.htm
 HTML\task_printroutine.htm
diff --git a/Src/Help/HTML/dlg_deleteuserdb.htm b/Src/Help/HTML/dlg_deleteuserdb.htm
new file mode 100644
index 000000000..86cd27a83
--- /dev/null
+++ b/Src/Help/HTML/dlg_deleteuserdb.htm
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!--
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Help topic for Delete User Database dialogue box.
+-->
+<html>
+  <head>
+    <meta
+     http-equiv="Content-Type"
+     content="text-html; charset=Windows-1252">
+    <title>
+      Delete User Database Dialogue Box
+    </title>
+    <link
+     rel="stylesheet"
+     href="../css/codesnip.css"
+     type="text/css">
+  </head>
+  <body>
+    <object
+     type="application/x-oleobject"
+     classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+      <param
+       name="ALink Name"
+       value="DeleteUserDBDlg">
+    </object>
+    <h1>
+      <a name="dlg_deleteuserdb"></a>Delete User Database Dialogue Box
+    </h1>
+    <p>
+      This dialogue box is displayed when you choose the <em>Database | Delete
+      User Database</em> menu option.
+    </p>
+    <p class="bordered">
+      <strong class="warning">Proceed with caution.</strong> If you give
+      permission here, <strong>all</strong> your user-defined snippets will be
+      deleted without further confirmation. <span class="warning">This action
+      can't be undone</span>.
+    </p>
+    <p>
+      Click <em>Cancel</em> to back out of this dialogue box.
+    </p>
+    <p>
+      If you decide you really want to do this you must enter the upper case
+      text <code>DELETE</code> <code>MY</code> <code>SNIPPETS</code> in the edit
+      box, then press <em>OK</em>. You will get an error message, and the
+      snippets won't be deleted, if the text you entered is incorrect.
+    </p>
+    <p>
+      Once you enter the required text and click <em>OK</em> all user-defined
+      snippets will be deleted straight away and the main display will be
+      re-loaded.
+    </p>
+    <p class="bordered">
+      You are <strong>strongly advised</strong> to take a backup of your
+      snippets before deleting them, in case you change you mind. To do this
+      first cancel this dialogue box then use the <em>Database | Backup User
+      Database</em> menu option.
+    </p>
+    <h2>
+      Why would you do this?
+    </h2>
+    <p>
+      It's very unlikely you will need to delete all your snippets, but there
+      is one use case where this facility is useful. That is when you are moving
+      snippets from the standard version of CodeSnip to a portable version, or
+      vice versa.
+    </p>
+    <p>
+      For further details, see <a
+        class="weblink"
+        target="_blank"
+        href="https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md#faq-8"
+      >this FAQ</a>.
+    </p>
+  </body>
+</html>
\ No newline at end of file
diff --git a/Src/Help/HTML/menu_database.htm b/Src/Help/HTML/menu_database.htm
index 92f236ee6..303a0d8c4 100644
--- a/Src/Help/HTML/menu_database.htm
+++ b/Src/Help/HTML/menu_database.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic describing Database menu.
 -->
@@ -96,6 +96,18 @@ <h1>
           such as a <em>DropBox</em> or <em>Google Drive</em> sub-directory.
         </td>
       </tr>
+      <tr>
+        <td class="img">
+          &nbsp;
+        </td>
+        <td class="item">
+          Delete User Database
+        </td>
+        <td>
+          Displays the <a href="dlg_deleteuserdb.htm">Delete User Database</a> dialogue box that asks for permission to delete <strong>ALL</strong> the snippets created by the user. If permission is granted then all snippets user defined snippets will be deleted without any further warning.
+          <br><span class="warning">Use with caution &ndash; this action can't be undone.</span>
+        </td>
+      </tr>
     </table>
     <p>
       &dagger; The <em>Move User Database</em> option is not available in the
diff --git a/Src/Help/HTML/task_deleteuserdb.htm b/Src/Help/HTML/task_deleteuserdb.htm
new file mode 100644
index 000000000..a6264cef9
--- /dev/null
+++ b/Src/Help/HTML/task_deleteuserdb.htm
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<!--
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Help topic describing how to delete the user database.
+-->
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text-html; charset=Windows-1252">
+    <title>
+      Delete User Defined Database
+    </title>
+    <link rel="stylesheet" href="../css/codesnip.css" type="text/css">
+  </head>
+  <body>
+    <h1>
+      <a name="task_deleteuserdb"></a>Delete the User-Defined Snippets Database
+    </h1>
+    <p>
+      In the unlikely event you need to delete all of the user defined snippets from CodeSnip you can use the <em>Database | Delete User Database</em> menu option, which will display the <a href="dlg_deleteuserdb.htm">Delete User Database</a> dialogue box.
+    </p>
+    <p>
+      There are very few use cases where you will want to delete the whole database, but one such case is where you want to move your snippets from a portable version of CodeSnip to a standard version, or vice-versa. For more information about this, see <a
+        class="weblink"
+        target="_blank"
+        href="https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md#faq-8"
+      >this FAQ</a>.
+    </p>
+  </body>
+</html>
diff --git a/Src/Help/Index.hhk b/Src/Help/Index.hhk
index 148b650e4..9b3a0f57a 100644
--- a/Src/Help/Index.hhk
+++ b/Src/Help/Index.hhk
@@ -75,6 +75,10 @@
       <param name="Name" value="customise codesnip">
       <param name="Local" value="HTML\task_customise.htm">
       </OBJECT>
+    <LI> <OBJECT type="text/sitemap">
+      <param name="Name" value="delete the whole user database">
+      <param name="Local" value="HTML\task_deleteuserdb.htm">
+      </OBJECT>
     <LI> <OBJECT type="text/sitemap">
       <param name="Name" value="duplicate snippet">
       <param name="Local" value="HTML\dlg_duplicatesnippet.htm">
@@ -383,6 +387,9 @@
   <LI> <OBJECT type="text/sitemap">
     <param name="Name" value="view menu">
     <param name="Local" value="HTML\menu_view.htm">
+  <LI> <OBJECT type="text/sitemap">
+    <param name="Name" value="delete user database dialogue">
+    <param name="Local" value="HTML\dlg_deleteuserdb.htm">
     </OBJECT>
 </UL>
 </BODY></HTML>
diff --git a/Src/Help/TOC.hhc b/Src/Help/TOC.hhc
index de429d3fe..f206f44bc 100644
--- a/Src/Help/TOC.hhc
+++ b/Src/Help/TOC.hhc
@@ -144,6 +144,10 @@
       <param name="Name" value="Backup and Restore the User Database">
       <param name="Local" value="HTML\task_backup.htm">
       </OBJECT>
+    <LI> <OBJECT type="text/sitemap">
+      <param name="Name" value="Delete the whole User Database">
+      <param name="Local" value="HTML\task_deleteuserdb.htm">
+      </OBJECT>
   </UL>
   <LI> <OBJECT type="text/sitemap">
     <param name="Name" value="About the Kinds of Snippets">

From ed8becf4c39299a992676e110af97c8d6e31890b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Jan 2022 11:30:53 +0000
Subject: [PATCH 013/264] Minor changes to Delete User Database dialogue box

Punctuation & spacing changes
Confirmation text string now cleared when invalid text entered
---
 Src/FmDeleteUserDBDlg.pas      | 3 ++-
 Src/Res/HTML/dlg-dbdelete.html | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Src/FmDeleteUserDBDlg.pas b/Src/FmDeleteUserDBDlg.pas
index 3aee061a4..d6c04b056 100644
--- a/Src/FmDeleteUserDBDlg.pas
+++ b/Src/FmDeleteUserDBDlg.pas
@@ -64,13 +64,14 @@ procedure TDeleteUserDBDlg.ArrangeForm;
 
 procedure TDeleteUserDBDlg.btnOKClick(Sender: TObject);
 resourcestring
-  sBadPassword = 'Invalid confirmation text entered: not deleting';
+  sBadPassword = 'Invalid confirmation text entered';
 begin
   inherited;
   fPermissionGranted := IsValidPassword;
   if not fPermissionGranted then
   begin
     TMessageBox.Error(Self, sBadPassword);
+    edConfirm.Text := '';
     ModalResult := mrNone;
   end;
 end;
diff --git a/Src/Res/HTML/dlg-dbdelete.html b/Src/Res/HTML/dlg-dbdelete.html
index 92e7f7c2f..b21cfb4c7 100644
--- a/Src/Res/HTML/dlg-dbdelete.html
+++ b/Src/Res/HTML/dlg-dbdelete.html
@@ -34,11 +34,11 @@ <h1>
     <p>
       <strong class="warning">This action cannot be undone: you will loose all your user-defined snippets.</strong>
     </p>
-    
+
     <p>
-      To confirm enter <code>DELETE MY SNIPPETS</code> (in capital letters) in the box below then click <em>OK</em>.
+      To confirm enter <code>DELETE</code> <code>MY</code> <code>SNIPPETS</code> (in capital letters) in the box below, then click <em>OK</em>.
     </p>
-    
+
     <p>
       <strong>There will be no further chances to change your mind.</strong>
     </p>

From 830a888e44cfb831fe99ab3a0a64bfa1b4bc1157 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Jan 2022 16:45:52 +0000
Subject: [PATCH 014/264] Add new TSnippetList.IsEmpty(Boolean) method
 override;

The Boolean parameter specifies whether we're checking User defined
database (True) or main database (False) for emptiness.
---
 Src/DB.USnippet.pas | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/Src/DB.USnippet.pas b/Src/DB.USnippet.pas
index 15b33452c..5af498162 100644
--- a/Src/DB.USnippet.pas
+++ b/Src/DB.USnippet.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Objects, records etc that encapsulate a code snippet, its data and lists of
  * code snippets.
@@ -328,10 +328,17 @@   TSnippetList = class(TObject)
       {Counts number of snippets in list.
         @return Number of snippets in list.
       }
-    function IsEmpty: Boolean; inline;
+    function IsEmpty: Boolean; overload; inline;
       {Checks if list is empty.
         @return True if list is empty, False otehrwise.
       }
+    function IsEmpty(const UserDefined: Boolean): Boolean; overload; inline;
+      {Checks if sub-set of list from either from or not from use defined
+      database is empty.
+        @param UserDefined [in] Flags whether to check for snippets in user
+          database (True) or in main database (False).
+        @return True if required subset is empty, False if not empty.
+      }
     property Items[Idx: Integer]: TSnippet read GetItem; default;
       {List of snippets}
   end;
@@ -764,6 +771,11 @@ function TSnippetList.IsEmpty: Boolean;
   Result := Count = 0;
 end;
 
+function TSnippetList.IsEmpty(const UserDefined: Boolean): Boolean;
+begin
+  Result := Count(UserDefined) = 0;
+end;
+
 function TSnippetList.IsEqual(const AList: TSnippetList): Boolean;
   {Checks if this list contains same snippets as another list.
     @param AList [in] List of snippets to compare.

From d1593988f0caf02a81b2e0a21003494188e9f8a6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Jan 2022 16:50:51 +0000
Subject: [PATCH 015/264] Fix bug in accessing some database operations from
 main menu.

Database menu's Backup User Database, Move User Database & Delete
User Database options are now disabled if user database is empty.
Additionally, new, un-saved snippets are now saved to user database
before the database operations take place.

Fixes #45
---
 Src/FmMain.dfm |  3 +++
 Src/FmMain.pas | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/Src/FmMain.dfm b/Src/FmMain.dfm
index e2441f840..343bc0d9b 100644
--- a/Src/FmMain.dfm
+++ b/Src/FmMain.dfm
@@ -619,6 +619,7 @@ inherited MainForm: TMainForm
       Hint = 'Backup user database|Backup the user-defined snippet database'
       ImageIndex = 33
       OnExecute = actBackupDatabaseExecute
+      OnUpdate = ActNonEmptyUserDBUpdate
     end
     object actRestoreDatabase: TAction
       Category = 'Database'
@@ -849,6 +850,7 @@ inherited MainForm: TMainForm
         'Move user database|Move the user-defined snippet database to a n' +
         'ew directory'
       OnExecute = actMoveUserDatabaseExecute
+      OnUpdate = ActNonEmptyUserDBUpdate
     end
     object actSWAGImport: TAction
       Category = 'Snippets'
@@ -873,6 +875,7 @@ inherited MainForm: TMainForm
         'Delete User Database|Deletes the user'#39's snippets database - USE ' +
         'WITH CAUTION'
       OnExecute = actDeleteUserDatabaseExecute
+      OnUpdate = ActNonEmptyUserDBUpdate
     end
   end
   object mnuMain: TMainMenu
diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 6e56de410..1342be28c 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -495,6 +495,7 @@   TMainForm = class(THelpAwareForm)
     ///  position is permitted and blocks the move if not.</summary>
     procedure splitVertCanResize(Sender: TObject; var NewSize: Integer;
       var Accept: Boolean);
+    procedure ActNonEmptyUserDBUpdate(Sender: TObject);
   strict private
     var
       ///  <summary>Object that notifies user-initiated events by triggering
@@ -621,7 +622,10 @@ procedure TMainForm.actAddSnippetExecute(Sender: TObject);
 
 procedure TMainForm.actBackupDatabaseExecute(Sender: TObject);
 begin
+  if (Database as IDatabaseEdit).Updated then
+    TUserDBMgr.Save(Self);
   TUserDBMgr.BackupDatabase(Self);
+  fStatusBarMgr.Update;
 end;
 
 procedure TMainForm.actBugReportExecute(Sender: TObject);
@@ -721,8 +725,13 @@ procedure TMainForm.actDeleteSnippetExecute(Sender: TObject);
 
 procedure TMainForm.actDeleteUserDatabaseExecute(Sender: TObject);
 begin
+  if (Database as IDatabaseEdit).Updated then
+    TUserDBMgr.Save(Self);
   if TUserDBMgr.DeleteDatabase then
+  begin
     ReloadDatabase;
+    fStatusBarMgr.Update;
+  end;
 end;
 
 procedure TMainForm.actDuplicateSnippetExecute(Sender: TObject);
@@ -902,6 +911,8 @@ procedure TMainForm.actLoadSelectionExecute(Sender: TObject);
 
 procedure TMainForm.actMoveUserDatabaseExecute(Sender: TObject);
 begin
+  if (Database as IDatabaseEdit).Updated then
+    TUserDBMgr.Save(Self);
   TUserDBMgr.MoveDatabase;
 end;
 
@@ -920,6 +931,11 @@ procedure TMainForm.ActNonEmptyDBUpdate(Sender: TObject);
   (Sender as TAction).Enabled := not Database.Snippets.IsEmpty;
 end;
 
+procedure TMainForm.ActNonEmptyUserDBUpdate(Sender: TObject);
+begin
+  (Sender as TAction).Enabled := not Database.Snippets.IsEmpty(True);
+end;
+
 procedure TMainForm.ActOverviewTabExecute(Sender: TObject);
 begin
   // Action's Tag property specifies index of tab being selected
@@ -979,7 +995,10 @@ procedure TMainForm.actRenameCategoryUpdate(Sender: TObject);
 procedure TMainForm.actRestoreDatabaseExecute(Sender: TObject);
 begin
   if TUserDBMgr.RestoreDatabase(Self) then
+  begin
     ReloadDatabase;
+    fStatusBarMgr.Update;
+  end;
 end;
 
 procedure TMainForm.actSaveDatabaseExecute(Sender: TObject);

From 81e6df5ba32ae7005dd1fdacb3e445d962ed0e43 Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 22 Jan 2022 15:26:50 +0000
Subject: [PATCH 016/264] Update README.md

Overhaul and update "Source Code" section
---
 README.md | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index be346abbd..d3ec8ce78 100644
--- a/README.md
+++ b/README.md
@@ -43,14 +43,15 @@ There's also plenty of info available on how to compile CodeSnip from source - s
 
 CodeSnip's source code is maintained in the [`delphidabbler/codesnip`](https://github.com/delphidabbler/codesnip) Git repository on GitHub†.
 
-[Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) methodology has been adopted, with the exception of some branches that have been used in various attempts to start work on CodeSnip 5.
+The [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) methodology has been adopted, with the exception of some branches that have been used in various attempts to start work on CodeSnip 5.
 
-The following branches existed at the time when CodeSnip v4.16.0 was released:
+The following branches existed as of 2022/01/01:
 
 * `master`: Always reflects the state of the source code as of the latest release.‡
-* `develop`: Main development branch. The head of this branch contains the latest development code.
+* `develop`: Main development branch. The head of this branch contains the latest v4 development code.
+* `belvedere`: The latest attempt to develop CodeSnip 5. See the [Belvedere Readme file](https://github.com/delphidabbler/codesnip/blob/belvedere/README.md) for a full explanation.
 * `pagoda`: An abortive attempt at developing CodeSnip 5. Work on this branch has halted. It does not follow GitFlow methodology. ***Do not use this branch: it may be pruned.***
-* `pavilion`: Another attempt at working on CodeSnip 5. It branched off `pagoda` and it's future is uncertain. Again it does not follow GitFlow methodology.
+* `pavilion`: Another attempt at working on CodeSnip 5. It branched off `pagoda` and work on it has halted. Again it does not follow GitFlow methodology. ***Do not use this branch: it may be pruned.***
 
 New features and most bug fixes are worked on in `feature/xxxx` branches that are branched off `develop` locally. They are merged into `develop` as they are completed and the branches are deleted.
 
@@ -62,7 +63,17 @@ Note that the default branch on GitHub is `master`, which contains the state of
 
 ### Contributions
 
-To contribute to the project please fork the repository on GitHub. Create a feature branch off the `develop` branch. Make your changes to the feature branch then submit a pull request via GitHub.
+#### CodeSnip 4
+
+To contribute to CodeSnip 4 development please fork the repository on GitHub. Create a feature branch off the `develop` branch. Make your changes to your feature branch then submit a pull request via GitHub.
+
+> **Do not create branches off `master`, always branch from `develop`.**
+
+#### CodeSnip 5 Belvedere
+
+Proceed as for CodeSnip 4 except create your feature branch off the `belvedere` branch instead of `develop`.
+
+> **Do not submit changes to the earlier `pagoda` or `pavilion` branches because they will not be accepted.**
 
 ### Compiling
 

From 5aa3d93e90705eb74314530c04882334c30376ad Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 23 Jan 2022 04:01:19 +0000
Subject: [PATCH 017/264] Update README.md

Update "Compiling" section.
Update "Contributions" section (a) delete mention of belvedere branch (b) add "Licensing of contributions" subsection.
---
 README.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d3ec8ce78..74fad43e0 100644
--- a/README.md
+++ b/README.md
@@ -63,24 +63,28 @@ Note that the default branch on GitHub is `master`, which contains the state of
 
 ### Contributions
 
-#### CodeSnip 4
-
 To contribute to CodeSnip 4 development please fork the repository on GitHub. Create a feature branch off the `develop` branch. Make your changes to your feature branch then submit a pull request via GitHub.
 
 > **Do not create branches off `master`, always branch from `develop`.**
 
-#### CodeSnip 5 Belvedere
+#### Licensing of contributions
+
+The license that applies to any existing file you edit will continue to apply to the edited file. Any existing license text or copyright statement **must not** be altered or removed.
 
-Proceed as for CodeSnip 4 except create your feature branch off the `belvedere` branch instead of `develop`.
+Any new file you contribute **must** either be licensed under the Mozilla Public License v2.0 (MPL2) or have a license compatible with the MPL2. If a license is not specified then the MPL2 will be applied to the file. You should insert a suitable copyright statement in the file.
 
-> **Do not submit changes to the earlier `pagoda` or `pavilion` branches because they will not be accepted.**
+Any third party code used by your contributed code **must** also have a license compatible with the MPL2.
+
+> MPL2 boilerplate text, in several programming language's comment formats, can be found in the file `Docs/MPL-2.0-Boilerplate.txt`. You will need to change the name of the copyright holder.
 
 ### Compiling
 
-`master` has a file in the root directory named [`Build.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Build.html) that gives detailed information about how to compile the current release of CodeSnip.
+`master` has a file in the root directory named [`Build.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Build.html) that gives detailed information about how to compile the current release of CodeSnip 4.
 
 There is also a [Compiling & Source Code FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md).
 
+CodeSnip 4 **must** be compiled with Delphi XE. See [Compiling & Source Code FAQ 11](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md#faq-11) for the reason why.
+
 ## Change Log
 
 The program's current change log can be found in the file `CHANGELOG.md` in the root of the `master` branch.

From 4f1d56f98bfad25e0a0e752146459b9babb2cc4a Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 23 Jan 2022 04:17:32 +0000
Subject: [PATCH 018/264] Update Build.html

Add link to explanation of why CodeSnip uses Delphi XE.
---
 Build.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Build.html b/Build.html
index f30a3d15b..a6a432a39 100644
--- a/Build.html
+++ b/Build.html
@@ -80,6 +80,13 @@ <h2>
   XE. Compilation with other compilers is not guaranteed.
 </p>
 
+<p class="note">
+  For an explanation of why <em>CodeSnip</em> still uses Delphi XE see
+  <a
+    href="https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md#faq-11"
+  >FAQ 11</a> of the CodeSnip Compiling &amp; Source Code FAQs.
+</p>
+
 <p>
   The are currently two editions of <em>CodeSnip</em>: the standard edition and
   the portable edition. They both share the same code base: the different

From 9ba823e1768b7cff6d7b47df1dca211ef461f0a1 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 09:02:29 +0100
Subject: [PATCH 019/264] Bump config file version number to 18

This because of addition of DetailFontSize property to Prefs:Display
section of per-user config file.
---
 Src/FirstRun.UConfigFile.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/FirstRun.UConfigFile.pas b/Src/FirstRun.UConfigFile.pas
index 30bca5999..2645b6acc 100644
--- a/Src/FirstRun.UConfigFile.pas
+++ b/Src/FirstRun.UConfigFile.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements class that manages the updating of older config files to the
  * current format.
@@ -82,7 +82,7 @@   TUserConfigFileUpdater = class(TConfigFileUpdater)
   strict private
     const
       ///  <summary>Current user config file version.</summary>
-      FileVersion = 17;
+      FileVersion = 18;
   strict protected
     ///  <summary>Returns current user config file version.</summary>
     class function GetFileVersion: Integer; override;

From 39af1835851b4dab6a243ca3a9e9ce9816c2761b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 09:03:44 +0100
Subject: [PATCH 020/264] Update config file docs

Note addition of DetailFontSize property to Prefs:Display section of
per-user config file and resulting bumping of file's version number.
---
 Docs/Design/FileFormats/config.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
index ed05ef9b2..cf2ce3f32 100644
--- a/Docs/Design/FileFormats/config.html
+++ b/Docs/Design/FileFormats/config.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Configuration Files
 -->
@@ -167,7 +167,7 @@ <h3>
 </p>
 
 <p>
-  There have been several versions of this file. The current one is version 17. The change to version 17 came with CodeSnip v4.19.0 and the addition of the [Prefs] section.
+  There have been several versions of this file. The current one is version 18. The change to version 18 came with CodeSnip v4.20.0 and the addition of the [Prefs] section.
 </p>
 
 <p>
@@ -919,6 +919,12 @@ <h4>
   <dd>
     Size of font to be used in overview pane tree view. If missing or empty the default value is <code class="value">9</code>.
   </dd>
+  <dt>
+    <code class="key">DetailFontSize</code> (Integer)
+  </dt>
+  <dd>
+    Size of font to be used in detail pane for all text except for source code. If missing or empty the default value is the default content font size of the operating system.
+  </dd>
 </dl>
 
 <h4>

From eff0390cbb44cec6705cb5ed332d681bfa80ff1b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 09:07:25 +0100
Subject: [PATCH 021/264] Fix description of Prefs:Display OverviewFontSize
 option

---
 Docs/Design/FileFormats/config.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
index cf2ce3f32..b84ff246d 100644
--- a/Docs/Design/FileFormats/config.html
+++ b/Docs/Design/FileFormats/config.html
@@ -917,7 +917,7 @@ <h4>
     <code class="key">OverviewFontSize</code> (Integer)
   </dt>
   <dd>
-    Size of font to be used in overview pane tree view. If missing or empty the default value is <code class="value">9</code>.
+    Size of font to be used in overview pane tree view. If missing or empty the default value is the default font size of the operationg system.
   </dd>
   <dt>
     <code class="key">DetailFontSize</code> (Integer)

From 3aa37bc8e5f25fd326fc7c9fa9fcbb98f588fa52 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 09:23:30 +0100
Subject: [PATCH 022/264] Update 3rd party PJSysInfo unit to v5.11.0

Fixes #49
---
 Src/3rdParty/PJSysInfo.pas | 189 ++++++++++++++++++++++++-------------
 1 file changed, 123 insertions(+), 66 deletions(-)

diff --git a/Src/3rdParty/PJSysInfo.pas b/Src/3rdParty/PJSysInfo.pas
index fa4cd593b..b1040bb83 100644
--- a/Src/3rdParty/PJSysInfo.pas
+++ b/Src/3rdParty/PJSysInfo.pas
@@ -3,10 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2001-2021, Peter Johnson (@delphidabbler).
- *
- * $Rev: 2082 $
- * $Date: 2022-01-01 10:12:03 +0000 (Sat, 01 Jan 2022) $
+ * Copyright (C) 2001-2022, Peter Johnson (@delphidabbler).
  *
  * This unit contains various static classes, constants, type definitions and
  * global variables for use in providing information about the host computer and
@@ -419,7 +416,8 @@ interface
     osWin10Svr,             // Windows 2016 Server
     osWinSvr2019,           // Windows 2019 Server
     osWin11,                // Windows 11
-    osWinSvr2022            // Windows 2022 Server
+    osWinSvr2022,           // Windows 2022 Server
+    osWinServer             // Windows Server (between Server 2019 & 2022)
   );
 
 type
@@ -1209,6 +1207,7 @@ implementation
   Win8Point1Build = 9600;       // Build number used for all Win 8.1/Svr 2012 R2
 
   // Windows 10 ----------------------------------------------------------------
+
   Win10TH1Build = 10240;        // Windows 10 TH1 - version 1507 (1st release)
   Win10TH2Build = 10586;        // Windows 10 TH2 - version 1511
   Win10RS1Build = 14393;        // Windows 10 RS1 - version 1607
@@ -1221,9 +1220,28 @@ implementation
   Win1020H1Build = 19041;       // Windows 10 20H1 - version 2004
   Win1020H2Build = 19042;       // Windows 10 20H2 - version 20H2
   Win1021H1Build = 19043;       // Windows 10 21H1 - version 21H1
+                                //   revisions 844..964 were beta
   Win1021H2Build = 19044;       // Windows 10 21H2 - version 21H2
+                                //   revisions 1147..1266 were previews
+
+  // Fast ring
+  Win10FastRing: array[0..21] of Integer = (
+    19536, 19541, 19546, 19551, 19555, 19559, 19564, 19569, 19577, 19582, 19587,
+    19592, 19603, 19608, 19613, 19619, 19624, 19628, 19631, 19635, 19640, 19645
+  );
+
+  // Dev channel
+  // Assuming all Dev channel releases had version string "Dev"
+  Win10DevChannel: array[0..44] of Integer = (
+    20150, 20152, 20161, 20170, 20175, 20180, 20185, 20190, 20197, 20201, 20206,
+    20211, 20215, 20221, 20226, 20231, 20236, 20241, 20246, 20251, 20257, 20262,
+    20270, 20277, 21277, 20279, 21286, 21292, 21296, 21301, 21313, 21318, 21322,
+    21327, 21332, 21337, 21343, 21354, 21359, 21364, 21370, 21376, 21382, 21387,
+    21390 // transitioned to Windows 11 after here
+  );
 
   // Windows 11 ----------------------------------------------------------------
+
   // NOTE: Preview and beta & release versions of Windows 11 report version 10.0
   Win11DevBuild = 21996;          // Windows 11 version Dev
                                   //   - 10.0.21996.1 (Insider version)
@@ -1237,28 +1255,28 @@ implementation
                                   //   Revision # 194
                                   //     Windows 11 version 21H2
                                   //       - ** 1st Public Release **
-  Win11v21H2PreRel1Build = 22449; // Windows 11 version 21H2
-                                  //   - 10.0.22449.000 (RSPRERELEASE)
-  Win11v21H2PreRel2Build = 22454; // Windows 11 version 21H2
-                                  //   - 10.0.22454.1000 (RSPRERELEASE)
-  Win11v21H2PreRel3Build = 22458; // Windows 11 version 21H2
-                                  //   - 10.0.22458.1000 (RSPRERELEASE)
-  Win11v21H2PreRel4Build = 22463; // Windows 11 version 21H2
-                                  //   - 10.0.22463.1000 (RSPRERELEASE)
-  Win11v21H2PreRel5Build = 22468; // Windows 11 version 21H2
-                                  //   - 10.0.22468.1000 (RSPRERELEASE)
-  Win11v21H2PreRel6Build = 22471; // Windows 11 version 21H2
-                                  //   - 10.0.22471.1000 (RSPRERELEASE)
-  Win11v21H2PreRel7Build = 22478; // Windows 11 version 21H2
-                                  //   - 10.0.22478.1000 (RSPRERELEASE)
-  Win11v21H2PreRel8Build = 22483; // Windows 11 version 21H2
-                                  //   - 10.0.22483.1000 (RSPRERELEASE)
-  Win11v21H2PreRel9Build = 22489; // Windows 11 version 21H2
-                                  //   - 10.0.22489.1000 (RSPRERELEASE)
-  Win11v21H2PreRel10Build = 22494;// Windows 11 version 21H2
-                                  //   - 10.0.22494.1000 (RSPRERELEASE)
-  Win11v21H2PreRel11Build = 22509;// Windows 11 version 21H2
-                                  //   - 10.0.22509.1000 (RSPRERELEASE)
+
+  // Dev channel release - different sources give different names.
+  // From what I can gather (and take this with a pinch of salt!):
+  // * Insider Dev channel releases from the RS_PRERELEASE branch weren't
+  //   matched to a Windows 11 release and had version string "Dev").
+  // * The NI_RELEASE channel was used from 2022/02/16 (build 2257).
+  // * From build 22567 the release string changed from "Dev" to "22H"
+
+  // Builds with version string "Dev"
+  Win11DevChannelDevBuilds: array[0..20] of Integer = (
+    22449, 22454, 22458, 22463, 22468,    // pre Win 11 release
+    22471, 22478, 22483, 22489, 22494, 22499, 22504, 22509, 22518, 22523, 22526,
+    22533, 22538, 22543, 22557, 22563
+  );
+  // Builds with version string "22H2" in Dev channel
+  Win11DevChannel22H2Builds: array[0..2] of Integer = (
+    22567, 22572, 22579
+  );
+  // Builds with version string "22H2" in Dev & Beta channels
+  Win11DevBetaChannels22H2Builds: array[0..3] of Integer = (
+    22581, 22593, 22598, 22610
+  );
 
   Win11FirstBuild = Win11DevBuild;  // First build number of Windows 11
 
@@ -1275,23 +1293,23 @@ implementation
                                         // After this it's Win 2019 Server
 
   // Windows 2019 Server -------------------------------------------------------
-  Win2019IP180320Build = 17623; // Win Server 2019 Insider Preview Build 17623
-  Win2019IP180324Build = 17627; // Win Server 2019 Insider Preview Build 17627
-  Win2019IP180515Build = 17666; // Win Server 2019 Insider Preview Build 17666
-  Win2019IP180619Build = 17692; // Win Server 2019 Insider Preview Build 17692
-  Win2019IP180710Build = 17709; // Win Server 2019 Insider Preview Build 17709
-  Win2019IP180716Build = 17713; // Win Server 2019 Insider Preview Build 17713
-  Win2019IP180731Build = 17723; // Win Server 2019 Insider Preview Build 17723
-  Win2019IP180814Build = 17733; // Win Server 2019 Insider Preview Build 17733
-  Win2019IP180821Build = 17738; // Win Server 2019 Insider Preview Build 17738
-  Win2019IP180828Build = 17744; // Win Server 2019 Insider Preview Build 17744
+  // Insider Preview builds
+  Win2019IPBuilds: array[0..9] of Integer = (
+    17623, 17627, 17666, 17692, 17709, 17713, 17723, 17733, 17738, 17744
+  );
+  // Release builds
   Win2019v1809Build = 17763;    // Win Server 2019 version 1809
   Win2019v1903Build = 18362;    // Win Server 2019 version 1903
   Win2019v1909Build = 18363;    // Win Server 2019 version 1909
-  Win2019v2004Build = 19041;    // Win Server 2019 version 2004
-  Win2019v20H2Build = 19042;    // Win Server 2019 version 20H2
-  Win2019LastBuild = Win2019v20H2Build; // Last build number of Win 2019 Server
-                                        // After this it's Win 2022 Server
+  Win2019LastBuild = Win2019v1909Build; // Last build number of Win 2019 Server
+                                        // After this it's Windows Server
+
+  // Windows Server ------------------------------------------------------------
+  WinServerv2004Build = 19041;    // Win Server version 2004
+  WinServerv20H2Build = 19042;    // Win Server version 20H2
+  WinServerLastBuild = WinServerv20H2Build; // Last build number of Windows
+                                            // Server. After this it's Window
+                                            // 2022 Sever
 
   // Windows 2022 Server -------------------------------------------------------
   Win2022v21H2Build = 20348;    // Win Server 2022 version 21H2
@@ -1510,6 +1528,14 @@ function ExcludeTrailingPathDelimiter(const DirOrPath: string) : string;
 end;
 {$ENDIF}
 
+// Checks if integer V is in the range of values defined by VLo and VHi,
+// inclusive.
+function IsInRange(const V, VLo, VHi: Integer): Boolean;
+begin
+  Assert(VLo <= VHi);
+  Result := (V >= VLo) and (V <= VHi);
+end;
+
 // Returns the value of the given environment variable.
 function GetEnvVar(const VarName: string): string;
 var
@@ -1823,6 +1849,8 @@ procedure InitPlatformIdEx;
             begin
               InternalBuildNumber := Win1021H1Build;
               InternalExtraUpdateInfo := 'Version 21H1';
+              if IsInRange(InternalRevisionNumber, 844, 964) then
+                InternalExtraUpdateInfo := InternalExtraUpdateInfo + ' (beta)';
             end
             else if IsBuildNumber(Win1021H2Build) then
             begin
@@ -1830,8 +1858,29 @@ procedure InitPlatformIdEx;
               // yearly cycle
               InternalBuildNumber := Win1021H2Build;
               InternalExtraUpdateInfo := 'Version 21H2';
+              if IsInRange(InternalRevisionNumber, 1147, 1266) then
+                InternalExtraUpdateInfo := InternalExtraUpdateInfo
+                  + ' (preview)';
+            end
+            else if FindBuildNumberFrom(
+              Win10DevChannel, InternalBuildNumber
+            ) then
+            begin
+              // Windows 10 Dev Channel releases
+              InternalExtraUpdateInfo := Format(
+                'Dev Channel v10.0.%d.%d (Dev)',
+                [InternalBuildNumber, InternalRevisionNumber]
+              );
             end
-            // As of 2021-09-11, Win 11 pre-releases are reporting v10.0
+            else if FindBuildNumberFrom(Win10FastRing, InternalBuildNumber) then
+            begin
+              // Windows 10 Fast Ring releases
+              InternalExtraUpdateInfo := Format(
+                'Fast ring v10.0.%d.%d',
+                [InternalBuildNumber, InternalRevisionNumber]
+              );
+            end
+            // Win 11 releases are reporting v10.0
             // Details taken from: https://tinyurl.com/usupsz4a
             // Correct according to above web page as of 2021-09-11
             else if IsBuildNumber(Win11DevBuild) then
@@ -1872,19 +1921,32 @@ procedure InitPlatformIdEx;
               end;
             end
             else if FindBuildNumberFrom(
-              [
-                Win11v21H2PreRel1Build, Win11v21H2PreRel2Build,
-                Win11v21H2PreRel3Build, Win11v21H2PreRel4Build,
-                Win11v21H2PreRel5Build, Win11v21H2PreRel6Build,
-                Win11v21H2PreRel7Build, Win11v21H2PreRel8Build,
-                Win11v21H2PreRel9Build, Win11v21H2PreRel10Build,
-                Win11v21H2PreRel11Build
-              ],
-              InternalBuildNumber
+              Win11DevChannelDevBuilds, InternalBuildNumber
+            ) then
+            begin
+              // Win11 Dev Channel builds with version string "Dev"
+              InternalExtraUpdateInfo := Format(
+                'Dev Channel v10.0.%d.%d (Dev)',
+                [InternalBuildNumber, InternalRevisionNumber]
+              );
+            end
+            else if FindBuildNumberFrom(
+              Win11DevChannel22H2Builds, InternalBuildNumber
+            ) then
+            begin
+              // Win11 Dev channel builds with version string "22H2"
+              InternalExtraUpdateInfo := Format(
+                'Dev Channel v10.0.%d.%d (22H2)',
+                [InternalBuildNumber, InternalRevisionNumber]
+              );
+            end
+            else if FindBuildNumberFrom(
+              Win11DevBetaChannels22H2Builds, InternalBuildNumber
             ) then
             begin
+              // Win 11 Dev & Beta channel builds with verison string "22H2"
               InternalExtraUpdateInfo := Format(
-                'Version 21H2 [RSPRERELEASE v10.0.%d.%d]',
+                'Dev & Beta Channels v10.0.%d.%d (22H2)',
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
@@ -1930,14 +1992,7 @@ procedure InitPlatformIdEx;
               InternalExtraUpdateInfo := 'Version 1803';
             end
             else if FindBuildNumberFrom(
-              [
-                Win2019IP180320Build, Win2019IP180324Build,
-                Win2019IP180515Build, Win2019IP180619Build,
-                Win2019IP180710Build, Win2019IP180716Build,
-                Win2019IP180731Build, Win2019IP180814Build,
-                Win2019IP180821Build, Win2019IP180828Build
-              ],
-              InternalBuildNumber
+              Win2019IPBuilds, InternalBuildNumber
             ) then
             begin
               InternalExtraUpdateInfo := Format(
@@ -1959,14 +2014,14 @@ procedure InitPlatformIdEx;
               InternalBuildNumber := Win2019v1909Build;
               InternalExtraUpdateInfo := 'Version 1909';
             end
-            else if IsBuildNumber(Win2019v2004Build) then
+            else if IsBuildNumber(WinServerv2004Build) then
             begin
-              InternalBuildNumber := Win2019v2004Build;
+              InternalBuildNumber := WinServerv2004Build;
               InternalExtraUpdateInfo := 'Version 2004';
             end
-            else if IsBuildNumber(Win2019v20H2Build) then
+            else if IsBuildNumber(WinServerv20H2Build) then
             begin
-              InternalBuildNumber := Win2019v20H2Build;
+              InternalBuildNumber := WinServerv20H2Build;
               InternalExtraUpdateInfo := 'Version 20H2';
             end
             else if IsBuildNumber(Win2022v21H2Build) then
@@ -2132,7 +2187,7 @@ class function TPJOSInfo.Edition: string;
     osWin7, osWinSvr2008R2,
     osWin8, osWinSvr2012,
     osWin8Point1, osWinSvr2012R2,
-    osWin10, osWin11, osWin10Svr, osWinSvr2019, osWinSvr2022:
+    osWin10, osWin11, osWin10Svr, osWinSvr2019, osWinSvr2022, osWinServer:
     begin
       // For v6.0 and later we ignore the suite mask and use the new
       // PRODUCT_ flags from the GetProductInfo() function to determine the
@@ -2682,8 +2737,9 @@ class function TPJOSInfo.Product: TPJOSProduct;
                   Result := osWin10Svr
                 else if InternalBuildNumber <= Win2019LastBuild then
                   Result := osWinSvr2019
+                else if InternalBuildNumber <= WinServerLastBuild then
+                  Result := osWinServer
                 else
-                  //
                   Result := osWinSvr2022;
               end;
           end;
@@ -2734,6 +2790,7 @@ class function TPJOSInfo.ProductName: string;
     osWinSvr2019: Result := 'Windows Server 2019';
     osWin11: Result := 'Windows 11';
     osWinSvr2022: Result := 'Windows Server 2022';
+    osWinServer: Result := 'Windows Server';
     else
       raise EPJSysInfo.Create(sUnknownProduct);
   end;

From fae18d192b8704941fbc8aae785b00100bd4e5d5 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 09:34:49 +0100
Subject: [PATCH 023/264] Update version displayed for Delphi Alexandria

Change version number from 11 to 11.x to reflect fact that there is
more than one version number applied to Delphi Alexandria.
---
 Src/Compilers.UBDS.pas | 4 ++--
 Src/FrCodeGenPrefs.pas | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Src/Compilers.UBDS.pas b/Src/Compilers.UBDS.pas
index 6d5cd7b3e..668916c19 100644
--- a/Src/Compilers.UBDS.pas
+++ b/Src/Compilers.UBDS.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that controls and provides information about Borland CodeGear and
  * Embarcadero "BDS" Win32 compilers.
@@ -175,7 +175,7 @@ function TBDSCompiler.GetName: string;
   sDelphi102T = 'Delphi 10.2 Tokyo';
   sDelphi103R = 'Delphi 10.3 Rio';
   sDelphi104S = 'Delphi 10.4 Sydney';
-  sDelphi11A =  'Delphi 11 Alexandria';
+  sDelphi11A =  'Delphi 11.x Alexandria';
 begin
   case GetID of
     ciDXE:
diff --git a/Src/FrCodeGenPrefs.pas b/Src/FrCodeGenPrefs.pas
index 7e572fb9a..7814ad14b 100644
--- a/Src/FrCodeGenPrefs.pas
+++ b/Src/FrCodeGenPrefs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2010-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2010-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that allows user to set source code generation
  * preferences.
@@ -685,7 +685,7 @@ procedure TCodeGenPrefsFrame.PopulatePreDefCompilerMenu;
   AddMenuItem('Delphi 10.2 Tokyo', 32.0);
   AddMenuItem('Delphi 10.3 Rio', 33.0);
   AddMenuItem('Delphi 10.4 Sydney', 34.0);
-  AddMenuItem('Delphi 11 Alexandria', 35.0);
+  AddMenuItem('Delphi 11.x Alexandria', 35.0);
 end;
 
 procedure TCodeGenPrefsFrame.PreDefCompilerMenuClick(Sender: TObject);

From 4c34f8bd406a2e7beaa4a74d38a464f4c442e8cd Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 09:35:09 +0100
Subject: [PATCH 024/264] Update version number for Delphi Alexandria in docs

Change version number from 11 to 11.x to reflect fact that there is
more than one version number applied to Delphi Alexandria.
---
 Docs/Design/FileFormats/config.html     | 4 ++--
 Docs/Design/FileFormats/export.html     | 6 +++---
 Docs/Design/FileFormats/main-db.html    | 4 ++--
 Docs/Design/FileFormats/user-db.html    | 6 +++---
 Docs/ReadMe.txt                         | 4 ++--
 Src/Compilers.UGlobals.pas              | 4 ++--
 Src/Help/HTML/about_compiler_checks.htm | 4 ++--
 Src/Help/HTML/dlg_configcompilers.htm   | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
index b84ff246d..c81851d94 100644
--- a/Docs/Design/FileFormats/config.html
+++ b/Docs/Design/FileFormats/config.html
@@ -257,7 +257,7 @@ <h4>
     <em>D104S</em> &ndash; Delphi 10.4 Sydney
   </li>
   <li>
-    <em>D11A</em> &ndash; Delphi 11 Alexandria
+    <em>D11A</em> &ndash; Delphi 11.x Alexandria
   </li>
   <li>
     <em>FPC</em> &ndash; Free Pascal
@@ -570,7 +570,7 @@ <h4>
     <code class="key">D11A</code> (Boolean)
   </dt>
   <dd>
-    Indicates whether Delphi 11 Alexandria was included in the search.
+    Indicates whether Delphi 11.x Alexandria was included in the search.
   </dd>
   <dt>
     <code class="key">FPC</code> (Boolean)
diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
index 58e394aa6..91e1a1059 100644
--- a/Docs/Design/FileFormats/export.html
+++ b/Docs/Design/FileFormats/export.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Export
 -->
@@ -597,7 +597,7 @@ <h2>
             <em>d104s</em> &ndash; Delphi 10.4 Sydney compiler <span class="highlight">(v7.1 &amp; later)</span>
           </li>
           <li>
-            <em>d11a</em> &ndash; Delphi 11 Alexandria compiler <span class="highlight">(v7.2 &amp; later)</span>
+            <em>d11a</em> &ndash; Delphi 11.x Alexandria compiler <span class="highlight">(v7.2 &amp; later)</span>
           </li>
           <li>
             <em>fpc</em> &ndash; Free Pascal compiler <span class="highlight">(all versions)</span>
@@ -969,7 +969,7 @@ <h2>
         <em>Version 7.2 - 13 September 2021</em>
       </dt>
       <dd>
-        Updated with CodeSnip v4.18.0 to add support for Delphi 11 Alexandria.
+        Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
       </dd>
     </dl>
   </dd>
diff --git a/Docs/Design/FileFormats/main-db.html b/Docs/Design/FileFormats/main-db.html
index 6183e4682..031fac904 100644
--- a/Docs/Design/FileFormats/main-db.html
+++ b/Docs/Design/FileFormats/main-db.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Main Database
 -->
@@ -417,7 +417,7 @@ <h4>
         <code class="key">Delphi104S</code> – Delphi 10.4 Sydney compiler *
       </li>
       <li>
-        <code class="key">Delphi11A</code> – Delphi 11 Alexandria compiler *
+        <code class="key">Delphi11A</code> – Delphi 11.x Alexandria compiler *
       </li>
       <li>
         <code class="key">FPC</code> – Free Pascal compiler
diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
index 6c0fe0a88..baeb84715 100644
--- a/Docs/Design/FileFormats/user-db.html
+++ b/Docs/Design/FileFormats/user-db.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: User Database
 -->
@@ -622,7 +622,7 @@ <h3 id="xml-file">
             <em>d104s</em> &ndash; Delphi 10.4 Sydney compiler <span class="highlight">(v6.9 &amp; later)</span>
           </li>
           <li>
-            <em>d11a</em> &ndash; Delphi 11 Alexandria compiler <span class="highlight">(v6.10 &amp; later)</span>
+            <em>d11a</em> &ndash; Delphi 11.x Alexandria compiler <span class="highlight">(v6.10 &amp; later)</span>
           </li>
           <li>
             <em>fpc</em> &ndash; Free Pascal compiler <span class="highlight">(all versions)</span>
@@ -1005,7 +1005,7 @@ <h2>
         <em>Version 6.10 - 13 September 2021</em>
       </dt>
       <dd>
-        Updated with CodeSnip v4.18.0 to add support for Delphi 11 Alexandria.
+        Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
       </dd>
     </dl>
   </dd>
diff --git a/Docs/ReadMe.txt b/Docs/ReadMe.txt
index c7c2339a8..3346f91af 100644
--- a/Docs/ReadMe.txt
+++ b/Docs/ReadMe.txt
@@ -14,7 +14,7 @@ online DelphiDabbler Code Snippets database as well as maintain a database of
 user-defined snippets.
 
 It displays details of each snippet in the database and can test-compile them
-with each installed Win32 version of Delphi from Delphi 2 to Delphi 11
+with each installed Win32 version of Delphi from Delphi 2 to Delphi 11.x
 Alexandria and Free Pascal.
 
 Compilable Pascal units can be created that contain selected snippets.
@@ -201,7 +201,7 @@ Configuring CodeSnip to Work With Your Compilers
 ================================================================================
 
 A feature of CodeSnip is its ability to test compile snippets with any installed
-Windows 32 version of Delphi (from Delphi 2 to Delphi 11 Alexandria) and
+Windows 32 version of Delphi (from Delphi 2 to Delphi 11.x Alexandria) and
 FreePascal, providing some simple rules are followed.
 
 When CodeSnip is first installed it knows nothing about the available compilers
diff --git a/Src/Compilers.UGlobals.pas b/Src/Compilers.UGlobals.pas
index 83e287164..5653202f9 100644
--- a/Src/Compilers.UGlobals.pas
+++ b/Src/Compilers.UGlobals.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Declares various types that describe the compiler and compilation results and
  * defines interfaces to compiler objects.
@@ -43,7 +43,7 @@ interface
     ciD102T,                            // Delphi 10.2 Tokyo
     ciD103R,                            // Delphi 10.3 Rio
     ciD104S,                            // Delphi 10.4 Sydney,
-    ciD11A,                             // Delphi 11 Alexandria
+    ciD11A,                             // Delphi 11.x Alexandria
     ciFPC                               // Free Pascal
   );
 
diff --git a/Src/Help/HTML/about_compiler_checks.htm b/Src/Help/HTML/about_compiler_checks.htm
index 5d9469874..0aa09cb0e 100644
--- a/Src/Help/HTML/about_compiler_checks.htm
+++ b/Src/Help/HTML/about_compiler_checks.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic explaining compiler checks.
 -->
@@ -34,7 +34,7 @@ <h1>
     </p>
     <p>
       The supported compilers are the Win32 Delphi compilers from Delphi 2 to
-      Delphi 11 Alexandria and Free Pascal.
+      Delphi 11.x Alexandria and Free Pascal.
     </p>
     <h2>
       Configuring CodeSnip
diff --git a/Src/Help/HTML/dlg_configcompilers.htm b/Src/Help/HTML/dlg_configcompilers.htm
index 4f82b47e8..9055f3c9f 100644
--- a/Src/Help/HTML/dlg_configcompilers.htm
+++ b/Src/Help/HTML/dlg_configcompilers.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic for Configure Compilers dialogue box.
 -->
@@ -281,7 +281,7 @@ <h2>
     </h2>
     <p>
       <em>CodeSnip</em> can automatically detect the presence of Win 32 Delphi
-      compilers from Delphi 2 to Delphi 11 Alexandria. Click the <em>Detect
+      compilers from Delphi 2 to Delphi 11.x Alexandria. Click the <em>Detect
       Delphi Compilers</em> button to do this. Any supported installed version
       of Delphi will be recorded. This can save considerable time and avoid
       errors.

From 5b9325024f48ead0482e8f04f6a6314cd1502063 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 09:43:19 +0100
Subject: [PATCH 025/264] Widen Compilers list in Configure Compilers dlg

Widened the compilers list box by 8px to display the longer name
"Delphi 11.x Alexandria". Widened dlg and rearranged controls to
suit.
---
 Src/FmCompilersDlg.dfm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Src/FmCompilersDlg.dfm b/Src/FmCompilersDlg.dfm
index f3bf3134f..12ae8c2a1 100644
--- a/Src/FmCompilersDlg.dfm
+++ b/Src/FmCompilersDlg.dfm
@@ -1,16 +1,16 @@
 inherited CompilersDlg: TCompilersDlg
   Caption = 'Configure Compilers'
   ClientHeight = 381
-  ClientWidth = 547
-  ExplicitWidth = 553
+  ClientWidth = 588
+  ExplicitWidth = 594
   ExplicitHeight = 410
   PixelsPerInch = 96
   TextHeight = 13
   inherited pnlBody: TPanel
-    Width = 531
-    ExplicitWidth = 531
+    Width = 539
+    ExplicitWidth = 539
     object pbBanner: TPaintBox
-      Left = 161
+      Left = 169
       Top = 0
       Width = 370
       Height = 23
@@ -26,7 +26,7 @@ inherited CompilersDlg: TCompilersDlg
     object lbCompilers: TListBox
       Left = 0
       Top = 0
-      Width = 155
+      Width = 163
       Height = 292
       Style = lbOwnerDrawFixed
       Ctl3D = True
@@ -36,7 +36,7 @@ inherited CompilersDlg: TCompilersDlg
       TabOrder = 0
     end
     object pcCompiler: TPageControl
-      Left = 161
+      Left = 169
       Top = 29
       Width = 370
       Height = 263
@@ -52,8 +52,6 @@ inherited CompilersDlg: TCompilersDlg
           Height = 235
           Align = alClient
           TabOrder = 0
-          ExplicitLeft = -4
-          ExplicitTop = 2
         end
       end
       object tsSwitches: TTabSheet

From e873b90834aa71899615c888ed1ef3818035c9ab Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 10:24:00 +0100
Subject: [PATCH 026/264] Bump version information to v2.20.0 build 264

---
 Src/VCodeSnip.vi         | 6 +++---
 Src/VCodeSnipPortable.vi | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
index b9320937b..336a57137 100644
--- a/Src/VCodeSnip.vi
+++ b/Src/VCodeSnip.vi
@@ -2,14 +2,14 @@
 ; v. 2.0. If a copy of the MPL was not distributed with this file, You can
 ; obtain one at https://mozilla.org/MPL/2.0/
 ;
-; Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+; Copyright (C) 2008-2022, Peter Johnson (gravatar.com/delphidabbler).
 ;
 ; Version information description file for CodeSnip.
 
 
 [Fixed File Info]
-File Version #=4, 19, 0, 263
-Product Version #=4, 19, 0, 0
+File Version #=4, 20, 0, 264
+Product Version #=4, 20, 0, 0
 File OS=4
 File Type=1
 File Sub-Type=0
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
index 6b8647290..6f78cbaff 100644
--- a/Src/VCodeSnipPortable.vi
+++ b/Src/VCodeSnipPortable.vi
@@ -2,14 +2,14 @@
 ; v. 2.0. If a copy of the MPL was not distributed with this file, You can
 ; obtain one at https://mozilla.org/MPL/2.0/
 ;
-; Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+; Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
 ;
 ; Version information description file for the portable edition of CodeSnip
 
 
 [Fixed File Info]
-File Version #=4, 19, 0, 263
-Product Version #=4, 19, 0, 0
+File Version #=4, 20, 0, 264
+Product Version #=4, 20, 0, 0
 File OS=4
 File Type=1
 File Sub-Type=0

From 7dcbab3916532174dd8aaadf0433a5c3c25e356c Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 10:24:23 +0100
Subject: [PATCH 027/264] Update change log re v4.20.0 changes

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb395c211..251825295 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,22 @@ This change log begins with the first ever pre-release version of _CodeSnip_. Re
 
 From v4.1.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Release v4.20.0 of 15 May 2022
+
+* Added an option to delete the user defined database.
+* Fixed bug that enabled the user to attempt to move, or back up, the user database when it doesn't exist. These options are now disabled when there is no user database.
+* Added facility to customise the size of font used in the details pane for all items except the source code font (which could already be modified separately). A new preference was added to the Display pane of the Preferences dialogue box to be used to set the font size.
+* Rearranged the controls on the Preferences dialogue box's Display pane.
+* Changed the default font used for the overview pane from a fixed value to the default size for the underlying operating system.
+* Changed the description of "Delphi 11 Alexandria" to "Delphi 11.x Alexandria" to reflect the fact the Delphi 11 updates have different minor version numbers, but can't be installed alongside each other.
+* Widened the compiler list box in the Configure Compilers dialogue box to accommodate the longer name used for Delphi 11.x compilers.
+* Refactored some font handling code.
+* Operating system detection code was updated to (a) fix some bugs and (b) detect some Dev channel builds of Windows 11.
+* Bumped the version of the per-user config file to 18 following the addition of a new preference.
+* Help file updated re the changes in this release.
+* Documentation updated to reflect changes in this release.
+* Updated `README.md` and `Build.html`
+
 ## Release v4.19.0 of 31 December 2021
 
 * Improved user-friendliness of Preferences dialogue box:

From 5ee57b09466425da3ef2cef2e301d7f39e07a1db Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 10:25:32 +0100
Subject: [PATCH 028/264] Bump copyright date in header comments

Change copyright date range to include 2022 for files modified for
this release.
---
 Src/FrDetailView.pas                | 2 +-
 Src/FrDisplayPrefs.pas              | 2 +-
 Src/Help/CodeSnip.hhp               | 2 +-
 Src/Help/HTML/dlg_prefs_display.htm | 2 +-
 Src/Help/Index.hhk                  | 2 +-
 Src/Help/TOC.hhc                    | 2 +-
 Src/Hiliter.UAttrs.pas              | 2 +-
 Src/UFontHelper.pas                 | 2 +-
 Src/UPreferences.pas                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Src/FrDetailView.pas b/Src/FrDetailView.pas
index 78d56a712..b6feecc76 100644
--- a/Src/FrDetailView.pas
+++ b/Src/FrDetailView.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that can display detailed views.
 }
diff --git a/Src/FrDisplayPrefs.pas b/Src/FrDisplayPrefs.pas
index 83ed29e2c..015d1ea02 100644
--- a/Src/FrDisplayPrefs.pas
+++ b/Src/FrDisplayPrefs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that allows user to set application display preferences.
 
diff --git a/Src/Help/CodeSnip.hhp b/Src/Help/CodeSnip.hhp
index 1bde50619..271557747 100644
--- a/Src/Help/CodeSnip.hhp
+++ b/Src/Help/CodeSnip.hhp
@@ -2,7 +2,7 @@
 ; v. 2.0. If a copy of the MPL was not distributed with this file, You can
 ; obtain one at https://mozilla.org/MPL/2.0/
 ;
-; Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+; Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
 ;
 ; CodeSnip help project file.
 
diff --git a/Src/Help/HTML/dlg_prefs_display.htm b/Src/Help/HTML/dlg_prefs_display.htm
index 0dbb43732..50ed4fcfd 100644
--- a/Src/Help/HTML/dlg_prefs_display.htm
+++ b/Src/Help/HTML/dlg_prefs_display.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic for Display page of Preferences dialogue box.
 -->
diff --git a/Src/Help/Index.hhk b/Src/Help/Index.hhk
index 9b3a0f57a..f5550c5d1 100644
--- a/Src/Help/Index.hhk
+++ b/Src/Help/Index.hhk
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip help index file.
 -->
diff --git a/Src/Help/TOC.hhc b/Src/Help/TOC.hhc
index f206f44bc..cd91c1f05 100644
--- a/Src/Help/TOC.hhc
+++ b/Src/Help/TOC.hhc
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip help table of contents file.
 -->
diff --git a/Src/Hiliter.UAttrs.pas b/Src/Hiliter.UAttrs.pas
index 24a91dd25..42ab29f1d 100644
--- a/Src/Hiliter.UAttrs.pas
+++ b/Src/Hiliter.UAttrs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements classes that define syntax highlighter attributes along with an
  * object that provides a list of named highlighter attributes.
diff --git a/Src/UFontHelper.pas b/Src/UFontHelper.pas
index 5e40c0296..dca71c381 100644
--- a/Src/UFontHelper.pas
+++ b/Src/UFontHelper.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a static class used to assist when working with fonts.
 }
diff --git a/Src/UPreferences.pas b/Src/UPreferences.pas
index 59bd8e09a..26a412804 100644
--- a/Src/UPreferences.pas
+++ b/Src/UPreferences.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a singletion object that exposes and persists user preferences.
 }

From 8fcc715fa781be3fc27de56b346c013b0b215adb Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 15 May 2022 12:01:46 +0100
Subject: [PATCH 029/264] Update copyright date in License.html

Fixes #50
---
 Docs/License.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Docs/License.html b/Docs/License.html
index 3fd6ff97f..9964fa5df 100644
--- a/Docs/License.html
+++ b/Docs/License.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip license.
 -->
@@ -225,7 +225,7 @@ <h2>
     Executable Program
   </h2>
   <p>
-    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2021 by <a
+    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2022 by <a
       href="https://gravatar.com/delphidabbler"
     >Peter D Johnson</a>.
   </p>
@@ -327,7 +327,7 @@ <h2>
       <div>
         This condition applies to all files in the
         <kbd>Src/Res/Img/Branding</kbd> directory, all of which are original
-        work copyright &copy; 2012-2021 by <a
+        work copyright &copy; 2012-2022 by <a
           href="https://gravatar.com/delphidabbler"
         >Peter D Johnson</a>.
       </div>

From 3d71453660b0bbec1e7e552e28b3e2be29458b1c Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:33:20 +0100
Subject: [PATCH 030/264] Update 3rd party PJSysInfo unit to v5.13.0

Fix serous long term bug in PJSysInfo

Fixes #53
---
 Src/3rdParty/PJSysInfo.pas | 396 ++++++++++++++++++-------------------
 1 file changed, 195 insertions(+), 201 deletions(-)

diff --git a/Src/3rdParty/PJSysInfo.pas b/Src/3rdParty/PJSysInfo.pas
index b1040bb83..75bba654b 100644
--- a/Src/3rdParty/PJSysInfo.pas
+++ b/Src/3rdParty/PJSysInfo.pas
@@ -1172,6 +1172,14 @@ implementation
     'Software\Microsoft\Windows NT\CurrentVersion'
   );
 
+type
+  // Record used to map a build number to a release name
+  // Generally used in arrays
+  TBuildNameMap = record
+    Build: Integer;
+    Name: string;
+  end;
+
 const
   {
     Known windows build numbers.
@@ -1208,21 +1216,35 @@ implementation
 
   // Windows 10 ----------------------------------------------------------------
 
-  Win10TH1Build = 10240;        // Windows 10 TH1 - version 1507 (1st release)
-  Win10TH2Build = 10586;        // Windows 10 TH2 - version 1511
-  Win10RS1Build = 14393;        // Windows 10 RS1 - version 1607
-  Win10RS2Build = 15063;        // Windows 10 RS2 - version 1703
-  Win10RS3Build = 16299;        // Windows 10 RS3 - version 1709
-  Win10RS4Build = 17134;        // Windows 10 RS4 - version 1803
-  Win10RS5Build = 17763;        // Windows 10 RS5 - version 1809
-  Win1019H1Build = 18362;       // Windows 10 19H1 - version 1903
-  Win1019H2Build = 18363;       // Windows 10 19H2 - version 1909
-  Win1020H1Build = 19041;       // Windows 10 20H1 - version 2004
-  Win1020H2Build = 19042;       // Windows 10 20H2 - version 20H2
-  Win1021H1Build = 19043;       // Windows 10 21H1 - version 21H1
-                                //   revisions 844..964 were beta
-  Win1021H2Build = 19044;       // Windows 10 21H2 - version 21H2
-                                //   revisions 1147..1266 were previews
+  // Map of Win 10 builds from 1st release (version 1507) to version 20H2
+  Win10BuildMap: array[0..10] of TBuildNameMap = (
+    (Build: 10240; Name: 'Version 1507'),
+    (Build: 10586; Name: 'Version 1511: November Update'),
+    (Build: 14393; Name: 'Version 1607: Anniversary Update'),
+    (Build: 15063; Name: 'Version 1703: Creators Update'),
+    (Build: 16299; Name: 'Version 1709: Fall Creators Update'),
+    (Build: 17134; Name: 'Version 1803: April 2018 Update'),
+    (Build: 17763; Name: 'Version 1809: October 2018 Update'),
+    (Build: 18362; Name: 'Version 1903: May 2019 Update'),
+    (Build: 18363; Name: 'Version 1909: November 2019 Update'),
+    (Build: 19041; Name: 'Version 2004: May 2020 Update'),
+    // Note: Microsoft announced the official version name of build 19042 as
+    // '20H2', not '2010' which some had expected it to be
+    (Build: 19042; Name: 'Version 20H2: October 2020 Update')
+  );
+
+  // Additional information is available for Win 10 buulds from version 21H1,
+  // as follows:
+
+  // Windows 10 version 21H1:
+  //  * revisions 844..964 were Beta builds
+  //  * later revisions were Public Release builds
+  Win1021H1Build = 19043;
+
+  // Windows 10 version 21H2:
+  //  * revisions 1147..1266 were Preview builds
+  //  * later revisions were Public Release builds
+  Win1021H2Build = 19044;
 
   // Fast ring
   Win10FastRing: array[0..21] of Integer = (
@@ -1243,18 +1265,21 @@ implementation
   // Windows 11 ----------------------------------------------------------------
 
   // NOTE: Preview and beta & release versions of Windows 11 report version 10.0
-  Win11DevBuild = 21996;          // Windows 11 version Dev
-                                  //   - 10.0.21996.1 (Insider version)
-  Win11v21H2Build = 22000;        // Version depends on revision # [Rev#]:
-                                  //   Revision # 51,65,71,100,120,132,168:
-                                  //     Windows 11 version 21H2
-                                  //       - 10.0.22000.[Rev#] (Insider version)
-                                  //   Revision # 184
-                                  //     Windows 11 version 21H2
-                                  //       - 10.0.22000.184 (Beta Version)
-                                  //   Revision # 194
-                                  //     Windows 11 version 21H2
-                                  //       - ** 1st Public Release **
+
+  // Windows 11 version Dev: 10.0.21996.1 (Insider version)
+  Win11DevBuild = 21996;
+
+  // Windows 11 version 21H2:
+  //  * revisions 51,65,71,100,120,132,168 were Insider builds
+  //  * revision 184 was Beta build
+  //  * revision 194 and later were Public Release builds
+  Win11v21H2Build = 22000;
+
+  // Windows 11 version 22H2:
+  //  * revision 1 was Beta & Release Preview build
+  //  * revisions 105 & 169 were Release Preview builds
+  //  * revision 160 was Beta build
+  Win11v22H2Build = 22621;
 
   // Dev channel release - different sources give different names.
   // From what I can gather (and take this with a pinch of salt!):
@@ -1264,55 +1289,67 @@ implementation
   // * From build 22567 the release string changed from "Dev" to "22H"
 
   // Builds with version string "Dev"
-  Win11DevChannelDevBuilds: array[0..20] of Integer = (
-    22449, 22454, 22458, 22463, 22468,    // pre Win 11 release
+  Win11DevChannelDevBuilds: array[0..28] of Integer = (
+    // pre Win 11 release
+    22449, 22454, 22458, 22463, 22468,
+    // post Win 11 release, pre Win 11 22H2 beta release
     22471, 22478, 22483, 22489, 22494, 22499, 22504, 22509, 22518, 22523, 22526,
-    22533, 22538, 22543, 22557, 22563
+    22533, 22538, 22543, 22557, 22563,
+    // post Win 11 22H2 beta release
+    25115, 25120, 25126, 25131, 25136, 25140, 25145, 25151
   );
   // Builds with version string "22H2" in Dev channel
   Win11DevChannel22H2Builds: array[0..2] of Integer = (
     22567, 22572, 22579
   );
   // Builds with version string "22H2" in Dev & Beta channels
-  Win11DevBetaChannels22H2Builds: array[0..3] of Integer = (
-    22581, 22593, 22598, 22610
+  Win11DevBetaChannels22H2Builds: array[0..4] of Integer = (
+    22581, 22593, 22598, 22610, 22616
   );
 
   Win11FirstBuild = Win11DevBuild;  // First build number of Windows 11
 
-  // Windows 2016 Server -------------------------------------------------------
-  Win2016TP1Build = 9841;       // Win 2016 Server Technical Preview 1
-  Win2016TP2Build = 10074;      // Win 2016 Server Technical Preview 2
-  Win2016TP3Build = 10514;      // Win 2016 Server Technical Preview 3
-  Win2016TP4Build = 10586;      // Win 2016 Server Technical Preview 4
-  Win2016TP5Build = 14300;      // Win 2016 Server Technical Preview 5
-  Win2016RTMBuild = 14393;      // Win 2016 Server Release To Manufacturing
-  Win2016v1709Build = 16299;    // Win Server 2016 version 1709
-  Win2016v1803Build = 17134;    // Win Server 2016 version 1803
-  Win2016LastBuild = Win2016v1803Build; // Last build number of Win 2016 Server
-                                        // After this it's Win 2019 Server
-
-  // Windows 2019 Server -------------------------------------------------------
-  // Insider Preview builds
+  // Windows server v10.0 version ----------------------------------------------
+
+  // These are the Windows server versions that (with one exception) report
+  // version 10.0. There's always an exception with Windows versioning!
+
+  // Last build numbers of each "major" release before moving on to the next
+  Win2016LastBuild = 17134;
+  Win2019LastBuild = 18363;
+  WinServerLastBuild = 19042;
+
+  // Map of Windows server releases that are named straightforwardly
+  WinServerSimpleBuildMap: array[0..12] of TBuildNameMap = (
+    // Windows Server 2016
+    (Build: 10074; Name: 'Technical Preview 2'),
+    (Build: 10514; Name: 'Technical Preview 3'),
+    (Build: 10586; Name: 'Technical Preview 4'),
+    (Build: 14300; Name: 'Technical Preview 5'),
+    (Build: 14393; Name: 'Version 1607'),
+    (Build: 16299; Name: 'Version 1709'),
+    (Build: Win2016LastBuild; Name: 'Version 1803'),
+    // Windows Server 2019
+    (Build: 17763; Name: 'Version 1809'),
+    (Build: 18362; Name: 'Version 1903'),
+    (Build: Win2019LastBuild; Name: 'Version 1909'),
+    // Windows Server (no year number)
+    (Build: 19041; Name: 'Version 2004'),
+    (Build: WinServerLastBuild; Name: 'Version 20H2'),
+    // Windows Sever 2022
+    (Build: 20348; Name: 'Version 21H2')
+  );
+
+  // Windows server releases needing special handling
+
+  // Server 2016 Technical Preview 1: reports version 6.4 instead of 10.0!
+  Win2016TP1Build = 9841;
+
+  // Server 2019 Insider Preview builds: require format strings in names
   Win2019IPBuilds: array[0..9] of Integer = (
     17623, 17627, 17666, 17692, 17709, 17713, 17723, 17733, 17738, 17744
   );
-  // Release builds
-  Win2019v1809Build = 17763;    // Win Server 2019 version 1809
-  Win2019v1903Build = 18362;    // Win Server 2019 version 1903
-  Win2019v1909Build = 18363;    // Win Server 2019 version 1909
-  Win2019LastBuild = Win2019v1909Build; // Last build number of Win 2019 Server
-                                        // After this it's Windows Server
-
-  // Windows Server ------------------------------------------------------------
-  WinServerv2004Build = 19041;    // Win Server version 2004
-  WinServerv20H2Build = 19042;    // Win Server version 20H2
-  WinServerLastBuild = WinServerv20H2Build; // Last build number of Windows
-                                            // Server. After this it's Window
-                                            // 2022 Sever
-
-  // Windows 2022 Server -------------------------------------------------------
-  Win2022v21H2Build = 20348;    // Win Server 2022 version 21H2
+
 
 type
   // Function type of the GetNativeSystemInfo and GetSystemInfo functions
@@ -1411,9 +1448,12 @@ function TestWindowsVersion(wMajorVersion, wMinorVersion,
   );
 end;
 
-// Checks if given build number matches that of the current OS.
-// Assumes VerifyVersionInfo & VerSetConditionMask APIs functions are available
-function IsBuildNumber(BuildNumber: DWORD): Boolean;
+// Checks how the OS build number compares to the given TestBuildNumber
+// according to operator Op.
+// Op must be one of VER_EQUAL, VER_GREATER, VER_GREATER_EQUAL, VER_LESS or
+// VER_LESS_EQUAL.
+// Assumes VerifyVersionInfo & VerSetConditionMask APIs functions are available.
+function TestBuildNumber(Op, TestBuildNumber: DWORD): Boolean;
 var
   OSVI: TOSVersionInfoEx;
   POSVI: POSVersionInfoEx;
@@ -1422,12 +1462,20 @@ function IsBuildNumber(BuildNumber: DWORD): Boolean;
   Assert(Assigned(VerSetConditionMask) and Assigned(VerifyVersionInfo));
   FillChar(OSVI, SizeOf(OSVI), 0);
   OSVI.dwOSVersionInfoSize := SizeOf(OSVI);
-  OSVI.dwBuildNumber := BuildNumber;
+  OSVI.dwBuildNumber := TestBuildNumber;
   POSVI := @OSVI;
-  ConditionalMask := VerSetConditionMask(0, VER_BUILDNUMBER, VER_EQUAL);
+  ConditionalMask := VerSetConditionMask(0, VER_BUILDNUMBER, Op);
   Result := VerifyVersionInfo(POSVI, VER_BUILDNUMBER, ConditionalMask);
 end;
 
+// Checks if given build number matches that of the current OS.
+// Assumes VerifyVersionInfo & VerSetConditionMask APIs functions are available.
+function IsBuildNumber(BuildNumber: DWORD): Boolean;
+  {$IFDEF INLINEMETHODS}inline;{$ENDIF}
+begin
+  Result := TestBuildNumber(VER_EQUAL, BuildNumber);
+end;
+
 // Checks if any of the given build numbers match that of the current OS.
 // If current build number is in the list, FoundBN is set to the found build
 // number and True is returned. Otherwise False is returned and FoundBN is set
@@ -1450,6 +1498,31 @@ function FindBuildNumberFrom(const BNs: array of Integer; var FoundBN: Integer):
   end;
 end;
 
+// Checks if any of the build numbers in the given array match that of the
+// current OS. If so the build number that was found then True is returned, and
+// the build number and it's associated text are passed back in the FoundBN and
+// FoundExtra parameters respectively. Otherwise False is returned, FoundBN is
+// set to 0 and FoundExtra is set to ''.
+function FindBuildNameAndExtraFrom(const Infos: array of TBuildNameMap;
+  var FoundBN: Integer; var FoundExtra: string): Boolean;
+var
+  I: Integer;
+begin
+  FoundBN := 0;
+  FoundExtra := '';
+  Result := False;
+  for I := Low(Infos) to High(Infos) do
+  begin
+    if IsBuildNumber(Infos[I].Build) then
+    begin
+      FoundBN := Infos[I].Build;
+      FoundExtra := Infos[I].Name;
+      Result := True;
+      Break;
+    end;
+  end;
+end;
+
 // Checks if the OS has the given product type.
 // Assumes VerifyVersionInfo & VerSetConditionMask APIs functions are available
 function IsWindowsProductType(ProductType: Byte): Boolean;
@@ -1782,68 +1855,17 @@ procedure InitPlatformIdEx;
       begin
         case InternalMinorVersion of
           0:
-          // ** As of 2021/10/05 all releases of Windows 10 **and**
+          // ** As of 2022/06/01   all releases of Windows 10 **and**
           //    Windows 11 report major version 10 and minor version 0
+          //    Well that's helpful!!
           if (Win32ProductType <> VER_NT_DOMAIN_CONTROLLER)
             and (Win32ProductType <> VER_NT_SERVER) then
           begin
-            if IsBuildNumber(Win10TH1Build) then
-            begin
-              // First public release of Window 10
-              InternalBuildNumber := Win10TH1Build;
-              InternalExtraUpdateInfo := 'Version 1507';
-            end
-            else if IsBuildNumber(Win10TH2Build) then
-            begin
-              InternalBuildNumber := Win10TH2Build;
-              InternalExtraUpdateInfo := 'Version 1511: November Update';
-            end
-            else if IsBuildNumber(Win10RS1Build) then
-            begin
-              InternalBuildNumber := Win10RS1Build;
-              InternalExtraUpdateInfo := 'Version 1607: Anniversary Update';
-            end
-            else if IsBuildNumber(Win10RS2Build) then
-            begin
-              InternalBuildNumber := Win10RS2Build;
-              InternalExtraUpdateInfo := 'Version 1703: Creators Update';
-            end
-            else if IsBuildNumber(Win10RS3Build) then
-            begin
-              InternalBuildNumber := Win10RS3Build;
-              InternalExtraUpdateInfo := 'Version 1709: Fall Creators Update';
-            end
-            else if IsBuildNumber(Win10RS4Build) then
-            begin
-              InternalBuildNumber := Win10RS4Build;
-              InternalExtraUpdateInfo := 'Version 1803: April 2018 Update';
-            end
-            else if IsBuildNumber(Win10RS5Build) then
-            begin
-              InternalBuildNumber := Win10RS5Build;
-              InternalExtraUpdateInfo := 'Version 1809: October 2018 Update';
-            end
-            else if IsBuildNumber(Win1019H1Build) then
-            begin
-              InternalBuildNumber := Win1019H1Build;
-              InternalExtraUpdateInfo := 'Version 1903: May 2019 Update';
-            end
-            else if IsBuildNumber(Win1019H2Build) then
-            begin
-              InternalBuildNumber := Win1019H2Build;
-              InternalExtraUpdateInfo := 'Version 1909: November 2019 Update';
-            end
-            else if IsBuildNumber(Win1020H1Build) then
-            begin
-              InternalBuildNumber := Win1020H1Build;
-              InternalExtraUpdateInfo := 'Version 2004: May 2020 Update';
-            end
-            else if IsBuildNumber(Win1020H2Build) then
+            if FindBuildNameAndExtraFrom(
+              Win10BuildMap, InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
             begin
-              InternalBuildNumber := Win1020H2Build;
-              // Note: Microsoft announced the official version name is '20H2',
-              //       not '2010' which some had expected it to be
-              InternalExtraUpdateInfo := 'Version 20H2: October 2020 Update';
+              // Nothing to do: required internal variables set in function call
             end
             else if IsBuildNumber(Win1021H1Build) then
             begin
@@ -1882,7 +1904,6 @@ procedure InitPlatformIdEx;
             end
             // Win 11 releases are reporting v10.0
             // Details taken from: https://tinyurl.com/usupsz4a
-            // Correct according to above web page as of 2021-09-11
             else if IsBuildNumber(Win11DevBuild) then
             begin
               InternalBuildNumber := Win11DevBuild;
@@ -1899,7 +1920,7 @@ procedure InitPlatformIdEx;
               // *** Amazingly one of them, revision 194, is the 1st public
               //     release of Win 11 -- well hidden eh?!
               InternalBuildNumber := Win11v21H2Build;
-              case InternalBuildNumber of
+              case InternalRevisionNumber of
                 194..MaxInt:
                   // Public releases of Windows 11 have build number >= 194
                   InternalExtraUpdateInfo := 'Version 21H2';
@@ -1915,7 +1936,35 @@ procedure InitPlatformIdEx;
                   );
                 else
                   InternalExtraUpdateInfo := Format(
-                    'Unknown release v10.0.%d.%d',
+                    'Version 21H2 [Unknown release v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
+            end
+            else if IsBuildNumber(Win11v22H2Build) then
+            begin
+              InternalBuildNumber := Win11v22H2Build;
+              // See comments with declaration of Win11v22H2Build for details
+              // of naming of revisions
+              case InternalRevisionNumber of
+                1:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [Beta & Release Preview v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                105, 169:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [Release Preview v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                160:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [Beta v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [Unknown release v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
               end;
@@ -1953,92 +2002,37 @@ procedure InitPlatformIdEx;
           end
           else // Win32ProductType in [VER_NT_DOMAIN_CONTROLLER, VER_NT_SERVER]
           begin
-            // Check for Win Server 2016 technical previews.
-            // We don't check for TP1 // here because that reported version 6.4,
-            // not version 10!
-            if IsBuildNumber(Win2016TP2Build) then
-            begin
-              InternalBuildNumber := Win2016TP2Build;
-              InternalExtraUpdateInfo := 'Technical Preview 2';
-            end
-            else if IsBuildNumber(Win2016TP3Build) then
-            begin
-              InternalBuildNumber := Win2016TP3Build;
-              InternalExtraUpdateInfo := 'Technical Preview 3';
-            end
-            else if IsBuildNumber(Win2016TP4Build) then
-            begin
-              InternalBuildNumber := Win2016TP4Build;
-              InternalExtraUpdateInfo := 'Technical Preview 4';
-            end
-            else if IsBuildNumber(Win2016TP5Build) then
-            begin
-              InternalBuildNumber := Win2016TP5Build;
-              InternalExtraUpdateInfo := 'Technical Preview 5';
-            end
-            else if IsBuildNumber(Win2016RTMBuild) then
-            begin
-              InternalBuildNumber := Win2016RTMBuild;
-              InternalExtraUpdateInfo := 'Version 1607';
-            end
-            else if IsBuildNumber(Win2016v1709Build) then
-            begin
-              InternalBuildNumber := Win2016v1709Build;
-              InternalExtraUpdateInfo := 'Version 1709';
-            end
-            else if IsBuildNumber(Win2016v1803Build) then
+            // Check for the easy-to-handle Win Server v10. builds, i.e. the
+            // ones where Extra Update Info is just plain text.
+            if FindBuildNameAndExtraFrom(
+              WinServerSimpleBuildMap,
+              InternalBuildNumber,
+              InternalExtraUpdateInfo
+            ) then
             begin
-              InternalBuildNumber := Win2016v1803Build;
-              InternalExtraUpdateInfo := 'Version 1803';
+              // Nothing to do: required internal variables set in function call
             end
             else if FindBuildNumberFrom(
               Win2019IPBuilds, InternalBuildNumber
             ) then
             begin
+              // Windows 2019 Insider preview builds require build number in
+              // Extra Update Info.
               InternalExtraUpdateInfo := Format(
                 'Insider Preview Build %d', [InternalBuildNumber]
               );
             end
-            else if IsBuildNumber(Win2019v1809Build) then
-            begin
-              InternalBuildNumber := Win2019v1809Build;
-              InternalExtraUpdateInfo := 'Version 1809';
-            end
-            else if IsBuildNumber(Win2019v1903Build) then
-            begin
-              InternalBuildNumber := Win2019v1903Build;
-              InternalExtraUpdateInfo := 'Version 1903';
-            end
-            else if IsBuildNumber(Win2019v1909Build) then
-            begin
-              InternalBuildNumber := Win2019v1909Build;
-              InternalExtraUpdateInfo := 'Version 1909';
-            end
-            else if IsBuildNumber(WinServerv2004Build) then
-            begin
-              InternalBuildNumber := WinServerv2004Build;
-              InternalExtraUpdateInfo := 'Version 2004';
-            end
-            else if IsBuildNumber(WinServerv20H2Build) then
-            begin
-              InternalBuildNumber := WinServerv20H2Build;
-              InternalExtraUpdateInfo := 'Version 20H2';
-            end
-            else if IsBuildNumber(Win2022v21H2Build) then
-            begin
-              InternalBuildNumber := Win2022v21H2Build;
-              InternalExtraUpdateInfo := 'Version 21H2';
-            end;
           end;
         end;
       end;
     end;
 
     // ** If InternalBuildNumber is 0 when we get here then we failed to get it
-    //    We no longer look in registry as of SVN commit r2001, because this can
-    //    get spoofed. E.g. when running on Windows 10 TH2 registry call is
-    //    returning build number of 7600 even though regedit reveals it to be
-    //    10586 !
+    //    We no longer look in registry as of SVN commit r2001 (Git commit
+    //    d44aea3e6e0ed7bd317398252fcf862051b159f7 in ddablib/sysinfo on
+    //    GitHub), because this can get spoofed. E.g. when running on Windows 10
+    //    TH2 registry call is returning build number of 7600 even though
+    //    regedit reveals it to be 10586 !
     //    So we must now consider a build number of 0 as indicating an unknown
     //    build number.
     //    But note that some users report that their registry is returning
@@ -2725,7 +2719,7 @@ class function TPJOSInfo.Product: TPJOSProduct;
             0:
               if not IsServer then
               begin
-                if InternalBuildNumber < Win11FirstBuild then
+                if TestBuildNumber(VER_LESS, Win11FirstBuild) then
                   Result := osWin10
                 else
                   // ** As of 2021-10-05 Win 11 is reporting version 10.0!
@@ -2733,11 +2727,11 @@ class function TPJOSInfo.Product: TPJOSProduct;
               end
               else
               begin
-                if InternalBuildNumber <= Win2016LastBuild then
+                if TestBuildNumber(VER_LESS_EQUAL, Win2016LastBuild) then
                   Result := osWin10Svr
-                else if InternalBuildNumber <= Win2019LastBuild then
+                else if TestBuildNumber(VER_LESS_EQUAL, Win2019LastBuild) then
                   Result := osWinSvr2019
-                else if InternalBuildNumber <= WinServerLastBuild then
+                else if TestBuildNumber(VER_LESS_EQUAL, WinServerLastBuild) then
                   Result := osWinServer
                 else
                   Result := osWinSvr2022;

From 41305ed8017d3e5685e529021fb1aaaf7e3f26ca Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:41:31 +0100
Subject: [PATCH 031/264] Bump version information to v2.20.1 build 265

---
 Src/VCodeSnip.vi         | 4 ++--
 Src/VCodeSnipPortable.vi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
index 336a57137..0a826d5a3 100644
--- a/Src/VCodeSnip.vi
+++ b/Src/VCodeSnip.vi
@@ -8,8 +8,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 20, 0, 264
-Product Version #=4, 20, 0, 0
+File Version #=4, 20, 1, 265
+Product Version #=4, 20, 1, 0
 File OS=4
 File Type=1
 File Sub-Type=0
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
index 6f78cbaff..d5fdc997b 100644
--- a/Src/VCodeSnipPortable.vi
+++ b/Src/VCodeSnipPortable.vi
@@ -8,8 +8,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 20, 0, 264
-Product Version #=4, 20, 0, 0
+File Version #=4, 20, 1, 265
+Product Version #=4, 20, 1, 0
 File OS=4
 File Type=1
 File Sub-Type=0

From 83aee213d2421cc1cdadc3c9323e19accf184829 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:46:31 +0100
Subject: [PATCH 032/264] Update change log re v4.20.1 changes

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 251825295..5f9ed8c24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,11 @@ This change log begins with the first ever pre-release version of _CodeSnip_. Re
 
 From v4.1.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Release v4.20.1 of 01 July 2022
+
+* Operating system detection code was updated to (a) fix bugs and (b) detect some Dev, Beta and Release Preview builds of Windows 11 22H2.
+* Fixed copyright date in `Docs/License.html`.
+
 ## Release v4.20.0 of 15 May 2022
 
 * Added an option to delete the user defined database.

From 918b871cc667a7e18ccd857195f9cd4480665c7c Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 1 Jul 2022 16:01:47 +0100
Subject: [PATCH 033/264] Update README.md

Minor edits
Add several links
---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 74fad43e0..5bfc29a5d 100644
--- a/README.md
+++ b/README.md
@@ -18,13 +18,13 @@ CodeSnip can import code from the DelphiDabbler [Code Snippets Database](https:/
 
 The program is available in both standard and portable editions.
 
-CodeSnip requires Windows 2000 or later and Internet Explorer 6 or later, although XP and IE 8 and later are preferred.
+CodeSnip requires Windows 2000 or later and Internet Explorer 6 or later, although XP and IE 8 and later are recommended.
 
 ## Installation
 
 The standard edition of CodeSnip is installed and removed using a standard Windows installer. Administrator privileges are required for installation.
 
-The portable edition has no installer. Simply follow the instructions in the [read me file](https://github.com/delphidabbler/codesnip/blob/master/Docs/ReadMe.txt) that is included in the download zip file.
+The portable edition has no installer. Simply follow the instructions in the [read me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt) that is included in the download zip file.
 
 ## Support
 
@@ -37,7 +37,7 @@ The following support is available CodeSnip users:
 
 There's also plenty of info available on how to compile CodeSnip from source - see below.
 
-<sup>*</sup> This link takes you to the most recent version of the read-me file -- it can change from release to release.
+> <sup>*</sup> This link takes you to the most recent version of the read-me file -- it can change from release to release.
 
 ## Source Code
 
@@ -45,7 +45,7 @@ CodeSnip's source code is maintained in the [`delphidabbler/codesnip`](https://g
 
 The [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) methodology has been adopted, with the exception of some branches that have been used in various attempts to start work on CodeSnip 5.
 
-The following branches existed as of 2022/01/01:
+The following branches existed as of 2022/07/01:
 
 * `master`: Always reflects the state of the source code as of the latest release.‡
 * `develop`: Main development branch. The head of this branch contains the latest v4 development code.
@@ -71,11 +71,11 @@ To contribute to CodeSnip 4 development please fork the repository on GitHub. Cr
 
 The license that applies to any existing file you edit will continue to apply to the edited file. Any existing license text or copyright statement **must not** be altered or removed.
 
-Any new file you contribute **must** either be licensed under the Mozilla Public License v2.0 (MPL2) or have a license compatible with the MPL2. If a license is not specified then the MPL2 will be applied to the file. You should insert a suitable copyright statement in the file.
+Any new file you contribute **must** either be licensed under the [Mozilla Public License v2.0](https://www.mozilla.org/MPL/2.0/) (MPL2) or have a license compatible with the MPL2. If a license is not specified then MPL2 will be assumed and will be applied to the file. You should insert a suitable copyright statement in the file.
 
 Any third party code used by your contributed code **must** also have a license compatible with the MPL2.
 
-> MPL2 boilerplate text, in several programming language's comment formats, can be found in the file `Docs/MPL-2.0-Boilerplate.txt`. You will need to change the name of the copyright holder.
+> MPL2 boilerplate text, in several programming language's comment formats, can be found in the file [`Docs/MPL-2.0-Boilerplate.txt`](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/MPL-2.0-Boilerplate.txt). You will need to change the name of the copyright holder.
 
 ### Compiling
 
@@ -87,7 +87,7 @@ CodeSnip 4 **must** be compiled with Delphi XE. See [Compiling & Source Code FAQ
 
 ## Change Log
 
-The program's current change log can be found in the file `CHANGELOG.md` in the root of the `master` branch.
+The program's current change log can be found in the file [`CHANGELOG.md`](https://github.com/delphidabbler/codesnip/blob/master/CHANGELOG.md) in the root of the `master` branch.
 
 > Note that CodeSnip v4.15.1 and earlier did not have `CHANGELOG.md`. Instead, some versions maintained a separate change log for each major version in the `Docs/ChangeLogs` directory.
 

From 633a18dd45d93376492edff7b14b9a74d7a5d601 Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 31 Jul 2022 07:27:39 +0100
Subject: [PATCH 034/264] Update .gitignore

Remove invalid paths
---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 34885dadb..c5a26ecfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,3 @@ Exe
 Release
 Src/CodeSnip.cfg
 Src/AutoGen/IntfExternalObj.pas
-Src/Portable/CodeSnipPortable.cfg
-Src/Main/AutoGen/IntfExternalObj.pas

From a6fd1892c3317c811e4d4f7e408ae587b7722ac3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 29 Aug 2022 16:30:29 +0100
Subject: [PATCH 035/264] Fix F1 key press over menu item bug

Add OnHelp event handler on main form that cancels help operation
that triggered the exception.

Fixes #54
---
 Src/FmMain.dfm |  1 +
 Src/FmMain.pas | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/Src/FmMain.dfm b/Src/FmMain.dfm
index 343bc0d9b..902e71720 100644
--- a/Src/FmMain.dfm
+++ b/Src/FmMain.dfm
@@ -1174,6 +1174,7 @@ inherited MainForm: TMainForm
     end
   end
   object appEvents: TApplicationEvents
+    OnHelp = appEventsHelp
     OnHint = appEventsHint
     Left = 291
     Top = 96
diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 1342be28c..828ef997f 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -478,6 +478,11 @@   TMainForm = class(THelpAwareForm)
     procedure actViewTestUnitUpdate(Sender: TObject);
     ///  <summary>Displays the Welcome page in the details pane.</summary>
     procedure actWelcomeExecute(Sender: TObject);
+    ///  <summary>Handles events triggered when help system is invoked. Prevents
+    ///  exception being raised when F1 key is pressed when a menu is dropped
+    ///  down.</summary>
+    function appEventsHelp(Command: Word; Data: Integer;
+      var CallHelp: Boolean): Boolean;
     ///  <summary>Handles events triggered when a control issues a hint. The
     ///  hint is displayed in the form's status bar.</summary>
     procedure appEventsHint(Sender: TObject);
@@ -1215,6 +1220,16 @@ procedure TMainForm.AfterShowForm;
   fMainDisplayMgr.ShowWelcomePage;
 end;
 
+function TMainForm.appEventsHelp(Command: Word; Data: Integer;
+  var CallHelp: Boolean): Boolean;
+begin
+  // Prevent Delphi Help system from interfering!
+  // This prevents exception being raised when F1 is pressed over menu items
+  // while still allowing our custom help manager to operate.
+  CallHelp := False;
+  Result := True;
+end;
+
 procedure TMainForm.appEventsHint(Sender: TObject);
 begin
   if Assigned(fStatusBarMgr) then

From 984a71393c5c96e839a13a613810b47eb700a639 Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 17 Sep 2022 23:11:10 +0100
Subject: [PATCH 036/264] Create .gitattributes

Get Linguist to highlight .ps files as Pascal (fixes #58)
Also get Linguist to count Markdown files in repo stats (no related issue)
---
 .gitattributes | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..765207f06
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+# Customise GitHub Linguist
+
+# Highlight Inno Setup's .ps files as Pascal
+*.ps linguist-language=Pascal
+# Include Markdown files in stats
+*.md linguist-detectable

From 7a1fcc6775490157c4023b73a827e880233b9a0b Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 17 Sep 2022 23:39:39 +0100
Subject: [PATCH 037/264] Update PJSysInfo.pas

Update to release v5.15.0

Fixes #55
---
 Src/3rdParty/PJSysInfo.pas | 111 +++++++++++++++++++++++++------------
 1 file changed, 76 insertions(+), 35 deletions(-)

diff --git a/Src/3rdParty/PJSysInfo.pas b/Src/3rdParty/PJSysInfo.pas
index 75bba654b..ec8838745 100644
--- a/Src/3rdParty/PJSysInfo.pas
+++ b/Src/3rdParty/PJSysInfo.pas
@@ -1,9 +1,9 @@
 {
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/
+ * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2001-2022, Peter Johnson (@delphidabbler).
+ * Copyright (C) 2001-2022, Peter Johnson (https://gravatar.com/delphidabbler).
  *
  * This unit contains various static classes, constants, type definitions and
  * global variables for use in providing information about the host computer and
@@ -232,7 +232,7 @@ interface
   // GetProductInfo API call used with Windows Vista and later
   // ** Thanks to Laurent Pierre for providing these definitions.
   // ** Additional definitions were obtained from
-  //    http://msdn.microsoft.com/en-us/library/ms724358
+  //    https://msdn.microsoft.com/en-us/library/ms724358
   PRODUCT_BUSINESS                            = $00000006;
   PRODUCT_BUSINESS_N                          = $00000010;
   PRODUCT_CLUSTER_SERVER                      = $00000012;
@@ -324,7 +324,7 @@ interface
   // These constants are required for use with GetSystemMetrics to detect
   // certain editions. GetSystemMetrics returns non-zero when passed these flags
   // if the associated edition is present.
-  // Obtained from http://msdn.microsoft.com/en-us/library/ms724385
+  // Obtained from https://msdn.microsoft.com/en-us/library/ms724385
   SM_TABLETPC       = 86;     // Detects XP Tablet Edition
   SM_MEDIACENTER    = 87;     // Detects XP Media Center Edition
   SM_STARTER        = 88;     // Detects XP Starter Edition
@@ -806,7 +806,7 @@   TPJComputerInfo = class(TObject)
     ///  <para>WARNING: True is also returned when running in Windows 9x
     ///  compatibility mode on a Windows NT platform system, regardless of
     ///  whether the user has admin privileges or not.</para>
-    ///  <para>Based on code at http://edn.embarcadero.com/article/26752</para>
+    ///  <para>Based on a former Embarcadero article.</para>
     ///  </remarks>
     class function IsAdmin: Boolean;
 
@@ -818,7 +818,7 @@   TPJComputerInfo = class(TObject)
     ///  earlier compatibility mode on Windows Vista or later, regardless of
     ///  whether UAC is enabled or not.</para>
     ///  <para>Based on code on Stack Overflow, answer by norgepaul, at
-    ///  http://tinyurl.com/avlztmg</para>
+    ///  https://tinyurl.com/avlztmg</para>
     ///  </remarks>
     class function IsUACActive: Boolean;
 
@@ -983,7 +983,7 @@ implementation
   // Map of product codes per GetProductInfo API to product names
   // ** Laurent Pierre supplied original code on which this map is based
   //    It has been modified and extended using MSDN documentation at
-  //    http://msdn.microsoft.com/en-us/library/ms724358
+  //    https://msdn.microsoft.com/en-us/library/ms724358
   cProductMap: array[1..87] of record
     Id: Cardinal; // product ID
     Name: string; // product name
@@ -1246,6 +1246,10 @@   TBuildNameMap = record
   //  * later revisions were Public Release builds
   Win1021H2Build = 19044;
 
+  // Windows 10 version 22H2
+  // * revision 1865 was Release Preview build (KB5015878)
+  Win1022H2Build = 19045;
+
   // Fast ring
   Win10FastRing: array[0..21] of Integer = (
     19536, 19541, 19546, 19551, 19555, 19559, 19564, 19569, 19577, 19582, 19587,
@@ -1270,16 +1274,22 @@   TBuildNameMap = record
   Win11DevBuild = 21996;
 
   // Windows 11 version 21H2:
-  //  * revisions 51,65,71,100,120,132,168 were Insider builds
-  //  * revision 184 was Beta build
-  //  * revision 194 and later were Public Release builds
+  //  * Dev channel: revs 51,65,71
+  //  * Dev & Beta channels: revs 100,120,132,160,168
+  //  * Beta & Release Preview channels: revs 176,184
+  //  * Public Release: rev 194 and later
   Win11v21H2Build = 22000;
 
-  // Windows 11 version 22H2:
-  //  * revision 1 was Beta & Release Preview build
-  //  * revisions 105 & 169 were Release Preview builds
-  //  * revision 160 was Beta build
+  // Windows 11 version 22H2
+  //
+  // Build 22631 was the original beta build.
+  //  * Beta & Release Preview channels: rev 1
+  //  * Beta channel: revs 160,290,436,440,450,575,586,590
+  //  * Release Preview channel: revs 105,169,232,317,382,457
   Win11v22H2Build = 22621;
+  // Build 22632 was added as an alternative Beta channel build as of rev 290:
+  //  * Beta channel: revs 290,436,440,450,575,586,590
+  Win11v22H2BuildAlt = 22622;
 
   // Dev channel release - different sources give different names.
   // From what I can gather (and take this with a pinch of salt!):
@@ -1289,14 +1299,15 @@   TBuildNameMap = record
   // * From build 22567 the release string changed from "Dev" to "22H"
 
   // Builds with version string "Dev"
-  Win11DevChannelDevBuilds: array[0..28] of Integer = (
+  Win11DevChannelDevBuilds: array[0..36] of Integer = (
     // pre Win 11 release
     22449, 22454, 22458, 22463, 22468,
     // post Win 11 release, pre Win 11 22H2 beta release
     22471, 22478, 22483, 22489, 22494, 22499, 22504, 22509, 22518, 22523, 22526,
     22533, 22538, 22543, 22557, 22563,
     // post Win 11 22H2 beta release
-    25115, 25120, 25126, 25131, 25136, 25140, 25145, 25151
+    25115, 25120, 25126, 25131, 25136, 25140, 25145, 25151, 25158, 25163, 25169,
+    25174, 25179, 25182, 25188, 25193
   );
   // Builds with version string "22H2" in Dev channel
   Win11DevChannel22H2Builds: array[0..2] of Integer = (
@@ -1813,7 +1824,7 @@ procedure InitPlatformIdEx;
       Win32ProductType := 0;
     // NOTE: It's going to be very slow to test for all possible build numbers,
     // so I've narrowed the search down using the information at
-    // http://en.wikipedia.org/wiki/Windows_NT
+    // https://en.wikipedia.org/wiki/Windows_NT
     case InternalMajorVersion of
       6:
       begin
@@ -1884,6 +1895,13 @@ procedure InitPlatformIdEx;
                 InternalExtraUpdateInfo := InternalExtraUpdateInfo
                   + ' (preview)';
             end
+            else if IsBuildNumber(Win1022H2Build) then
+            begin
+              InternalBuildNumber := Win1022H2Build;
+              { TODO: As of 1 Aug 2022 all rev numbers are previews.
+                      Change following once this is no longer the case. }
+              InternalExtraUpdateInfo := 'Version 22H2 (preview)';
+            end
             else if FindBuildNumberFrom(
               Win10DevChannel, InternalBuildNumber
             ) then
@@ -1924,14 +1942,20 @@ procedure InitPlatformIdEx;
                 194..MaxInt:
                   // Public releases of Windows 11 have build number >= 194
                   InternalExtraUpdateInfo := 'Version 21H2';
-                51, 65, 71, 100, 120, 132, 168:
+                51, 65, 71:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 21H2 [Dev Channel v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                100, 120, 132, 160, 168:
                   InternalExtraUpdateInfo := Format(
-                    'Version 21H2 [Insider v10.0.%d.%d]',
+                    'Version 21H2 [Dev & Beta Channels v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                184:
+                176, 184:
                   InternalExtraUpdateInfo := Format(
-                    'Version 21H2 [Beta v10.0.%d.%d]',
+                    'Version 21H2 '
+                      + '[Beta & Release Preview Channels v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 else
@@ -1943,21 +1967,40 @@ procedure InitPlatformIdEx;
             end
             else if IsBuildNumber(Win11v22H2Build) then
             begin
+              // See comments with declarations of Win11v22H2Build and
+              // Win11v22H2BuildAlt for details of naming of revisions.
               InternalBuildNumber := Win11v22H2Build;
-              // See comments with declaration of Win11v22H2Build for details
-              // of naming of revisions
               case InternalRevisionNumber of
                 1:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta & Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                105, 169:
+                105, 169, 232, 317, 382, 457:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                160:
+                160, 290, 436, 440, 450, 575, 586, 590:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [Beta v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [Unknown release v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
+            end
+            else if IsBuildNumber(Win11v22H2BuildAlt) then
+            begin
+              // See comments with declarations of Win11v22H2Build and
+              // Win11v22H2BuildAlt for details of naming of revisions.
+              InternalBuildNumber := Win11v22H2BuildAlt;
+              // Set fallback update info for unknown revisions
+              case InternalRevisionNumber of
+                290, 436, 440, 450, 575, 586, 590:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2196,8 +2239,8 @@ class function TPJOSInfo.Edition: string;
     osWinSvr2003, osWinSvr2003R2:
     begin
       // We check different processor architectures and act accordingly
-      // This code closely based on MS's sample code found at
-      // http://msdn2.microsoft.com/en-us/library/ms724429
+      // This code closely based on sample code by Microsoft that is no longer
+      // available
       if InternalProcessorArchitecture = PROCESSOR_ARCHITECTURE_IA64 then
       begin
         if CheckSuite(VER_SUITE_DATACENTER) then
@@ -2688,9 +2731,9 @@ class function TPJOSInfo.Product: TPJOSProduct;
             3:
               // NOTE: Version 6.3 may only be reported by Windows if the
               // application is "manifested" for Windows 8.1. See
-              // http://bit.ly/MJSO8Q. Getting the OS via VerifyVersionInfo
-              // instead of GetVersion or GetVersionEx should work round this
-              // for Windows 8.1 (i.e. version 6.3).
+              // https://tinyurl.com/2s384ha4. Getting the OS via
+              // VerifyVersionInfo instead of GetVersion or GetVersionEx should
+              // work round this for Windows 8.1 (i.e. version 6.3).
               if not IsServer then
                 Result := osWin8Point1
               else
@@ -2699,7 +2742,7 @@ class function TPJOSInfo.Product: TPJOSProduct;
               // Version 6.4 was used for Windows 2016 server tech preview 1.
               // This version *may* only be detected by Windows if the
               // application is "manifested" for the correct Windows version.
-              // See http://bit.ly/MJSO8Q.
+              // See https://bit.ly/MJSO8Q.
               if IsServer then
                 Result := osWin10Svr;
             else
@@ -2711,7 +2754,7 @@ class function TPJOSInfo.Product: TPJOSProduct;
         begin
           // NOTE: Version 10 and later may only be reported by Windows if the
           // application is "manifested" for the correct Windows version. See
-          // http://bit.ly/MJSO8Q. Previously, getting the OS from
+          // https://bit.ly/MJSO8Q. Previously, getting the OS from
           // VerifyVersionInfo instead of GetVersion or GetVersionEx worked
           // round this, but MS deprecated this in Windows 10, reverting
           // VerifyVersionInfo to work like GetVersion. WHY????!!!!
@@ -3001,8 +3044,7 @@ class function TPJComputerInfo.IsUACActive: Boolean;
 
 class function TPJComputerInfo.MACAddress: string;
 type
-  // Based on code at MSDN knowledge base Q118623 article at
-  // http://support.microsoft.com/kb/q118623/}
+  // Based on former MSDN knowledge base article Q118623.
   // According to MSDN this method should fail on Windows 6.0 (Vista) and later.
   // It has been known to fail on Vista, but works on Vista Home Premium SP1!
   // It would seem that the call will succeed if there's an active network with
@@ -3252,4 +3294,3 @@ initialization
 InitPlatformIdEx;
 
 end.
-

From 49b5dff87a5595dfc42a776943e60494d43d9a7f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 4 Nov 2022 16:38:20 +0000
Subject: [PATCH 038/264] Update DDabLib PJSysInfo unit to v5.17.0

Replaces #55 that updated to PJSysInfo v5.15.5

Closes #62
---
 Src/3rdParty/PJSysInfo.pas | 58 ++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/Src/3rdParty/PJSysInfo.pas b/Src/3rdParty/PJSysInfo.pas
index ec8838745..9a93aff09 100644
--- a/Src/3rdParty/PJSysInfo.pas
+++ b/Src/3rdParty/PJSysInfo.pas
@@ -1186,13 +1186,10 @@   TBuildNameMap = record
     Sources:
       https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions
       https://en.wikipedia.org/wiki/Windows_NT
-      https://en.wikipedia.org/wiki/Windows_10_version_history
-      https://en.wikipedia.org/wiki/Windows_11_version_history
       https://en.wikipedia.org/wiki/Windows_Server
       https://en.wikipedia.org/wiki/Windows_Server_2019
       https://en.wikipedia.org/wiki/Windows_Server_2016
       https://tinyurl.com/y8tfadm2 (MS Windows Server release information)
-      https://tinyurl.com/usupsz4a (Win 11 Version Numbers & Build Versions)
       https://docs.microsoft.com/en-us/lifecycle/products/windows-server-2022
       https://tinyurl.com/yj5e72jt (MS Win 10 release info)
       https://tinyurl.com/kd3weeu7 (MS Server release info)
@@ -1282,13 +1279,12 @@   TBuildNameMap = record
 
   // Windows 11 version 22H2
   //
-  // Build 22631 was the original beta build.
-  //  * Beta & Release Preview channels: rev 1
-  //  * Beta channel: revs 160,290,436,440,450,575,586,590
-  //  * Release Preview channel: revs 105,169,232,317,382,457
+  // Build 22621 was the original beta build. Same build used for releases and
+  // various other channels.
+  // See **REF1** in implementation
   Win11v22H2Build = 22621;
   // Build 22632 was added as an alternative Beta channel build as of rev 290:
-  //  * Beta channel: revs 290,436,440,450,575,586,590
+  //  * Beta channel: revs 290,436,440,450,575,586,590,598,601
   Win11v22H2BuildAlt = 22622;
 
   // Dev channel release - different sources give different names.
@@ -1299,7 +1295,7 @@   TBuildNameMap = record
   // * From build 22567 the release string changed from "Dev" to "22H"
 
   // Builds with version string "Dev"
-  Win11DevChannelDevBuilds: array[0..36] of Integer = (
+  Win11DevChannelDevBuilds: array[0..43] of Integer = (
     // pre Win 11 release
     22449, 22454, 22458, 22463, 22468,
     // post Win 11 release, pre Win 11 22H2 beta release
@@ -1307,7 +1303,9 @@   TBuildNameMap = record
     22533, 22538, 22543, 22557, 22563,
     // post Win 11 22H2 beta release
     25115, 25120, 25126, 25131, 25136, 25140, 25145, 25151, 25158, 25163, 25169,
-    25174, 25179, 25182, 25188, 25193
+    25174, 25179, 25182, 25188, 25193, 25197, 25201, 25206, 25211,
+    // post Win 11 22H2 release
+    25217, 25227, 25231
   );
   // Builds with version string "22H2" in Dev channel
   Win11DevChannel22H2Builds: array[0..2] of Integer = (
@@ -1318,6 +1316,8 @@   TBuildNameMap = record
     22581, 22593, 22598, 22610, 22616
   );
 
+  Win11FutureComponentBetaChannelBuilds: array[0..0] of Integer = (22623);
+
   Win11FirstBuild = Win11DevBuild;  // First build number of Windows 11
 
   // Windows server v10.0 version ----------------------------------------------
@@ -1856,7 +1856,7 @@ procedure InitPlatformIdEx;
           // ** Tried to read this info from registry, but for some weird
           //    reason the required value is reported as non-existant by
           //    TRegistry, even though it is present in registry.
-          // ** Seems there is some kind of regitry "spoofing" going on (see
+          // ** Seems there is some kind of registry "spoofing" going on (see
           //    below.
           InternalCSDVersion := Format(
             'Service Pack %d', [Win32ServicePackMajor]
@@ -1866,7 +1866,7 @@ procedure InitPlatformIdEx;
       begin
         case InternalMinorVersion of
           0:
-          // ** As of 2022/06/01   all releases of Windows 10 **and**
+          // ** As of 2022/06/01 all releases of Windows 10 **and**
           //    Windows 11 report major version 10 and minor version 0
           //    Well that's helpful!!
           if (Win32ProductType <> VER_NT_DOMAIN_CONTROLLER)
@@ -1898,9 +1898,13 @@ procedure InitPlatformIdEx;
             else if IsBuildNumber(Win1022H2Build) then
             begin
               InternalBuildNumber := Win1022H2Build;
-              { TODO: As of 1 Aug 2022 all rev numbers are previews.
-                      Change following once this is no longer the case. }
-              InternalExtraUpdateInfo := 'Version 22H2 (preview)';
+              if IsInRange(InternalRevisionNumber, 1865, 2075) then
+                InternalExtraUpdateInfo := Format(
+                  'Version 22H2 [Release Preview v10.0.%d.%d]',
+                  [InternalBuildNumber, InternalRevisionNumber]
+                )
+              else
+                InternalExtraUpdateInfo := 'Version 22H2';
             end
             else if FindBuildNumberFrom(
               Win10DevChannel, InternalBuildNumber
@@ -1967,21 +1971,23 @@ procedure InitPlatformIdEx;
             end
             else if IsBuildNumber(Win11v22H2Build) then
             begin
-              // See comments with declarations of Win11v22H2Build and
-              // Win11v22H2BuildAlt for details of naming of revisions.
+              // **REF1**
               InternalBuildNumber := Win11v22H2Build;
               case InternalRevisionNumber of
+                876..MaxInt, 382, 521, 525, 608, 674, 675, 755:
+                  InternalExtraUpdateInfo := 'Version 22H2';
                 1:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta & Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                105, 169, 232, 317, 382, 457:
+                105, 169, 232, 317, 457, 607, 754:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                160, 290, 436, 440, 450, 575, 586, 590:
+                160, 290, 436, 440, 450, 575, 586, 590, 598, 601, 730, 741, 746,
+                870, 875:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2000,9 +2006,9 @@ procedure InitPlatformIdEx;
               InternalBuildNumber := Win11v22H2BuildAlt;
               // Set fallback update info for unknown revisions
               case InternalRevisionNumber of
-                290, 436, 440, 450, 575, 586, 590:
+                290, 436, 440, 450, 575, 586, 590, 598, 601:
                   InternalExtraUpdateInfo := Format(
-                    'Version 22H2 [Beta v10.0.%d.%d]',
+                    'Version 22H2 [October Component Update v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 else
@@ -2042,6 +2048,15 @@ procedure InitPlatformIdEx;
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
+            else if FindBuildNumberFrom(
+              Win11FutureComponentBetaChannelBuilds, InternalBuildNumber
+            ) then
+            begin
+              InternalExtraUpdateInfo := Format(
+                'Future Component Update Beta v10.0.%d.%d',
+                [InternalBuildNumber, InternalRevisionNumber]
+              );
+            end;
           end
           else // Win32ProductType in [VER_NT_DOMAIN_CONTROLLER, VER_NT_SERVER]
           begin
@@ -3294,3 +3309,4 @@ initialization
 InitPlatformIdEx;
 
 end.
+

From 6ea0ea5cca9569cc08b573961852958ded2b9da8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 4 Nov 2022 17:00:14 +0000
Subject: [PATCH 039/264] Fix corrupted copyright symbols is .vi files

---
 Src/VCodeSnip.vi         | 2 +-
 Src/VCodeSnipPortable.vi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
index 0a826d5a3..60eb51dc0 100644
--- a/Src/VCodeSnip.vi
+++ b/Src/VCodeSnip.vi
@@ -26,7 +26,7 @@ Company Name=DelphiDabbler
 File Description=CodeSnip Database Viewer
 File Version=<#F1>.<#F2>.<#F3> build <#F4>
 Internal Name=<SHORTFNAME>
-Legal Copyright=Copyright � P.D.Johnson, 2005-<YEAR>.
+Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
 Legal Trademark=
 Original File Name=CodeSnip.exe
 Private Build=
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
index d5fdc997b..238d407c8 100644
--- a/Src/VCodeSnipPortable.vi
+++ b/Src/VCodeSnipPortable.vi
@@ -26,7 +26,7 @@ Company Name=DelphiDabbler
 File Description=CodeSnip Database Viewer (Portable Edition)
 File Version=<#F1>.<#F2>.<#F3> build <#F4>
 Internal Name=<SHORTFNAME>
-Legal Copyright=Copyright � P.D.Johnson, 2005-<YEAR>.
+Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
 Legal Trademark=
 Original File Name=CodeSnip-p.exe
 Private Build=

From 09ebe9328a625f7c2f6bae57603925e6b29dca19 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 4 Nov 2022 17:00:52 +0000
Subject: [PATCH 040/264] Bump version numbers to 2.20.2 build 266

---
 Src/VCodeSnip.vi         | 4 ++--
 Src/VCodeSnipPortable.vi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
index 60eb51dc0..3ed5f7959 100644
--- a/Src/VCodeSnip.vi
+++ b/Src/VCodeSnip.vi
@@ -8,8 +8,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 20, 1, 265
-Product Version #=4, 20, 1, 0
+File Version #=4, 20, 2, 266
+Product Version #=4, 20, 2, 0
 File OS=4
 File Type=1
 File Sub-Type=0
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
index 238d407c8..ff5d8d1b6 100644
--- a/Src/VCodeSnipPortable.vi
+++ b/Src/VCodeSnipPortable.vi
@@ -8,8 +8,8 @@
 
 
 [Fixed File Info]
-File Version #=4, 20, 1, 265
-Product Version #=4, 20, 1, 0
+File Version #=4, 20, 2, 266
+Product Version #=4, 20, 2, 0
 File OS=4
 File Type=1
 File Sub-Type=0

From 00297eac331d3263d106acfacea3fe9758b5b1cd Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 4 Nov 2022 17:18:31 +0000
Subject: [PATCH 041/264] Update CHANGELOG.md re changes in release v4.20.2

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f9ed8c24..2c58946c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,12 @@ This change log begins with the first ever pre-release version of _CodeSnip_. Re
 
 From v4.1.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Release v4.20.2 of 04 November 2022
+
+* Fixes bug where an exception was raised when selecting a main menu item with the cursor keys then pressing F1. [issue 54]
+* Update operating system detection code to correctly detect Version 22H2 of Windows 10 & Windows 11 plus some other Windows releases on the Dev, Beta & Release channels. [issues 55, 61 & 62]
+* Fix appearance of copyright symbol in version information.
+
 ## Release v4.20.1 of 01 July 2022
 
 * Operating system detection code was updated to (a) fix bugs and (b) detect some Dev, Beta and Release Preview builds of Windows 11 22H2.

From 3f3a9bb029e348e025056cb288a803c36d9242ea Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 9 Nov 2022 23:04:19 +0000
Subject: [PATCH 042/264] Update License.html

* Change image attribution for CodeSnip images.
* Strike out a broken link.
* Change links that support it to use https instead of http.
---
 Docs/License.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Docs/License.html b/Docs/License.html
index 9964fa5df..d4b0f895c 100644
--- a/Docs/License.html
+++ b/Docs/License.html
@@ -340,12 +340,12 @@ <h2>
         License</a>.
       </div>
       <div>
-        The license requires that the images should be attributed. To do this
+        This license requires that the images should be attributed. To do this
         simply note in your documentation, about box, web page or similar that
         the icons form part of the image set for DelphiDabbler <em>CodeSnip</em>
         and provide a link to <a
-          href="https://github.com/delphidabbler/codesnip"
-        >https://github.com/delphidabbler/codesnip</a>.
+          href="https://delphidabbler.com/software/codesnip"
+        >https://delphidabbler.com/software/codesnip</a>.
       </div>
       <div>
         These images include modifications and remixes of icons supplied under
@@ -1614,7 +1614,7 @@ <h2 id="toolbar-icons-mit">
 
   <p>Toolbar Icons is made available under the terms of the MIT License.
   See <a
-    href="http://toolbaricons.sourceforge.net/"
+    href="https://toolbaricons.sourceforge.net/"
   >http://toolbaricons.sourceforge.net/</a> for more information.</p>
 
   <p>Copyright &copy; 2010 Florian Haag</p>
@@ -1685,9 +1685,7 @@ <h1>
           Led Icon Set v1.0: <del>http://led24.de/iconset/</del> [link broken].
         </li>
         <li>
-          16x16-free-application-icons by Aha-Soft: <a
-            href="https://www.aha-soft.com"
-          >https://www.aha-soft.com</a>.
+          16x16-free-application-icons by Aha-Soft: <del>https://www.aha-soft.com</del> [link broken].
         </li>
       </ul>
     </li>
@@ -1715,7 +1713,7 @@ <h1>
     </li>
     <li>
       Some program icons are based on Florian Haag's Toolbar Icons set at <a
-        href="http://toolbaricons.sourceforge.net/"
+        href="https://toolbaricons.sourceforge.net/"
       >http://toolbaricons.sourceforge.net/</a>.
     </li>
     <li>

From 2bed7c731cb5f28ef029541a69285e54a8972a19 Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 9 Nov 2022 23:31:09 +0000
Subject: [PATCH 043/264] Update License.rtf

Update copyright date to 2022.
Fix typo.
---
 Src/Install/Assets/License.rtf | Bin 1189 -> 1192 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Src/Install/Assets/License.rtf b/Src/Install/Assets/License.rtf
index 998dd2d2fa0ba0479cd2a88f475f28678eab7bbd..3795e032266c876568ad121ba7a2cd003548536c 100644
GIT binary patch

From 8548d1d3387fb6abe8b2042f5fb13d1862b4f4c8 Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 3 Dec 2022 10:40:21 +0000
Subject: [PATCH 044/264] Update README.md

Change Source Code section re addition of caboli branch and abandonment of belvedere.
Some other corrections & clarifications
---
 README.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 5bfc29a5d..61d3680c7 100644
--- a/README.md
+++ b/README.md
@@ -22,13 +22,13 @@ CodeSnip requires Windows 2000 or later and Internet Explorer 6 or later, althou
 
 ## Installation
 
-The standard edition of CodeSnip is installed and removed using a standard Windows installer. Administrator privileges are required for installation.
+The standard edition of CodeSnip is installed and removed using a Windows installer. Administrator privileges are required for installation.
 
 The portable edition has no installer. Simply follow the instructions in the [read me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt) that is included in the download zip file.
 
 ## Support
 
-The following support is available CodeSnip users:
+The following support is available to CodeSnip users:
 
 * A comprehensive help file.
 * A [read-me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt)<sup> *</sup> that discusses installation, configuration, updating and known issues.
@@ -43,19 +43,17 @@ There's also plenty of info available on how to compile CodeSnip from source - s
 
 CodeSnip's source code is maintained in the [`delphidabbler/codesnip`](https://github.com/delphidabbler/codesnip) Git repository on GitHub†.
 
-The [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) methodology has been adopted, with the exception of some branches that have been used in various attempts to start work on CodeSnip 5.
+The [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) methodology has been adopted, with the exception of some experimental branches.
 
-The following branches existed as of 2022/07/01:
+The following branches existed as of 2022/12/03:
 
-* `master`: Always reflects the state of the source code as of the latest release.‡
-* `develop`: Main development branch. The head of this branch contains the latest v4 development code.
-* `belvedere`: The latest attempt to develop CodeSnip 5. See the [Belvedere Readme file](https://github.com/delphidabbler/codesnip/blob/belvedere/README.md) for a full explanation.
-* `pagoda`: An abortive attempt at developing CodeSnip 5. Work on this branch has halted. It does not follow GitFlow methodology. ***Do not use this branch: it may be pruned.***
-* `pavilion`: Another attempt at working on CodeSnip 5. It branched off `pagoda` and work on it has halted. Again it does not follow GitFlow methodology. ***Do not use this branch: it may be pruned.***
-
-New features and most bug fixes are worked on in `feature/xxxx` branches that are branched off `develop` locally. They are merged into `develop` as they are completed and the branches are deleted.
-
-Note that the default branch on GitHub is `master`, which contains the state of the project as of the latest release. If you want to see the current state of play with new developments switch to `develop`.
+* [`master`](https://github.com/delphidabbler/codesnip/tree/master): Always reflects the state of the source code as of the latest release.‡ 
+* [`develop`](https://github.com/delphidabbler/codesnip/tree/develop): Main development branch. The head of this branch contains the latest v4 development code. Normal development of CodeSnip 4 takes place in `feature/xxx` branches off `develop`.
+* [`caboli`](https://github.com/delphidabbler/codesnip/tree/caboli): Experimental branch where an attempt is being made to (a) modernise the UI and (b) get the code to work properly when compiled with Delphi 11.
+* Abandoned branches:
+  * [`pagoda`](https://github.com/delphidabbler/codesnip/tree/pagoda): An abortive attempt at developing CodeSnip 5.
+  * [`pavilion`](https://github.com/delphidabbler/codesnip/tree/pavilion): Another attempt at working on CodeSnip 5 that branched off `pagoda`.
+  * [`belvedere`](https://github.com/delphidabbler/codesnip/tree/belvedere): A thiird, failed attempt to develop CodeSnip 5 as a ground up rewrite. Not related to `pagoda` & `pavilion`. 
 
 > † Up to and including v4.13.1 the source code was kept in a Subversion repository on SourceForge. It was converted to Git in October 2015 and imported into GitHub. All releases from v3.0.0 are marked by tags in the form `version-x.x.x` where `x.x.x` is the version number. None of the Subversion branches made it through the conversion to Git, so to see a full history look at the old [SourceForge repository](https://sourceforge.net/p/codesnip/code/).
 
@@ -65,7 +63,9 @@ Note that the default branch on GitHub is `master`, which contains the state of
 
 To contribute to CodeSnip 4 development please fork the repository on GitHub. Create a feature branch off the `develop` branch. Make your changes to your feature branch then submit a pull request via GitHub.
 
-> **Do not create branches off `master`, always branch from `develop`.**
+:warning: **Do not create branches off `master`, always branch from `develop`.**
+
+:no_entry: Contributions to experimental branches are not being excepted just now.
 
 #### Licensing of contributions
 

From 3b99e86907a052e1032047e5406aa1d292889d37 Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 12 Dec 2022 04:30:45 +0000
Subject: [PATCH 045/264] Update copyright date range in help license

---
 Src/Help/HTML/license.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/Help/HTML/license.htm b/Src/Help/HTML/license.htm
index 66c40cee7..50c1357c2 100644
--- a/Src/Help/HTML/license.htm
+++ b/Src/Help/HTML/license.htm
@@ -27,7 +27,7 @@ <h1>
       <a name="license"></a>Summary of End User License Agreement
     </h1>
     <p>
-      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2020 by Peter D
+      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2022 by Peter D
       Johnson, <a
         href="https://gravatar.com/delphidabbler"
         class="weblink"

From 75ddfccf8fe80d48dfbc5841297ee6a2575149e0 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 11 Dec 2022 21:01:40 +0000
Subject: [PATCH 046/264] Add new REML character entities in UREMLDataIO unit

Remove REML docs from comments: they are in a separate unit and fix
other header comments.
---
 Src/UREMLDataIO.pas | 96 +++++++++++++++++----------------------------
 1 file changed, 37 insertions(+), 59 deletions(-)

diff --git a/Src/UREMLDataIO.pas b/Src/UREMLDataIO.pas
index 5f809c127..5381b6565 100644
--- a/Src/UREMLDataIO.pas
+++ b/Src/UREMLDataIO.pas
@@ -7,7 +7,7 @@
  *
  * Implements classes that render and parse Routine Extra Markup Language (REML)
  * code. This markup is used to read and store active text objects as used by
- * the Extra property of a TSnippet object. Also includes helper classes.
+ * some properties of a TSnippet object. Also includes helper classes.
 }
 
 
@@ -139,59 +139,8 @@ implementation
   It comprises plain text with limited inline and block level formatting and
   hyperlink specified by HTML like tags.
 
-  Supported tags are as follows. Unless otherwise specified, no tags may have
-  any attributes:
-
-  Inline:
-    <a href="url">xxxx</a>  - Hyperlink: must have an href attribute that
-                              specifies the link destination as a valid URL.
-                              URLs must not be URL encoded. No other attributes
-                              may be specified.
-    <strong>..</strong>     - Renders enclosed text with strong emphasis.
-    <em>..</em>             - Renders enclosed text emphasised.
-    <var>..</var>           - Renders enclosed text as a programming variable.
-    <warning>..</warning>   - Renders enclosed text as a warning.
-    <mono>..</mono>         - Renders enclosed text as mono spaced.
-
-  Block:
-    <p>..</p>               - Enclosed text is formatted as a paragraph.
-    <heading>..</heading>   - Enclosed text is formatted as a heading.
-
-  Certain characters in plain text or in attribute values must be encoded as
-  HTML-like character entities. Attribute names must not contain any of these
-  characters. The characters that must be encoded are:
-
-  Character       Entity
-  >               &gt;
-  <               &lt;
-  "               &quot;
-  &               &amp;
-  �               &copy;
-
-  No other entities are supported. Any other character can be encoded using its
-  unicode or ascii value. For example, the @ symbol (ascii 64) is encoded as
-  &#64;
-
-  Example:
-    <heading>Hello</heading>
-    <p>&quot;<strong>Hello</strong>&quot; to
-    <a href="https://example.com">you</a></p>
-
-  This example specifes a heading "Hello" followed by a single paragraph. In the
-  paragraph, "Hello" will be bold, "to" should be plain text and "you" should
-  hyperlink to "example.com".
-
-  There are two versions of REML as follows:
-  v1 - supported tags: <strong> and <a>.
-     - supported entities: &gt;, &lt, &quot;, &amp;.
-  v2 - added tags: <em>, <var>, <warning>, <mono>, <p> and <heading>.
-     - added entity: &copy;.
-
-  The implementation of active text's link element changed over time. At first
-  it supported only the http:// protocol for URLs. This limited REML v1 <a> tags
-  to using just that protocol. CodeSnip v3.0.1 added support to active text for
-  the file:// protocol. From CodeSnip v4.0 active text was extended to support
-  the https:// protocol.
+  Valid REML tags and character entities are documented in the file reml.html in
+  the Docs/Design directory.
 }
 
 
@@ -841,13 +790,42 @@ class function TREMLEntities.CharToMnemonicEntity(const Ch: Char): string;
   {Class constructor. Creates map of mnemonic entities to equivalent characters.
   }
 begin
-  SetLength(fEntityMap, 5);
-  // Record all supported character entities
-  fEntityMap[0] := TREMLEntity.Create('amp',  '&');
+  SetLength(fEntityMap, 34);
+  // Supported character entities. All are optional unless otherwise stated
+  fEntityMap[0] := TREMLEntity.Create('amp', '&');   // required in REML
   fEntityMap[1] := TREMLEntity.Create('quot', DOUBLEQUOTE);
-  fEntityMap[2] := TREMLEntity.Create('gt',   '>');
-  fEntityMap[3] := TREMLEntity.Create('lt',   '<');
+  fEntityMap[2] := TREMLEntity.Create('gt', '>');
+  fEntityMap[3] := TREMLEntity.Create('lt', '<');   // required in REML
   fEntityMap[4] := TREMLEntity.Create('copy', '©');
+  fEntityMap[5] := TREMLEntity.Create('times', '×');
+  fEntityMap[6] := TREMLEntity.Create('divide', '÷');
+  fEntityMap[7] := TREMLEntity.Create('div', '÷');
+  fEntityMap[8] := TREMLEntity.Create('plusmn', '±');
+  fEntityMap[9] := TREMLEntity.Create('ne', '≠');
+  fEntityMap[10] := TREMLEntity.Create('neq', '≠');
+  fEntityMap[11] := TREMLEntity.Create('sum', '∑');
+  fEntityMap[12] := TREMLEntity.Create('infin', '∞');
+  fEntityMap[13] := TREMLEntity.Create('pound', '£');
+  fEntityMap[14] := TREMLEntity.Create('curren', '¤');
+  fEntityMap[15] := TREMLEntity.Create('yen', '¥');
+  fEntityMap[16] := TREMLEntity.Create('euro', '€');
+  fEntityMap[17] := TREMLEntity.Create('dagger', '†');
+  fEntityMap[18] := TREMLEntity.Create('ddagger', '‡');
+  fEntityMap[19] := TREMLEntity.Create('Dagger', '‡');
+  fEntityMap[20] := TREMLEntity.Create('hellip', '…');
+  fEntityMap[21] := TREMLEntity.Create('para', '¶');
+  fEntityMap[22] := TREMLEntity.Create('sect', '§');
+  fEntityMap[23] := TREMLEntity.Create('reg', '®');
+  fEntityMap[24] := TREMLEntity.Create('frac14', '¼');
+  fEntityMap[25] := TREMLEntity.Create('frac12', '½');
+  fEntityMap[26] := TREMLEntity.Create('half', '½');
+  fEntityMap[27] := TREMLEntity.Create('frac34', '¾');
+  fEntityMap[28] := TREMLEntity.Create('micro', 'µ');
+  fEntityMap[29] := TREMLEntity.Create('deg', '°');
+  fEntityMap[30] := TREMLEntity.Create('cent', '¢');
+  fEntityMap[31] := TREMLEntity.Create('laquo', '«');
+  fEntityMap[32] := TREMLEntity.Create('raquo', '»');
+  fEntityMap[33] := TREMLEntity.Create('iquest', '¿');
 end;
 
 class destructor TREMLEntities.Destroy;

From 0ff201464e15100a7b253d1b5ef75d0433dbcf1f Mon Sep 17 00:00:00 2001
From: delphidabbler <delphidabbler@gmail.com>
Date: Thu, 23 Jul 2020 21:01:56 +0100
Subject: [PATCH 047/264] Update UStrUtils unit & update other unit re changes

* Add new StrOfChar and StrOfSpaces functions
* Refactor to use StrOfSpaces instead of StringOfChar routine.
* Update indexed for loop to for .. in loop

FmSWAGImportDlg: Replace StringOfChar routine call with StrOfChar
---
 Src/FmSWAGImportDlg.pas |  2 +-
 Src/UStrUtils.pas       | 28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/Src/FmSWAGImportDlg.pas b/Src/FmSWAGImportDlg.pas
index efeb0e8a9..421840eb8 100644
--- a/Src/FmSWAGImportDlg.pas
+++ b/Src/FmSWAGImportDlg.pas
@@ -812,7 +812,7 @@ procedure TSWAGImportDlg.PreviewSelectedPacket;
       FullPacket.FileName,
       FullPacket.Title,
       FullPacket.Author,
-      StringOfChar('-', 80),
+      StrOfChar('-', 80),
       StrWindowsLineBreaks(FullPacket.SourceCode)
     ]
   );
diff --git a/Src/UStrUtils.pas b/Src/UStrUtils.pas
index 972302609..0d4eb057d 100644
--- a/Src/UStrUtils.pas
+++ b/Src/UStrUtils.pas
@@ -269,6 +269,16 @@ procedure StrArrayToStrList(const SA: array of string; const SL: TStrings);
 function StrIsEmpty(const S: string; const IgnoreWhiteSpace: Boolean = False):
   Boolean;
 
+///  <summary>Returns a string containing Count copies of character Ch.
+///  </summary>
+///  <remarks>If Count is zero then the empty string is returned.</remarks>
+function StrOfChar(const Ch: Char; const Count: Word): string;
+
+///  <summary>Returns a string of a given number of spaces.</summary>
+///  <param name="Count">Word [in] Required number of spaces.</param>
+///  <returns>string. Required number of spaces.</returns>
+///  <remarks>If Count is zero then an empty string is returned.</remarks>
+function StrOfSpaces(const Count: Word): string;
 
 implementation
 
@@ -769,7 +779,6 @@ function StrWrap(const Str: UnicodeString; const MaxLen, Margin: Integer):
   Word: UnicodeString;  // next word in input Str
   Line: UnicodeString;  // current output line
   Words: TStringList;   // list of words in input Str
-  I: Integer;           // loops thru all words in input Str
 
   // -------------------------------------------------------------------------
   ///  Adds a line of text to output, offseting line by Margin spaces
@@ -777,7 +786,7 @@ function StrWrap(const Str: UnicodeString; const MaxLen, Margin: Integer):
   begin
     if Result <> '' then    // not first line: insert new line
       Result := Result + EOL;
-    Result := Result + StringOfChar(' ', Margin) + Line;
+    Result := Result + StrOfSpaces(Margin) + Line;
   end;
   // -------------------------------------------------------------------------
 
@@ -789,9 +798,8 @@ function StrWrap(const Str: UnicodeString; const MaxLen, Margin: Integer):
     Result := '';
     Line := '';
     // Loop for each word in Str
-    for I := 0 to Pred(Words.Count) do
+    for Word in Words do
     begin
-      Word := Words[I];
       if Length(Line) + Length(Word) + 1 <= MaxLen then
       begin
         // Word fits on current line: add it
@@ -904,5 +912,17 @@ function StrIsEmpty(const S: string; const IgnoreWhiteSpace: Boolean = False):
     Result := S = '';
 end;
 
+function StrOfChar(const Ch: Char; const Count: Word): string;
+begin
+  if Count = 0 then
+    Exit('');
+  Result := System.StringOfChar(Ch, Count);
+end;
+
+function StrOfSpaces(const Count: Word): string;
+begin
+  Result := StrOfChar(' ', Count);
+end;
+
 end.
 

From c4ef947cfee1cfc42eabc8c7132a59b59b670430 Mon Sep 17 00:00:00 2001
From: delphidabbler <delphidabbler@gmail.com>
Date: Sun, 19 Jul 2020 05:18:48 +0100
Subject: [PATCH 048/264] ActiveText.UMain.pas: Rename parameters

---
 Src/ActiveText.UMain.pas | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Src/ActiveText.UMain.pas b/Src/ActiveText.UMain.pas
index bb5e534a5..5a5ce1fcc 100644
--- a/Src/ActiveText.UMain.pas
+++ b/Src/ActiveText.UMain.pas
@@ -383,13 +383,14 @@   TActiveTextActionElem = class(TInterfacedObject,
     fAttrs: IActiveTextAttrs;
   public
     ///  <summary>Object constructor. Creates an action element.</summary>
-    ///  <param name="Kind">TActiveTextElemKind [in] Required kind of element.
+    ///  <param name="AKind">TActiveTextElemKind [in] Required kind of element.
     ///  </param>
-    ///  <param name="Attrs">IActiveTextAttrs [in] Element's attributes.</param>
-    ///  <param name="State">TActiveTextElemState [in] State of element: opening
-    ///  or closing.</param>
-    constructor Create(const Kind: TActiveTextActionElemKind;
-      Attrs: IActiveTextAttrs; const State: TActiveTextElemState);
+    ///  <param name="AAttrs">IActiveTextAttrs [in] Element's attributes.
+    ///  </param>
+    ///  <param name="AState">TActiveTextElemState [in] State of element:
+    ///  opening or closing.</param>
+    constructor Create(const AKind: TActiveTextActionElemKind;
+      AAttrs: IActiveTextAttrs; const AState: TActiveTextElemState);
     ///  <summary>Assigns properties of another object to this object.</summary>
     ///  <param name="Src">IInterface [in] Object whose properties are to be
     ///  assigned. Src must support IActiveTextActionElem.</param>
@@ -674,13 +675,13 @@ function TActiveTextActionElem.Clone: IInterface;
   Result := TActiveTextActionElem.Create(GetKind, Attrs, GetState);
 end;
 
-constructor TActiveTextActionElem.Create(const Kind: TActiveTextActionElemKind;
-  Attrs: IActiveTextAttrs; const State: TActiveTextElemState);
+constructor TActiveTextActionElem.Create(const AKind: TActiveTextActionElemKind;
+  AAttrs: IActiveTextAttrs; const AState: TActiveTextElemState);
 begin
   inherited Create;
-  fAttrs := Attrs;
-  fState := State;
-  fKind := Kind;
+  fAttrs := AAttrs;
+  fState := AState;
+  fKind := AKind;
 end;
 
 function TActiveTextActionElem.GetAttrs: IActiveTextAttrs;

From 5ec55ba6ee5cc6624a483c0b52bb2d92f9abb460 Mon Sep 17 00:00:00 2001
From: delphidabbler <delphidabbler@gmail.com>
Date: Fri, 24 Jul 2020 05:26:06 +0100
Subject: [PATCH 049/264] Add new TCSSBuilder.EnsureSelector method

This added because attempting to add an existing selector raises an
exception and reading a non-existant selector returns a null pointer.
This makes it hard to write bug-free code without checking for the
existence of a selector. It's been annoying me for years!
---
 Src/UCSSBuilder.pas | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Src/UCSSBuilder.pas b/Src/UCSSBuilder.pas
index fbc1d307f..662e44dd6 100644
--- a/Src/UCSSBuilder.pas
+++ b/Src/UCSSBuilder.pas
@@ -83,6 +83,12 @@   TCSSBuilder = class(TObject)
         @param Selector [in] Name of new selector.
         @return New empty selector object.
       }
+    function EnsureSelector(const Selector: string): TCSSSelector;
+      {Returns selector object with given name or adds a new selector with the
+      given name if no such selector exists.
+        @parm Selector [in] Name of selector.
+        @return Reference to new or pre-existing selector.
+      }
     procedure Clear;
       {Clears all selectors from style sheet and frees selector objects.
       }
@@ -204,6 +210,18 @@ destructor TCSSBuilder.Destroy;
   inherited;
 end;
 
+function TCSSBuilder.EnsureSelector(const Selector: string): TCSSSelector;
+  {Returns selector object with given name or adds a new selector with the given
+  name if no such selector exists.
+    @parm Selector [in] Name of selector.
+    @return Reference to new or pre-existing selector.
+  }
+begin
+  Result := GetSelector(Selector);
+  if not Assigned(Result) then
+    Result := AddSelector(Selector);
+end;
+
 function TCSSBuilder.GetSelector(const Selector: string): TCSSSelector;
   {Read access method for Selectors property. Returns selector object with given
   name.

From 473739d1f29d5955a910ad2ac8492e1284353646 Mon Sep 17 00:00:00 2001
From: delphidabbler <delphidabbler@gmail.com>
Date: Sun, 19 Jul 2020 04:53:44 +0100
Subject: [PATCH 050/264] Add list support to REML

New tags supported: <ol>, <ul> & <li>.

* Major support to REML parser in UREMLDataIO:

  * Added support for <ul>, <ol> and <li> block level items.
  * Moved some code to active text units: it logically belonged this.
  * This change required some major changes to the parser: it previously
    assumed that block level tags could not be nested.
  * Comments added to indicate REML version support for entities.

* Add support for lists to active text:

  * Added ordered & unordered lists and list items.
  * Update renderers re recent method name changes in active text code.
  * Also extracted some info from REML code that belongs in active text.
  * Revised REML writer to indent blocks.

* Refactor code to use TActiveTextElemCaps for element information.
  Determination of capabilities was moved from UREMLDataIO unit into
  UActiveText.UMain where it logically belongs.

* Add CSS support for lists:

  * In UCSSUtils - Added methods to generate CSS "list-style-position"
    and "list-style-type" properties.
  * Update main display and Active Text preview dialogue box.
  * Set list CSS styling for display frame.

* Update USnippetExtraHelper:

  * Revise code that adds paragraphs around text not contained in block.
    Revision was to get the code to work with blocks nested more than
	one level deep.
  * Changes re renamed TActiveTextElemCaps method.
---
 Src/ActiveText.UHTMLRenderer.pas |   6 +-
 Src/ActiveText.UMain.pas         | 243 +++++++++++++++++++++++++++----
 Src/ActiveText.URTFRenderer.pas  |   2 +-
 Src/ActiveText.UTextRenderer.pas |   2 +-
 Src/FmActiveTextPreviewDlg.pas   |  40 ++++-
 Src/FrDetailView.pas             |  32 ++++
 Src/Res/CSS/detail.css           |  35 +++++
 Src/UCSSUtils.pas                |  61 ++++++++
 Src/UREMLDataIO.pas              | 243 +++++++++++++++++--------------
 Src/USnippetExtraHelper.pas      |  99 ++++++-------
 10 files changed, 565 insertions(+), 198 deletions(-)

diff --git a/Src/ActiveText.UHTMLRenderer.pas b/Src/ActiveText.UHTMLRenderer.pas
index 81a844a91..daa25dc0d 100644
--- a/Src/ActiveText.UHTMLRenderer.pas
+++ b/Src/ActiveText.UHTMLRenderer.pas
@@ -134,7 +134,7 @@ procedure TActiveTextHTML.InitialiseTagInfoMap;
   ElemKind: TActiveTextActionElemKind;
 const
   Tags: array[TActiveTextActionElemKind] of string = (
-    'a', 'strong', 'em', 'var', 'p', 'span', 'h2', 'code'
+    'a', 'strong', 'em', 'var', 'p', 'span', 'h2', 'code', 'ul', 'ol', 'li'
   );
 begin
   NullAttrs := function(Elem: IActiveTextActionElem): IHTMLAttributes
@@ -194,7 +194,7 @@ function TActiveTextHTML.Render(ActiveText: IActiveText): string;
       RenderTextElem(TextElem)
     else if Supports(Elem, IActiveTextActionElem, ActionElem) then
     begin
-      if ActionElem.DisplayStyle = dsBlock then
+      if TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock then
         RenderBlockActionElem(ActionElem)
       else
         RenderInlineActionElem(ActionElem);
@@ -244,7 +244,7 @@ procedure TActiveTextHTML.RenderTextElem(Elem: IActiveTextTextElem);
 constructor TActiveTextHTML.TCSSStyles.Create;
 const
   DefaultClasses: array[TActiveTextActionElemKind] of string = (
-    'external-link', '', '', '', '', 'warning', '', ''
+    'external-link', '', '', '', '', 'warning', '', '', '', '', ''
   );
 var
   ElemKind: TActiveTextActionElemKind;
diff --git a/Src/ActiveText.UMain.pas b/Src/ActiveText.UMain.pas
index 5a5ce1fcc..8d6e54602 100644
--- a/Src/ActiveText.UMain.pas
+++ b/Src/ActiveText.UMain.pas
@@ -120,14 +120,17 @@   TActiveTextAttrNames = record
 type
   ///  <summary>Supported types of active text action elements.</summary>
   TActiveTextActionElemKind = (
-    ekLink,         // link element: has a URL (inline)
-    ekStrong,       // text formatted as strong (inline)
-    ekEm,           // text formatted as emphasised (inline)
-    ekVar,          // text formatted as variable (inline)
-    ekPara,         // delimits a paragraph (block level)
-    ekWarning,      // text formatted as a warning (inline)
-    ekHeading,      // delimits a heading (block level)
-    ekMono          // text formatted as mono spaced (inline)
+    ekLink,           // link element: has a URL (inline)
+    ekStrong,         // text formatted as strong (inline)
+    ekEm,             // text formatted as emphasised (inline)
+    ekVar,            // text formatted as variable (inline)
+    ekPara,           // delimits a paragraph (block level)
+    ekWarning,        // text formatted as a warning (inline)
+    ekHeading,        // delimits a heading (block level)
+    ekMono,           // text formatted as mono spaced (inline)
+    ekUnorderedList,  // container for unordered lists (block level)
+    ekOrderedList,    // container for ordered list (block level)
+    ekListItem        // list item (block level)
   );
 
 type
@@ -157,12 +160,6 @@   TActiveTextAttrNames = record
     function GetAttrs: IActiveTextAttrs;
     ///  <summary>Object describing element's attributes.</summary>
     property Attrs: IActiveTextAttrs read GetAttrs;
-    ///  <summary>Returns value that indicates whether element is an inline or
-    ///  block element.</summary>
-    function GetDisplayStyle: TActiveTextDisplayStyle;
-    ///  <summary>Indicates whether element displays inline or as a block.
-    ///  </summary>
-    property DisplayStyle: TActiveTextDisplayStyle read GetDisplayStyle;
   end;
 
 type
@@ -273,6 +270,162 @@   TActiveTextFactory = class(TNoConstructObject)
       IActiveTextAttrs; overload;
   end;
 
+type
+  ///  <summary>Provides information about the capabilities of each supported
+  ///  active text element.</summary>
+  TActiveTextElemCaps = record
+  strict private
+    type
+      ///  <summary>Fields used to define an active text element's capabilities.
+      ///  </summary>
+      TCaps = record
+      public
+        var
+          ///  <summary>Determines how element is to be displayed.</summary>
+          DisplayStyle: TActiveTextDisplayStyle;
+          ///  <summary>Set of elements that may not occur inside the element.
+          ///  </summary>
+          Exclusions: TActiveTextActionElemKinds;
+          ///  <summary>Set of elements that are permitted as parents of the
+          ///  element.</summary>
+          ///  <remarks>An empty set is taken to mean any element is permitted.
+          ///  </remarks>
+          RequiredParents: TActiveTextActionElemKinds;
+          ///  <summary>Specifies whether plain text can be contained within the
+          ///  element.</summary>
+          PermitsText: Boolean;
+      end;
+    const
+      ///  <summary>Set of block level elements.</summary>
+      BlockElems = [
+        ekPara, ekHeading, ekUnorderedList, ekOrderedList, ekListItem
+      ];
+      ///  <summary>Set of inline elements.</summary>
+      InlineElems = [
+        ekLink, ekStrong, ekEm, ekVar, ekWarning, ekMono
+      ];
+      ///  <summary>Set of all elements.</summary>
+      AllElems = BlockElems + InlineElems;
+      ///  <summary>Map of all elements to their capabilities.</summary>
+      Map: array[TActiveTextActionElemKind] of TCaps =
+        (
+          (
+            // ekLink
+            //   may contain any inline elements but no block elements
+            DisplayStyle: dsInline;
+            Exclusions: BlockElems;
+            RequiredParents: [];
+            PermitsText: True;
+          ),
+          (
+            // ekStrong
+            //   may contain any inline elements but no block elements
+            DisplayStyle: dsInline;
+            Exclusions: BlockElems;
+            RequiredParents: [];
+            PermitsText: True;
+          ),
+          (
+            // ekEm
+            //   may contain any inline elements but no block elements
+            DisplayStyle: dsInline;
+            Exclusions: BlockElems;
+            RequiredParents: [];
+            PermitsText: True;
+          ),
+          (
+            // ekVar
+            //   may contain any inline elements but no block elements
+            DisplayStyle: dsInline;
+            Exclusions: BlockElems;
+            RequiredParents: [];
+            PermitsText: True;
+          ),
+          (
+            // ekPara
+            //   may contain any inline elements but no block elements
+            DisplayStyle: dsBlock;
+            Exclusions: BlockElems;
+            RequiredParents: [];
+            PermitsText: True;
+          ),
+          (
+            // ekWarning
+            //   may contain any inline elements but no block elements
+            DisplayStyle: dsInline;
+            Exclusions: BlockElems;
+            RequiredParents: [];
+            PermitsText: True;
+          ),
+          (
+            // ekHeading
+            //   may contain any inline elements but no block elements
+            DisplayStyle: dsBlock;
+            Exclusions: BlockElems;
+            RequiredParents: [];
+            PermitsText: True;
+          ),
+          (
+            // ekMono
+            //   may contain any inline elements but no block elements
+            DisplayStyle: dsInline;
+            Exclusions: BlockElems;
+            RequiredParents: [];
+            PermitsText: True;
+          ),
+          (
+            // ekUnorderedList
+            //   may contain only list item elements
+            DisplayStyle: dsBlock;
+            Exclusions: AllElems - [ekListItem];
+            RequiredParents: [];
+            PermitsText: False
+          ),
+          (
+            // ekOrderedList
+            //   may contain only list item elements
+            DisplayStyle: dsBlock;
+            Exclusions: AllElems - [ekListItem];
+            RequiredParents: [];
+            PermitsText: False;
+          ),
+          (
+            // ekListItem
+            //   may contain any inline or block elements except another list
+            //   item
+            DisplayStyle: dsBlock;
+            Exclusions: [ekListItem];
+            RequiredParents: [ekOrderedList, ekUnorderedList];
+            PermitsText: True;
+          )
+        );
+  public
+    ///  <summary>Returns the display type of the given element.</summary>
+    class function DisplayStyleOf(const Elem: TActiveTextActionElemKind):
+      TActiveTextDisplayStyle; static;
+    ///  <summary>Checks whether the given element can contain text.</summary>
+    class function CanContainText(const Elem: TActiveTextActionElemKind):
+      Boolean; static;
+    ///  <summary>Checks whether the given Parent element can contain the given
+    ///  Child element.</summary>
+    class function CanContainElem(
+      const Parent, Child: TActiveTextActionElemKind): Boolean; static;
+    ///  <summary>Checks whether the given Parent element is required as a
+    ///  parent of the given Child element.</summary>
+    class function IsRequiredParent(
+      const Parent, Child: TActiveTextActionElemKind): Boolean; static;
+    ///  <summary>Checks whether the given element is permitted in the root of
+    ///  an active text document, i.e. outside any other block level element.
+    ///  </summary>
+    class function IsElemPermittedInRoot(const Elem: TActiveTextActionElemKind):
+      Boolean; static;
+    ///  <summary>Checks whether the given child element is excluded from being
+    ///  a child of the given parent element.</summary>
+    class function IsExcludedElem(
+      const Parent, Child: TActiveTextActionElemKind): Boolean; static;
+
+  end;
+
 
 implementation
 
@@ -354,7 +507,7 @@   TActiveTextTextElem = class(TInterfacedObject,
     fText: string;
   public
     ///  <summary>Object constructor. Records given element text and sets
-    ///  required kind for a text element.</summary>
+    ///  required Elem for a text element.</summary>
     constructor Create(const Text: string);
     ///  <summary>Assigns properties of another object to this object.</summary>
     ///  <param name="Src">IInterface [in] Object whose properties are to be
@@ -375,7 +528,7 @@   TActiveTextActionElem = class(TInterfacedObject,
     IActiveTextElem, IActiveTextActionElem, IAssignable, IClonable
   )
   strict private
-    ///  <summary>Kind of element encapsulated by this object.</summary>
+    ///  <summary>Elem of element encapsulated by this object.</summary>
     fKind: TActiveTextActionElemKind;
     ///  <summary>State of element: opening or closing.</summary>
     fState: TActiveTextElemState;
@@ -383,7 +536,7 @@   TActiveTextActionElem = class(TInterfacedObject,
     fAttrs: IActiveTextAttrs;
   public
     ///  <summary>Object constructor. Creates an action element.</summary>
-    ///  <param name="AKind">TActiveTextElemKind [in] Required kind of element.
+    ///  <param name="AKind">TActiveTextElemKind [in] Required Elem of element.
     ///  </param>
     ///  <param name="AAttrs">IActiveTextAttrs [in] Element's attributes.
     ///  </param>
@@ -402,7 +555,7 @@   TActiveTextActionElem = class(TInterfacedObject,
     ///  <summary>Returns a cloned instance of this object.</summary>
     ///  <remarks>Method of IClonable.</remarks>
     function Clone: IInterface;
-    ///  <summary>Returns kind of action represented by this element.</summary>
+    ///  <summary>Returns Elem of action represented by this element.</summary>
     ///  <remarks>Method of IActiveTextActionElem.</remarks>
     function GetKind: TActiveTextActionElemKind;
     ///  <summary>Returns state of element.</summary>
@@ -411,10 +564,6 @@   TActiveTextActionElem = class(TInterfacedObject,
     ///  <summary>Returns object describing element's attributes.</summary>
     ///  <remarks>Method of IActiveTextActionElem.</remarks>
     function GetAttrs: IActiveTextAttrs;
-    ///  <summary>Returns value that indicates whether element is an inline or
-    ///  block element.</summary>
-    ///  <remarks>Method of IActiveTextActionElem.</remarks>
-    function GetDisplayStyle: TActiveTextDisplayStyle;
   end;
 
 type
@@ -618,7 +767,7 @@ function TActiveText.ToString: string;
       if Supports(Elem, IActiveTextTextElem, TextElem) then
         SB.Append(TextElem.Text);
       if Supports(Elem, IActiveTextActionElem, ActionElem)
-        and (ActionElem.DisplayStyle = dsBlock)
+        and (TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock)
         and (ActionElem.State = fsClose) then
         // new line at end of block to separate text at end of closing block
         // from text at start of following block
@@ -689,14 +838,6 @@ function TActiveTextActionElem.GetAttrs: IActiveTextAttrs;
   Result := fAttrs;
 end;
 
-function TActiveTextActionElem.GetDisplayStyle: TActiveTextDisplayStyle;
-begin
-  if GetKind in [ekPara, ekHeading] then
-    Result := dsBlock
-  else
-    Result := dsInline;
-end;
-
 function TActiveTextActionElem.GetKind: TActiveTextActionElemKind;
 begin
   Result := fKind;
@@ -756,5 +897,45 @@ function TActiveTextAttrs.GetEnumerator: TEnumerator<TPair<string, string>>;
   Result := fMap.GetEnumerator;
 end;
 
+{ TActiveTextElemCapsMap }
+
+class function TActiveTextElemCaps.CanContainElem(const Parent,
+  Child: TActiveTextActionElemKind): Boolean;
+begin
+  Result := not (Child in Map[Parent].Exclusions);
+end;
+
+class function TActiveTextElemCaps.CanContainText(
+  const Elem: TActiveTextActionElemKind): Boolean;
+begin
+  Result := Map[Elem].PermitsText;
+end;
+
+class function TActiveTextElemCaps.DisplayStyleOf(
+  const Elem: TActiveTextActionElemKind): TActiveTextDisplayStyle;
+begin
+  Result := Map[Elem].DisplayStyle;
+end;
+
+class function TActiveTextElemCaps.IsElemPermittedInRoot(
+  const Elem: TActiveTextActionElemKind): Boolean;
+begin
+  Result := Map[Elem].RequiredParents = [];
+end;
+
+class function TActiveTextElemCaps.IsExcludedElem(const Parent,
+  Child: TActiveTextActionElemKind): Boolean;
+begin
+  Result := Child in Map[Parent].Exclusions;
+end;
+
+class function TActiveTextElemCaps.IsRequiredParent(
+  const Parent, Child: TActiveTextActionElemKind): Boolean;
+begin
+  if Map[Child].RequiredParents = [] then
+    Exit(True);
+  Result := Parent in Map[Child].RequiredParents;
+end;
+
 end.
 
diff --git a/Src/ActiveText.URTFRenderer.pas b/Src/ActiveText.URTFRenderer.pas
index d11fc5ade..dc0267b79 100644
--- a/Src/ActiveText.URTFRenderer.pas
+++ b/Src/ActiveText.URTFRenderer.pas
@@ -196,7 +196,7 @@ procedure TActiveTextRTF.Render(ActiveText: IActiveText;
       RenderTextElem(TextElem, RTFBuilder)
     else if Supports(Elem, IActiveTextActionElem, ActionElem) then
     begin
-      if ActionElem.DisplayStyle = dsBlock then
+      if TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock then
         RenderBlockActionElem(ActionElem, RTFBuilder)
       else
         RenderInlineActionElem(ActionElem, RTFBuilder);
diff --git a/Src/ActiveText.UTextRenderer.pas b/Src/ActiveText.UTextRenderer.pas
index 7b844fe43..bd658666e 100644
--- a/Src/ActiveText.UTextRenderer.pas
+++ b/Src/ActiveText.UTextRenderer.pas
@@ -97,7 +97,7 @@ function TActiveTextTextRenderer.Render(ActiveText: IActiveText): string;
       RenderTextElem(TextElem)
     else if Supports(Elem, IActiveTextActionElem, ActionElem) then
     begin
-      if ActionElem.DisplayStyle = dsBlock then
+      if TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock then
         RenderBlockActionElem(ActionElem)
       else
         RenderInlineActionElem(ActionElem);
diff --git a/Src/FmActiveTextPreviewDlg.pas b/Src/FmActiveTextPreviewDlg.pas
index 1f415c2c0..e9bd1071f 100644
--- a/Src/FmActiveTextPreviewDlg.pas
+++ b/Src/FmActiveTextPreviewDlg.pas
@@ -220,7 +220,7 @@ procedure TActiveTextPreviewDlg.UpdateCSS(Sender: TObject;
   try
     TFontHelper.SetContentFont(ContentFont);
     // Set rendered REML container
-    with CSSBuilder.AddSelector('#content') do
+    with CSSBuilder.EnsureSelector('#content') do
     begin
       AddProperty(TCSS.FontProps(ContentFont));
       AddProperty(TCSS.BackgroundColorProp(clWindow));
@@ -235,22 +235,54 @@ procedure TActiveTextPreviewDlg.UpdateCSS(Sender: TObject;
       else
         AddProperty(TCSS.HeightProp(MaxHTMLHeight));
     end;
-    with CSSBuilder.AddSelector('.active-text h2') do
+    with CSSBuilder.EnsureSelector('.active-text h2') do
     begin
       AddProperty(TCSS.MarginProp(4, 0, 0, 0));
       AddProperty(TCSS.FontWeightProp(cfwBold));
       AddProperty(TCSS.FontSizeProp(ContentFont.Size + 1));
     end;
-    with CSSBuilder.AddSelector('.active-text p') do
+    with CSSBuilder.EnsureSelector('.active-text p') do
       AddProperty(TCSS.MarginProp(4, 0, 0, 0));
     // Show or hide text about links depending on if links are present
-    with CSSBuilder.AddSelector('#linktext') do
+    with CSSBuilder.EnsureSelector('#linktext') do
     begin
       if ContainsLinks then
         AddProperty(TCSS.DisplayProp(cdsInline))
       else
         AddProperty(TCSS.DisplayProp(cdsNone));
     end;
+    // Set up lists
+    with CSSBuilder.EnsureSelector('.active-text ul') do
+    begin
+      AddProperty(TCSS.MarginProp(cssAll, 0));
+      AddProperty(TCSS.MarginProp(cssTop, 4));
+      AddProperty(TCSS.PaddingProp(cssAll, 0));
+      AddProperty(TCSS.PaddingProp(cssLeft, 24));
+      AddProperty(TCSS.ListStylePositionProp(clspOutside));
+      AddProperty(TCSS.ListStyleTypeProp(clstDisc));
+    end;
+    with CSSBuilder.EnsureSelector('.active-text ol') do
+    begin
+      AddProperty(TCSS.MarginProp(cssAll, 0));
+      AddProperty(TCSS.MarginProp(cssTop, 4));
+      AddProperty(TCSS.PaddingProp(cssAll, 0));
+      AddProperty(TCSS.PaddingProp(cssLeft, 32));
+      AddProperty(TCSS.ListStylePositionProp(clspOutside));
+      AddProperty(TCSS.ListStyleTypeProp(clstDecimal));
+    end;
+    with CSSBuilder.EnsureSelector('.active-text li') do
+    begin
+      AddProperty(TCSS.PaddingProp(cssAll, 0));
+      AddProperty(TCSS.MarginProp(cssAll, 0));
+    end;
+    with CSSBuilder.EnsureSelector('.active-text li ol') do
+      AddProperty(TCSS.MarginProp(cssTop, 0));
+    with CSSBuilder.EnsureSelector('.active-text li ul') do
+      AddProperty(TCSS.MarginProp(cssTop, 0));
+    with CSSBuilder.EnsureSelector('.active-text ul li') do
+      AddProperty(TCSS.PaddingProp(cssLeft, 8));
+    with CSSBuilder.EnsureSelector('.active-text ul li ol li') do
+      AddProperty(TCSS.PaddingProp(cssLeft, 0));
   finally
     ContentFont.Free;
   end;
diff --git a/Src/FrDetailView.pas b/Src/FrDetailView.pas
index b6feecc76..7c21d29ba 100644
--- a/Src/FrDetailView.pas
+++ b/Src/FrDetailView.pas
@@ -265,6 +265,38 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
       AddProperty(TCSS.BackgroundColorProp(clCompTblHeadBg));
       AddProperty(TCSS.FontWeightProp(cfwNormal));
     end;
+    // Set active text list classes
+    with CSSBuilder.EnsureSelector('.active-text ul') do
+    begin
+      AddProperty(TCSS.MarginProp(cssAll, 0));
+      AddProperty(TCSS.MarginProp(cssTop, 4));
+      AddProperty(TCSS.PaddingProp(cssAll, 0));
+      AddProperty(TCSS.PaddingProp(cssLeft, 24));
+      AddProperty(TCSS.ListStylePositionProp(clspOutside));
+      AddProperty(TCSS.ListStyleTypeProp(clstDisc));
+    end;
+    with CSSBuilder.EnsureSelector('.active-text ol') do
+    begin
+      AddProperty(TCSS.MarginProp(cssAll, 0));
+      AddProperty(TCSS.MarginProp(cssTop, 4));
+      AddProperty(TCSS.PaddingProp(cssAll, 0));
+      AddProperty(TCSS.PaddingProp(cssLeft, 32));
+      AddProperty(TCSS.ListStylePositionProp(clspOutside));
+      AddProperty(TCSS.ListStyleTypeProp(clstDecimal));
+    end;
+    with CSSBuilder.EnsureSelector('.active-text li') do
+    begin
+      AddProperty(TCSS.PaddingProp(cssAll, 0));
+      AddProperty(TCSS.MarginProp(cssAll, 0));
+    end;
+    with CSSBuilder.EnsureSelector('.active-text li ol') do
+      AddProperty(TCSS.MarginProp(cssTop, 0));
+    with CSSBuilder.EnsureSelector('.active-text li ul') do
+      AddProperty(TCSS.MarginProp(cssTop, 0));
+    with CSSBuilder.EnsureSelector('.active-text ul li') do
+      AddProperty(TCSS.PaddingProp(cssLeft, 8));
+    with CSSBuilder.EnsureSelector('.active-text ul li ol li') do
+      AddProperty(TCSS.PaddingProp(cssLeft, 0));
   finally
     ContentFont.Free;
     MonoFont.Free;
diff --git a/Src/Res/CSS/detail.css b/Src/Res/CSS/detail.css
index db791bb02..bea2dc732 100644
--- a/Src/Res/CSS/detail.css
+++ b/Src/Res/CSS/detail.css
@@ -57,6 +57,41 @@ p {
   margin: 4px 0 0 0;
 }
 
+ul, ol {
+  margin: 4px 0 0 0;
+  padding: 0;
+  list-style-position: outside;
+}
+
+ul {
+  list-style-type: disc;
+  padding-left: 24px;
+}
+
+ol {
+  list-style-type: decimal;
+  padding-left: 32px;
+}
+
+li ol,
+li ul {
+  margin-top: 0;
+}
+
+li {
+  padding: 0;
+  margin: 0;
+}
+
+ul li {
+  padding-left: 8px;
+}
+
+ul li ol li {
+  padding-left: 0px;
+}
+
+
 pre {
   margin: 4px 0;
   padding: 4px;
diff --git a/Src/UCSSUtils.pas b/Src/UCSSUtils.pas
index bb2e83a35..53d6bb4f0 100644
--- a/Src/UCSSUtils.pas
+++ b/Src/UCSSUtils.pas
@@ -155,6 +155,32 @@ interface
     codY            // overflow in y direction only: "overflow-y" property
   );
 
+type
+  ///  <summary>Enumeration of different list markers.</summary>
+  ///  <remarks>This is not a complete list. Additional values are defined in
+  ///  CSS.</remarks>
+  TCSSListStyleType = (
+    clstNone,       // no marker
+    clstInitial,    // default marker
+    clstInherit,    // inherit from parent
+    clstDisc,       // filled circle
+    clstCircle,     // un-filled circle
+    clstSquare,     // filled square
+    clstDecimal,    // decimal number (1, 2, 3...)
+    clstDecimal0,   // decimal number padding with leading zeros (01, 02, 03...)
+    clstLowerRoman, // lower case roman numeral (i, ii, iii, iv...)
+    clstUpperRoman, // upper case roman numeral (I, II, III, IV...)
+    clstLowerAlpha, // lower case letter (a, b, c, d...)
+    clstUpperAlpha  // upper case letter (A, B, C, D...)
+  );
+
+type
+  ///  <summary>Enumeration of possible list item markers.</summary>
+  TCSSListStylePosition = (
+    clspOutside,    // list marker outside the list item
+    clspInside      // list marker inside the list item
+  );
+
 type
   ///  <summary>
   ///  Container for static methods that return CSS properties as text.
@@ -429,6 +455,20 @@   TCSS = record
     ///  <remarks>Only the percentage version of line height is supported.
     ///  </remarks>
     class function LineHeightProp(const Percentage: UInt16): string; static;
+
+    ///  <summary>Creates a CSS "list-style-type" property.</summary>
+    ///  <param name="Value">TCSSListStyleType [in] Required property value.
+    ///  </param>
+    ///  <returns>string. Required CSS property.</returns>
+    class function ListStyleTypeProp(const Value: TCSSListStyleType): string;
+      static;
+
+    ///  <summary>Creates a CSS "list-style-position" property.</summary>
+    ///  <param name="Value">TCSSListStylePosition [in] Required property value.
+    ///  </param>
+    ///  <returns>string. Required CSS property.</returns>
+    class function ListStylePositionProp(const Value: TCSSListStylePosition):
+      string; static;
   end;
 
 
@@ -640,6 +680,27 @@ class function TCSS.LineHeightProp(const Percentage: UInt16): string;
   Result := 'line-height: ' + IntToStr(Percentage) + '%';
 end;
 
+class function TCSS.ListStylePositionProp(
+  const Value: TCSSListStylePosition): string;
+const
+  Positions: array[TCSSListStylePosition] of string = ('outside', 'inside');
+begin
+  Result := 'list-style-position: ' + Positions[Value] + ';';
+end;
+
+class function TCSS.ListStyleTypeProp(const Value: TCSSListStyleType): string;
+const
+  Types: array[TCSSListStyleType] of string = (
+    'none', 'initial', 'inherit',
+    'disc', 'circle', 'square',
+    'decimal', 'decimal-leading-zero',
+    'lower-roman', 'upper-roman',
+    'lower-alpha', 'upper-alpha'
+  );
+begin
+  Result := 'list-style-type: ' + Types[Value] + ';';
+end;
+
 class function TCSS.MarginProp(const Margin: array of Integer): string;
 begin
   Assert(Length(Margin) in [1,2,4],
diff --git a/Src/UREMLDataIO.pas b/Src/UREMLDataIO.pas
index 5381b6565..acd5bc135 100644
--- a/Src/UREMLDataIO.pas
+++ b/Src/UREMLDataIO.pas
@@ -34,24 +34,11 @@ interface
   }
   TREMLReader = class(TInterfacedObject, IActiveTextParser)
   strict private
-    type
-      TOpenTagTracker = class(TObject)
-      strict private
-        var
-          fTagState: array[TActiveTextActionElemKind] of Cardinal;
-      public
-        constructor Create;
-        destructor Destroy; override;
-        procedure Clear;
-        procedure OpenTag(Tag: TActiveTextActionElemKind);
-        procedure CloseTag(Tag: TActiveTextActionElemKind);
-        function TagsOpen(Tags: TActiveTextActionElemKinds): Boolean;
-      end;
-  strict private
-    fLexer: TTaggedTextLexer;     // Analysis REML markup
-    fOpenTagTracker: TOpenTagTracker;
+    fLexer: TTaggedTextLexer;     // Analyses REML markup
     // Stack of tag params for use in closing tags
     fParamStack: TStack<TActiveTextAttr>;
+    // Stack of block level tags
+    fBlockTagStack: TStack<TActiveTextActionElemKind>;
     function TagInfo(const TagIdx: Integer; out TagName: string;
       out TagCode: Word; out IsContainer: Boolean): Boolean;
       {Callback that provides lexer with information about supported tags. Lexer
@@ -96,6 +83,11 @@       TOpenTagTracker = class(TObject)
   }
   TREMLWriter = class(TNoPublicConstructObject)
   strict private
+    const
+      IndentMult = 2; // Number of spaces to indent for each block elem level
+    var
+      fLevel: Integer;  // Indent level based on block nesting level
+      fIsStartOfTextLine: Boolean;  // flag true if we're at start of a line
     function TextToREMLText(const Text: string): string;
       {Converts plain text to REML compatible text by replacing illegal
       characters with related character entities.
@@ -148,7 +140,7 @@ implementation
   // Delphi
   SysUtils,
   // Project
-  UConsts, UExceptions, UStrUtils;
+  UConsts, UExceptions, UIStringList, UStrUtils;
 
 
 type
@@ -158,9 +150,6 @@ implementation
     Class that provides information about REML tags.
   }
   TREMLTags = class(TNoConstructObject)
-  strict private
-    const
-      BlockTags = [ekPara, ekHeading];
   strict private
     type
       {
@@ -170,12 +159,9 @@   TREMLTags = class(TNoConstructObject)
       TREMLTag = record
       public
         Id: TActiveTextActionElemKind;  // active text element kind
-        // ids of tags that can't nest inside this tag
-        Exclusions: TActiveTextActionElemKinds;
         TagName: string;                // corresponding REML tag name
         ParamName: string;              // name of any REML parameter
         constructor Create(const AId: TActiveTextActionElemKind;
-          const AExclusions: TActiveTextActionElemKinds;
           const ATagName: string;
           const AParamName: string = '');
           {Record contructor. Initialises fields.
@@ -206,8 +192,6 @@       TREMLTag = record
         @param Idx [in] Zero based index of required tag name.
         @return Required tag name.
       }
-    class function GetExclusions(Idx: Integer): TActiveTextActionElemKinds;
-      static;
   public
     class constructor Create;
       {Class constructor. Sets up map of REML tags.
@@ -236,8 +220,6 @@       TREMLTag = record
       {List of tag ids}
     class property Names[Idx: Integer]: string read GetName;
       {List of tag names}
-    class property Exclusions[Idx: Integer]: TActiveTextActionElemKinds
-      read GetExclusions;
   end;
 
   {
@@ -313,14 +295,14 @@ constructor TREMLReader.Create;
   inherited Create;
   fLexer := TTaggedTextLexer.Create(TagInfo, EntityInfo);
   fParamStack := TStack<TActiveTextAttr>.Create;
-  fOpenTagTracker := TOpenTagTracker.Create;
+  fBlockTagStack := TStack<TActiveTextActionElemKind>.Create;
 end;
 
 destructor TREMLReader.Destroy;
   {Class destructor. Finalises object.
   }
 begin
-  fOpenTagTracker.Free;
+  fBlockTagStack.Free;
   FreeAndNil(fParamStack);
   FreeAndNil(fLexer);
   inherited;
@@ -356,13 +338,40 @@ procedure TREMLReader.Parse(const Markup: string;
   ParamValue: string;                 // value of a parameter
   TagId: TActiveTextActionElemKind;   // id of a tag
   Attr: TActiveTextAttr;              // attributes of tag
+
+  function IsTextPermittedInParentBlock: Boolean;
+  begin
+    if fBlockTagStack.Count = 0 then
+      Exit(True);
+    Result := TActiveTextElemCaps.CanContainText(fBlockTagStack.Peek);
+  end;
+
+  function IsElemPermittedParentBlock(const Elem: TActiveTextActionElemKind):
+    Boolean;
+  begin
+    if fBlockTagStack.Count = 0 then
+      Exit(TActiveTextElemCaps.IsElemPermittedInRoot(Elem));
+    Result := TActiveTextElemCaps.IsRequiredParent(fBlockTagStack.Peek, Elem);
+  end;
+
+  function IsElemExcluded(const Elem: TActiveTextActionElemKind):
+    Boolean;
+  begin
+    if fBlockTagStack.Count = 0 then
+      Exit(False);
+    Result := TActiveTextElemCaps.IsExcludedElem(fBlockTagStack.Peek, Elem);
+  end;
+
 resourcestring
   // Error message
   sErrMissingParam = 'Expected a "%0:s" parameter value in tag "%1:s"';
   sErrNesting = 'Illegal nesting of "%0:s" tag';
+  sBadParentBlock = 'Invalid parent block for tag %0:s';
+  sNoTextPermitted = 'Text is not permitted in enclosing block';
+  sMismatchedCloser = 'Mismatching closing block tag %0:s';
 begin
   Assert(Assigned(ActiveText), ClassName + '.Parse: ActiveText is nil');
-  fOpenTagTracker.Clear;
+  fBlockTagStack.Clear;
   try
     // Nothing to do if there is no markup
     if Markup = '' then
@@ -373,25 +382,45 @@ procedure TREMLReader.Parse(const Markup: string;
     while fLexer.NextItem <> ttsEOF do
     begin
       case fLexer.Kind of
+
         ttsText:
         begin
-          if fLexer.PlainText <> '' then
-            // Plain text: add text element (lexer will have replaced character
-            // entities with actual characters
+          if IsTextPermittedInParentBlock then
+          begin
+            // Plain text is allowed in parent block: add it
             ActiveText.AddElem(
               TActiveTextFactory.CreateTextElem(fLexer.PlainText)
             );
+          end
+          else
+          begin
+            // Plain text not allowed in parent block: raise exception UNLESS
+            // text is only white space or empty, in which case we simply ignore
+            // the text. This is because white space will often occur after
+            // end tag of enclosed blocks
+            if not StrIsEmpty(fLexer.PlainText, True) then
+              raise EActiveTextParserError.Create(sNoTextPermitted);
+          end
         end;
+
         ttsCompoundStartTag:
         begin
           // Start of an action element
           // Get tag id and any parameter
           TagId := TActiveTextActionElemKind(fLexer.TagCode);
-          if fOpenTagTracker.TagsOpen(TREMLTags.Exclusions[fLexer.TagCode]) then
+
+          // Validate tag id
+          if IsElemExcluded(TagId) then
             raise EActiveTextParserError.CreateFmt(
               sErrNesting, [fLexer.TagName]
             );
-          fOpenTagTracker.OpenTag(TagId);
+          if not IsElemPermittedParentBlock(TagID) then
+            raise EActiveTextParserError.CreateFmt(
+              sBadParentBlock, [fLexer.TagName]
+            );
+
+          if TActiveTextElemCaps.DisplayStyleOf(TagId) = dsBlock then
+            fBlockTagStack.Push(TagId);
           TREMLTags.LookupParamName(TagId, ParamName);
           if ParamName <> '' then
           begin
@@ -419,12 +448,24 @@ procedure TREMLReader.Parse(const Markup: string;
             );
           end;
         end;
+
         ttsCompoundEndTag:
         begin
           // End of an action element
-          // Get tag id and note if tag should have a parameter
+          // Get elem id
           TagId := TActiveTextActionElemKind(fLexer.TagCode);
-          fOpenTagTracker.CloseTag(TagId);
+
+          // Validate elem
+          if TActiveTextElemCaps.DisplayStyleOf(TagId) = dsBlock then
+          begin
+            if fBlockTagStack.Peek <> TagId then
+              raise EActiveTextParserError.CreateFmt(
+                sMismatchedCloser, [fLexer.TagName]
+              );
+            fBlockTagStack.Pop;
+          end;
+
+          // Process params
           TREMLTags.LookupParamName(TagId, ParamName);
           if ParamName <> '' then
           begin
@@ -449,9 +490,12 @@ procedure TREMLReader.Parse(const Markup: string;
             );
           end;
         end;
+
       end;
     end;
+
   except
+
     // Handle exceptions: convert expected exceptions to EActiveTextParserError
     on E: ETaggedTextLexer do
       raise EActiveTextParserError.Create(E);
@@ -481,51 +525,6 @@ function TREMLReader.TagInfo(const TagIdx: Integer; out TagName: string;
   end;
 end;
 
-{ TREMLReader.TOpenTagTracker }
-
-procedure TREMLReader.TOpenTagTracker.Clear;
-var
-  TagId: TActiveTextActionElemKind;
-begin
-  for TagId := Low(TActiveTextActionElemKind)
-    to High(TActiveTextActionElemKind) do
-    fTagState[TagId] := 0;
-end;
-
-procedure TREMLReader.TOpenTagTracker.CloseTag(Tag: TActiveTextActionElemKind);
-begin
-  if fTagState[Tag] > 0 then
-    Dec(fTagState[Tag]);
-end;
-
-constructor TREMLReader.TOpenTagTracker.Create;
-begin
-  inherited Create;
-  Clear;
-end;
-
-destructor TREMLReader.TOpenTagTracker.Destroy;
-begin
-
-  inherited;
-end;
-
-procedure TREMLReader.TOpenTagTracker.OpenTag(Tag: TActiveTextActionElemKind);
-begin
-  Inc(fTagState[Tag]);
-end;
-
-function TREMLReader.TOpenTagTracker.TagsOpen(
-  Tags: TActiveTextActionElemKinds): Boolean;
-var
-  TagId: TActiveTextActionElemKind;
-begin
-  for TagId in Tags do
-    if fTagState[TagId] > 0 then
-      Exit(True);
-  Result := False;
-end;
-
 { TREMLWriter }
 
 constructor TREMLWriter.InternalCreate;
@@ -545,17 +544,32 @@ class function TREMLWriter.Render(const ActiveText: IActiveText): string;
   Elem: IActiveTextElem;          // each element in active text object
   TextElem: IActiveTextTextElem;  // an active text text element
   TagElem: IActiveTextActionElem; // an active text action element
+  Text: string;
+  SrcLines: IStringList;
+  SrcLine: string;
+  DestLines: IStringList;
+  DestLine: string;
 begin
   with InternalCreate do
     try
-      Result := '';
+      Text := '';
+      fLevel := 0;
       for Elem in ActiveText do
       begin
         if Supports(Elem, IActiveTextTextElem, TextElem) then
-          Result := Result + RenderText(TextElem)
+          Text := Text + RenderText(TextElem)
         else if Supports(Elem, IActiveTextActionElem, TagElem) then
-          Result := Result + RenderTag(TagElem);
+          Text := Text + RenderTag(TagElem);
+      end;
+      SrcLines := TIStringList.Create(Text, EOL, False);
+      DestLines := TIStringList.Create;
+      for SrcLine in SrcLines do
+      begin
+        DestLine := StrTrimRight(SrcLine);
+        if not StrIsEmpty(DestLine) then
+          DestLines.Add(DestLine);
       end;
+      Result := DestLines.GetText(EOL, False);
     finally
       Free;
     end;
@@ -580,8 +594,11 @@ function TREMLWriter.RenderTag(
     begin
       // closing tag
       Result := Format('</%s>', [TagName]);
-      if TagElem.DisplayStyle = dsBlock then
-        Result := Result + EOL;
+      if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsBlock then
+      begin
+        Dec(fLevel);
+        Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
+      end;
     end;
     fsOpen:
     begin
@@ -598,6 +615,12 @@ function TREMLWriter.RenderTag(
             TextToREMLText(TagElem.Attrs[TActiveTextAttrNames.Link_URL])
           ]
         );
+      if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsBlock then
+      begin
+        Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
+        Inc(fLevel);
+        fIsStartOfTextLine := True;
+      end;
     end;
   end;
 end;
@@ -610,7 +633,14 @@ function TREMLWriter.RenderText(
     @return REML-safe text containing necessary character entities.
   }
 begin
-  Result := TextToREMLText(TextElem.Text);
+  if fIsStartOfTextLine then
+  begin
+    Result := StrOfSpaces(IndentMult * fLevel);
+    fIsStartOfTextLine := False;
+  end
+  else
+    Result := '';
+  Result := Result + TextToREMLText(TextElem.Text);
 end;
 
 function TREMLWriter.TextToREMLText(const Text: string): string;
@@ -641,15 +671,21 @@ function TREMLWriter.TextToREMLText(const Text: string): string;
   }
 begin
   // Record all supported tags
-  SetLength(fTagMap, 8);
-  fTagMap[0] := TREMLTag.Create(ekLink, [],  'a', 'href');
-  fTagMap[1] := TREMLTag.Create(ekStrong, [],  'strong');
-  fTagMap[2] := TREMLTag.Create(ekEm, [],  'em');
-  fTagMap[3] := TREMLTag.Create(ekVar, [],  'var');
-  fTagMap[4] := TREMLTag.Create(ekPara, BlockTags,  'p');
-  fTagMap[5] := TREMLTag.Create(ekWarning, [],  'warning');
-  fTagMap[6] := TREMLTag.Create(ekHeading, BlockTags, 'heading');
-  fTagMap[7] := TREMLTag.Create(ekMono, [], 'mono');
+  SetLength(fTagMap, 11);
+  // REML v1
+  fTagMap[0] := TREMLTag.Create(ekLink, 'a', 'href'); // <a> has href param
+  fTagMap[1] := TREMLTag.Create(ekStrong, 'strong');
+  // REML v2
+  fTagMap[2] := TREMLTag.Create(ekEm, 'em');
+  fTagMap[3] := TREMLTag.Create(ekVar, 'var');
+  fTagMap[4] := TREMLTag.Create(ekPara, 'p');
+  fTagMap[5] := TREMLTag.Create(ekWarning, 'warning');
+  fTagMap[6] := TREMLTag.Create(ekHeading, 'heading');
+  fTagMap[7] := TREMLTag.Create(ekMono, 'mono');
+  // REML v5
+  fTagMap[8] := TREMLTag.Create(ekUnorderedList, 'ul');
+  fTagMap[9] := TREMLTag.Create(ekOrderedList, 'ol');
+  fTagMap[10] := TREMLTag.Create(ekListItem, 'li');
 end;
 
 class destructor TREMLTags.Destroy;
@@ -667,12 +703,6 @@ class function TREMLTags.GetCount: Integer;
   Result := Length(fTagMap);
 end;
 
-class function TREMLTags.GetExclusions(Idx: Integer):
-  TActiveTextActionElemKinds;
-begin
-  Result := fTagMap[Idx].Exclusions;
-end;
-
 class function TREMLTags.GetId(Idx: Integer): TActiveTextActionElemKind;
   {Read accessor for Ids[] property.
     @param Idx [in] Zero based index of required id.
@@ -751,8 +781,7 @@ class function TREMLTags.LookupTagName(const Id: TActiveTextActionElemKind;
 { TREMLTags.TREMLTag }
 
 constructor TREMLTags.TREMLTag.Create(const AId: TActiveTextActionElemKind;
-  const AExclusions: TActiveTextActionElemKinds; const ATagName,
-  AParamName: string);
+  const ATagName, AParamName: string);
   {Record contructor. Initialises fields.
     @param AId [in] Active text element kind.
     @param ATagName [in] REML tag name.
@@ -760,7 +789,6 @@ constructor TREMLTags.TREMLTag.Create(const AId: TActiveTextActionElemKind;
   }
 begin
   Id := AId;
-  Exclusions := AExclusions;
   TagName := ATagName;
   ParamName := AParamName;
 end;
@@ -792,11 +820,14 @@ class function TREMLEntities.CharToMnemonicEntity(const Ch: Char): string;
 begin
   SetLength(fEntityMap, 34);
   // Supported character entities. All are optional unless otherwise stated
+  // REML v1
   fEntityMap[0] := TREMLEntity.Create('amp', '&');   // required in REML
   fEntityMap[1] := TREMLEntity.Create('quot', DOUBLEQUOTE);
   fEntityMap[2] := TREMLEntity.Create('gt', '>');
   fEntityMap[3] := TREMLEntity.Create('lt', '<');   // required in REML
+  // REML v2
   fEntityMap[4] := TREMLEntity.Create('copy', '©');
+  // REML v5
   fEntityMap[5] := TREMLEntity.Create('times', '×');
   fEntityMap[6] := TREMLEntity.Create('divide', '÷');
   fEntityMap[7] := TREMLEntity.Create('div', '÷');
diff --git a/Src/USnippetExtraHelper.pas b/Src/USnippetExtraHelper.pas
index 80598eada..fafad6eea 100644
--- a/Src/USnippetExtraHelper.pas
+++ b/Src/USnippetExtraHelper.pas
@@ -124,39 +124,46 @@ class function TSnippetExtraHelper.BuildActiveText(
       empty string.
   }
 
+  // Check for an opening block tag
   function IsBlockOpener(Elem: IActiveTextElem): Boolean;
   var
     ActionElem: IActiveTextActionElem;
   begin
     if not Supports(Elem, IActiveTextActionElem, ActionElem) then
       Exit(False);
-    Result := (ActionElem.DisplayStyle = dsBlock)
+    Result := (TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock)
       and (ActionElem.State = fsOpen);
   end;
 
+  // Check for a closing block tag
   function IsBlockCloser(Elem: IActiveTextElem): Boolean;
   var
     ActionElem: IActiveTextActionElem;
   begin
     if not Supports(Elem, IActiveTextActionElem, ActionElem) then
       Exit(False);
-    Result := (ActionElem.DisplayStyle = dsBlock)
+    Result := (TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock)
       and (ActionElem.State = fsClose);
   end;
 
-type
-  ///  <summary>Describes different parts of parsed REML code in relation to
-  ///  block tags.</summary>
-  ///  <remarks>Can be within a pair of block tags; without, i.e. not enclosed
-  ///  by block tags or in the transitional state between one and the other.
-  ///  </remarks>
-  TBlockState = (bsWithin, bsWithout, bsTransition);
+  // Embed given content in a para block and append to result, unless content is
+  // empty when do nothing.
+  procedure AddNoneEmptyParaToResult(ParaContent: IActiveText);
+  begin
+    if ParaContent.IsEmpty then
+      Exit;
+    if StrTrim(ParaContent.ToString) = '' then
+      Exit;
+    Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsOpen));
+    Result.Append(ParaContent);
+    Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsClose));
+  end;
+
 var
-  ActiveText: IActiveText;  // receives active text built from REML
-  TextElem: IActiveTextTextElem;
-  Text: string;
-  BlockState: TBlockState;  // state of current position relating to block tags
-  Elem: IActiveTextElem;    // each element in active text
+  ActiveText: IActiveText;              // receives active text built from REML
+  OutsideBlockActiveText: IActiveText;  // receives text outside of blocks
+  Elem: IActiveTextElem;                // each element in active text
+  Level: Integer;                       // depth of block levels
 begin
   Result := TActiveTextFactory.CreateActiveText;
   if REML = '' then
@@ -165,59 +172,47 @@ class function TSnippetExtraHelper.BuildActiveText(
   ActiveText := TActiveTextFactory.CreateActiveText(REML, TREMLReader.Create);
   if ActiveText.IsEmpty then
     Exit;
-  // Scan active text, inserting paragraph level block tags where the active
-  // text is not enclosed by them: this can be at the start, at the end or
-  // between existing blocks. E.g for "xxx <p>yyy</p> xxx <p>yyy</p> xxx", xxx
-  // is without any block and will be enclosed in paragraphs while yyy is within
-  // a block and will be unchanged.
-  BlockState := bsTransition;
+  // Init block level & obj used to accumulate text outside blocks
+  Level := 0;
+  OutsideBlockActiveText := TActiveTextFactory.CreateActiveText;
   for Elem in ActiveText do
   begin
     if IsBlockOpener(Elem) then
     begin
-      Assert(BlockState <> bsWithin,
-        ClassName + '.BuildActiveText: Block is nested.');
-      if BlockState = bsWithout then
-        Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsClose));
+      // We have block opener tag. Check for any text that preceeded a level
+      // zero block and wrap it in a paragraph before writing the block opener
+      if Level = 0 then
+      begin
+        if not OutsideBlockActiveText.IsEmpty then
+        begin
+          AddNoneEmptyParaToResult(OutsideBlockActiveText);
+          OutsideBlockActiveText := TActiveTextFactory.CreateActiveText;
+        end;
+      end;
       Result.AddElem(Elem);
-      BlockState := bsWithin;
+      Inc(Level); // drop down one level
     end
     else if IsBlockCloser(Elem) then
     begin
-      Assert(BlockState = bsWithin,
-        ClassName + '.BuildActiveText: Block closer outside block.');
-      Result.AddElem(Elem);
-      BlockState := bsTransition;
+      // Block closer
+      Dec(Level);
+      Result.AddElem(Elem); // climb up one level
     end
     else
     begin
-      if BlockState = bsTransition then
-      begin
-        if Supports(Elem, IActiveTextTextElem, TextElem) then
-        begin
-          // make sure we don't start a paragraph block if text contains only
-          // spaces
-          Text := StrTrimLeft(TextElem.Text);
-          if Text <> '' then
-          begin
-            Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsOpen));
-            Result.AddElem(TActiveTextFactory.CreateTextElem(Text));
-            BlockState := bsWithout;
-          end;
-        end
-        else
-        begin
-          Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsOpen));
-          Result.AddElem(Elem);
-          BlockState := bsWithout;
-        end;
-      end
+      // Not block opener or closer
+      // If we're outside any block, append elem to store of elems not included
+      // in blocks. If we're in a block, just add the elem to output
+      if Level = 0 then
+        OutsideBlockActiveText.AddElem(Elem)
       else
         Result.AddElem(Elem);
     end;
   end;
-  if BlockState = bsWithout then
-    Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsClose));
+  Assert(Level = 0, ClassName + '.BuildActiveText: Unbalanced blocks');
+  // Write any outstanding elems that occured outside a block
+  if not OutsideBlockActiveText.IsEmpty then
+    AddNoneEmptyParaToResult(OutsideBlockActiveText);
 end;
 
 class function TSnippetExtraHelper.BuildREMLMarkup(

From aa5f8dbe829e10a0f574c1b2065c971c734d46cb Mon Sep 17 00:00:00 2001
From: delphidabbler <delphidabbler@gmail.com>
Date: Fri, 17 Jul 2020 01:24:08 +0100
Subject: [PATCH 051/264] Update docs & help topic re REML v5 changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update Docs/Design/reml & help topic:
* With details of <ol>, <ul> & <li> tags.
* To note new REML entities.
* Bump current REML version to v5.

Add REML version history to reml.html documentation.

Add new CSS to help's codesnip.css for table in reml.htm help topic.

Update design docs export.html, main-db.html & user-db.html as required.

NOTE: Several files have ««TODO»» placeholders that need to be updated
once CodeSnip release date and version are known.
---
 Docs/Design/FileFormats/export.html  |  49 ++++--
 Docs/Design/FileFormats/main-db.html |   2 +-
 Docs/Design/FileFormats/user-db.html |  21 ++-
 Docs/Design/reml.html                | 243 +++++++++++++++++++++++----
 Src/Help/CSS/codesnip.css            |  21 ++-
 Src/Help/HTML/reml.htm               | 238 +++++++++++++++++++++-----
 6 files changed, 478 insertions(+), 96 deletions(-)

diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
index 91e1a1059..3a383591d 100644
--- a/Docs/Design/FileFormats/export.html
+++ b/Docs/Design/FileFormats/export.html
@@ -144,7 +144,7 @@ <h2>
         </div>
         <ul class="squashed">
           <li>
-            <span class="highlight">versions 1..4:</span> Attribute not
+            <span class="highlight">versions 1 to 4:</span> Attribute not
             provided.
           </li>
           <li>
@@ -176,7 +176,7 @@ <h2>
       </dt>
       <dd>
         Identifies version of file. Determines which tags are valid and
-        establishes rules concerning content. Valid versions are 1..7.
+        establishes rules concerning content. Valid versions are 1 to 7.
       </dd>
     </dl>
   </dd>
@@ -195,7 +195,7 @@ <h2>
   <dd>
     <ul class="squashed">
       <li>
-        <span class="highlight">versions 1..6:</span> Contains information about user who created the file &nbsp; used for submissions to the online database, omitted for other exports.
+        <span class="highlight">versions 1 to 6:</span> Contains information about user who created the file &nbsp; used for submissions to the online database, omitted for other exports.
       </li>
       <li>
         <span class="highlight">version 7:</span> Not supported. Ignored if present.
@@ -209,7 +209,7 @@ <h2>
   <dd>
     <ul class="squashed">
       <li>
-        <span class="highlight">versions 1..6:</span> User's name or nickname.
+        <span class="highlight">versions 1 to 6:</span> User's name or nickname.
       </li>
       <li>
         <span class="highlight">version 7:</span> Not supported. Ignored if present.
@@ -223,7 +223,7 @@ <h2>
   <dd>
     <ul class="squashed">
       <li>
-        <span class="highlight">versions 1..6:</span> User's email address.
+        <span class="highlight">versions 1 to 6:</span> User's email address.
       </li>
       <li>
         <span class="highlight">version 7:</span> Not supported. Ignored if present.
@@ -237,7 +237,7 @@ <h2>
   <dd>
     <ul class="squashed">
       <li>
-        <span class="highlight">versions 1..6:</span> Any comments provided by user.
+        <span class="highlight">versions 1 to 6:</span> Any comments provided by user.
       </li>
       <li>
         <span class="highlight">version 7:</span> Not supported. Ignored if present.
@@ -270,7 +270,7 @@ <h2>
         </div>
         <ul class="squashed">
           <li>
-            <span class="highlight">versions 1..4:</span> Name must begin with
+            <span class="highlight">versions 1 to 4:</span> Name must begin with
             an English language letter or the underscore.
           </li>
           <li>
@@ -292,13 +292,17 @@ <h2>
     </div>
     <ul class="squashed">
       <li>
-        <span class="highlight">versions 1..5:</span> Content is a single line
+        <span class="highlight">versions 1 to 5:</span> Content is a single line
         of plain text.
       </li>
       <li>
-        <span class="highlight">version 6 and later:</span> Content is formatted text
+        <span class="highlight">version 6 to 7.2:</span> Content is formatted text
         encoded in REML markup. REML v4 is supported.
       </li>
+      <li>
+        <span class="highlight">version 7.3 and later:</span> Content is formatted text
+        encoded in REML markup. REML v5 is supported.
+      </li>
     </ul>
   </dd>
 
@@ -315,7 +319,7 @@ <h2>
   <dd>
     <ul class="squashed">
       <li>
-        <span class="highlight">versions 1..5:</span> Not supported.
+        <span class="highlight">versions 1 to 5:</span> Not supported.
       </li>
       <li>
         <div>
@@ -349,7 +353,7 @@ <h2>
   <dd>
     <ul class="squashed">
       <li>
-        <span class="highlight">versions 1..5:</span> Not supported.
+        <span class="highlight">versions 1 to 5:</span> Not supported.
       </li>
       <li>
         <span class="highlight">version 6 and later:</span> Display name of snippet. Can
@@ -440,7 +444,10 @@ <h2>
               <span class="highlight">version 4:</span> supports REML v3.
             </li>
             <li>
-              <span class="highlight">versions 5 &amp; 6:</span> supports REML v4.
+              <span class="highlight">versions 5 to 7.2:</span> supports REML v4.
+            </li>
+            <li>
+              <span class="highlight">version 7.3 &amp; later:</span> supports REML v5.
             </li>
           </ul>
         </li>
@@ -559,7 +566,7 @@ <h2>
             <em>dXE2</em> &ndash; Delphi XE2 compiler <span class="highlight">(v4.3 &amp; later)</span>
           </li>
           <li>
-            <em>dXE3</em> &ndash; Delphi XE3 compiler <span class="highlight">(v4.4..v4.5  and v6.1 &amp; later)</span>
+            <em>dXE3</em> &ndash; Delphi XE3 compiler <span class="highlight">(v4.4 to v4.5  and v6.1 &amp; later)</span>
           </li>
           <li>
             <em>dXE4</em> &ndash; Delphi XE4 compiler <span class="highlight">(v4.5 only)</span>
@@ -659,7 +666,7 @@ <h2>
     </div>
     <ul class="squashed">
       <li>
-        <span class="highlight">versions 1..4:</span> Name must begin with an
+        <span class="highlight">versions 1 to 4:</span> Name must begin with an
         English language letter or the underscore.
       </li>
       <li>
@@ -686,7 +693,7 @@ <h2>
     </div>
     <ul class="squashed">
       <li>
-        <span class="highlight">versions 1..4:</span> Name must begin with an
+        <span class="highlight">versions 1 to 4:</span> Name must begin with an
         English language letter or the underscore.
       </li>
       <li>
@@ -783,7 +790,7 @@ <h2>
       Introduced with CodeSnip v3.0.
     </p>
     <p>
-      Introduced with CodeSnip v3.0.
+      The following tag was removed:
     </p>
     <ul class="squashed">
       <li>
@@ -971,6 +978,12 @@ <h2>
       <dd>
         Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
       </dd>
+      <dt>
+        <em>Version 7.3 - &laquo;&laquo;TODO&raquo;&raquo;</em>
+      </dt>
+      <dd>
+        Updated with CodeSnip v&laquo;&laquo;TODO&raquo;&raquo; to add support for REML v5, which is backward compatible with REML v4.
+      </dd>
     </dl>
   </dd>
 </dl>
@@ -1019,6 +1032,10 @@ <h2>
   Readers of v1 to v6 files must ignore the <em>codesnip-export/user-info</em> tag and sub-tags, where present.
 </p>
 
+<p>
+  Readers of v2 files and later can parse REML as v5, since all versions of REML up to v5 are backwards compatible.
+</p>
+
 </section>
 
 </body>
diff --git a/Docs/Design/FileFormats/main-db.html b/Docs/Design/FileFormats/main-db.html
index 031fac904..867438356 100644
--- a/Docs/Design/FileFormats/main-db.html
+++ b/Docs/Design/FileFormats/main-db.html
@@ -925,7 +925,7 @@ <h2>
 <ol>
   <li id="footnote-1">
     <p>
-      REML is a text markup language used to format text. REML version 4 is supported. The REML format is documented <a href="../reml.html">here</a>.
+      REML is a text markup language used to format text. REML version 5 is supported. The REML format is documented <a href="../reml.html">here</a>.
      </p>
   </li>
   <li id="footnote-2">
diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
index baeb84715..db90b23df 100644
--- a/Docs/Design/FileFormats/user-db.html
+++ b/Docs/Design/FileFormats/user-db.html
@@ -321,9 +321,13 @@ <h3 id="xml-file">
         of plain text.
       </li>
       <li>
-        <span class="highlight">version 6:</span> Content is formatted text
+        <span class="highlight">version 6.0 to 6.10:</span> Content is formatted text
         encoded in REML markup. REML v4 is supported.
       </li>
+      <li>
+        <span class="highlight">version 6.11 &amp; later:</span> Content is formatted text
+        encoded in REML markup. REML v5 is supported.
+      </li>
     </ul>
   </dd>
 
@@ -465,7 +469,10 @@ <h3 id="xml-file">
               <span class="highlight">version 4:</span> supports REML v3.
             </li>
             <li>
-              <span class="highlight">versions 5 &amp; 6:</span> supports REML v4.
+              <span class="highlight">versions 5 &amp; 6.10:</span> supports REML v4.
+            </li>
+            <li>
+              <span class="highlight">version 6.11 &amp; later:</span> supports REML v5.
             </li>
           </ul>
         </li>
@@ -1007,6 +1014,12 @@ <h2>
       <dd>
         Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
       </dd>
+      <dt>
+        <em>Version 6.11 - &laquo;&laquo;TODO&raquo;&raquo;</em>
+      </dt>
+      <dd>
+        Updated with CodeSnip v&laquo;&laquo;TODO&raquo;&raquo; to add support for REML v5, which is backwards compatible with REML v4.
+      </dd>
     </dl>
   </dd>
 </dl>
@@ -1064,6 +1077,10 @@ <h3>
   </li>
 </ul>
 
+<p>
+  Readers of v2 and later files may parse REML from any file version as if it were REML v5, since all versions of REML up to v5 are compatible.
+</p>
+
 <h3>
   Handling Text File Encodings
 </h3>
diff --git a/Docs/Design/reml.html b/Docs/Design/reml.html
index bbc138a8b..3fce8fae1 100644
--- a/Docs/Design/reml.html
+++ b/Docs/Design/reml.html
@@ -44,7 +44,6 @@
   text-align: center;
   margin: 0.5em;
 }
-
 header nav {
   display: block;
   margin: 1em;
@@ -150,7 +149,7 @@
 dt {
   margin: 0;
   padding: 0;
-  font-weight: inherited;
+  font-weight: bold;
 }
 dd {
   margin: 0 0 0 2em;
@@ -172,6 +171,36 @@
   margin-top: 0;
   margin-bottom: 0.5em;
 }
+table {
+  border-collapse: collapse;
+}
+tr {
+  border-bottom: 1px silver solid;
+}
+th {
+  text-align: center;
+  font-weight: bold;
+  margin: 0;
+  padding: 0;
+  border-bottom: 2px silver solid;
+}
+td {
+  border-bottom: 1px silver solid;
+  margin: 0;
+  padding: 0;
+}
+td, th {
+  padding: 0.5em;
+}
+td:first-child, th:first-child {
+  border-right: 1px silver solid;
+}
+td:last-child {
+  text-align: center;
+}
+tr:nth-child(even), th {
+  background-color: #eee;
+}
 </style>
 
 <title>
@@ -222,7 +251,7 @@ <h1>
     The REML language is a SGML language similar to a greatly simplified XHTML. The are a small number of tags and character entities that can be used.
   </p>
   <aside>
-    <strong>Note:</strong> The language described here is REML v4. Earlier versions are obsolete.
+    <strong>Note:</strong> The language described here is REML v5. v4 is still in regular use in CodeSnip up to v4.20.x. Earlier versions are obsolete.
   </aside>
 
 </section>
@@ -255,19 +284,34 @@ <h2>
     <li>
       <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> &ndash; Renders the enclosed markup as a heading.
     </li>
+    <li>
+      <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> &ndash; Renders the enclosed HTML as an ordered list. <span class="very-strong">Must</span> contain <code class="value">&lt;li&gt;...&lt;/li&gt</code> blocks and nothing else.
+    </li>
+    <li>
+      <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> &ndash; Renders the enclosed HTML as an unordered list. <span class="very-strong">Must</span> contain <code class="value">&lt;li&gt;...&lt;/li&gt</code> blocks and nothing else.
+    </li>
+    <li>
+      <code class="value">&lt;li&gt;...&lt;/li&gt;</code> &ndash; Renders the enclosed HTML as a list item. <span class="very-strong">Must</span> only be used within <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks.
+    </li>
   </ul>
   <p>
     The following rules apply to the use of block level tags:
   </p>
   <ul class="unspaced">
     <li>
-      The tags <span class="very-strong">must not</span> be nested.
+      <span class="very-strong">Must</span> be matched, e.g. <code class="value">&lt;p&gt;</code> <span class="very-strong">must</span> have a matching <code class="value">&lt;/p&gt;</code>.
+    </li>
+    <li>
+      <code class="value">&lt;p&gt;...&lt;/p&gt;</code> and <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> blocks <span class="very-strong">must not</span> contain other block level tags.
+    </li>
+    <li>
+      <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks <span class="very-strong">must only</span> contain one or more <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks.
     </li>
     <li>
-      The tags <span class="very-strong">must</span> be matched, e.g. <code class="value">&lt;p&gt;</code> must have a matching <code class="value">&lt;/p&gt;</code>.
+      <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks <span class="very-strong">must not</span> contain <code class="value">&lt;p&gt;...&lt;/p&gt;</code>, <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> or other <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks directly, but <em>may</em> contain <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks.
     </li>
     <li>
-      All text <em>should</em> be embedded within block level tags, e.g. <code class="value">&lt;heading&gt;heading&lt;/heading&gt;&lt;p&gt;text&lt;/p&gt;</code> or simply <code class="value">&lt;p&gt;text&lt;/p&gt;</code>.
+      All text <em>should</em> be embedded within <code class="value">&lt;p&gt;...&lt;/p&gt;</code>, <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> or <code class="value">&lt;li&gt;...&lt;/li&gt;</code> block level tags, e.g. <code class="value">&lt;heading&gt;heading&lt;/heading&gt;&lt;p&gt;text&lt;/p&gt;</code> or simply <code class="value">&lt;p&gt;text&lt;/p&gt;</code>.
     </li>
     <li>
       White space between blocks <span class="very-strong">must</span> be ignored.
@@ -278,7 +322,12 @@ <h2>
   </p>
   <pre class="sample">&lt;p&gt;Hello World&lt;/p&gt;
 &lt;heading&gt;Hello&lt;/heading&gt;
-&lt;p&gt;Hello World&lt;/p&gt;</pre>
+&lt;p&gt;Hello World&lt;/p&gt;
+&lt;ol&gt;
+  &lt;li&gt;one&lt;/li&gt;
+  &lt;li&gt;two&lt;/li&gt;
+  &lt;li&gt;three&lt;/li&gt;
+&lt;/ol&gt;</pre>
   <p>
     Strictly speaking, the following example is invalid code &ndash; all occurrences of <code class="value">wrong</code> are in error because they are not contained within block tags.
   </p>
@@ -353,32 +402,146 @@ <h1>
   </h1>
 
   <p>
-    A few symbolic character entities are supported in REML. Here is the complete list:
+    Some symbolic character entities are supported in REML. Many symbols, but not all, have analogues in the list of supported character entities in XHTML or HTML 5. Some entities have alternate symbols. Here is the complete list.
   </p>
-  <ul class="half-spaced">
-    <li>
-      <code class="value">&amp;lt;</code> for <code class="value">&lt;</code>
-    </li>
-    <li>
-      <code class="value">&amp;gt;</code> for <code class="value">&gt;</code>
-    </li>
-    <li>
-      <code class="value">&amp;quot;</code> for <code class="value">&quot;</code>
-    </li>
-    <li>
-      <code class="value">&amp;amp;</code> for <code class="value">&amp;</code>
-    </li>
-    <li>
-      <code class="value">&amp;copy;</code> for <code class="value">&copy;</code>
-    </li>
-  </ul>
+
+  <table>
+    <thead>
+      <tr>
+        <th>Character Entity</th>
+        <th>Actual Character</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td><code>&amp;amp;</code></td>
+        <td>&amp;</td>
+      </tr>
+      <tr>
+        <td><code>&amp;quot;</code></td>
+        <td>&quot;</td>
+      </tr>
+      <tr>
+        <td><code>&amp;gt;</code></td>
+        <td>&gt;</td>
+      </tr>
+      <tr>
+        <td><code>&amp;lt;</code></td>
+        <td>&lt;</td>
+      </tr>
+      <tr>
+        <td><code>&amp;copy;</code></td>
+        <td>©</td>
+      </tr>
+      <tr>
+        <td><code>&amp;times;</code></td>
+        <td>×</td>
+      </tr>
+      <tr>
+        <td><code>&amp;divide;</code> or <code>&amp;div;</code></td>
+        <td>÷</td>
+      </tr>
+      <tr>
+        <td><code>&amp;plusmn;</code></td>
+        <td>±</td>
+      </tr>
+      <tr>
+        <td><code>&amp;ne;</code> or <code>&amp;neq;</code></td>
+        <td>≠</td>
+      </tr>
+      <tr>
+        <td><code>&amp;sum;</code></td>
+        <td>∑</td>
+      </tr>
+      <tr>
+        <td><code>&amp;infin;</code></td>
+        <td>∞</td>
+      </tr>
+      <tr>
+        <td><code>&amp;pound;</code></td>
+        <td>£</td>
+      </tr>
+      <tr>
+        <td><code>&amp;curren;</code></td>
+        <td>¤</td>
+      </tr>
+      <tr>
+        <td><code>&amp;yen;</code></td>
+        <td>¥</td>
+      </tr>
+      <tr>
+        <td><code>&amp;euro;</code></td>
+        <td>€</td>
+      </tr>
+      <tr>
+        <td><code>&amp;cent;</code></td>
+        <td>¢</td>
+      </tr>
+      <tr>
+        <td><code>&amp;dagger;</code></td>
+        <td>†</td>
+      </tr>
+      <tr>
+        <td><code>&amp;ddagger;</code> or <code>&amp;Dagger;</code></td>
+        <td>‡</td>
+      </tr>
+      <tr>
+        <td><code>&amp;hellip;</code></td>
+        <td>…</td>
+      </tr>
+      <tr>
+        <td><code>&amp;para;</code></td>
+        <td>¶</td>
+      </tr>
+      <tr>
+        <td><code>&amp;sect;</code></td>
+        <td>§</td>
+      </tr>
+      <tr>
+        <td><code>&amp;reg;</code></td>
+        <td>®</td>
+      </tr>
+      <tr>
+        <td><code>&amp;frac14;</code></td>
+        <td>¼</td>
+      </tr>
+      <tr>
+        <td><code>&amp;frac12;</code> or <code>&amp;half;</code></td>
+        <td>½</td>
+      </tr>
+      <tr>
+        <td><code>&amp;frac34;</code></td>
+        <td>¾</td>
+      </tr>
+      <tr>
+        <td><code>&amp;micro;</code></td>
+        <td>µ</td>
+      </tr>
+      <tr>
+        <td><code>&amp;deg;</code></td>
+        <td>°</td>
+      </tr>
+      <tr>
+        <td><code>&amp;laquo;</code></td>
+        <td>«</td>
+      </tr>
+      <tr>
+        <td><code>&amp;raquo;</code></td>
+        <td>»</td>
+      </tr>
+      <tr>
+        <td><code>&amp;iquest;</code></td>
+        <td>¿</td>
+      </tr>
+    </tbody>
+  </table>
 
   <aside>
     <strong>Note:</strong> the '&lt;' and '&amp;' characters are special within the markup and cannot be used literally, even when you are just entering plain text. You <span class="very-strong">must</span> use the <code class="value">&amp;lt;</code> character entity in place of <code class="value">&lt;</code> and <code class="value">&amp;amp;</code> instead of <code class="value">&amp;</code>. For example to write <code class="value">x&lt;y</code> in REML use <code class="value">x&amp;lt;y</code> and to write <code class="value">you &amp; me</code> use <code class="value">you &amp;amp; me</code>.
   </aside>
 
   <p>
-    To express other special symbols for which there is no symbolic character entity, numeric character entities can be used. For example to display the '¶' character (Unicode <em>pilcrow sign</em>) use <code class="value">&amp;#182;</code>.
+    To express other special symbols for which there is no symbolic character entity, numeric character entities can be used. For example to display the 'Ω' character (Unicode <em>Greek capital letter Omega</em>) use <code class="value">&amp;#937;</code>.
   </p>
 
   <aside>
@@ -387,6 +550,7 @@ <h1>
 
 </section>
 
+
 <section id="changes">
 
   <h1>Change Log</h1>
@@ -396,7 +560,7 @@ <h1>Change Log</h1>
   </p>
 
   <p>
-    <strong>v1 of 2008/12/31</strong>
+    <strong>v1 of 2008-12-31</strong>
   </p>
 
   <p>
@@ -416,7 +580,7 @@ <h1>Change Log</h1>
   </ul>
 
   <p>
-    <strong>v2 of 2009/06/29</strong>
+    <strong>v2 of 2009-06-29</strong>
   </p>
 
   <p>
@@ -433,7 +597,7 @@ <h1>Change Log</h1>
   </ul>
 
   <p>
-    <strong>v3 of 2009/07/06</strong>
+    <strong>v3 of 2009-07-06</strong>
   </p>
 
   <p>
@@ -447,7 +611,7 @@ <h1>Change Log</h1>
   </ul>
 
   <p>
-    <strong>v4 of 2011/12/31</strong>
+    <strong>v4 of 2011-12-31</strong>
   </p>
 
   <p>
@@ -460,7 +624,26 @@ <h1>Change Log</h1>
     </li>
   </ul>
 
+  <p>
+    <strong>v5 of &laquo;&laquo;TODO&raquo;&raquo;</strong>
+  </p>
+
+  <p>
+    Introduced in CodeSnip &laquo;&laquo;TODO&raquo;&raquo;
+  </p>
+
+  <ul>
+    <li>
+      Added support for lists with the <code class="value">&lt;ol&gt;</code>, <code class="value">&lt;ul&gt;</code> &amp; <code class="value">&lt;li&gt;</code> block tags.
+    </li>
+    <li>
+      Added entities: <code class="value">&amp;times;</code>, <code class="value">&amp;divide;</code>, <code class="value">&amp;div;</code> <code class="value">&amp;plusmn;</code>, <code class="value">&amp;ne;</code>, <code class="value">&amp;neq;</code>, <code class="value">&amp;sum;</code>, <code class="value">&amp;infin;</code>, <code class="value">&amp;pound;</code>, <code class="value">&amp;curren;</code>, <code class="value">&amp;yen;</code>, <code class="value">&amp;euro;</code>, <code class="value">&amp;cent;</code>, <code class="value">&amp;dagger;</code>, <code class="value">&amp;ddagger;</code>, <code class="value">&amp;Dagger;</code>, <code class="value">&amp;hellip;</code>, <code class="value">&amp;para;</code>, <code class="value">&amp;sect;</code>, <code class="value">&amp;reg;</code>, <code class="value">&amp;frac14;</code>, <code class="value">frac12</code>, <code class="value">&amp;half;</code>, <code class="value">&amp;frac34;</code>, <code class="value">&amp;micro;</code>, <code class="value">&amp;deg;</code>, <code class="value">&amp;laquo;</code>, <code class="value">&amp;raquo;</code> &amp; <code class="value">&amp;iquest;</code>.
+    </li>
+  </ul>
+
 </section>
+
+
 </body>
 
 </html>
diff --git a/Src/Help/CSS/codesnip.css b/Src/Help/CSS/codesnip.css
index 3460d1fd8..333f831cf 100644
--- a/Src/Help/CSS/codesnip.css
+++ b/Src/Help/CSS/codesnip.css
@@ -112,7 +112,7 @@ tr {
   margin: 0;
 }
 
-td {
+td, th {
   padding: 4px;
   margin: 1px;
 }
@@ -122,6 +122,18 @@ table.menu {
   margin-left: 1em;
 }
 
+table.bordered {
+  padding: 0;
+}
+
+table.bordered {
+  background-color: #ccc;
+}
+
+table.bordered th {
+  background-color: white;
+}
+
 table.menu td.img {
   width: 24px;
   height: 24px;
@@ -141,10 +153,15 @@ table.menu td.mainitem {
   background-color: #eee;
 }
 
-table.menu td.desc {
+table.menu td.desc,
+table.bordered td {
   background-color: white;
 }
 
+table.bordered td.centre {
+  text-align: center;
+}
+
 pre.reml,
 code.reml {
   color: purple;
diff --git a/Src/Help/HTML/reml.htm b/Src/Help/HTML/reml.htm
index cac5e92a4..a3dc8260e 100644
--- a/Src/Help/HTML/reml.htm
+++ b/Src/Help/HTML/reml.htm
@@ -43,7 +43,8 @@ <h1>
     <p>
       <em>REML</em> is <em>CodeSnip</em>'s own little markup language that can
       be used to style the text of a snippet's description and / or extra
-      information.
+      information. The latest version is v5, which is backwards compatible with
+	  all other versions.
     </p>
     <h2>
       Language Details
@@ -66,43 +67,80 @@ <h3>
       <dd>
         Renders the enclosed markup as a heading.
       </dd>
+      <dt><code class="reml">&lt;ol&gt;...&lt;/ol&gt;</code></dt>
+      <dd>
+        Renders the enclosed HTML as an ordered list. Must contain
+        <code class="value">&lt;li&gt;...&lt;/li&gt</code> blocks and nothing
+        else.
+      </dd>
+      <dt><code class="reml">&lt;ul&gt;...&lt;/ul&gt;</code></dt>
+      <dd>
+        Renders the enclosed HTML as an unordered list. Must contain
+        <code class="value">&lt;li&gt;...&lt;/li&gt</code> blocks and nothing
+        else.
+      </dd>
+      <dt><code class="reml">&lt;l1&gt;...&lt;/li&gt;</code></dt>
+      <dd>
+        Renders the enclosed HTML as a list item. May only be used within
+        <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and
+        <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks.
+      </dd>
     </dl>
     <p>
-      The following rules apply to the use of
-      <code class="reml">&lt;p&gt;</code> and
-      <code class="reml">&lt;heading&gt;</code>
+      The following rules apply to the use of block level tags:
     </p>
     <ol>
       <li>
-        The tags must not be nested.
+        Must be matched, e.g.
+        <code class="value">&lt;p&gt;</code> must have a matching
+        <code class="value">&lt;/p&gt;</code>.
       </li>
       <li>
-        The tags must be matched, e.g.
-        <code class="reml">&lt;p&gt;</code> must have a matching
-        <code class="reml">&lt;/p&gt;</code>.
+        <code class="value">&lt;p&gt;...&lt;/p&gt;</code> and
+        <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> blocks
+        must not contain other block level tags.
       </li>
       <li>
-        All text should be embedded within block level tags, e.g. <span
-          class="code"
-        >&lt;heading&gt;heading&lt;/heading&gt; &lt;p&gt;text&lt;/p&gt;</span>
-        or simply <span
-          class="code"
-        >&lt;p&gt;text&lt;/p&gt;</span>.
+        <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and
+        <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks must only
+        contain one or more
+        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks.
       </li>
-    </ol>
-    <p>
-      Here are some valid examples:
-    </p>
-    <ol>
-      <li class="extra-spacing">
-        <code class="reml">&lt;p&gt;Hello World&lt;/p&gt;</code>
+      <li>
+        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks must not
+        contain
+        <code class="value">&lt;p&gt;...&lt;/p&gt;</code>,
+        <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> or other
+        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks directly,
+        but may contain
+        <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and
+        <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks.
+      </li>
+      <li>
+        All text should be embedded within
+        <code class="value">&lt;p&gt;...&lt;/p&gt;</code>,
+        <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> or
+        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> block level tags,
+        e.g. <code class="value"
+        >&lt;heading&gt;heading&lt;/heading&gt;&lt;p&gt;text&lt;/p&gt;</code>
+        or simply <code class="value">&lt;p&gt;text&lt;/p&gt;</code>.
       </li>
       <li>
-        <code class="reml">&lt;heading&gt;Hello&lt;/heading&gt;<br>
-        &lt;p&gt;Hello World&lt;/p&gt;</code>
+        White space between blocks must be ignored.
       </li>
     </ol>
     <p>
+      Here is a valid example:
+    </p>
+    <pre class="sample">&lt;p&gt;Hello World&lt;/p&gt;
+&lt;heading&gt;Hello&lt;/heading&gt;
+&lt;p&gt;Hello World&lt;/p&gt;
+&lt;ol&gt;
+  &lt;li&gt;one&lt;/li&gt;
+  &lt;li&gt;two&lt;/li&gt;
+  &lt;li&gt;three&lt;/li&gt;
+&lt;/ol&gt;</pre>
+          <p>
       Srictly speaking, the following example is invalid code &ndash; the
       highlighted sections are in error, because they are not contained within
       block tags.
@@ -187,30 +225,141 @@ <h3 id="entities">
       A few other character entities are supported for convenience. Here is the
       complete list:
     </p>
-    <ul class="unspaced">
-      <li>
-        <code class="reml">&amp;lt;</code> for <code class="reml">&lt;</code>
-      </li>
-      <li>
-        <code class="reml">&amp;gt;</code> for <code class="reml">&gt;</code>
-      </li>
-      <li>
-        <code class="reml">&amp;quot;</code> for
-        <code class="reml">&quot;</code>
-      </li>
-      <li>
-        <code class="reml">&amp;amp;</code> for <code class="reml">&amp;</code>
-      </li>
-      <li>
-        <code class="reml">&amp;copy;</code> for
-        <code class="reml">&copy;</code>
-      </li>
-    </ul>
+    <table class="bordered" cellspacing="1" cellpadding="0">
+      <thead>
+        <tr>
+          <th>Character Entity</th>
+          <th>Actual Character</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><code>&amp;amp;</code></td>
+          <td class="centre">&amp;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;quot;</code></td>
+          <td class="centre">&quot;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;gt;</code></td>
+          <td class="centre">&gt;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;lt;</code></td>
+          <td class="centre">&lt;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;copy;</code></td>
+          <td class="centre">&copy;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;times;</code></td>
+          <td class="centre">&times;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;divide;</code> or <code>&amp;div;</code></td>
+          <td class="centre">&divide;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;plusmn;</code></td>
+          <td class="centre">&plusmn;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;ne;</code> or <code>&amp;neq;</code></td>
+          <td class="centre">&ne;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;sum;</code></td>
+          <td class="centre">&sum;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;infin;</code></td>
+          <td class="centre">&infin;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;pound;</code></td>
+          <td class="centre">&pound;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;curren;</code></td>
+          <td class="centre">&curren;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;yen;</code></td>
+          <td class="centre">&yen;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;euro;</code></td>
+          <td class="centre">&euro;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;cent;</code></td>
+          <td class="centre">&cent;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;dagger;</code></td>
+          <td class="centre">&dagger;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;ddagger;</code> or <code>&amp;Dagger;</code></td>
+          <td class="centre">&ddagger;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;hellip;</code></td>
+          <td class="centre">&hellip;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;para;</code></td>
+          <td class="centre">&para;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;sect;</code></td>
+          <td class="centre">&sect;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;reg;</code></td>
+          <td class="centre">&reg;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;frac14;</code></td>
+          <td class="centre">&frac14;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;frac12;</code> or <code>&amp;half;</code></td>
+          <td class="centre">&frac12;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;frac34;</code></td>
+          <td class="centre">&frac34;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;micro;</code></td>
+          <td class="centre">&micro;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;deg;</code></td>
+          <td class="centre">&deg;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;laquo;</code></td>
+          <td class="centre">&laquo;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;raquo;</code></td>
+          <td class="centre">&raquo;</td>
+        </tr>
+        <tr>
+          <td><code>&amp;iquest;</code></td>
+          <td class="centre">&iquest;</td>
+        </tr>
+      </tbody>
+    </table>
     <p>
-      By way of an example, if you want to display <code>x &lt; y</code>, use:
+      By way of an example, if you want to display <code>x &ne; y</code>, use:
     </p>
     <p class="indent">
-      <code class="reml">x &amp;lt; y</code>
+      <code class="reml">x &amp;ne; y</code>
     </p>
     <p>
       No other symbolic character entities are supported.
@@ -226,4 +375,3 @@ <h3 id="entities">
     </p>
   </body>
 </html>
-

From 1907d1b3dca6c4cdb5032d8b200b2e4ffa310c74 Mon Sep 17 00:00:00 2001
From: delphidabbler <delphidabbler@gmail.com>
Date: Sun, 19 Jul 2020 03:21:41 +0100
Subject: [PATCH 052/264] Fix typos in comments

In FmSnippetsEditorDlg.FrActiveTextEditor.pas
---
 Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas b/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
index dacef9202..541f19416 100644
--- a/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
+++ b/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
@@ -129,7 +129,7 @@ function TSnippetsActiveTextEdFrame.ActiveTextToPlainText(
 begin
   // NOTE: we use IActiveText.ToString here, because there may be text not in
   // blocks and we want to see that: usual renderer will ignore that text.
-  // However all lines are trimmed and empty blanks are ingored.
+  // However all lines are trimmed and empty blanks are ignored.
   Lines := TIStringList.Create(ActiveText.ToString, EOL, False, True);
   Result := Lines.GetText(EOL2, False); // insert blank line between paras
 end;
@@ -215,7 +215,7 @@ function TSnippetsActiveTextEdFrame.PlainTextToActiveText(Text: string):
   Paragraph: string;        // each paragraph in paragraphs
 begin
   // NOTE: TSnippetExtraHelper.PlainTextToActiveText is not sufficient for use
-  // here since it ignores newlines and we want double newlines to separated
+  // here since it ignores newlines and we want double newlines to separate
   // paragraphs.
   Result := TActiveTextFactory.CreateActiveText;
   Text := StrTrim(Text);

From 241d61c918d755042873fe5ec3de2895f8c158d1 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 12:49:26 +0000
Subject: [PATCH 053/264] Update TCSSSelector for fluid chaining of methods

Modify TCSSSelector.AddProperty to reference to current TCSSSelector
instance to permit chaining the method to others that return aborts
TCSSSelector reference.

Add new TCSSSelector.AddPropertyIf fluid method to permit a choice of
two different properties to be added depending on the value of a Boolean
variable. This was created prevent chaining from being broken when a
conditional statement was encountered.

Closes #73
---
 Src/UCSSBuilder.pas | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/Src/UCSSBuilder.pas b/Src/UCSSBuilder.pas
index 662e44dd6..172f8b07d 100644
--- a/Src/UCSSBuilder.pas
+++ b/Src/UCSSBuilder.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Classes that help create and manage cascading style sheet code.
 }
@@ -46,12 +46,25 @@   TCSSSelector = class(TObject)
       {Checks whether the selector is empty, i.e. contains no code.
         @return True if selector is empty and false if not.
       }
-    procedure AddProperty(const CSSProp: string);
-      {Adds a new CSS property to the selector.
-        @param CSSProp [in] CSS property to be added.
-      }
+    ///  <summary>Adds a new CSS property to the selector.</summary>
+    ///  <param name="CSSProp">string [in] Property definition.</param>
+    ///  <returns>TCSSSelector. Class instance returned to enable the method to
+    ///  be chained.</returns>
+    function AddProperty(const CSSProp: string): TCSSSelector;
+    ///  <summary>Adds a new CSS property to the selector depending on a given
+    ///  condition.</summary>
+    ///  <param name="Condition">Boolean [in] Condition that determines which
+    ///  CSS property is added.</param>
+    ///  <param name="CSSPropTrue">string [in] CSS property that is added when
+    ///  Condition is True.</param>
+    ///  <param name="CSSPropFalse">string [in] CSS property that is added when
+    ///  Condition is False.</param>
+    ///  <returns>TCSSSelector. Class instance returned to enable the method to
+    ///  be chained.</returns>
+    function AddPropertyIf(const Condition: Boolean;
+      const CSSPropTrue: string; const CSSPropFalse: string = ''): TCSSSelector;
+    ///  <summary>Name of selector.</summary>
     property Selector: string read fSelector;
-      {Name of selector}
   end;
 
   {
@@ -112,12 +125,20 @@ implementation
 
 { TCSSSelector }
 
-procedure TCSSSelector.AddProperty(const CSSProp: string);
-  {Adds a new CSS property to the selector.
-    @param CSSProp [in] CSS property to be added.
-  }
+function TCSSSelector.AddProperty(const CSSProp: string): TCSSSelector;
 begin
   fProperties.Add(CSSProp);
+  Result := Self;
+end;
+
+function TCSSSelector.AddPropertyIf(const Condition: Boolean;
+  const CSSPropTrue: string; const CSSPropFalse: string): TCSSSelector;
+begin
+  if Condition then
+    AddProperty(CSSPropTrue)
+  else if CSSPropFalse <> '' then
+    AddProperty(CSSPropFalse);
+  Result := Self;
 end;
 
 function TCSSSelector.AsString: string;

From 4dca160f800709365780aae12d3077b43d99eb3d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 12:58:23 +0000
Subject: [PATCH 054/264] Refactor units to use fluid TCSSSelector methods

Various units that were using a "with..do" statement to add properties
to a CSS selector were refactored to get rid of the "with" statement
and to use chains of TCSSSelector AddProperty & AddPropertyIf method
calls instead.
---
 Src/FirstRun.FmWhatsNew.FrHTML.pas |  46 +++---
 Src/FmAboutDlg.pas                 |  48 +++---
 Src/FmActiveTextPreviewDlg.pas     | 113 ++++++-------
 Src/FmDBUpdateDlg.pas              |  10 +-
 Src/FmSWAGImportDlg.pas            |  16 +-
 Src/FrBrowserBase.pas              |  94 +++++------
 Src/FrDetailView.pas               | 245 ++++++++++++++---------------
 Src/FrEasterEgg.pas                |   6 +-
 Src/FrHTMLDlg.pas                  |  84 ++++++----
 Src/FrHTMLPreview.pas              |   6 +-
 Src/Hiliter.UCSS.pas               |  25 ++-
 11 files changed, 325 insertions(+), 368 deletions(-)

diff --git a/Src/FirstRun.FmWhatsNew.FrHTML.pas b/Src/FirstRun.FmWhatsNew.FrHTML.pas
index 69110c448..749ea3122 100644
--- a/Src/FirstRun.FmWhatsNew.FrHTML.pas
+++ b/Src/FirstRun.FmWhatsNew.FrHTML.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2020-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2020-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Frame that displays HTML of "what's new" message in a TWebBrowser control.
 }
@@ -67,34 +67,24 @@ procedure TWhatsNewHTMLFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
   try
     TFontHelper.SetContentFont(CSSFont);
     CSSFont.Size := CSSFont.Size + 2;
-    with CSSBuilder.AddSelector('body') do
-    begin
-      AddProperty(TCSS.FontProps(CSSFont));
-      AddProperty(TCSS.MarginProp(0, 8, 0, 8));
-    end;
-    with CSSBuilder.AddSelector('.lead') do
-    begin
-      AddProperty(TCSS.FontSizeProp(CSSFont.Size + 2));
-      AddProperty(TCSS.FontWeightProp(cfwBold));
-      AddProperty(TCSS.ColorProp($233bc2));
-    end;
+    CSSBuilder.AddSelector('body')
+      .AddProperty(TCSS.FontProps(CSSFont))
+      .AddProperty(TCSS.MarginProp(0, 8, 0, 8));
+    CSSBuilder.AddSelector('.lead')
+      .AddProperty(TCSS.FontSizeProp(CSSFont.Size + 2))
+      .AddProperty(TCSS.FontWeightProp(cfwBold))
+      .AddProperty(TCSS.ColorProp($233bc2));
     // Sets paragraph margins and padding
-    with CSSBuilder.AddSelector('p') do
-    begin
-      AddProperty(TCSS.MarginProp(cssTop, 6));
-      AddProperty(TCSS.MarginProp(cssBottom, 0));
-      AddProperty(TCSS.PaddingProp(0));
-    end;
-    with CSSBuilder.AddSelector('ul') do
-    begin
-      AddProperty(TCSS.MarginProp(cssTop, 6));
-      AddProperty(TCSS.MarginProp(cssBottom, 0));
-      AddProperty(TCSS.PaddingProp(0));
-    end;
-    with CSSBuilder.AddSelector('li') do
-    begin
-      AddProperty(TCSS.MarginProp(cssTop, 6));
-    end;
+    CSSBuilder.AddSelector('p')
+      .AddProperty(TCSS.MarginProp(cssTop, 6))
+      .AddProperty(TCSS.MarginProp(cssBottom, 0))
+      .AddProperty(TCSS.PaddingProp(0));
+    CSSBuilder.AddSelector('ul')
+      .AddProperty(TCSS.MarginProp(cssTop, 6))
+      .AddProperty(TCSS.MarginProp(cssBottom, 0))
+      .AddProperty(TCSS.PaddingProp(0));
+    CSSBuilder.AddSelector('li')
+      .AddProperty(TCSS.MarginProp(cssTop, 6));
    finally
     CSSFont.Free;
   end;
diff --git a/Src/FmAboutDlg.pas b/Src/FmAboutDlg.pas
index d278b6810..421495c56 100644
--- a/Src/FmAboutDlg.pas
+++ b/Src/FmAboutDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements the program's About dialogue box.
 }
@@ -524,40 +524,36 @@ procedure TAboutDlg.UpdateDetailCSS(Sender: TObject;
   ContentFont: TFont; // font used for content
 begin
   // Modify body's margin and, for themed windows, background colour
-  with CSSBuilder.Selectors['body'] do
-  begin
-    ContentFont := TFont.Create;
-    try
-      TFontHelper.SetContentFont(ContentFont);
-      AddProperty(TCSS.FontProps(ContentFont));
-      if ThemeServicesEx.ThemesEnabled then
-        AddProperty(TCSS.BackgroundColorProp(ThemeServicesEx.GetTabBodyColour));
-      AddProperty(UCSSUtils.TCSS.MarginProp(0, 2, 6, 2));
-    finally
-      FreeAndNil(ContentFont);
-    end;
+  ContentFont := TFont.Create;
+  try
+    TFontHelper.SetContentFont(ContentFont);
+    CSSBuilder.Selectors['body']
+      .AddProperty(TCSS.FontProps(ContentFont))
+      .AddProperty(UCSSUtils.TCSS.MarginProp(0, 2, 6, 2))
+      .AddPropertyIf(
+        ThemeServicesEx.ThemesEnabled,
+        TCSS.BackgroundColorProp(ThemeServicesEx.GetTabBodyColour)
+      );
+  finally
+    FreeAndNil(ContentFont);
   end;
   // Put border round scroll box
-  with CSSBuilder.AddSelector('.scrollbox') do
-    AddProperty(UCSSUtils.TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder));
+  CSSBuilder.AddSelector('.scrollbox')
+    .AddProperty(UCSSUtils.TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder));
   // Set colours and font style of contributors and testers headings
-  with CSSBuilder.AddSelector('.contrib-head, .tester-head') do
-  begin
-    AddProperty(TCSS.BackgroundColorProp(clBtnFace));
-    AddProperty(TCSS.ColorProp(clBtnText));
-    AddProperty(TCSS.FontWeightProp(cfwBold));
-  end;
+  CSSBuilder.AddSelector('.contrib-head, .tester-head')
+    .AddProperty(TCSS.BackgroundColorProp(clBtnFace))
+    .AddProperty(TCSS.ColorProp(clBtnText))
+    .AddProperty(TCSS.FontWeightProp(cfwBold));
 end;
 
 procedure TAboutDlg.UpdateTitleCSS(Sender: TObject;
   const CSSBuilder: TCSSBuilder);
 begin
   // Set body colour, and put border round it
-  with CSSBuilder.Selectors['body'] do
-  begin
-    AddProperty(TCSS.BackgroundColorProp(clWindow));
-    AddProperty(TCSS.PaddingProp(4));
-  end;
+  CSSBuilder.Selectors['body']
+    .AddProperty(TCSS.BackgroundColorProp(clWindow))
+    .AddProperty(TCSS.PaddingProp(4));
 end;
 
 procedure TAboutDlg.ViewConfigFile(const FileName, DlgTitle: string);
diff --git a/Src/FmActiveTextPreviewDlg.pas b/Src/FmActiveTextPreviewDlg.pas
index e9bd1071f..d35db88b1 100644
--- a/Src/FmActiveTextPreviewDlg.pas
+++ b/Src/FmActiveTextPreviewDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that displays active text rendered from REML markup
  * or plain text.
@@ -214,75 +214,62 @@ procedure TActiveTextPreviewDlg.UpdateCSS(Sender: TObject;
 const
   MaxHTMLHeight = 240;  // max height of rendered HTML
 var
-  ContentFont: TFont;   // font used for #content tab
+  ContentFont: TFont;     // font used for #content tab
 begin
   ContentFont := TFont.Create;
   try
     TFontHelper.SetContentFont(ContentFont);
     // Set rendered REML container
-    with CSSBuilder.EnsureSelector('#content') do
-    begin
-      AddProperty(TCSS.FontProps(ContentFont));
-      AddProperty(TCSS.BackgroundColorProp(clWindow));
-      AddProperty(TCSS.PaddingProp(0, 6, 6, 6));
-      AddProperty(TCSS.MarginProp(cssTop, 6));
-      AddProperty(TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder));
-      AddProperty(TCSS.OverflowProp(covAuto));
-      AddProperty(TCSS.WidthProp(cluAuto, 0));
-      // Use height instead of maxheight if IE 6 or lower
-      if TIEInfo.SupportsCSSMaxHeight then
-        AddProperty(TCSS.MaxHeightProp(MaxHTMLHeight))
-      else
-        AddProperty(TCSS.HeightProp(MaxHTMLHeight));
-    end;
-    with CSSBuilder.EnsureSelector('.active-text h2') do
-    begin
-      AddProperty(TCSS.MarginProp(4, 0, 0, 0));
-      AddProperty(TCSS.FontWeightProp(cfwBold));
-      AddProperty(TCSS.FontSizeProp(ContentFont.Size + 1));
-    end;
-    with CSSBuilder.EnsureSelector('.active-text p') do
-      AddProperty(TCSS.MarginProp(4, 0, 0, 0));
+    CSSBuilder.EnsureSelector('#content')
+      .AddProperty(TCSS.FontProps(ContentFont))
+      .AddProperty(TCSS.BackgroundColorProp(clWindow))
+      .AddProperty(TCSS.PaddingProp(0, 6, 6, 6))
+      .AddProperty(TCSS.MarginProp(cssTop, 6))
+      .AddProperty(TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder))
+      .AddProperty(TCSS.OverflowProp(covAuto))
+      .AddProperty(TCSS.WidthProp(cluAuto, 0))
+      .AddPropertyIf(
+        TIEInfo.SupportsCSSMaxHeight,
+        TCSS.MaxHeightProp(MaxHTMLHeight),
+        TCSS.HeightProp(MaxHTMLHeight)
+      );
+    CSSBuilder.EnsureSelector('.active-text h2')
+      .AddProperty(TCSS.MarginProp(4, 0, 0, 0))
+      .AddProperty(TCSS.FontWeightProp(cfwBold))
+      .AddProperty(TCSS.FontSizeProp(ContentFont.Size + 1));
+    CSSBuilder.EnsureSelector('.active-text p')
+      .AddProperty(TCSS.MarginProp(4, 0, 0, 0));
     // Show or hide text about links depending on if links are present
-    with CSSBuilder.EnsureSelector('#linktext') do
-    begin
-      if ContainsLinks then
-        AddProperty(TCSS.DisplayProp(cdsInline))
-      else
-        AddProperty(TCSS.DisplayProp(cdsNone));
-    end;
+    CSSBuilder.EnsureSelector('#linktext')
+      .AddPropertyIf(
+        ContainsLinks, TCSS.DisplayProp(cdsInline), TCSS.DisplayProp(cdsNone)
+      );
     // Set up lists
-    with CSSBuilder.EnsureSelector('.active-text ul') do
-    begin
-      AddProperty(TCSS.MarginProp(cssAll, 0));
-      AddProperty(TCSS.MarginProp(cssTop, 4));
-      AddProperty(TCSS.PaddingProp(cssAll, 0));
-      AddProperty(TCSS.PaddingProp(cssLeft, 24));
-      AddProperty(TCSS.ListStylePositionProp(clspOutside));
-      AddProperty(TCSS.ListStyleTypeProp(clstDisc));
-    end;
-    with CSSBuilder.EnsureSelector('.active-text ol') do
-    begin
-      AddProperty(TCSS.MarginProp(cssAll, 0));
-      AddProperty(TCSS.MarginProp(cssTop, 4));
-      AddProperty(TCSS.PaddingProp(cssAll, 0));
-      AddProperty(TCSS.PaddingProp(cssLeft, 32));
-      AddProperty(TCSS.ListStylePositionProp(clspOutside));
-      AddProperty(TCSS.ListStyleTypeProp(clstDecimal));
-    end;
-    with CSSBuilder.EnsureSelector('.active-text li') do
-    begin
-      AddProperty(TCSS.PaddingProp(cssAll, 0));
-      AddProperty(TCSS.MarginProp(cssAll, 0));
-    end;
-    with CSSBuilder.EnsureSelector('.active-text li ol') do
-      AddProperty(TCSS.MarginProp(cssTop, 0));
-    with CSSBuilder.EnsureSelector('.active-text li ul') do
-      AddProperty(TCSS.MarginProp(cssTop, 0));
-    with CSSBuilder.EnsureSelector('.active-text ul li') do
-      AddProperty(TCSS.PaddingProp(cssLeft, 8));
-    with CSSBuilder.EnsureSelector('.active-text ul li ol li') do
-      AddProperty(TCSS.PaddingProp(cssLeft, 0));
+    CSSBuilder.EnsureSelector('.active-text ul')
+      .AddProperty(TCSS.MarginProp(cssAll, 0))
+      .AddProperty(TCSS.MarginProp(cssTop, 4))
+      .AddProperty(TCSS.PaddingProp(cssAll, 0))
+      .AddProperty(TCSS.PaddingProp(cssLeft, 24))
+      .AddProperty(TCSS.ListStylePositionProp(clspOutside))
+      .AddProperty(TCSS.ListStyleTypeProp(clstDisc));
+    CSSBuilder.EnsureSelector('.active-text ol')
+      .AddProperty(TCSS.MarginProp(cssAll, 0))
+      .AddProperty(TCSS.MarginProp(cssTop, 4))
+      .AddProperty(TCSS.PaddingProp(cssAll, 0))
+      .AddProperty(TCSS.PaddingProp(cssLeft, 32))
+      .AddProperty(TCSS.ListStylePositionProp(clspOutside))
+      .AddProperty(TCSS.ListStyleTypeProp(clstDecimal));
+    CSSBuilder.EnsureSelector('.active-text li')
+      .AddProperty(TCSS.PaddingProp(cssAll, 0))
+      .AddProperty(TCSS.MarginProp(cssAll, 0));
+    CSSBuilder.EnsureSelector('.active-text li ol')
+      .AddProperty(TCSS.MarginProp(cssTop, 0));
+    CSSBuilder.EnsureSelector('.active-text li ul')
+      .AddProperty(TCSS.MarginProp(cssTop, 0));
+    CSSBuilder.EnsureSelector('.active-text ul li')
+      .AddProperty(TCSS.PaddingProp(cssLeft, 8));
+    CSSBuilder.EnsureSelector('.active-text ul li ol li')
+      .AddProperty(TCSS.PaddingProp(cssLeft, 0));
   finally
     ContentFont.Free;
   end;
diff --git a/Src/FmDBUpdateDlg.pas b/Src/FmDBUpdateDlg.pas
index 14e7dddec..80cd905b2 100644
--- a/Src/FmDBUpdateDlg.pas
+++ b/Src/FmDBUpdateDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a wizard dialogue box that handles the updating of the main
  * DelphiDabbler Code Snippets database.
@@ -254,11 +254,9 @@ procedure TDBUpdateDlg.BuildCSS(Sender: TObject;
 begin
   inherited;
   // Create .framed border style
-  with CSSBuilder.AddSelector('.framed') do
-  begin
-    AddProperty(TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder));
-    AddProperty(TCSS.PaddingProp(4));
-  end;
+  CSSBuilder.AddSelector('.framed')
+    .AddProperty(TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder))
+    .AddProperty(TCSS.PaddingProp(4));
 end;
 
 procedure TDBUpdateDlg.ConfigForm;
diff --git a/Src/FmSWAGImportDlg.pas b/Src/FmSWAGImportDlg.pas
index 421840eb8..ceb931628 100644
--- a/Src/FmSWAGImportDlg.pas
+++ b/Src/FmSWAGImportDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2013-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2013-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a wizard dialogue box that lets the user select and import
  * packets from the DelphiDabbler implementation of the SWAG Pascal archive as
@@ -422,15 +422,13 @@ procedure TSWAGImportDlg.BuildCSS(Sender: TObject;
 begin
   inherited;
   // Set body text spacing
-  with CSSBuilder.Selectors['body'] do
-    AddProperty(TCSS.LineHeightProp(120));
+  CSSBuilder.Selectors['body']
+    .AddProperty(TCSS.LineHeightProp(120));
   // Create .framed border style
-  with CSSBuilder.AddSelector('.framed') do
-  begin
-    AddProperty(TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder));
-    AddProperty(TCSS.PaddingProp(0, 4, 4, 4));
-    AddProperty(TCSS.MarginProp(cssTop, 4));
-  end;
+  CSSBuilder.AddSelector('.framed')
+    .AddProperty(TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder))
+    .AddProperty(TCSS.PaddingProp(0, 4, 4, 4))
+    .AddProperty(TCSS.MarginProp(cssTop, 4));
 end;
 
 procedure TSWAGImportDlg.clbSelectPacketsClickCheck(Sender: TObject);
diff --git a/Src/FrBrowserBase.pas b/Src/FrBrowserBase.pas
index 5f07709ff..479b1c828 100644
--- a/Src/FrBrowserBase.pas
+++ b/Src/FrBrowserBase.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a base class for all frames that contain a web browser control.
 }
@@ -193,76 +193,56 @@ procedure TBrowserBaseFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
   CSSFont: TFont;
 begin
   // <img> tag style: no borders
-  with CSSBuilder.AddSelector('img') do
-    AddProperty(TCSS.HideBorderProp(cssAll));
+  CSSBuilder.AddSelector('img')
+    .AddProperty(TCSS.HideBorderProp(cssAll));
 
   // Default <a> tag style: fall back links for unknown link classes.
   // Each link type is expected to define own colour as a minimum.
-  with CSSBuilder.AddSelector('a') do
-  begin
-    AddProperty(TCSS.ColorProp(clDefaultLink));
-    AddProperty(TCSS.TextDecorationProp([ctdUnderline]));
-  end;
+  CSSBuilder.AddSelector('a')
+    .AddProperty(TCSS.ColorProp(clDefaultLink))
+    .AddProperty(TCSS.TextDecorationProp([ctdUnderline]));
   // <a class="help-link"> override
-  with CSSBuilder.AddSelector('a.help-link') do
-  begin
-    AddProperty(TCSS.ColorProp(clHelpLink));
-  end;
+  CSSBuilder.AddSelector('a.help-link')
+    .AddProperty(TCSS.ColorProp(clHelpLink));
   // <a class="snippet-link"> and <a class="category-link"> overrides
-  with CSSBuilder.AddSelector('a.snippet-link, a.category-link') do
-  begin
-    AddProperty(TCSS.ColorProp(clDBLink));
-    AddProperty(TCSS.FontStyleProp(cfsItalic));
-    AddProperty(TCSS.TextDecorationProp([ctdNone]));
-  end;
-  with CSSBuilder.AddSelector('a:hover.snippet-link, a:hover.category-link') do
-  begin
-    AddProperty(TCSS.BorderProp(cssBottom, 1, cbsDotted, clDBLink));
-  end;
+  CSSBuilder.AddSelector('a.snippet-link, a.category-link')
+    .AddProperty(TCSS.ColorProp(clDBLink))
+    .AddProperty(TCSS.FontStyleProp(cfsItalic))
+    .AddProperty(TCSS.TextDecorationProp([ctdNone]));
+  CSSBuilder.AddSelector('a:hover.snippet-link, a:hover.category-link')
+    .AddProperty(TCSS.BorderProp(cssBottom, 1, cbsDotted, clDBLink));
   // <a class="command-link"> override
-  with CSSBuilder.AddSelector('a.command-link') do
-  begin
-    AddProperty(TCSS.ColorProp(clCommandLink));
-    AddProperty(TCSS.FontStyleProp(cfsItalic));
-    AddProperty(TCSS.TextDecorationProp([ctdNone]));
-  end;
-  with CSSBuilder.AddSelector('a:hover.command-link') do
-  begin
-    AddProperty(TCSS.BorderProp(cssBottom, 1, cbsDotted, clCommandLink));
-  end;
-  with CSSBuilder.AddSelector('.no-link-decoration a:hover') do
-    AddProperty(TCSS.HideBorderProp(cssBottom));
+  CSSBuilder.AddSelector('a.command-link')
+    .AddProperty(TCSS.ColorProp(clCommandLink))
+    .AddProperty(TCSS.FontStyleProp(cfsItalic))
+    .AddProperty(TCSS.TextDecorationProp([ctdNone]));
+  CSSBuilder.AddSelector('a:hover.command-link')
+    .AddProperty(TCSS.BorderProp(cssBottom, 1, cbsDotted, clCommandLink));
+  CSSBuilder.AddSelector('.no-link-decoration a:hover')
+    .AddProperty(TCSS.HideBorderProp(cssBottom));
   // <a class="external-link"> override
-  with CSSBuilder.AddSelector('a.external-link') do
-  begin
-    AddProperty(TCSS.ColorProp(clExternalLink));
-  end;
+  CSSBuilder.AddSelector('a.external-link')
+    .AddProperty(TCSS.ColorProp(clExternalLink));
 
   // <var> tag style
-  with CSSBuilder.AddSelector('var') do
-  begin
-    AddProperty(TCSS.ColorProp(clVarText));
-    AddProperty(TCSS.FontStyleProp(cfsItalic));
-  end;
+  CSSBuilder.AddSelector('var')
+    .AddProperty(TCSS.ColorProp(clVarText))
+    .AddProperty(TCSS.FontStyleProp(cfsItalic));
 
   // <code> tag style
-  with CSSBuilder.AddSelector('code') do
-  begin
-    CSSFont := TFont.Create;
-    try
-      TFontHelper.SetDefaultMonoFont(CSSFont);
-      AddProperty(TCSS.FontProps(CSSFont));
-    finally
-      CSSFont.Free;
-    end;
+  CSSFont := TFont.Create;
+  try
+    TFontHelper.SetDefaultMonoFont(CSSFont);
+    CSSBuilder.AddSelector('code')
+      .AddProperty(TCSS.FontProps(CSSFont));
+  finally
+    CSSFont.Free;
   end;
 
   // .warning class style: mainly for use inline
-  with CSSBuilder.AddSelector('.warning') do
-  begin
-    AddProperty(TCSS.ColorProp(clWarningText));
-    AddProperty(TCSS.FontWeightProp(cfwBold));
-  end;
+  CSSBuilder.AddSelector('.warning')
+    .AddProperty(TCSS.ColorProp(clWarningText))
+    .AddProperty(TCSS.FontWeightProp(cfwBold));
 end;
 
 function TBrowserBaseFrame.CanCopy: Boolean;
diff --git a/Src/FrDetailView.pas b/Src/FrDetailView.pas
index 7c21d29ba..bb68e32d5 100644
--- a/Src/FrDetailView.pas
+++ b/Src/FrDetailView.pas
@@ -143,6 +143,7 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
     ContentFont := TFont.Create;
     TFontHelper.SetDefaultMonoFont(MonoFont);
     TFontHelper.SetContentFont(ContentFont);
+
     // Must do next two lines before changing content & mono font sizes
     DefContentFontSize := ContentFont.Size;
     DefMonoFontSize := MonoFont.Size;
@@ -150,96 +151,92 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
     MonoToContentFontRatio := DefMonoFontSize / DefContentFontSize;
     ContentFont.Size := Preferences.DetailFontSize;
     MonoFont.Size := Round(ContentFont.Size * MonoToContentFontRatio);
+
     // Set body style to use program's font and window colour
-    with CSSBuilder.AddSelector('body') do
-    begin
-      CSSFont.Assign(ContentFont);
-      AddProperty(TCSS.FontProps(CSSFont));
-      AddProperty(TCSS.BackgroundColorProp(clWindow));
-    end;
-    with CSSBuilder.Selectors['code'] do
-    begin
-      CSSFont.Assign(MonoFont);
-      AddProperty(TCSS.FontProps(CSSFont));
-    end;
+    CSSFont.Assign(ContentFont);
+    CSSBuilder.AddSelector('body')
+      .AddProperty(TCSS.FontProps(CSSFont))
+      .AddProperty(TCSS.BackgroundColorProp(clWindow));
+
+    // Set mono spaced font for <code> tags
+    CSSFont.Assign(MonoFont);
+    CSSBuilder.Selectors['code']
+      .AddProperty(TCSS.FontProps(CSSFont));
+
     // Set table to use required font
-    with CSSBuilder.AddSelector('table') do
-    begin
-      CSSFont.Assign(ContentFont);
-      AddProperty(TCSS.FontProps(CSSFont));
-      AddProperty(TCSS.BackgroundColorProp(clBorder));
-    end;
+    CSSFont.Assign(ContentFont);
+    CSSBuilder.AddSelector('table')
+      .AddProperty(TCSS.FontProps(CSSFont))
+      .AddProperty(TCSS.BackgroundColorProp(clBorder));
+
     // Set default table cell colour (must be different to table to get border)
-    with CSSBuilder.AddSelector('td') do
-      AddProperty(TCSS.BackgroundColorProp(clWindow));
+    CSSBuilder.AddSelector('td')
+      .AddProperty(TCSS.BackgroundColorProp(clWindow));
+
     // Sets H1 heading font size and border
-    with CSSBuilder.AddSelector('h1') do
-    begin
-      CSSFont.Assign(ContentFont);
-      CSSFont.Size := CSSFont.Size + Max(
-        Round(2 * ContentFontScaleFactor * CSSFont.Size), 2
-      );
-      CSSFont.Style := [fsBold];
-      AddProperty(TCSS.FontProps(CSSFont));
-      AddProperty(TCSS.BorderProp(cssBottom, 1, cbsSolid, clBorder));
-    end;
+    CSSFont.Assign(ContentFont);
+    CSSFont.Size := CSSFont.Size + Max(
+      Round(2 * ContentFontScaleFactor * CSSFont.Size), 2
+    );
+    CSSFont.Style := [fsBold];
+    CSSBuilder.AddSelector('h1')
+      .AddProperty(TCSS.FontProps(CSSFont))
+      .AddProperty(TCSS.BorderProp(cssBottom, 1, cbsSolid, clBorder));
+
     // Sets H2 heading font size and border
-    with CSSBuilder.AddSelector('h2') do
-    begin
-      CSSFont.Assign(ContentFont);
-      CSSFont.Style := [fsBold];
-      AddProperty(TCSS.FontProps(CSSFont));
-    end;
+    CSSFont.Assign(ContentFont);
+    CSSFont.Style := [fsBold];
+    CSSBuilder.AddSelector('h2')
+      .AddProperty(TCSS.FontProps(CSSFont));
+
     // Set H2 heading font for use in rendered active text
-    with CSSBuilder.AddSelector('.active-text h2') do
-    begin
-      CSSFont.Assign(ContentFont);
-      CSSFont.Style := [fsBold];
-      CSSFont.Size := CSSFont.Size + Max(
-        Round(ContentFontScaleFactor * CSSFont.Size), 1
-      );
-      AddProperty(TCSS.FontProps(CSSFont));
-    end;
+    CSSFont.Assign(ContentFont);
+    CSSFont.Style := [fsBold];
+    CSSFont.Size := CSSFont.Size + Max(
+      Round(ContentFontScaleFactor * CSSFont.Size), 1
+    );
+    CSSBuilder.AddSelector('.active-text h2')
+      .AddProperty(TCSS.FontProps(CSSFont));
+
     // Set CODE tag within H2 heading for use in rendered active text
-    with CSSBuilder.AddSelector('.active-text h2 code') do
-    begin
-      CSSFont.Assign(MonoFont);
-      CSSFont.Style := [fsBold];
-      CSSFont.Size := CSSFont.Size + Max(
-        Round(ContentFontScaleFactor * CSSFont.Size), 1
-      );
-      AddProperty(TCSS.FontProps(CSSFont));
-    end;
+    CSSFont.Assign(MonoFont);
+    CSSFont.Style := [fsBold];
+    CSSFont.Size := CSSFont.Size + Max(
+      Round(ContentFontScaleFactor * CSSFont.Size), 1
+    );
+    CSSBuilder.AddSelector('.active-text h2 code')
+      .AddProperty(TCSS.FontProps(CSSFont));
+
     // Set H2 heading font for use in rendered active text in snippet list table
-    with CSSBuilder.AddSelector('.snippet-list .active-text h2') do
-    begin
-      CSSFont.Assign(ContentFont);
-      CSSFont.Style := [fsBold];
-      AddProperty(TCSS.FontProps(CSSFont));
-    end;
-    // Set CODE within H2 heading font for use in rendered active text in
+    CSSFont.Assign(ContentFont);
+    CSSFont.Style := [fsBold];
+    CSSBuilder.AddSelector('.snippet-list .active-text h2')
+      .AddProperty(TCSS.FontProps(CSSFont));
+
+    // Set <code> within H2 heading font for use in rendered active text in
     // snippet list table
-    with CSSBuilder.AddSelector('.snippet-list .active-text h2 code') do
-    begin
-      CSSFont.Assign(MonoFont);
-      CSSFont.Style := [fsBold];
-      AddProperty(TCSS.FontProps(CSSFont));
-    end;
+    CSSFont.Assign(MonoFont);
+    CSSFont.Style := [fsBold];
+    CSSBuilder.AddSelector('.snippet-list .active-text h2 code')
+      .AddProperty(TCSS.FontProps(CSSFont));
+
     // Style of box that appears around clickable options (or actions)
-    with CSSBuilder.AddSelector('.optionbox') do
-      AddProperty(TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder));
-    with CSSBuilder.AddSelector('.userdb') do
-      AddProperty(TCSS.ColorProp(Preferences.DBHeadingColours[True]));
-    with CSSBuilder.AddSelector('.maindb') do
-      AddProperty(TCSS.ColorProp(Preferences.DBHeadingColours[False]));
+    CSSBuilder.AddSelector('.optionbox')
+      .AddProperty(TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder));
+
+    // Heading colours for user & main databases
+    CSSBuilder.AddSelector('.userdb')
+      .AddProperty(TCSS.ColorProp(Preferences.DBHeadingColours[True]));
+    CSSBuilder.AddSelector('.maindb')
+      .AddProperty(TCSS.ColorProp(Preferences.DBHeadingColours[False]));
+
     // Sets CSS for style of New Tab text
-    with CSSBuilder.AddSelector('#newtab') do
-    begin
-      CSSFont.Assign(ContentFont);
-      CSSFont.Size := 36 + Round(36 * ContentFontScaleFactor);
-      CSSFont.Color := clNewTabText;
-      AddProperty(TCSS.FontProps(CSSFont));
-    end;
+    CSSFont.Assign(ContentFont);
+    CSSFont.Size := 36 + Round(36 * ContentFontScaleFactor);
+    CSSFont.Color := clNewTabText;
+    CSSBuilder.AddSelector('#newtab')
+      .AddProperty(TCSS.FontProps(CSSFont));
+
     // Sets text styles and colours used by syntax highlighter
     HiliteAttrs := THiliteAttrsFactory.CreateUserAttrs;
     with THiliterCSS.Create(HiliteAttrs) do
@@ -248,55 +245,53 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
       finally
         Free;
       end;
+
     // Adjust .pas-source class to use required background colour
-    with CSSBuilder.Selectors['.' + THiliterCSS.GetMainCSSClassName] do
-    begin
-      AddProperty(TCSS.BackgroundColorProp(Preferences.SourceCodeBGcolour));
-      if TIEInfo.SupportsCSSOverflowX then
-        AddProperty(TCSS.OverflowProp(covAuto, codX));
-    end;
+    CSSBuilder.Selectors['.' + THiliterCSS.GetMainCSSClassName]
+      .AddProperty(TCSS.BackgroundColorProp(Preferences.SourceCodeBGcolour))
+      .AddPropertyIf(
+        TIEInfo.SupportsCSSOverflowX, TCSS.OverflowProp(covAuto, codX)
+      );
+
+    // Address IE peculiarities
     if TIEInfo.SupportsCSSOverflowX then
-    begin
-      with CSSBuilder.AddSelector('#compile-results') do
-        AddProperty(TCSS.OverflowProp(covAuto, codX));
-    end;
-    with CSSBuilder.AddSelector('.comptable th') do
-    begin
-      AddProperty(TCSS.BackgroundColorProp(clCompTblHeadBg));
-      AddProperty(TCSS.FontWeightProp(cfwNormal));
-    end;
+      CSSBuilder.AddSelector('#compile-results')
+        .AddProperty(TCSS.OverflowProp(covAuto, codX));
+
+    // Compiler table heading
+    CSSBuilder.AddSelector('.comptable th')
+      .AddProperty(TCSS.BackgroundColorProp(clCompTblHeadBg))
+      .AddProperty(TCSS.FontWeightProp(cfwNormal));
+
     // Set active text list classes
-    with CSSBuilder.EnsureSelector('.active-text ul') do
-    begin
-      AddProperty(TCSS.MarginProp(cssAll, 0));
-      AddProperty(TCSS.MarginProp(cssTop, 4));
-      AddProperty(TCSS.PaddingProp(cssAll, 0));
-      AddProperty(TCSS.PaddingProp(cssLeft, 24));
-      AddProperty(TCSS.ListStylePositionProp(clspOutside));
-      AddProperty(TCSS.ListStyleTypeProp(clstDisc));
-    end;
-    with CSSBuilder.EnsureSelector('.active-text ol') do
-    begin
-      AddProperty(TCSS.MarginProp(cssAll, 0));
-      AddProperty(TCSS.MarginProp(cssTop, 4));
-      AddProperty(TCSS.PaddingProp(cssAll, 0));
-      AddProperty(TCSS.PaddingProp(cssLeft, 32));
-      AddProperty(TCSS.ListStylePositionProp(clspOutside));
-      AddProperty(TCSS.ListStyleTypeProp(clstDecimal));
-    end;
-    with CSSBuilder.EnsureSelector('.active-text li') do
-    begin
-      AddProperty(TCSS.PaddingProp(cssAll, 0));
-      AddProperty(TCSS.MarginProp(cssAll, 0));
-    end;
-    with CSSBuilder.EnsureSelector('.active-text li ol') do
-      AddProperty(TCSS.MarginProp(cssTop, 0));
-    with CSSBuilder.EnsureSelector('.active-text li ul') do
-      AddProperty(TCSS.MarginProp(cssTop, 0));
-    with CSSBuilder.EnsureSelector('.active-text ul li') do
-      AddProperty(TCSS.PaddingProp(cssLeft, 8));
-    with CSSBuilder.EnsureSelector('.active-text ul li ol li') do
-      AddProperty(TCSS.PaddingProp(cssLeft, 0));
+    CSSBuilder.EnsureSelector('.active-text ul')
+      .AddProperty(TCSS.MarginProp(cssAll, 0))
+      .AddProperty(TCSS.MarginProp(cssTop, 4))
+      .AddProperty(TCSS.PaddingProp(cssAll, 0))
+      .AddProperty(TCSS.PaddingProp(cssLeft, 24))
+      .AddProperty(TCSS.ListStylePositionProp(clspOutside))
+      .AddProperty(TCSS.ListStyleTypeProp(clstDisc));
+
+    // Active list styling
+    CSSBuilder.EnsureSelector('.active-text ol')
+      .AddProperty(TCSS.MarginProp(cssAll, 0))
+      .AddProperty(TCSS.MarginProp(cssTop, 4))
+      .AddProperty(TCSS.PaddingProp(cssAll, 0))
+      .AddProperty(TCSS.PaddingProp(cssLeft, 32))
+      .AddProperty(TCSS.ListStylePositionProp(clspOutside))
+      .AddProperty(TCSS.ListStyleTypeProp(clstDecimal));
+    CSSBuilder.EnsureSelector('.active-text li')
+      .AddProperty(TCSS.PaddingProp(cssAll, 0))
+      .AddProperty(TCSS.MarginProp(cssAll, 0));
+    CSSBuilder.EnsureSelector('.active-text li ol')
+      .AddProperty(TCSS.MarginProp(cssTop, 0));
+    CSSBuilder.EnsureSelector('.active-text li ul')
+      .AddProperty(TCSS.MarginProp(cssTop, 0));
+    CSSBuilder.EnsureSelector('.active-text ul li')
+      .AddProperty(TCSS.PaddingProp(cssLeft, 8));
+    CSSBuilder.EnsureSelector('.active-text ul li ol li')
+      .AddProperty(TCSS.PaddingProp(cssLeft, 0));
+
   finally
     ContentFont.Free;
     MonoFont.Free;
diff --git a/Src/FrEasterEgg.pas b/Src/FrEasterEgg.pas
index f815303e3..f993747b7 100644
--- a/Src/FrEasterEgg.pas
+++ b/Src/FrEasterEgg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that hosts the HTML, CSS and JavaScript used to display
  * the program's animated easter egg.
@@ -74,8 +74,8 @@ procedure TEasterEggFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
   CSSFont := TFont.Create;
   try
     TFontHelper.SetContentFont(CSSFont);
-    with CSSBuilder.AddSelector('body') do
-      AddProperty(TCSS.FontProps(CSSFont));
+    CSSBuilder.AddSelector('body')
+      .AddProperty(TCSS.FontProps(CSSFont));
   finally
     FreeAndNil(CSSFont);
   end;
diff --git a/Src/FrHTMLDlg.pas b/Src/FrHTMLDlg.pas
index f2e87cde4..b9901068a 100644
--- a/Src/FrHTMLDlg.pas
+++ b/Src/FrHTMLDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame containing a web browser control that displays HTML
  * content that takes on the appearance of a dialogue box.
@@ -18,9 +18,16 @@ interface
 
 uses
   // Delphi
-  OleCtrls, SHDocVw, Classes, Controls, ExtCtrls, Forms,
+  OleCtrls,
+  SHDocVw,
+  Classes,
+  Controls,
+  ExtCtrls,
+  Forms,
   // Project
-  FrBrowserBase, UCSSBuilder;
+  Browser.UUIMgr,
+  FrBrowserBase,
+  UCSSBuilder;
 
 
 type
@@ -35,8 +42,11 @@   THTMLDlgFrame = class(TBrowserBaseFrame)
     fOwner: TForm;
       {Form that owns the frame. Used to set font and colours to display in
       frame's HTML }
+    function GetScrollStyle: TWBScrollbarStyle;
+    procedure SetScrollStyle(const AValue: TWBScrollbarStyle);
   strict protected
     procedure BuildCSS(const CSSBuilder: TCSSBuilder); override;
+  published
       {Generates CSS classes specific to HTML dialog boxes. This CSS is added to
       that provided by parent class.
         @param CSSBuilder [in] Object used to build the CSS code.
@@ -50,6 +60,7 @@   THTMLDlgFrame = class(TBrowserBaseFrame)
       {Calculates height of document displayed in browser.
         @return Document height in pixels.
       }
+    property ScrollStyle: TWBScrollbarStyle read GetScrollStyle write SetScrollStyle default sbsHide;
   end;
 
 
@@ -58,9 +69,11 @@ implementation
 
 uses
   // Delphi
-  SysUtils, Graphics,
+  SysUtils,
+  Graphics,
   // Project
-  Browser.UUIMgr, UCSSUtils, UNulDropTarget;
+  UCSSUtils,
+  UNulDropTarget;
 
 
 {$R *.dfm}
@@ -80,38 +93,30 @@ procedure THTMLDlgFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
   // Set body style to use dialog box colour and font with no margin
   CSSFont := TFont.Create;
   try
-    with CSSBuilder.AddSelector('body') do
-    begin
-      AddProperty(TCSS.BackgroundColorProp(fOwner.Color));
-      AddProperty(TCSS.FontProps(fOwner.Font));
-      AddProperty(TCSS.MarginProp(0));
-    end;
+    CSSBuilder.AddSelector('body')
+      .AddProperty(TCSS.BackgroundColorProp(fOwner.Color))
+      .AddProperty(TCSS.FontProps(fOwner.Font))
+      .AddProperty(TCSS.MarginProp(0));
     // Sets heading margins, padding and font size
-    with CSSBuilder.AddSelector('h1') do
-    begin
-      CSSFont.Assign(Self.Font);
-      CSSFont.Size := CSSFont.Size + 2;
-      CSSFont.Style := [fsBold];
-      AddProperty(TCSS.FontProps(CSSFont));
-      AddProperty(TCSS.MarginProp(0));
-      AddProperty(TCSS.PaddingProp(0));
-    end;
+    CSSFont.Assign(Self.Font);
+    CSSFont.Size := CSSFont.Size + 2;
+    CSSFont.Style := [fsBold];
+    CSSBuilder.AddSelector('h1')
+      .AddProperty(TCSS.FontProps(CSSFont))
+      .AddProperty(TCSS.MarginProp(0))
+      .AddProperty(TCSS.PaddingProp(0));
     // Sets paragraph margins and padding
-    with CSSBuilder.AddSelector('p') do
-    begin
-      AddProperty(TCSS.MarginProp(cssTop, 6));
-      AddProperty(TCSS.MarginProp(cssBottom, 0));
-      AddProperty(TCSS.PaddingProp(0));
-    end;
-    with CSSBuilder.AddSelector('ul') do
-    begin
-      AddProperty(TCSS.MarginProp(cssTop, 6));
-      AddProperty(TCSS.MarginProp(cssBottom, 0));
-      AddProperty(TCSS.PaddingProp(0));
-    end;
+    CSSBuilder.AddSelector('p')
+      .AddProperty(TCSS.MarginProp(cssTop, 6))
+      .AddProperty(TCSS.MarginProp(cssBottom, 0))
+      .AddProperty(TCSS.PaddingProp(0));
+    CSSBuilder.AddSelector('ul')
+      .AddProperty(TCSS.MarginProp(cssTop, 6))
+      .AddProperty(TCSS.MarginProp(cssBottom, 0))
+      .AddProperty(TCSS.PaddingProp(0));
     // Sets table font info
-    with CSSBuilder.AddSelector('table') do
-      AddProperty(TCSS.FontProps(fOwner.Font));
+    CSSBuilder.AddSelector('table')
+      .AddProperty(TCSS.FontProps(fOwner.Font));
   finally
     FreeAndNil(CSSFont);
   end;
@@ -140,5 +145,16 @@ function THTMLDlgFrame.DocHeight: Integer;
   Result := WBController.UIMgr.DocHeight;
 end;
 
+function THTMLDlgFrame.GetScrollStyle: TWBScrollbarStyle;
+begin
+  Result := WBController.UIMgr.ScrollbarStyle;
+end;
+
+procedure THTMLDlgFrame.SetScrollStyle(const AValue: TWBScrollbarStyle);
+begin
+  if AValue <> GetScrollStyle then
+    WBController.UIMgr.ScrollbarStyle := AValue;
+end;
+
 end.
 
diff --git a/Src/FrHTMLPreview.pas b/Src/FrHTMLPreview.pas
index 5e895a9f9..e45cc0641 100644
--- a/Src/FrHTMLPreview.pas
+++ b/Src/FrHTMLPreview.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame used to display previews of HTML documents.
 }
@@ -70,8 +70,8 @@ procedure THTMLPreviewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
   }
 begin
   inherited;
-  with CSSBuilder.AddSelector('body') do
-    AddProperty(TCSS.MarginProp(cPreviewMargin));
+  CSSBuilder.AddSelector('body')
+    .AddProperty(TCSS.MarginProp(cPreviewMargin));
 end;
 
 procedure THTMLPreviewFrame.Display(const DocContent: TEncodedData);
diff --git a/Src/Hiliter.UCSS.pas b/Src/Hiliter.UCSS.pas
index 785e56802..2a605527e 100644
--- a/Src/Hiliter.UCSS.pas
+++ b/Src/Hiliter.UCSS.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a class that generates CSS code to enable syntax highlighted source
  * to be displayed in HTML. CSS code uses a highlighter's attributes. Access to
@@ -82,11 +82,9 @@ procedure THiliterCSS.BuildCSS(const CSSBuilder: TCSSBuilder);
   Elem: THiliteElement; // loops thru highlighter elements
 begin
   // Add font definition in main class
-  with CSSBuilder.AddSelector('.' + GetMainCSSClassName) do
-  begin
-    AddProperty(TCSS.FontFamilyProp(fHiliteAttrs.FontName, cfgMonoSpace));
-    AddProperty(TCSS.FontSizeProp(fHiliteAttrs.FontSize));
-  end;
+  CSSBuilder.AddSelector('.' + GetMainCSSClassName)
+    .AddProperty(TCSS.FontFamilyProp(fHiliteAttrs.FontName, cfgMonoSpace))
+    .AddProperty(TCSS.FontSizeProp(fHiliteAttrs.FontSize));
   // Add font style and colour definitions for each element
   for Elem := Low(THiliteElement) to High(THiliteElement) do
     BuildElemCSS(Elem, CSSBuilder);
@@ -105,14 +103,13 @@ procedure THiliterCSS.BuildElemCSS(const Elem: THiliteElement;
   // We only create CSS class if element attributes are non-nul
   if not ElemAttr.IsNul then
   begin
-    with CSSBuilder.AddSelector('.' + GetElemCSSClassName(Elem)) do
-    begin
-      if ElemAttr.ForeColor <> clNone then
-        AddProperty(TCSS.ColorProp(ElemAttr.ForeColor));
-      AddProperty(TCSS.FontWeightProp(ElemAttr.FontStyle));
-      AddProperty(TCSS.FontStyleProp(ElemAttr.FontStyle));
-      AddProperty(TCSS.TextDecorationProp(ElemAttr.FontStyle));
-    end;
+    CSSBuilder.AddSelector('.' + GetElemCSSClassName(Elem))
+      .AddProperty(TCSS.FontWeightProp(ElemAttr.FontStyle))
+      .AddProperty(TCSS.FontStyleProp(ElemAttr.FontStyle))
+      .AddProperty(TCSS.TextDecorationProp(ElemAttr.FontStyle))
+      .AddPropertyIf(
+        ElemAttr.ForeColor <> clNone, TCSS.ColorProp(ElemAttr.ForeColor)
+      );
   end;
 end;
 

From 97411af8941507e2ca5c69714487361e08d69b7c Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 13 Dec 2022 11:11:59 +0000
Subject: [PATCH 055/264] Refactor TBorlandCompiler.DetectExeFile method

Passed off installed versions of Delphi to new private
GetExePathIfRegistered method.
---
 Src/Compilers.UBorland.pas | 39 ++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/Src/Compilers.UBorland.pas b/Src/Compilers.UBorland.pas
index d25b99538..1786c4ad2 100644
--- a/Src/Compilers.UBorland.pas
+++ b/Src/Compilers.UBorland.pas
@@ -40,6 +40,15 @@   TBorlandCompiler = class(TCompilerBase)
         @param RootKey [in] Given registry root key.
         @return Required root path or '' if not compiler not installed.
       }
+    ///  <summary>Gets the path to the compiler exe file if the compiler is
+    ///  registered as installed on the user's computer.</summary>
+    ///  <param name="ExePath">string [out] Set to path to compiler executable
+    ///  file. Empty string if compiler not installed.</param>
+    ///  <returns>Boolean. True if compiler is registered as installed or False
+    ///  otherwise.</returns>
+    ///  <remarks>Does not check if compiler exe is actually present, just if
+    ///  it is registered.</remarks>
+    function GetExePathIfInstalled(out ExePath: string): Boolean;
   strict protected
     function SearchDirParams: string; override;
       {One of more parameters that define any search directories to be passed
@@ -128,17 +137,11 @@ function TBorlandCompiler.DetectExeFile: Boolean;
     @return True if compiler path found, false otherwise.
   }
 var
-  InstDir: string;    // installation root directory
+  ExePath: string;
 begin
-  // try HKLM
-  InstDir := InstallPathFromReg(HKEY_LOCAL_MACHINE);
-  if InstDir = '' then
-    // in case install was for user only, try HKCU
-    InstDir := InstallPathFromReg(HKEY_CURRENT_USER);
-  if InstDir = '' then
-    Exit(False);
-  SetExecFile(IncludeTrailingPathDelimiter(InstDir) + 'Bin\DCC32.exe');
-  Result := True;
+  Result := GetExePathIfInstalled(ExePath);
+  if Result then
+    SetExecFile(ExePath);
 end;
 
 function TBorlandCompiler.GetDefaultSwitches: string;
@@ -161,6 +164,22 @@ function TBorlandCompiler.GetDefaultSwitches: string;
          +  '-$P+';   // Open string params ON
 end;
 
+function TBorlandCompiler.GetExePathIfInstalled(out ExePath: string): Boolean;
+var
+  InstDir: string;
+begin
+  ExePath := '';
+  // try HKLM
+  InstDir := InstallPathFromReg(HKEY_LOCAL_MACHINE);
+  if InstDir = '' then
+    // in case install was for user only, try HKCU
+    InstDir := InstallPathFromReg(HKEY_CURRENT_USER);
+  if InstDir = '' then
+    Exit(False);
+  ExePath := TPath.Combine(InstDir, 'Bin\DCC32.exe');
+  Result := True;
+end;
+
 function TBorlandCompiler.GetID: TCompilerID;
   {Provides the unique id of the compiler.
     @return Compiler id.

From 86d1e8aa18de8ced9e699def48086c954892675f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 13 Dec 2022 11:34:49 +0000
Subject: [PATCH 056/264] Add support for new ICompilerAutoDetect methods

Add methods to ICompilerAutoDetect in Compilers.UGlobals.
Implement methods in Compilers.UBorland
Update TPersistCompilers in Compilers.UCompilers to persist
CanAutoInstall "property" in config file.
---
 Src/Compilers.UBorland.pas   | 55 +++++++++++++++++++++++++++++++++---
 Src/Compilers.UCompilers.pas | 10 +++++++
 Src/Compilers.UGlobals.pas   | 11 +++++++-
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/Src/Compilers.UBorland.pas b/Src/Compilers.UBorland.pas
index 1786c4ad2..79d680290 100644
--- a/Src/Compilers.UBorland.pas
+++ b/Src/Compilers.UBorland.pas
@@ -35,6 +35,8 @@   TBorlandCompiler = class(TCompilerBase)
     var
       fId: TCompilerID;
         {Identifies compiler}
+      // Flags whether user permits compiler to be auto installed.
+      fCanAutoInstall: Boolean;
     function InstallPathFromReg(const RootKey: HKEY): string;
       {Gets compiler install root path from given registry root key, if present.
         @param RootKey [in] Given registry root key.
@@ -70,10 +72,35 @@   TBorlandCompiler = class(TCompilerBase)
         @param Obj Compiler object to copy.
       }
     { ICompilerAutoDetect }
+    ///  <summary>Detects and records path to command line compiler exe file,
+    ///  if compiler is registered as installed.</summary>
+    ///  <returns>Boolean. True if compiler is registered as installed, False
+    ///  otherwise.</returns>
+    ///  <remarks>
+    ///  <para>Does not check if the compiler exe file actually exists.</para>
+    ///  <para>Does not set compiler exe file if compiler is not installed.
+    ///  </para>
+    ///  <para>Method of ICompilerAutoDetect.</para>
+    ///  </remarks>
     function DetectExeFile: Boolean;
-      {Detects and records path to command line compiler if present.
-        @return True if compiler path found, false otherwise.
-      }
+    ///  <summary>Checks if the compiler is installed on the user's system.
+    ///  </summary>
+    ///  <returns>Boolean. True if compiler is physically installed, False
+    ///  otherwise.</returns>
+    ///  <remarks>
+    ///  <para>Checks if compiler exe is actually present.</para>
+    ///  <para>Method of ICompilerAutoDetect.</para>
+    ///  </remarks>
+    function IsInstalled: Boolean;
+    ///  <summary>Checks if the compiler is permitted to be automatically
+    ///  installed.</summary>
+    ///  <remarks>Method of ICompilerAutoDetect.</remarks>
+    function GetCanAutoInstall: Boolean;
+    ///  <summary>Determines whether the compiler can be automatically
+    ///  installed.</summary>
+    ///  <remarks>Method of ICompilerAutoDetect.</remarks>
+    procedure SetCanAutoInstall(const Value: Boolean);
+
     { ICompiler }
     function GetDefaultSwitches: string; override;
       {Returns default command line switches for compiler.
@@ -97,7 +124,7 @@ implementation
 
 uses
   // Delphi
-  SysUtils, Registry,
+  SysUtils, Registry, IOUtils,
   // Project
   UIStringList, UStrUtils, USystemInfo;
 
@@ -118,6 +145,7 @@ constructor TBorlandCompiler.CreateCopy(const Obj: TBorlandCompiler);
 begin
   inherited CreateCopy(Obj);
   fId := Obj.GetID;
+  fCanAutoInstall := Obj.GetCanAutoInstall;
 end;
 
 procedure TBorlandCompiler.DeleteObjFiles(const Path, Project: string);
@@ -144,6 +172,11 @@ function TBorlandCompiler.DetectExeFile: Boolean;
     SetExecFile(ExePath);
 end;
 
+function TBorlandCompiler.GetCanAutoInstall: Boolean;
+begin
+  Result := fCanAutoInstall;
+end;
+
 function TBorlandCompiler.GetDefaultSwitches: string;
   {Returns default command line switches for Borland compilers.
     @return Switches separated by commas.
@@ -211,6 +244,15 @@ function TBorlandCompiler.InstallPathFromReg(const RootKey: HKEY): string;
   end;
 end;
 
+function TBorlandCompiler.IsInstalled: Boolean;
+var
+  ExePath: string;
+begin
+  if not GetExePathIfInstalled(ExePath) then
+    Exit(False);
+  Result := TFile.Exists(ExePath, False);
+end;
+
 function TBorlandCompiler.SearchDirParams: string;
   {One of more parameters that define any search directories to be passed to
   compiler on command line.
@@ -228,5 +270,10 @@ function TBorlandCompiler.SearchDirParams: string;
     + ' ' + StrQuoteSpaced('-R' + Dirs.GetText(';', False));
 end;
 
+procedure TBorlandCompiler.SetCanAutoInstall(const Value: Boolean);
+begin
+  fCanAutoInstall := Value;
+end;
+
 end.
 
diff --git a/Src/Compilers.UCompilers.pas b/Src/Compilers.UCompilers.pas
index a0d840690..16c484e30 100644
--- a/Src/Compilers.UCompilers.pas
+++ b/Src/Compilers.UCompilers.pas
@@ -328,6 +328,12 @@ procedure TPersistCompilers.Load(const Compilers: ICompilers);
     // Load search directories
     SearchDirNames := Storage.GetStrings('SearchDirCount', 'SearchDir%d');
     Compiler.SetSearchDirs(TSearchDirs.Create(SearchDirNames.ToArray));
+
+    // Check if compiler can be auto-detected
+    if Supports(Compiler, ICompilerAutoDetect) then
+      (Compiler as ICompilerAutoDetect).SetCanAutoInstall(
+        Storage.GetBoolean('CanAutoInstall', True)
+      );
   end;
 end;
 
@@ -363,6 +369,10 @@ procedure TPersistCompilers.Save(const Compilers: ICompilers);
       Storage.SetString('Namespaces', Compiler.GetRTLNamespaces);
     SearchDirNames := TIStringList.Create(Compiler.GetSearchDirs.ToStrings);
     Storage.SetStrings('SearchDirCount', 'SearchDir%d', SearchDirNames);
+    if Supports(Compiler, ICompilerAutoDetect) then
+      Storage.SetBoolean(
+        'CanAutoInstall', (Compiler as ICompilerAutoDetect).GetCanAutoInstall
+      );
     // save the data
     Storage.Save;
   end;
diff --git a/Src/Compilers.UGlobals.pas b/Src/Compilers.UGlobals.pas
index 5653202f9..3600176bf 100644
--- a/Src/Compilers.UGlobals.pas
+++ b/Src/Compilers.UGlobals.pas
@@ -299,7 +299,7 @@ interface
     property Count: Integer read GetCount;
 
     ///  <summary>Number of compilers installed on this computer and made
-    ///  available CodeSnip.</summary>
+    ///  available to CodeSnip.</summary>
     property AvailableCount: Integer read GetAvailableCount;
 
     ///  <summary>Checks if any compilers in the list are displayable.</summary>
@@ -327,6 +327,15 @@ interface
     ///  <summary>Detects and records the full path of the compiler's
     ///  executable.</summary>
     function DetectExeFile: Boolean;
+    ///  <summary>Checks if the compiler is installed on the user's system.
+    ///  </summary>
+    function IsInstalled: Boolean;
+    ///  <summary>Checks if the compiler is permitted to be automatically
+    ///  installed.</summary>
+    function GetCanAutoInstall: Boolean;
+    ///  <summary>Determines whether the compiler can be automatically
+    ///  installed.</summary>
+    procedure SetCanAutoInstall(const Value: Boolean);
   end;
 
 

From cb68028d471e50387202fd9b772a5210489bbd67 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 03:36:50 +0000
Subject: [PATCH 057/264] New TCompilerList class

Added to Compilers.UCompilers unit
---
 Src/Compilers.UCompilers.pas | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/Src/Compilers.UCompilers.pas b/Src/Compilers.UCompilers.pas
index 16c484e30..92b6e7881 100644
--- a/Src/Compilers.UCompilers.pas
+++ b/Src/Compilers.UCompilers.pas
@@ -20,6 +20,8 @@ interface
 
 
 uses
+  // Delphi
+  Generics.Collections,
   // Project
   Compilers.UGlobals, UBaseObjects;
 
@@ -64,13 +66,18 @@   TCompilersFactory = class(TNoConstructObject)
       }
   end;
 
+  TCompilerList = class(TList<ICompiler>)
+  public
+    constructor Create;
+  end;
+
 
 implementation
 
 
 uses
   // Delphi
-  Generics.Collections, SysUtils,
+  Generics.Defaults, SysUtils,
   // Project
   Compilers.UBDS, Compilers.UDelphi, Compilers.UFreePascal,
   Compilers.USearchDirs, IntfCommon, UConsts, UExceptions, UIStringList,
@@ -378,5 +385,19 @@ procedure TPersistCompilers.Save(const Compilers: ICompilers);
   end;
 end;
 
+{ TCompilerList }
+
+constructor TCompilerList.Create;
+begin
+  inherited Create(
+    TDelegatedComparer<ICompiler>.Create(
+      function (const Left, Right: ICompiler): Integer
+      begin
+        Result := Ord(Left.GetID) - Ord(Right.GetID);
+      end
+    )
+  )
+end;
+
 end.
 

From 9209e64f106aff94410bf6c4d4b5a8e29faceba0 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 13 Dec 2022 16:02:44 +0000
Subject: [PATCH 058/264] Add option to switch off pre-compiler auto-detect

Update FmCompilersDlg.FrCompiler frame to display a check box for Delphi
compilers to permit auto-detection of each compiler to be disabled.
---
 Src/FmCompilersDlg.FrCompiler.dfm | 13 ++++++++++++-
 Src/FmCompilersDlg.FrCompiler.pas | 14 +++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Src/FmCompilersDlg.FrCompiler.dfm b/Src/FmCompilersDlg.FrCompiler.dfm
index 1d844035a..91c15db22 100644
--- a/Src/FmCompilersDlg.FrCompiler.dfm
+++ b/Src/FmCompilersDlg.FrCompiler.dfm
@@ -1,4 +1,7 @@
 inherited CompilersDlgCompilerFrame: TCompilersDlgCompilerFrame
+  DesignSize = (
+    362
+    235)
   object lblCompilerPath: TLabel
     Left = 4
     Top = 4
@@ -46,9 +49,17 @@ inherited CompilersDlgCompilerFrame: TCompilersDlgCompilerFrame
   object chkShowInMain: TCheckBox
     Left = 4
     Top = 88
-    Width = 273
+    Width = 320
     Height = 17
     Caption = 'Display &results for this compiler in details pane'
     TabOrder = 3
   end
+  object chkPermitAutoDetect: TCheckBox
+    Left = 4
+    Top = 111
+    Width = 320
+    Height = 17
+    Caption = 'Permit &auto-detection && registration of this compiler'
+    TabOrder = 4
+  end
 end
diff --git a/Src/FmCompilersDlg.FrCompiler.pas b/Src/FmCompilersDlg.FrCompiler.pas
index 8b9c2b2db..b4657ab02 100644
--- a/Src/FmCompilersDlg.FrCompiler.pas
+++ b/Src/FmCompilersDlg.FrCompiler.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame used to edit executable file name of compiler being edited
  * in TCompilersDlg.
@@ -34,6 +34,7 @@   TCompilersDlgCompilerFrame = class(TCompilersDlgBaseFrame)
     btnBrowse: TButton;
     btnClear: TButton;
     chkShowInMain: TCheckBox;
+    chkPermitAutoDetect: TCheckBox;
     ///  <summary>Displays file open dialog box and places entered file name in
     ///  compiler file name edit control.</summary>
     procedure btnBrowseClick(Sender: TObject);
@@ -98,6 +99,7 @@ procedure TCompilersDlgCompilerFrame.ArrangeControls;
   );
   btnClear.Top := TCtrlArranger.BottomOf([edCompilerPath, btnBrowse], 8);
   chkShowInMain.Top := TCtrlArranger.BottomOf(btnClear, 24);
+  chkPermitAutoDetect.Top := TCtrlArranger.BottomOf(chkShowInMain, 8);
 end;
 
 procedure TCompilersDlgCompilerFrame.btnBrowseClick(Sender: TObject);
@@ -164,12 +166,22 @@ procedure TCompilersDlgCompilerFrame.Initialise;
 begin
   edCompilerPath.Text := Compiler.GetExecFile;
   chkShowInMain.Checked := Compiler.GetDisplayable;
+  chkPermitAutoDetect.Visible := Supports(Compiler, ICompilerAutoDetect);
+  if chkPermitAutoDetect.Visible then
+    chkPermitAutoDetect.Checked :=
+      (Compiler as ICompilerAutoDetect).GetCanAutoInstall
+  else
+    chkPermitAutoDetect.Checked := False;
 end;
 
 procedure TCompilersDlgCompilerFrame.UpdateCompiler;
 begin
   Compiler.SetExecFile(GetCompilerPath);
   Compiler.SetDisplayable(chkShowInMain.Checked);
+  if Supports(Compiler, ICompilerAutoDetect) then
+    (Compiler as ICompilerAutoDetect).SetCanAutoInstall(
+      chkPermitAutoDetect.Checked
+    );
 end;
 
 function TCompilersDlgCompilerFrame.ValidateFileName(const FileName: string;

From c4d6ca767f859d37b14f6481f5d3dacf0af20dd8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 17:15:34 +0000
Subject: [PATCH 059/264] Add new Compilers.UAutoDetect unit to project

Implements a static class that can detect and register Delphi compilers
present on the user's system that are not yet registered with CodeSnip.
---
 Src/CodeSnip.dpr              |   3 +-
 Src/CodeSnip.dproj            |   1 +
 Src/Compilers.UAutoDetect.pas | 115 ++++++++++++++++++++++++++++++++++
 3 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 Src/Compilers.UAutoDetect.pas

diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index d608babf8..a3b16a3cc 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -370,7 +370,8 @@ uses
   UXMLDocConsts in 'UXMLDocConsts.pas',
   UXMLDocHelper in 'UXMLDocHelper.pas',
   UXMLDocumentEx in 'UXMLDocumentEx.pas',
-  FmDeleteUserDBDlg in 'FmDeleteUserDBDlg.pas' {DeleteUserDBDlg};
+  FmDeleteUserDBDlg in 'FmDeleteUserDBDlg.pas' {DeleteUserDBDlg},
+  Compilers.UAutoDetect in 'Compilers.UAutoDetect.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index e1a91d26d..096228d32 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -575,6 +575,7 @@
 			<DCCReference Include="FmDeleteUserDBDlg.pas">
 				<Form>DeleteUserDBDlg</Form>
 			</DCCReference>
+			<DCCReference Include="Compilers.UAutoDetect.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
diff --git a/Src/Compilers.UAutoDetect.pas b/Src/Compilers.UAutoDetect.pas
new file mode 100644
index 000000000..40d1bebea
--- /dev/null
+++ b/Src/Compilers.UAutoDetect.pas
@@ -0,0 +1,115 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Implements a static class that can detect and register Delphi compilers
+ * present on the user's system that are not yet registered with CodeSnip.
+}
+
+
+unit Compilers.UAutoDetect;
+
+interface
+
+uses
+  Compilers.UGlobals,
+  Compilers.UCompilers,
+  UBaseObjects;
+
+type
+  TCompilerAutoDetect = class(TNoConstructObject)
+  public
+    type
+      TCallback = reference to procedure (Compiler: ICompiler);
+  strict private
+    class procedure DoCallback(const Callback: TCallback;
+      Compiler: ICompiler);
+  public
+    class procedure RegisterCompilers(Compilers: ICompilers;
+      const Callback: TCallback = nil); overload;
+    class procedure RegisterSpecificCompilers(AllCompilers: ICompilers;
+      const RegList: TCompilerList; const Callback: TCallback = nil);
+    class procedure ListRegisterableCompilers(Compilers: ICompilers;
+      const Registerable: TCompilerList);
+  end;
+
+implementation
+
+uses
+  SysUtils;
+
+{ TCompilerAutoDetect }
+
+class procedure TCompilerAutoDetect.DoCallback(
+  const Callback: TCallback; Compiler: ICompiler);
+begin
+  if Assigned(Callback) then
+    Callback(Compiler);
+end;
+
+class procedure TCompilerAutoDetect.ListRegisterableCompilers(
+  Compilers: ICompilers; const Registerable: TCompilerList);
+var
+  Compiler: ICompiler;
+begin
+  Registerable.Clear;
+  for Compiler in Compilers do
+  begin
+    if not Supports(Compiler, ICompilerAutoDetect) then
+      Continue; // compiler can't be auto-detected/registered
+    if not (Compiler as ICompilerAutoDetect).IsInstalled then
+      Continue; // compiler is not installed on the user's system
+    if Compiler.IsAvailable then
+      Continue; // compiler installed & already registered for use by CodeSnip
+    if not (Compiler as ICompilerAutoDetect).GetCanAutoInstall then
+      Continue; // user has excluded this compiler from being auto-registered
+    // We get here then we have an installed, un-registered, auto-detectable
+    // compiler with permission to register
+    Registerable.Add(Compiler);
+  end;
+end;
+
+class procedure TCompilerAutoDetect.RegisterSpecificCompilers(
+  AllCompilers: ICompilers; const RegList: TCompilerList;
+  const Callback: TCallback);
+var
+  Compiler: ICompiler;
+begin
+  for Compiler in AllCompilers do
+  begin
+    if RegList.IndexOf(Compiler) >= 0 then
+    begin
+      Assert(Supports(Compiler, ICompilerAutoDetect), ClassName +
+        '.RegisterCompilers: Compiler does not support ICompilerAutoDetect');
+      if (Compiler as ICompilerAutoDetect).DetectExeFile then
+        DoCallback(Callback, Compiler);
+    end;
+  end;
+end;
+
+class procedure TCompilerAutoDetect.RegisterCompilers(Compilers: ICompilers;
+  const Callback: TCallback);
+var
+  Registerable: TCompilerList;
+  Compiler: ICompiler;
+begin
+  Registerable := TCompilerList.Create;
+  try
+    ListRegisterableCompilers(Compilers, Registerable);
+    for Compiler in Registerable do
+    begin
+      Assert(Supports(Compiler, ICompilerAutoDetect), ClassName +
+        '.RegisterCompilers: Compiler does not support ICompilerAutoDetect');
+      if (Compiler as ICompilerAutoDetect).DetectExeFile then
+        DoCallback(Callback, Compiler);
+    end;
+  finally
+    Registerable.Free;
+  end;
+end;
+
+end.
+

From d156dcadd324f089efaa8a99db8decd62dae4883 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 17:26:57 +0000
Subject: [PATCH 060/264] Refactor compiler registration in FmCompilersDlg

Change to use Compilers.UAutoDetect unit to perform compiler
registration.

Also refactored out a with..do statement.
---
 Src/FmCompilersDlg.pas | 55 +++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/Src/FmCompilersDlg.pas b/Src/FmCompilersDlg.pas
index 135895a33..4dc64a6e8 100644
--- a/Src/FmCompilersDlg.pas
+++ b/Src/FmCompilersDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box where the user can configure the Pascal compilers
  * that are to be used by CodeSnip.
@@ -122,7 +122,12 @@ implementation
 
 uses
   // Project
-  Compilers.UCompilers, IntfCommon, UCtrlArranger, UExeFileType, UFontHelper,
+  Compilers.UAutoDetect,
+  Compilers.UCompilers,
+  IntfCommon,
+  UCtrlArranger,
+  UExeFileType,
+  UFontHelper,
   UMessageBox;
 
 
@@ -148,8 +153,6 @@ procedure TCompilersDlg.ArrangeForm;
 end;
 
 procedure TCompilersDlg.btnDetectClick(Sender: TObject);
-var
-  Compiler: ICompiler;  // refers to each compiler
 resourcestring
   // Text displayed in confirmation box
   sOKToDetect = 'Detected compiler file names will overwrite any existing '
@@ -159,19 +162,14 @@ procedure TCompilersDlg.btnDetectClick(Sender: TObject);
     Exit;
   // Record any changes to current compiler
   UpdateCurrentCompiler;
-  // Loop thru all compilers attempting to detect exe files
-  for Compiler in fLocalCompilers do
-  begin
-    if Supports(Compiler, ICompilerAutoDetect) then
+  // Register any available compilers
+  TCompilerAutoDetect.RegisterCompilers(fLocalCompilers,
+    procedure (RegisteredCompiler: ICompiler)
     begin
-      if (Compiler as ICompilerAutoDetect).DetectExeFile then
-      begin
-        // Update currently displayed compiler details
-        if Compiler.GetID = fCurCompiler.GetID then
-          UpdateEditFrames;
-      end;
-    end;
-  end;
+      if RegisteredCompiler.GetID = fCurCompiler.GetID then
+        UpdateEditFrames;
+    end
+  );
   // Redisplay compiler list and current compiler title to reflect any changes
   fCompListMgr.Refresh;
   fBannerMgr.Refresh;
@@ -234,20 +232,21 @@ class function TCompilersDlg.Execute(AOwner: TComponent;
   const ACompilers: ICompilers): Boolean;
 var
   Persister: IPersistCompilers; // object used to save object to storage
+  Dlg: TCompilersDlg;           // dialogue box instance
 begin
-  with InternalCreate(AOwner) do
-    try
-      (fLocalCompilers as IAssignable).Assign(ACompilers);
-      Result := ShowModal = mrOK;
-      if Result then
-      begin
-        (ACompilers as IAssignable).Assign(fLocalCompilers);
-        Persister := TPersistCompilers.Create;
-        Persister.Save(ACompilers);
-      end;
-    finally
-      Free;
+  Dlg := InternalCreate(AOwner);
+  try
+    (Dlg.fLocalCompilers as IAssignable).Assign(ACompilers);
+    Result := Dlg.ShowModal = mrOK;
+    if Result then
+    begin
+      (ACompilers as IAssignable).Assign(Dlg.fLocalCompilers);
+      Persister := TPersistCompilers.Create;
+      Persister.Save(ACompilers);
     end;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TCompilersDlg.FormCreate(Sender: TObject);

From 4ec90aeafcd65ee08356e093c7b94b0c7485bbd1 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 17:32:08 +0000
Subject: [PATCH 061/264] Add new all-compilers settings unit to project

New static TCompilerSettings class in new Compiler.USettings unit
provided to read/write settings to config file that apply to all
compilers.

Added only a single PermitStartupDetection class property that specifies
whether CodeSnip should detect un-registered Delphi compiler
installations on start-up.

Added a new ssCompilers ("Compilers") section to USettings unit for
use by the new TCompilerSettings class.
---
 Src/CodeSnip.dpr            |  3 +-
 Src/CodeSnip.dproj          |  1 +
 Src/Compilers.USettings.pas | 61 +++++++++++++++++++++++++++++++++++++
 Src/USettings.pas           |  8 +++--
 4 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 Src/Compilers.USettings.pas

diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index a3b16a3cc..def4bca01 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -371,7 +371,8 @@ uses
   UXMLDocHelper in 'UXMLDocHelper.pas',
   UXMLDocumentEx in 'UXMLDocumentEx.pas',
   FmDeleteUserDBDlg in 'FmDeleteUserDBDlg.pas' {DeleteUserDBDlg},
-  Compilers.UAutoDetect in 'Compilers.UAutoDetect.pas';
+  Compilers.UAutoDetect in 'Compilers.UAutoDetect.pas',
+  Compilers.USettings in 'Compilers.USettings.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index 096228d32..6370f7d80 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -576,6 +576,7 @@
 				<Form>DeleteUserDBDlg</Form>
 			</DCCReference>
 			<DCCReference Include="Compilers.UAutoDetect.pas"/>
+			<DCCReference Include="Compilers.USettings.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
diff --git a/Src/Compilers.USettings.pas b/Src/Compilers.USettings.pas
new file mode 100644
index 000000000..a4baee07f
--- /dev/null
+++ b/Src/Compilers.USettings.pas
@@ -0,0 +1,61 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Class that reads and writes settings that apply to all compilers.
+}
+
+
+unit Compilers.USettings;
+
+interface
+
+uses
+  UBaseObjects,
+  USettings;
+
+type
+  ///  <summary>Manages settings that apply to all compilers.</summary>
+  TCompilerSettings = class(TNoConstructObject)
+  strict private
+    const
+      AllCompilersConfigSection = ssCompilers;
+      PermitStartupDetectionKey = 'PermitStartupDetection';
+    class function ReadStorage: ISettingsSection;
+    class function GetPermitStartupDetection: Boolean; static;
+    class procedure SetPermitStartupDetection(const Value: Boolean); static;
+  public
+    class property PermitStartupDetection: Boolean
+      read GetPermitStartupDetection write SetPermitStartupDetection
+      default True;
+  end;
+
+implementation
+
+{ TCompilerSettings }
+
+class function TCompilerSettings.GetPermitStartupDetection: Boolean;
+begin
+  Result := ReadStorage.GetBoolean(PermitStartupDetectionKey, True);
+end;
+
+class function TCompilerSettings.ReadStorage: ISettingsSection;
+begin
+  Result := Settings.ReadSection(AllCompilersConfigSection);
+end;
+
+class procedure TCompilerSettings.SetPermitStartupDetection(
+  const Value: Boolean);
+var
+  Stg: ISettingsSection;
+begin
+  Stg := ReadStorage;
+  Stg.SetBoolean(PermitStartupDetectionKey, Value);
+  Stg.Save;
+end;
+
+end.
+
diff --git a/Src/USettings.pas b/Src/USettings.pas
index 527364fbf..7de87b900 100644
--- a/Src/USettings.pas
+++ b/Src/USettings.pas
@@ -164,12 +164,12 @@ interface
   ///  <para>-ssWindowState - info about the size and state of various
   ///  windows</para>
   ///  <para>-ssDatabase - database customisation info</para>
-  ///  <para>-ssUpdateChecks - info about update checks</para>
+  ///  <para>-ssCompilers - info about all compilers</para>
   ///  </summary>
   TSettingsSectionId = (
     ssFindText, ssFindCompiler, ssFindXRefs, ssCompilerInfo,
     ssPreferences, ssUnits, ssDuplicateSnippet,
-    ssFavourites, ssWindowState, ssDatabase
+    ssFavourites, ssWindowState, ssDatabase, ssCompilers
   );
 
 type
@@ -540,7 +540,8 @@ function TIniSettings.SectionName(const Id: TSettingsSectionId;
     'DuplicateSnippet', // ssDuplicateSnippet
     'Favourites',       // ssFavourites
     'WindowState',      // ssWindowState
-    'Database'          // ssDatabase
+    'Database',         // ssDatabase
+    'Compilers'         // ssCompilers
   );
 begin
   Result := cSectionNames[Id];
@@ -751,3 +752,4 @@ procedure TIniSettingsSection.SetStrings(const CountName, ItemFmt: string;
 
 end.
 
+

From 7172b540b763eeccf06323416e3873ad1fb21dae Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 17:38:34 +0000
Subject: [PATCH 062/264] Update config compilers dlg with auto-detect option

A check box was added to FmCompilersDlg that enables/disables the option
to detect and register compilers at start up. Value of the option is
stored in the config file via the TCompilerSettings class from
Compilers.USettings unit.
---
 Src/FmCompilersDlg.dfm | 18 ++++++++++++++----
 Src/FmCompilersDlg.pas | 18 +++++++++++++++---
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Src/FmCompilersDlg.dfm b/Src/FmCompilersDlg.dfm
index 12ae8c2a1..f9155a014 100644
--- a/Src/FmCompilersDlg.dfm
+++ b/Src/FmCompilersDlg.dfm
@@ -138,13 +138,13 @@ inherited CompilersDlg: TCompilersDlg
     end
   end
   inherited btnHelp: TButton
-    TabOrder = 4
+    TabOrder = 5
   end
   inherited btnCancel: TButton
-    TabOrder = 3
+    TabOrder = 4
   end
   inherited btnOK: TButton
-    TabOrder = 2
+    TabOrder = 3
     OnClick = btnOKClick
   end
   object btnDetect: TButton
@@ -153,7 +153,17 @@ inherited CompilersDlg: TCompilersDlg
     Width = 153
     Height = 25
     Caption = '&Detect Delphi Compilers'
-    TabOrder = 1
+    TabOrder = 2
     OnClick = btnDetectClick
   end
+  object chkStartupDetection: TCheckBox
+    Left = 8
+    Top = 336
+    Width = 417
+    Height = 17
+    Caption = 
+      'Automatically register newly installed Delphi compilers at progr' +
+      'am startup'
+    TabOrder = 1
+  end
 end
diff --git a/Src/FmCompilersDlg.pas b/Src/FmCompilersDlg.pas
index 4dc64a6e8..e78f4fd14 100644
--- a/Src/FmCompilersDlg.pas
+++ b/Src/FmCompilersDlg.pas
@@ -45,6 +45,7 @@   TCompilersDlg = class(TGenericOKDlg, INoPublicConstruct)
     frmSearchDirs: TCompilersDlgSearchDirsFrame;
     tsNamespaces: TTabSheet;
     frmNamespaces: TCompilersDlgNamespacesFrame;
+    chkStartupDetection: TCheckBox;
     ///  <summary>When Auto Detect Compilers button is clicked, sets executable
     ///  program path for each installed compiler that can detect its own path.
     ///  </summary>
@@ -124,6 +125,7 @@ implementation
   // Project
   Compilers.UAutoDetect,
   Compilers.UCompilers,
+  Compilers.USettings,
   IntfCommon,
   UCtrlArranger,
   UExeFileType,
@@ -147,9 +149,16 @@ procedure TCompilersDlg.ArrangeForm;
   );
   // size dialogue and arrange inherited controls
   inherited;
-  // arrange extra button in bottom button line
-  btnDetect.Left := pnlBody.Left;
-  btnDetect.Top := btnHelp.Top;
+  TCtrlArranger.AlignLefts([btnDetect, chkStartupDetection], pnlBody.Left);
+  // place chkStartupDetection below bevel under body panel
+  TCtrlArranger.MoveBelow(bvlBottom, chkStartupDetection, 8);
+  // push buttons below chkStartupDetection
+  TCtrlArranger.AlignTops(
+    [btnDetect, btnOK, btnCancel, btnHelp],
+    TCtrlArranger.BottomOf(chkStartupDetection, 8)
+  );
+  // stretch form height to accomodate insertion of chkStartupDetection
+  ClientHeight := TCtrlArranger.BottomOf(btnHelp, 6);
 end;
 
 procedure TCompilersDlg.btnDetectClick(Sender: TObject);
@@ -237,12 +246,15 @@ class function TCompilersDlg.Execute(AOwner: TComponent;
   Dlg := InternalCreate(AOwner);
   try
     (Dlg.fLocalCompilers as IAssignable).Assign(ACompilers);
+    Dlg.chkStartupDetection.Checked := TCompilerSettings.PermitStartupDetection;
     Result := Dlg.ShowModal = mrOK;
     if Result then
     begin
       (ACompilers as IAssignable).Assign(Dlg.fLocalCompilers);
       Persister := TPersistCompilers.Create;
       Persister.Save(ACompilers);
+      TCompilerSettings.PermitStartupDetection :=
+        Dlg.chkStartupDetection.Checked;
     end;
   finally
     Dlg.Free;

From 561501e64422aac3326de595e7646a82b68a2b1c Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 17:45:58 +0000
Subject: [PATCH 063/264] Add FmRegisterCompilersDlg dialogue box to project.

This dialogue box is designed to present a list of Delphi compiler(s) to
the user to enabled them to select which, if any, compiler(s) are to be
registered.

Designed for display at startup when unregistered versions of Delphi are
detected.

The dialogue includes an HTML resource that is used to display help
information on the face of the dialogue box.
---
 Src/CodeSnip.dpr                         |   3 +-
 Src/CodeSnip.dproj                       |   3 +
 Src/FmRegisterCompilersDlg.dfm           |  91 +++++++++
 Src/FmRegisterCompilersDlg.pas           | 250 +++++++++++++++++++++++
 Src/HTML.hrc                             |   3 +
 Src/Res/HTML/dlg-register-compilers.html |  59 ++++++
 6 files changed, 408 insertions(+), 1 deletion(-)
 create mode 100644 Src/FmRegisterCompilersDlg.dfm
 create mode 100644 Src/FmRegisterCompilersDlg.pas
 create mode 100644 Src/Res/HTML/dlg-register-compilers.html

diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index def4bca01..e12778a39 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -372,7 +372,8 @@ uses
   UXMLDocumentEx in 'UXMLDocumentEx.pas',
   FmDeleteUserDBDlg in 'FmDeleteUserDBDlg.pas' {DeleteUserDBDlg},
   Compilers.UAutoDetect in 'Compilers.UAutoDetect.pas',
-  Compilers.USettings in 'Compilers.USettings.pas';
+  Compilers.USettings in 'Compilers.USettings.pas',
+  FmRegisterCompilersDlg in 'FmRegisterCompilersDlg.pas' {RegisterCompilersDlg};
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index 6370f7d80..628ac2cce 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -577,6 +577,9 @@
 			</DCCReference>
 			<DCCReference Include="Compilers.UAutoDetect.pas"/>
 			<DCCReference Include="Compilers.USettings.pas"/>
+			<DCCReference Include="FmRegisterCompilersDlg.pas">
+				<Form>RegisterCompilersDlg</Form>
+			</DCCReference>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
diff --git a/Src/FmRegisterCompilersDlg.dfm b/Src/FmRegisterCompilersDlg.dfm
new file mode 100644
index 000000000..c9db2d7e4
--- /dev/null
+++ b/Src/FmRegisterCompilersDlg.dfm
@@ -0,0 +1,91 @@
+inherited RegisterCompilersDlg: TRegisterCompilersDlg
+  Caption = 'RegisterCompilersDlg'
+  ClientHeight = 453
+  ExplicitWidth = 474
+  ExplicitHeight = 482
+  PixelsPerInch = 96
+  TextHeight = 13
+  inherited bvlBottom: TBevel
+    Top = 403
+    ExplicitTop = 403
+  end
+  inherited pnlBody: TPanel
+    Width = 433
+    Height = 389
+    ExplicitWidth = 433
+    ExplicitHeight = 389
+    object lblDesc: TLabel
+      Left = 0
+      Top = 0
+      Width = 33
+      Height = 13
+      Caption = 'lblDesc'
+      FocusControl = clbCompilers
+    end
+    object clbCompilers: TCheckListBox
+      Left = 0
+      Top = 32
+      Width = 361
+      Height = 56
+      IntegralHeight = True
+      ItemHeight = 13
+      TabOrder = 0
+    end
+    inline frmNotes: TFixedHTMLDlgFrame
+      Left = 0
+      Top = 159
+      Width = 361
+      Height = 199
+      TabOrder = 1
+      TabStop = True
+      ExplicitTop = 159
+      ExplicitWidth = 361
+      ExplicitHeight = 199
+      inherited pnlBrowser: TPanel
+        Width = 361
+        Height = 199
+        ExplicitWidth = 361
+        ExplicitHeight = 199
+        inherited wbBrowser: TWebBrowser
+          Width = 361
+          Height = 199
+          ExplicitWidth = 353
+          ExplicitHeight = 199
+          ControlData = {
+            4C0000004F250000911400000000000000000000000000000000000000000000
+            000000004C000000000000000000000001000000E0D057007335CF11AE690800
+            2B2E126208000000000000004C0000000114020000000000C000000000000046
+            8000000000000000000000000000000000000000000000000000000000000000
+            00000000000000000100000000000000000000000000000000000000}
+        end
+      end
+    end
+    object chkDontShowAgain: TCheckBox
+      Left = 0
+      Top = 372
+      Width = 145
+      Height = 17
+      Caption = '&Don'#39't show this again'
+      TabOrder = 2
+    end
+  end
+  inherited btnHelp: TButton
+    Left = 362
+    Top = 420
+    ExplicitLeft = 362
+    ExplicitTop = 420
+  end
+  inherited btnCancel: TButton
+    Left = 282
+    Top = 420
+    ExplicitLeft = 282
+    ExplicitTop = 420
+  end
+  inherited btnOK: TButton
+    Left = 201
+    Top = 420
+    Default = False
+    ExplicitLeft = 201
+    ExplicitTop = 420
+  end
+end
diff --git a/Src/FmRegisterCompilersDlg.pas b/Src/FmRegisterCompilersDlg.pas
new file mode 100644
index 000000000..05c897c49
--- /dev/null
+++ b/Src/FmRegisterCompilersDlg.pas
@@ -0,0 +1,250 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Implements a dialogue box that is optionally displayed at start-up when
+ * Delphi compiler(s) are installed but not registered with CodeSnip. Allows the
+ * user to specify which, if any, compiler(s) are to be registered.
+}
+
+
+unit FmRegisterCompilersDlg;
+
+interface
+
+uses
+  // Delphi
+  Forms,
+  Classes,
+  StdCtrls,
+  Controls,
+  CheckLst,
+  ExtCtrls,
+  SysUtils,
+  // Project
+  FmGenericOKDlg,
+  FrBrowserBase,
+  FrFixedHTMLDlg,
+  FrHTMLDlg,
+  Compilers.UCompilers,
+  Compilers.UGlobals,
+  UBaseObjects,
+  UCSSBuilder;
+
+type
+  TRegisterCompilersDlg = class(TGenericOKDlg, INoPublicConstruct)
+    lblDesc: TLabel;
+    clbCompilers: TCheckListBox;
+    frmNotes: TFixedHTMLDlgFrame;
+    chkDontShowAgain: TCheckBox;
+    procedure FormDestroy(Sender: TObject);
+    procedure alMainUpdate(Action: TBasicAction; var Handled: Boolean);
+  strict private
+    var
+      fCandidateCompilers: TCompilerList;
+      fSelectedCompilers: TCompilerList;
+    function CountTickedCompilers: Integer;
+    procedure StoreSelectedCompilers;
+    procedure SetCaptions;
+    procedure PopulateList;
+  strict protected
+    procedure ConfigForm; override;
+    procedure InitForm; override;
+    procedure ArrangeForm; override;
+    ///  <summary>Handles HTML frame's OnBuildCSS event. Adds additional CSS
+    ///  required by HTML in this form.</summary>
+    ///  <param name="Sender">TObject [in] Reference to object triggering event.
+    ///  </param>
+    ///  <param name="CSSBuilder">TCSSBuilder [in] Object used to construct the
+    ///  CSS.</param>
+    procedure BuildCSS(Sender: TObject; const CSSBuilder: TCSSBuilder);
+  public
+    class function Execute(const AOwner: TComponent;
+      const CandidateCompilers: TCompilerList;
+      const SelectedCompilers: TCompilerList): Boolean;
+  end;
+
+implementation
+
+uses
+  Compilers.USettings,
+  UBox,
+  UCSSUtils,
+  UCtrlArranger;
+
+{$R *.dfm}
+
+{ TRegisterCompilersDlg }
+
+procedure TRegisterCompilersDlg.alMainUpdate(Action: TBasicAction;
+  var Handled: Boolean);
+begin
+  inherited;
+  btnOK.Enabled := chkDontShowAgain.Checked or (CountTickedCompilers > 0);
+end;
+
+procedure TRegisterCompilersDlg.ArrangeForm;
+begin
+  TCtrlArranger.SetLabelHeight(lblDesc);
+  clbCompilers.Top := TCtrlArranger.BottomOf(lblDesc, 8);
+  frmNotes.Top := TCtrlArranger.BottomOf(clbCompilers, 0);
+  frmNotes.Height := frmNotes.DocHeight;
+  chkDontShowAgain.Top := TCtrlArranger.BottomOf(frmNotes, 8);
+  TCtrlArranger.AlignLefts(
+    [lblDesc, clbCompilers, frmNotes, chkDontShowAgain], 0
+  );
+  pnlBody.ClientHeight := TCtrlArranger.TotalControlHeight(pnlBody) + 8;
+  pnlBody.ClientWidth := TCtrlArranger.TotalControlWidth(pnlBody);
+  inherited;
+end;
+
+procedure TRegisterCompilersDlg.BuildCSS(Sender: TObject;
+  const CSSBuilder: TCSSBuilder);
+var
+  Selector: TCSSSelector;
+begin
+  Selector := CSSBuilder.AddSelector('ol');
+  Selector.AddProperty(TCSS.MarginProp(cssLeft, 24));
+  Selector.AddProperty(TCSS.MarginProp(cssTop, 6));
+  Selector.AddProperty(TCSS.MarginProp(cssBottom, 0));
+  Selector.AddProperty(TCSS.PaddingProp(0));
+
+  Selector := CSSBuilder.AddSelector('ol li');
+  Selector.AddProperty(TCSS.MarginProp(cssTop, 6));
+
+  Selector := CSSBuilder.AddSelector('ol li ul');
+  Selector.AddProperty(TCSS.MarginProp(cssLeft, 16));
+  Selector.AddProperty(TCSS.MarginProp(cssTop, 6));
+  Selector.AddProperty(TCSS.MarginProp(cssBottom, 0));
+  Selector.AddProperty(TCSS.PaddingProp(0));
+
+  Selector := CSSBuilder.AddSelector('ol li ul li');
+  Selector.AddProperty(TCSS.MarginProp(cssTop, 0));
+end;
+
+procedure TRegisterCompilersDlg.ConfigForm;
+begin
+  inherited;
+  frmNotes.OnBuildCSS := BuildCSS;
+  frmNotes.Initialise('dlg-register-compilers.html');
+end;
+
+function TRegisterCompilersDlg.CountTickedCompilers: Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := 0 to Pred(clbCompilers.Count) do
+    if clbCompilers.Checked[I] then
+      Inc(Result);
+end;
+
+class function TRegisterCompilersDlg.Execute(const AOwner: TComponent;
+  const CandidateCompilers: TCompilerList;
+  const SelectedCompilers: TCompilerList): Boolean;
+var
+  Dlg: TRegisterCompilersDlg;
+begin
+  Assert(Assigned(CandidateCompilers),
+    ClassName + '.Execute: AvailCompilers list is nil');
+  Assert(Assigned(SelectedCompilers),
+    ClassName + '.Execute: CompilersToReg list is nil');
+  Assert(CandidateCompilers.Count > 0,
+    ClassName + '.Execute: AvailCompilers list must not be empty');
+
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fCandidateCompilers := CandidateCompilers;  // reference to list
+    Dlg.fSelectedCompilers := SelectedCompilers; // reference to list
+    Result := Dlg.ShowModal = mrOK;
+    if Result then
+    begin
+      Dlg.StoreSelectedCompilers;
+      TCompilerSettings.PermitStartupDetection :=
+        not Dlg.chkDontShowAgain.Checked;
+    end;
+  finally
+    Dlg.Free;
+  end;
+end;
+
+procedure TRegisterCompilersDlg.FormDestroy(Sender: TObject);
+var
+  Idx: Integer;
+begin
+  // Free TBox<> objects associated with compiler list items
+  for Idx := Pred(clbCompilers.Count) downto 0 do
+    clbCompilers.Items.Objects[Idx].Free;
+  inherited;
+end;
+
+procedure TRegisterCompilersDlg.InitForm;
+begin
+  inherited;
+  SetCaptions;
+  PopulateList;
+end;
+
+procedure TRegisterCompilersDlg.PopulateList;
+var
+  Compiler: ICompiler;
+begin
+  clbCompilers.Items.BeginUpdate;
+  try
+    clbCompilers.Clear;
+    for Compiler in fCandidateCompilers do
+    begin
+      clbCompilers.Items.AddObject(
+        Compiler.GetName,
+        TBox<ICompiler>.Create(Compiler)
+      );
+    end;
+  finally
+    clbCompilers.Items.EndUpdate;
+  end;
+  Assert(clbCompilers.Count > 0,
+    ClassName + '.PopulateList: compiler list empty');
+  clbCompilers.ItemIndex := 0;
+end;
+
+procedure TRegisterCompilersDlg.SetCaptions;
+resourcestring
+  sFormCaptionS = 'Unregistered Delphi Installations Detected';
+  sFormCaptionP = 'Unregistered Delphi Installation Detected';
+  sDescS = '&Unregistered compiler. Tick to register:';
+  sDescP = '&Unregistered compilers. Tick the ones to be registered:';
+begin
+  // Set form and description captions
+  if fCandidateCompilers.Count = 1 then
+  begin
+    Caption := sFormCaptionS;
+    lblDesc.Caption := sDescS;
+  end
+  else
+  begin
+    // fCandidateCompilers.Count > 1 because fCandidateCompilers.Count > 0 assured by
+    // assertions in Execute method
+    Caption := sFormCaptionP;
+    lblDesc.Caption := sDescP;
+  end;
+end;
+
+procedure TRegisterCompilersDlg.StoreSelectedCompilers;
+var
+  I: Integer;
+begin
+  fSelectedCompilers.Clear;
+  for I := 0 to Pred(clbCompilers.Count) do
+    if clbCompilers.Checked[I] then
+    begin
+      fSelectedCompilers.Add(
+        TBox<ICompiler>(clbCompilers.Items.Objects[I]).Value
+      );
+    end;
+end;
+
+end.
+
diff --git a/Src/HTML.hrc b/Src/HTML.hrc
index a731c26f2..600d279b8 100644
--- a/Src/HTML.hrc
+++ b/Src/HTML.hrc
@@ -43,6 +43,9 @@ Res\HTML\dlg-whatsnew.html
 # delete database dialogue
 Res\HTML\dlg-dbdelete.html
 
+# auto-register new compilers dialogue
+Res\HTML\dlg-register-compilers.html
+
 
 # Detail pane pages, scripts and CSS
 # ==================================
diff --git a/Src/Res/HTML/dlg-register-compilers.html b/Src/Res/HTML/dlg-register-compilers.html
new file mode 100644
index 000000000..773bf8734
--- /dev/null
+++ b/Src/Res/HTML/dlg-register-compilers.html
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<!--
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Instructions diplayed on Register Compilers dialogue box.
+-->
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+  <head>
+    <title>Register Compilers Configration</title>
+  </head>
+
+  <body>
+    <p>
+      If you don't wish to receive notifications like this again you have two
+      options:
+    </p>
+    <ol>
+      <li>
+        <p>
+          Turn off <strong>all checks</strong> for new compiler installations.
+          Do this by ticking the <em>Don't show this again</em> check box below.
+        </p>
+        <p>
+          If you change your mind later you can re-enable the checks from the 
+          <em>Configure Compilers</em> dialogue box.
+        </p>
+      </li>
+      <li>
+        <p>
+          Turn notifications on or off on a <strong>per-compiler</strong> basis.
+          You need to do this after you have closed this dialogue box, again by
+          using the <em>Configure Compilers</em> dialogue box.
+        </p>  
+      </li>
+    </ol>
+    <p>
+      For information about how to configure automatic detection of Delphi
+      compilers see the <a
+        class="help-link"
+        href="help:TaskRegisterCompilers"
+      >Register Compilers with <em>CodeSnip</em></a> help topic.
+    </p>
+    <p>
+      <strong>Note:</strong> only Delphi compilers can be automatically
+      registered with <em>CodeSnip</em>: this doesn't work with Free Pascal.
+    </p>
+  </body>
+</html>

From a7286b4a2928d4cc5160bee667fc84f712b1e3fa Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 17:50:05 +0000
Subject: [PATCH 064/264] Add support for registering new compiler at startup

Add TMainCompileMgr.CheckForNewCompilerInstalls method to UCompileMgr
that checks for registerable compilers, gets user choices using
FmRegisterCompilers dialogue box thwn registers any selected compiler.

The main form, FmMain, simply calls CheckForNewCompilerInstalls just
after the main windows displays, in TMainForm.AfterShow.
---
 Src/FmMain.pas      |   2 +
 Src/UCompileMgr.pas | 118 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 117 insertions(+), 3 deletions(-)

diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 828ef997f..f2f5d1e91 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -1218,6 +1218,8 @@ procedure TMainForm.AfterShowForm;
   // initialise display
   fMainDisplayMgr.Initialise(fWindowSettings.OverviewTab);
   fMainDisplayMgr.ShowWelcomePage;
+  // check for registerable Delphi compiler installations
+  fCompileMgr.CheckForNewCompilerInstalls;
 end;
 
 function TMainForm.appEventsHelp(Command: Word; Data: Integer;
diff --git a/Src/UCompileMgr.pas b/Src/UCompileMgr.pas
index 22a5271ad..8a7cea3b5 100644
--- a/Src/UCompileMgr.pas
+++ b/Src/UCompileMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides objects that manage test compilation and assoicated UI, display of
  * compilation results via a callback and and compiler configuration.
@@ -91,7 +91,8 @@   TCompileMgr = class(TComponent)
   {
   TMainCompileMgr:
     Extended compilation manager for use with main form. Checks if a view item
-    can be compiled and also permits user to configure compilers.
+    can be compiled, permits user to configure compilers and checks for newly
+    installed compilers.
   }
   TMainCompileMgr = class(TCompileMgr)
   public
@@ -112,6 +113,15 @@   TMainCompileMgr = class(TCompileMgr)
       properties.
         @return True if user accepts changes, False if not.
       }
+    ///  <summary>Check for new compiler installations, get user permission to
+    ///  install any that are found and register any compilers that user
+    ///  selects.</summary>
+    ///  <remarks>
+    ///  <para>Does nothing if compiler detection is disabled or if there are
+    ///  no installed but unregistered compilers.</para>
+    ///  <para>Should be called at program startup.</para>
+    ///  </remarks>
+    procedure CheckForNewCompilerInstalls;
   end;
 
 
@@ -121,8 +131,18 @@ implementation
 uses
   // Delphi
   SysUtils,
+  Generics.Collections,
   // Project
-  Compilers.UCompilers, DB.UMain, FmCompErrorDlg, FmCompilersDlg,
+  Compilers.UAutoDetect,
+  Compilers.UCompilers,
+  Compilers.USettings,
+  DB.UMain,
+  FmCompErrorDlg,
+  FmCompilersDlg,
+  FmRegisterCompilersDlg,
+  UConsts,
+  UMessageBox,
+  UStrUtils,
   UTestCompileUI;
 
 
@@ -244,6 +264,98 @@ function TMainCompileMgr.CanCompile(View: IView): Boolean;
     and SnippetView.Snippet.CanCompile;
 end;
 
+procedure TMainCompileMgr.CheckForNewCompilerInstalls;
+var
+  CandidateCompilers: TCompilerList;  // compilers available for registration
+  SelectedCompilers: TCompilerList;   // compilers chosen for registration
+  Persister: IPersistCompilers;       // object to store compiler data in config
+
+  // Display message box informing user of which compilers were registered
+  // MUST be called with non zero number of registered compilers
+  procedure NotifyResults;
+  var
+    CompList: string;     // string containing list of compilers registered
+    Compiler: ICompiler;  // each compiler
+    RegCount: Integer;    // count of compilers registered
+  resourcestring
+    sPrefixS = 'The following compiler was registered:';
+    sPrefixP = 'The following compilers were registered:';
+    sNoRegistrations = 'Unexpected error. None of the requested compilers were '
+      + 'registered.';
+  begin
+    CompList := '';
+    RegCount := 0;
+    for Compiler in Compilers do
+    begin
+      if (SelectedCompilers.IndexOf(Compiler) >= 0)
+        and Compiler.IsAvailable then
+      begin
+        CompList := CompList + '� ' + Compiler.GetName + EOL;
+        Inc(RegCount);
+      end;
+    end;
+    if RegCount > 0 then
+    begin
+      CompList := StrIf(RegCount = 1, sPrefixS, sPrefixP) + EOL2 + CompList;
+      TMessageBox.Information(Owner, CompList);
+    end
+    else
+      TMessageBox.Error(Owner, sNoRegistrations);
+  end;
+
+  // Display message to user informing that no compilers were registred
+  // MUST be called only with a zero number of registered compilers
+  procedure NotifyNoRegistrations;
+  resourcestring
+    sNothingRegistered = 'No compilers were selected for registration';
+  begin
+    TMessageBox.Information(Owner, sNothingRegistered);
+  end;
+
+begin
+  if not TCompilerSettings.PermitStartupDetection then
+    Exit;
+  SelectedCompilers := nil;
+  CandidateCompilers := TCompilerList.Create;
+  try
+    SelectedCompilers := TCompilerList.Create;
+    // Build list of compilers that are installed but not registered
+    TCompilerAutoDetect.ListRegisterableCompilers(
+      Self.Compilers, CandidateCompilers
+    );
+    if CandidateCompilers.Count = 0 then
+      Exit;   // no compilers to register
+
+    // We have candidate compilers: get user to select
+    if TRegisterCompilersDlg.Execute(
+      Owner,
+      CandidateCompilers,
+      SelectedCompilers
+    ) then
+    begin
+      if SelectedCompilers.Count > 0 then
+      begin
+        // User selected one or more compilers to register
+        // register compiler(s)
+        TCompilerAutoDetect.RegisterSpecificCompilers(
+          Compilers, SelectedCompilers
+        );
+        // update config file with changes
+        Persister := TPersistCompilers.Create;
+        Persister.Save(Compilers);
+        // tell user what got registered
+        NotifyResults;
+      end
+      else
+        // User didn't select a file: tell them
+        NotifyNoRegistrations;
+    end;
+  finally
+    SelectedCompilers.Free;
+    CandidateCompilers.Free;
+  end;
+end;
+
 function TMainCompileMgr.ConfigCompilers: Boolean;
   {Displays Configure Compilers dialog to permit user to update compiler
   properties.

From 4e6924ffd68741a77530f6344f4a24089caea1a2 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 13 Dec 2022 16:05:22 +0000
Subject: [PATCH 065/264] Update help files for compiler registration changes

Add & update help re auto-detect compiler feature
Add new dlg_registercompilers.htm and task_registercompilers.htm help
topics.
Noted new option to switch off compiler auto-detection.
Update other topics re the new topics and auto-detection feature.
Update help project, index and TOC files re new topics.
---
 Src/Help/CodeSnip.hhp                    |   2 +
 Src/Help/HTML/about_compiler_checks.htm  |  24 ++++-
 Src/Help/HTML/dlg_configcompilers.htm    |  57 +++++++++--
 Src/Help/HTML/dlg_registercompilers.htm  |  66 +++++++++++++
 Src/Help/HTML/task_registercompilers.htm | 120 +++++++++++++++++++++++
 Src/Help/HTML/tasks.htm                  |   5 +
 Src/Help/Index.hhk                       |   8 ++
 Src/Help/TOC.hhc                         |   4 +
 8 files changed, 276 insertions(+), 10 deletions(-)
 create mode 100644 Src/Help/HTML/dlg_registercompilers.htm
 create mode 100644 Src/Help/HTML/task_registercompilers.htm

diff --git a/Src/Help/CodeSnip.hhp b/Src/Help/CodeSnip.hhp
index 271557747..c9d4acebd 100644
--- a/Src/Help/CodeSnip.hhp
+++ b/Src/Help/CodeSnip.hhp
@@ -53,6 +53,7 @@ HTML\dlg_prefs_printing.htm
 HTML\dlg_prefs_snippetlayout.htm
 HTML\dlg_prefs_sourcecode.htm
 HTML\dlg_print.htm
+HTML\dlg_registercompilers.htm
 HTML\dlg_renamecategory.htm
 HTML\dlg_restore.htm
 HTML\dlg_savehiliter.htm
@@ -101,6 +102,7 @@ HTML\task_deleteuserdb.htm
 HTML\task_export.htm
 HTML\task_generateunit.htm
 HTML\task_printroutine.htm
+HTML\task_registercompilers.htm
 HTML\task_savesnippet.htm
 HTML\task_search.htm
 HTML\task_testcompile.htm
diff --git a/Src/Help/HTML/about_compiler_checks.htm b/Src/Help/HTML/about_compiler_checks.htm
index 0aa09cb0e..54ab897b0 100644
--- a/Src/Help/HTML/about_compiler_checks.htm
+++ b/Src/Help/HTML/about_compiler_checks.htm
@@ -41,7 +41,8 @@ <h2>
     </h2>
     <p>
       Before <em>CodeSnip</em> can use the compilers it needs to be told about
-      them. This is done using the <a
+      them. Compilers are registered for use by <em>CodeSnip</em> This is done
+      using the <a
        href="dlg_configcompilers.htm">Configure Compilers</a> dialogue box that
       is accessed from the <em>Tools</em> menu.
     </p>
@@ -60,7 +61,26 @@ <h2>
       different compiler switches and search paths.
     </p>
     <p>
-      The portable version of CodeSnip only maintains one set of compiler configuration information per installation.
+      The portable version of CodeSnip only maintains one set of compiler
+      configuration information per installation.
+    </p>
+    <h3>
+      Automatic detection of Delphi compilers
+    </h3>
+    <p>
+      By default, when <em>CodeSnip</em> starts up, it will check if there are
+      any versions of Delphi installed on the user's system that
+      <em>CodeSnip</em> could use, but that are not registered for use. Any such
+      compilers are displayed in the <a
+        href="dlg_registercompilers.htm"
+      >Unregistered Delphi Installation(s) Detected</a> dialogue box where you
+      can choose whether or not to register them.
+    </p>
+    <p>
+      It is possible to switch off automatic detection on either a global or a
+	  per compiler basis. For more information see the <a
+        href="task_registercompilers.htm"
+      >Register Compilers with <em>CodeSnip</em></a> topic.
     </p>
     <h2>
       Running the tests
diff --git a/Src/Help/HTML/dlg_configcompilers.htm b/Src/Help/HTML/dlg_configcompilers.htm
index 9055f3c9f..73e6ad0be 100644
--- a/Src/Help/HTML/dlg_configcompilers.htm
+++ b/Src/Help/HTML/dlg_configcompilers.htm
@@ -37,12 +37,12 @@ <h1>
       Compilers that are installed on the system. It is displayed using the
       <em>Tools | Configure Compilers</em> menu option. <em>CodeSnip</em> uses
       these compilers when <a href="about_compiler_checks.htm">test
-      compiling</a> routines.
+      compiling</a> snippets.
     </p>
     <p class="bordered">
       When using the standard version of CodeSnip each logged on user has their
-      their own compiler configuration, so any changes you make will not affect
-      other users. The portable edition of CodeSnip only supports one set of
+      own compiler configuration, so any changes you make will not affect other
+      users. The portable edition of CodeSnip only supports one set of
       configuration data per installation.
     </p>
     <p>
@@ -54,11 +54,14 @@ <h1>
     <p>
       Selecting a compiler on the left displays information about it on the
       right hand side of the dialogue. Here you enter or edit the required
-      information on three tabs, as follows.
+      information on four or five tabs, as follows.
     </p>
     <h2>
       Compiler Tab
     </h2>
+	<h3>
+	  Compiler file name
+	</h3>
     <p>
       Enter the the full path to the compiler's executable file in the <em>Enter
       compiler executable file name</em> edit box. This must be file name of
@@ -75,8 +78,11 @@ <h2>
       path to its executable file. The <em>Enter compiler executable file
       name</em> edit box is cleared.
     </p>
+	<h3>
+	  Display compiler results
+	</h3>
     <p>
-      Finally, you can choose whether the compiler is included in the table of
+      You can choose whether the compiler is included in the table of
       compile results displayed in the <a href="detail_pane.htm">Details
       Pane</a>. This is done using the <em>Display results for this compiler in
       details pane</em> check box. Tick the box to display the compiler's
@@ -97,6 +103,31 @@ <h2>
       remove the <em>Compiler Results Table</em> component from the different
       kinds of snippet pages.
     </p>
+	<h3>
+	  Automatic compiler detection &amp; registration
+	</h3>
+	<p>
+	  By default <em>CodeSnip </em> will automatically detect and register
+	  installed Delphi compilers for use with the program. This can happen in
+	  two ways:
+	</p>
+	<ol>
+	  <li>
+		When the <em>Detect Delphi Compilers</em> button is clicked (see below).
+      </li>
+	  <li>
+	    Optionally, when the program starts up.
+	  </li>
+	</ol>
+	<p>
+	  You can prevent a specific Delphi compiler from being automatically
+	  registered by clearing the <em>Permit auto-detection & registration of
+	  this compiler</em> check box.
+	</p>
+	<p class="bordered">
+	  <strong>Note:</strong> This check box does not appear when the Free Pascal
+	  compiler is selected.
+	</p>
     <h2>
       Switches Tab
     </h2>
@@ -283,13 +314,23 @@ <h2>
       <em>CodeSnip</em> can automatically detect the presence of Win 32 Delphi
       compilers from Delphi 2 to Delphi 11.x Alexandria. Click the <em>Detect
       Delphi Compilers</em> button to do this. Any supported installed version
-      of Delphi will be recorded. This can save considerable time and avoid
-      errors.
+      of Delphi will be recorded<sup>&dagger;</sup>. This can save considerable
+	  time and avoid errors.
     </p>
     <p>
       Free Pascal cannot be detected automatically and must be configured
       manually.
     </p>
+	<p>
+	  If the <em>Automatically register newly installed Delphi compilers at
+	  program startup</em> check box is ticked then, when it starts up,
+	  <em>CodeSnip</em> will attempt to register any known Delphi compiler that
+	  is not yet registered with Delphi<sup>&dagger;</sup>.
+	</p>
+	<p class="bordered">
+	  &dagger; Any version of Delphi for which the <em>Permit auto-detection
+	  &amp; registration of this compiler</em> check box is cleared will not be
+	  recorded.
+	</p>
   </body>
 </html>
-
diff --git a/Src/Help/HTML/dlg_registercompilers.htm b/Src/Help/HTML/dlg_registercompilers.htm
new file mode 100644
index 000000000..3dc52b335
--- /dev/null
+++ b/Src/Help/HTML/dlg_registercompilers.htm
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!--
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Help topic for Unregistered Delphi Installation(s) dialogue box.
+-->
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text-html; charset=Windows-1252">
+    <title>
+      Unregistered Delphi Installation(s) Detected Dialogue Box
+    </title>
+    <link rel="stylesheet" href="../css/codesnip.css" type="text/css">
+  </head>
+  <body>
+    <object
+      type="application/x-oleobject"
+      classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e"
+    >
+      <param name="ALink Name" value="RegisterCompilersDlg">
+    </object>
+    <h1>
+      <a name="dlg_registercompilers"></a>Unregistered Delphi Installation(s)
+      Detected Dialogue Box
+    </h1>
+    <p>
+      This dialogue box is displayed at program start-up if <em>CodeSnip</em>
+      detects that Delphi compilers are installed on the user's system that have
+      not yet been registered for use by <em>CodeSnip</em>.
+    </p>
+    <p>
+      The available compilers are listed at the top of the dialogue box. Each
+      compiler has a check box to its left. You should tick this check box to
+      permit <em>CodeSnip</em> to register the compiler or leave it clear if you
+      don't want to register the compiler with <em>CodeSnip</em>.
+    </p>
+    <p>
+      Underneath the list of compilers are some instructions about how to
+      disable auto-registration of some or all compilers.
+    </p>
+    <p>
+      Once you have made your selection click the <em>OK</em> button to register
+      the selected compilers with <em>CodeSnip</em>. A message box will pop up
+      to confirm that the compilers have been registered.
+    </p>
+    <h2>
+      Preventing automatic detection
+    </h2>
+    <p>
+      You can prevent <em>CodeSnip</em> from checking for <strong>any</strong>
+      new compilers on startup in future by ticking the <em>Don't show this
+      again</em> check box before clicking <em>OK</em>.
+    </p>
+    <p>
+      If you change your mind startup checks can be re-enabled. Alternatively
+      you can exclude individual Delphi compilers from automatic detection.
+      For information about how to do this see <a
+        href="task_registercompilers.htm"
+      >Register Compilers with <em>CodeSnip</em></a>.
+    </p>
+  </body>
+</html>
diff --git a/Src/Help/HTML/task_registercompilers.htm b/Src/Help/HTML/task_registercompilers.htm
new file mode 100644
index 000000000..21d556623
--- /dev/null
+++ b/Src/Help/HTML/task_registercompilers.htm
@@ -0,0 +1,120 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<!--
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Hell topic describing how to register compilers with CodeSnip.
+-->
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text-html; charset=Windows-1252">
+    <title>
+      Register Compilers
+    </title>
+    <link rel="stylesheet" href="../css/codesnip.css" type="text/css">
+  </head>
+  <body>
+    <object
+      type="application/x-oleobject"
+      classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e"
+    >
+      <param name="ALink Name" value="TaskRegisterCompilers">
+    </object>
+    <h1>
+      <a name="task_registercompilers"></a>Register Compilers with
+      <em>CodeSnip</em>
+    </h1>
+    <p>
+      Before you can <a
+        href="task_testcompile.htm"
+      >test compile</a> a snippet you must first register one or more installed
+      compilers with <em>CodeSnip</em>.
+    </p>
+    <p>
+      To do this you must tell <em>CodeSnip</em> how to find the compiler and
+      configure the required options for it. There are three ways to do this:
+    </p>
+    <ol>
+      <li>
+        <p>
+          Manually configure the compiler using the <a
+            href="dlg_configcompilers.htm"
+          >Configure Compilers</a> dialogue box, accessed from the <em>Tools |
+          Configure Compilers</em> dialogue box.
+        </p>
+        <p class="bordered">
+          <strong>Note:</strong> This is the only option available for Free
+          Pascal.
+        </p>
+      </li>
+      <li>
+        <p>
+          Use the <em>Detect Delphi Compilers</em> button in the <a
+            href="dlg_configcompilers.htm"
+          >Configure Compilers</a> dialogue box. This searches for any installed
+          Delphi compilers that are not registered and registers them. Any
+		  compilers for which automatic detection has been disabled is ignored
+		  (see below).
+        </p>
+      </li>
+      <li>
+        <p>
+          By default <em>CodeSnip</em> checks for any un-registered installed
+          version of Delphi at start-up, and offers to register them by popping
+          up the <a
+            href="dlg_registercompilers.htm"
+          >Unregistered Delphi Installation(s) Detected Dialogue Box</a>.
+        </p>
+      </li>
+    </ol>
+    <h3>
+      Inhibiting Auto-Detection
+    </h3>
+    <p>
+      If you don't want <em>CodeSnip</em> to detect any new, unregistered,
+	  Delphi compilers at startup you can switch the feature off entirely from
+	  the <a
+        href="dlg_registercompilers.htm"
+      >Unregistered Delphi Installation(s) Detected Dialogue Box</a>, by ticking
+      the <em>Don't show this again</em> check box. You can do the same thing
+      from the <a
+        href="dlg_configcompilers.htm"
+      >Configure Compilers</a> dialogue box by clearing the <em>Automatically
+      register newly installed Delphi compilers at startup</em> check box.
+    </p>
+    <p>
+      Alternatively, if you don't want <em>CodeSnip</em> to automatically detect
+      one or more specific Delphi compilers you can do that in the <a
+        href="dlg_configcompilers.htm"
+      >Configure Compilers</a> dialogue box. You just need to clear the
+      <em>Permit auto-detection &amp; registration of this compiler</em> check
+      box on a selected compiler's <em>Compiler</em> tab. If you do this then
+      <em>CodeSnip</em> will not suggest registering that compiler at startup.
+	  The <a
+        href="dlg_configcompilers.htm"
+      >Configure Compilers</a> dialogue box's <em>Detect Delphi Compilers</em>
+      feature will ignore them too.
+    </p>
+    <h3>
+      (Re-)enabling Auto-Detection
+    </h3>
+    <p>
+      Global automatic detection can be enabled from the <a
+        href="dlg_configcompilers.htm"
+      >Configure Compilers</a> dialogue box by ticking the <em>Automatically
+      register newly installed Delphi compilers at startup</em> check box.
+    </p>
+    <p>
+      Individually excluded compilers can be included in automatic detection
+      again by ticking the <em>Permit auto-detection &amp; registration of this
+      compiler</em> check box on a selected compiler's <em>Compiler</em> tab in
+      the <a
+        href="dlg_configcompilers.htm"
+      >Configure Compilers</a> dialogue box.
+    </p>
+  </body>
+</html>
+
diff --git a/Src/Help/HTML/tasks.htm b/Src/Help/HTML/tasks.htm
index 2c11e282a..196b56c9c 100644
--- a/Src/Help/HTML/tasks.htm
+++ b/Src/Help/HTML/tasks.htm
@@ -42,6 +42,7 @@ <h1>
       </li>
       <li>
         <a href="task_printroutine.htm">Print Information about a Snippet</a>
+      </li>
       <li>
         <a href="task_generateunit.htm">Generate a Pascal Unit</a>
       </li>
@@ -51,6 +52,10 @@ <h1>
       <li>
         <a href="task_testcompile.htm">Test Compile a Snippet</a>
       </li>
+      <li>
+        <a href="task_registercompilers.htm">Register a Compiler for Test
+        Compilation</a>
+      </li>
       <li>
         <a href="task_update.htm">Install or Update the DelphiDabbler Code
         Snippets Database</a>
diff --git a/Src/Help/Index.hhk b/Src/Help/Index.hhk
index f5550c5d1..0b17203b6 100644
--- a/Src/Help/Index.hhk
+++ b/Src/Help/Index.hhk
@@ -99,6 +99,10 @@
       <param name="Name" value="test compiling">
       <param name="Local" value="HTML\task_testcompile.htm">
       </OBJECT>
+    <LI> <OBJECT type="text/sitemap">
+      <param name="Name" value="compiler registration">
+      <param name="Local" value="HTML\task_registercompilers.htm">
+      </OBJECT>
     <LI> <OBJECT type="text/sitemap">
       <param name="Name" value="update the database">
       <param name="Local" value="HTML\task_update.htm">
@@ -146,6 +150,10 @@
     <param name="Name" value="display preferences">
     <param name="Local" value="HTML\dlg_prefs_display.htm">
     </OBJECT>
+  <LI> <OBJECT type="text/sitemap">
+    <param name="Name" value="auto-register Delphi compilers dialogue">
+    <param name="Local" value="HTML\dlg_registercompilers.htm">
+    </OBJECT>
   <LI> <OBJECT type="text/sitemap">
     <param name="Name" value="download database">
     <param name="Local" value="HTML\task_update.htm">
diff --git a/Src/Help/TOC.hhc b/Src/Help/TOC.hhc
index cd91c1f05..ac2c63139 100644
--- a/Src/Help/TOC.hhc
+++ b/Src/Help/TOC.hhc
@@ -132,6 +132,10 @@
       <param name="Name" value="Test Compile Snippet">
       <param name="Local" value="HTML\task_testcompile.htm">
       </OBJECT>
+    <LI> <OBJECT type="text/sitemap">
+      <param name="Name" value="Register Compilers For Test Compilation">
+      <param name="Local" value="HTML\task_registercompilers.htm">
+      </OBJECT>
     <LI> <OBJECT type="text/sitemap">
       <param name="Name" value="Customise CodeSnip">
       <param name="Local" value="HTML\task_customise.htm">

From d8b61dda10ba74b53ee85186a78aae661b93500f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 00:14:41 +0000
Subject: [PATCH 066/264] Documents new values & section in config file

Update config file documentation with details of changes resulting from
implementing issue 19.

Add TODO placeholders that need to be resolved once next release version
and date are known.

Closes #74
---
 Docs/Design/FileFormats/config.html | 43 ++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
index c81851d94..d925f86c5 100644
--- a/Docs/Design/FileFormats/config.html
+++ b/Docs/Design/FileFormats/config.html
@@ -167,7 +167,7 @@ <h3>
 </p>
 
 <p>
-  There have been several versions of this file. The current one is version 18. The change to version 18 came with CodeSnip v4.20.0 and the addition of the [Prefs] section.
+  There have been several versions of this file. The current one is version 18 &laquo;&laquo;TODO&raquo;&raquo;. The change to version 18 came with CodeSnip v4.20.0&laquo;&laquo;TODO&raquo;&raquo; and the addition of the [Prefs] section.
 </p>
 
 <p>
@@ -333,8 +333,49 @@ <h4>
       Each entry contains a fully specified directory path.
     </div>
   </dd>
+  <dt>
+    <code class="key">CanAutoInstall</code> (Boolean)
+  </dt>
+  <dd>
+  <div class="half-spaced">
+    Determines whether the compiler can be automatically detected and registered by CodeSnip.
+  </div>
+  <div class="half-spaced">
+    Applies to Delphi compilers only, not to Free Pascal.
+  </div>
+  </dd>
+</dl>
+
+<h4>
+  [Compilers] section
+</h4>
+
+<p>
+  This section records configuration information that applies to all, or
+  multiple, compilers.
+</p>
+
+<p>
+  Name / Value pairs:
+</p>
+
+<dl class="indent">
+  <dt>
+    <code class="key">PermitStartupDetection</code> (Boolean)
+  </dt>
+  <dd>
+    <div class="half-spaced">
+      Determines whether CodeSnip should detect, and potentially register, any
+      Delphi compilers that are installed on the user's system but not
+      registered with the program.
+    </div>
+    <div class="half-spaced">
+      Does not apply to the Free Pascal compiler.
+    </div>
+  </dd>
 </dl>
 
+
 <h4>
   [Database] section
 </h4>

From 4ee4a9c2888b551710e260abb4badbe734cdcd88 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 01:17:02 +0000
Subject: [PATCH 067/264] Extract common version information into include file

Version information from VCodeSnip.vi and VCodeSnipPortable.vi that is
common to both files was extracted into the VersionInfo.vi-inc file as
macro definitions. The macros were then imported into to .vi files.

Changed file description. Renamed program from historic "Viewer" (that
dates back to v1!) to "Repository". Also added "Standard Version" for
standard version to match "Portable Version" that was already appended
to file description in portable version.

As a side effect, this commit fixes problem of rendering copyright
symbol, because VIEd handles UTF-8 correctly in macro import files but
not in .vi files!

Closes #75
---
 Src/VCodeSnip.vi         | 19 ++++++++++++-------
 Src/VCodeSnipPortable.vi | 19 ++++++++++++-------
 Src/VersionInfo.vi-inc   | 12 ++++++++++++
 3 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 Src/VersionInfo.vi-inc

diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
index 3ed5f7959..8dc6fb9de 100644
--- a/Src/VCodeSnip.vi
+++ b/Src/VCodeSnip.vi
@@ -7,9 +7,12 @@
 ; Version information description file for CodeSnip.
 
 
+[Macros]
+Import:ver=.\VersionInfo.vi-inc
+
 [Fixed File Info]
-File Version #=4, 20, 2, 266
-Product Version #=4, 20, 2, 0
+File Version #=<%ver.version>.<%ver.build>
+Product Version #=<%ver.version>
 File OS=4
 File Type=1
 File Sub-Type=0
@@ -21,19 +24,21 @@ Language=2057
 Character Set=1252
 
 [String File Info]
-Comments=Released under the terms of the Mozilla Public License v2.0 (https://www.mozilla.org/MPL/2.0/)
-Company Name=DelphiDabbler
-File Description=CodeSnip Database Viewer
+Comments=<%var.license>
+Company Name=<%ver.company>
+File Description=<%ver.description> (Standard Edition)
 File Version=<#F1>.<#F2>.<#F3> build <#F4>
 Internal Name=<SHORTFNAME>
-Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
+Legal Copyright=<%ver.copyright>
 Legal Trademark=
 Original File Name=CodeSnip.exe
 Private Build=
-Product Name=DelphiDabbler CodeSnip
+Product Name=<%ver.company> <%ver.name>
 Product Version=Release <#P1>.<#P2>.<#P3>
 Special Build=
 
 [Configuration Details]
 Identifier=
 NumRCComments=0
+ResOutputDir=
+FileVersion=1
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
index ff5d8d1b6..90646ad38 100644
--- a/Src/VCodeSnipPortable.vi
+++ b/Src/VCodeSnipPortable.vi
@@ -7,9 +7,12 @@
 ; Version information description file for the portable edition of CodeSnip
 
 
+[Macros]
+Import:ver=.\VersionInfo.vi-inc
+
 [Fixed File Info]
-File Version #=4, 20, 2, 266
-Product Version #=4, 20, 2, 0
+File Version #=<%ver.version>.<%ver.build>
+Product Version #=<%ver.version>
 File OS=4
 File Type=1
 File Sub-Type=0
@@ -21,19 +24,21 @@ Language=2057
 Character Set=1252
 
 [String File Info]
-Comments=Released under the terms of the Mozilla Public License v2.0 (https://www.mozilla.org/MPL/2.0/)
-Company Name=DelphiDabbler
-File Description=CodeSnip Database Viewer (Portable Edition)
+Comments=<%var.license>
+Company Name=<%ver.company>
+File Description=<%ver.description> (Portable Edition)
 File Version=<#F1>.<#F2>.<#F3> build <#F4>
 Internal Name=<SHORTFNAME>
-Legal Copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
+Legal Copyright=<%ver.copyright>
 Legal Trademark=
 Original File Name=CodeSnip-p.exe
 Private Build=
-Product Name=DelphiDabbler CodeSnip
+Product Name=<%ver.company> <%ver.name>
 Product Version=Release <#P1>.<#P2>.<#P3>
 Special Build=Portable
 
 [Configuration Details]
 Identifier=
 NumRCComments=0
+ResOutputDir=
+FileVersion=1
diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
new file mode 100644
index 000000000..b75936ffb
--- /dev/null
+++ b/Src/VersionInfo.vi-inc
@@ -0,0 +1,12 @@
+# CodeSnip Version Information Macros for Including in .vi files
+
+# Version & build numbers
+version=4.22.2
+build=266
+
+# String file information
+copyright=Copyright © P.D.Johnson, 2005-<YEAR>.
+description=Code Snippets Repository
+company=DelphiDabbler
+name=CodeSnip
+license=Released under the terms of the Mozilla Public License v2.0 (https://www.mozilla.org/MPL/2.0/)

From be944290f0710d797b1d629ae9f61b54fdae6ef8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 01:28:03 +0000
Subject: [PATCH 068/264] Update Build.html re change in required VIEd version

---
 Build.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Build.html b/Build.html
index a6a432a39..679825b07 100644
--- a/Build.html
+++ b/Build.html
@@ -6,7 +6,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Instructions for building CodeSnip from source.
 -->
@@ -191,10 +191,10 @@ <h3>
 </h3>
 
 <p>
-  This tool is used to compile version information (<code>.vi</code>) files
-  into intermediate resource source (<code>.rc</code>) files. Version 2.11.2
-  or later is required.
-  Version Information Editor can be obtained from
+  This tool is used to compile version information (<code>.vi</code>) files and
+  any associated macro file(s) into intermediate resource source
+  (<code>.rc</code>) files. Version 2.14.0 or later is required. Version
+  Information Editor can be obtained from
   <a
     href="https://github.com/delphidabbler/vied/releases"
   >https://github.com/delphidabbler/vied/releases</a>.

From c29bd68727653e19f3ce2eb7cb7b6b8ad044b252 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:24:53 +0000
Subject: [PATCH 069/264] Fix format error in REML code generator

Code in UREMLDataIO unit that pretty-printed REML from active text was
malforming some lines where (a) text followed a closing block tag and
(b) an inline tag immediately followed an opening block tag.
---
 Src/UREMLDataIO.pas | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Src/UREMLDataIO.pas b/Src/UREMLDataIO.pas
index acd5bc135..c6ae83bbc 100644
--- a/Src/UREMLDataIO.pas
+++ b/Src/UREMLDataIO.pas
@@ -598,6 +598,7 @@ function TREMLWriter.RenderTag(
       begin
         Dec(fLevel);
         Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
+        fIsStartOfTextLine := True;
       end;
     end;
     fsOpen:
@@ -620,6 +621,14 @@ function TREMLWriter.RenderTag(
         Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
         Inc(fLevel);
         fIsStartOfTextLine := True;
+      end
+      else if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsInline then
+      begin
+        if fIsStartOfTextLine then
+        begin
+          Result := StrOfSpaces(IndentMult * fLevel) + Result;
+          fIsStartOfTextLine := False;
+        end;
       end;
     end;
   end;

From e073b9c443abb2e721eb71cca41ce100d2822a96 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:30:27 +0000
Subject: [PATCH 070/264] Fix welcome page redraw after compilers registered

Main form was not redrawing the welcome page to reflect the addition of
compilers after user accepted new compilers automatically detected at
startup.

Changed UCompileMgr.TMainCompileMgr.CheckForNewCompilerInstalls to
return True if user had permitted compilers to be registered. Main
form's AfterShowForm event handler wa changed to refresh the display
when the method returns True.
---
 Src/FmMain.pas      | 3 ++-
 Src/UCompileMgr.pas | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index f2f5d1e91..54ee4a6bf 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -1219,7 +1219,8 @@ procedure TMainForm.AfterShowForm;
   fMainDisplayMgr.Initialise(fWindowSettings.OverviewTab);
   fMainDisplayMgr.ShowWelcomePage;
   // check for registerable Delphi compiler installations
-  fCompileMgr.CheckForNewCompilerInstalls;
+  if fCompileMgr.CheckForNewCompilerInstalls then
+    fMainDisplayMgr.Refresh;
 end;
 
 function TMainForm.appEventsHelp(Command: Word; Data: Integer;
diff --git a/Src/UCompileMgr.pas b/Src/UCompileMgr.pas
index 8a7cea3b5..47dc26f18 100644
--- a/Src/UCompileMgr.pas
+++ b/Src/UCompileMgr.pas
@@ -116,12 +116,14 @@   TMainCompileMgr = class(TCompileMgr)
     ///  <summary>Check for new compiler installations, get user permission to
     ///  install any that are found and register any compilers that user
     ///  selects.</summary>
+    ///  <returns>Boolean. True if any compilers were registered, False if not.
+    ///  </returns>
     ///  <remarks>
     ///  <para>Does nothing if compiler detection is disabled or if there are
     ///  no installed but unregistered compilers.</para>
     ///  <para>Should be called at program startup.</para>
     ///  </remarks>
-    procedure CheckForNewCompilerInstalls;
+    function CheckForNewCompilerInstalls: Boolean;
   end;
 
 
@@ -264,7 +266,7 @@ function TMainCompileMgr.CanCompile(View: IView): Boolean;
     and SnippetView.Snippet.CanCompile;
 end;
 
-procedure TMainCompileMgr.CheckForNewCompilerInstalls;
+function TMainCompileMgr.CheckForNewCompilerInstalls: Boolean;
 var
   CandidateCompilers: TCompilerList;  // compilers available for registration
   SelectedCompilers: TCompilerList;   // compilers chosen for registration
@@ -313,6 +315,7 @@ procedure TMainCompileMgr.CheckForNewCompilerInstalls;
   end;
 
 begin
+  Result := False;
   if not TCompilerSettings.PermitStartupDetection then
     Exit;
   SelectedCompilers := nil;
@@ -345,6 +348,7 @@ procedure TMainCompileMgr.CheckForNewCompilerInstalls;
         Persister.Save(Compilers);
         // tell user what got registered
         NotifyResults;
+        Result := True;
       end
       else
         // User didn't select a file: tell them
@@ -381,4 +385,3 @@ function TMainCompileMgr.IsLastCompiledView(View: IView): Boolean;
 end;
 
 end.
-

From e45c1490e6d360a930bab3f32e6be7efa30bb1f3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:35:27 +0000
Subject: [PATCH 071/264] Fix corrupted bullet character in message box.

Modified UCompileMgr.TMainCompileMgr.CheckForNewCompilerInstalls to
specify Unicode hex character representation of bullet character instead
of literal character when displaying message box that confirms new
compilers have been registered.
---
 Src/UCompileMgr.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/UCompileMgr.pas b/Src/UCompileMgr.pas
index 47dc26f18..ded36eca3 100644
--- a/Src/UCompileMgr.pas
+++ b/Src/UCompileMgr.pas
@@ -292,7 +292,7 @@ function TMainCompileMgr.CheckForNewCompilerInstalls: Boolean;
       if (SelectedCompilers.IndexOf(Compiler) >= 0)
         and Compiler.IsAvailable then
       begin
-        CompList := CompList + '� ' + Compiler.GetName + EOL;
+        CompList := CompList + #$2022' ' + Compiler.GetName + EOL;
         Inc(RegCount);
       end;
     end;

From 845c392cb0640218706bd860b96bc66a7c9c54a5 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:38:08 +0000
Subject: [PATCH 072/264] Replace TODO placeholders with CodeSnip ver & date

Update design documents with CodeSnip release version and release date
relating to changes in config, export, user database and REML file
formats.

Some other minor tweak too.
---
 Docs/Design/FileFormats/config.html  | 4 ++--
 Docs/Design/FileFormats/export.html  | 6 +++---
 Docs/Design/FileFormats/user-db.html | 6 +++---
 Docs/Design/reml.html                | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
index d925f86c5..8c0061093 100644
--- a/Docs/Design/FileFormats/config.html
+++ b/Docs/Design/FileFormats/config.html
@@ -167,7 +167,7 @@ <h3>
 </p>
 
 <p>
-  There have been several versions of this file. The current one is version 18 &laquo;&laquo;TODO&raquo;&raquo;. The change to version 18 came with CodeSnip v4.20.0&laquo;&laquo;TODO&raquo;&raquo; and the addition of the [Prefs] section.
+  There have been several versions of this file. The current one is version 19. The change to version 19 came with CodeSnip v4.21.0 and the addition of the [Compilers] section and the <code class="key">CanAutoInstall</code> key in the [Cmp:XXX] sections.
 </p>
 
 <p>
@@ -762,7 +762,7 @@ <h4>
       The version number of the config file. Incremented whenever the file format changes. If this section or this value is missing then the default value is <code class="value">1</code>.
     </div>
     <div class="half-spaced">
-      The current value is <code class="value">16</code>.
+      The current value is <code class="value">19</code>.
     </div>
   </dd>
   <dt>
diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
index 3a383591d..5f57b1c60 100644
--- a/Docs/Design/FileFormats/export.html
+++ b/Docs/Design/FileFormats/export.html
@@ -175,7 +175,7 @@ <h2>
         <em>version</em>
       </dt>
       <dd>
-        Identifies version of file. Determines which tags are valid and
+        Identifies major version of file. Determines which tags are valid and
         establishes rules concerning content. Valid versions are 1 to 7.
       </dd>
     </dl>
@@ -979,10 +979,10 @@ <h2>
         Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
       </dd>
       <dt>
-        <em>Version 7.3 - &laquo;&laquo;TODO&raquo;&raquo;</em>
+        <em>Version 7.3 - 16 December 2022</em>
       </dt>
       <dd>
-        Updated with CodeSnip v&laquo;&laquo;TODO&raquo;&raquo; to add support for REML v5, which is backward compatible with REML v4.
+        Updated with CodeSnip v4.21.0 to add support for REML v5, which is backward compatible with REML v4.
       </dd>
     </dl>
   </dd>
diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
index db90b23df..a5e03cfca 100644
--- a/Docs/Design/FileFormats/user-db.html
+++ b/Docs/Design/FileFormats/user-db.html
@@ -199,7 +199,7 @@ <h3 id="xml-file">
         <em>version</em>
       </dt>
       <dd>
-        Identifies version of file. Determines which tags are valid and rules
+        Identifies major version of file. Determines which tags are valid and rules
         concerning content. Valid versions are 1..6.
       </dd>
     </dl>
@@ -1015,10 +1015,10 @@ <h2>
         Updated with CodeSnip v4.18.0 to add support for Delphi 11.x Alexandria.
       </dd>
       <dt>
-        <em>Version 6.11 - &laquo;&laquo;TODO&raquo;&raquo;</em>
+        <em>Version 6.11 - 16 December 2022</em>
       </dt>
       <dd>
-        Updated with CodeSnip v&laquo;&laquo;TODO&raquo;&raquo; to add support for REML v5, which is backwards compatible with REML v4.
+        Updated with CodeSnip v4.21.0 to add support for REML v5, which is backwards compatible with REML v4.
       </dd>
     </dl>
   </dd>
diff --git a/Docs/Design/reml.html b/Docs/Design/reml.html
index 3fce8fae1..9762decaf 100644
--- a/Docs/Design/reml.html
+++ b/Docs/Design/reml.html
@@ -625,11 +625,11 @@ <h1>Change Log</h1>
   </ul>
 
   <p>
-    <strong>v5 of &laquo;&laquo;TODO&raquo;&raquo;</strong>
+    <strong>v5 of 2022-12-16</strong>
   </p>
 
   <p>
-    Introduced in CodeSnip &laquo;&laquo;TODO&raquo;&raquo;
+    Introduced in CodeSnip v4.21.0
   </p>
 
   <ul>

From aa102f9c31e2f27312e1c9d6aa89bac0e630fc5f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:39:53 +0000
Subject: [PATCH 073/264] Bump version # of user config file from 18 to 19

v19 is now stamped into config files when CodeSnip v4.21.0 starts for
the first time.
---
 Src/FirstRun.UConfigFile.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/FirstRun.UConfigFile.pas b/Src/FirstRun.UConfigFile.pas
index 2645b6acc..50bba121b 100644
--- a/Src/FirstRun.UConfigFile.pas
+++ b/Src/FirstRun.UConfigFile.pas
@@ -82,7 +82,7 @@   TUserConfigFileUpdater = class(TConfigFileUpdater)
   strict private
     const
       ///  <summary>Current user config file version.</summary>
-      FileVersion = 18;
+      FileVersion = 19;
   strict protected
     ///  <summary>Returns current user config file version.</summary>
     class function GetFileVersion: Integer; override;

From ef878a6611397cd3caadfff1bf2654d973eb737d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:41:25 +0000
Subject: [PATCH 074/264] Update program version to 4.21.0 build 267

!!!NOTE
The version number was actually reduced from v4.22.2 because that
number was entered in error when VersionInfo.vi-inc was first created:
the version should have been v4.20.2
!!!
---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index b75936ffb..f255c1655 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.22.2
-build=266
+version=4.21.0
+build=267
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From 97030525bcb2ab2812af20057ece7f46284f9bd2 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 16:43:23 +0000
Subject: [PATCH 075/264] Update change log with details of release v4.21.0

---
 CHANGELOG.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c58946c1..36e25aaf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,26 @@ This change log begins with the first ever pre-release version of _CodeSnip_. Re
 
 From v4.1.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Release v4.21.0 of 16 December 2022
+
+* Updated to support [REML version 5](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/version-4.21.0`/Docs/Design/reml.html) in snippet description & extra information [issue #71]:
+  * Numerous new character entities supported. 
+  * New list tags: `<ol>`, `<ul>` & `<li>`.
+* Program now automatically detects new (supported) Delphi installations at startup and offers to register the compiler(s) to be used for test compiling snippets. This feature is on by default but can be turned off completely or for specifically excluded compilers [issue #19].
+* Modified Configure Compilers dialogue box:
+  * Added facility to customise automatic compiler detection on per-compiler or global basis.
+  * Changed manually triggered compiler detection to ignore excluded compilers.
+* Some refactoring [including issues #73 and #75].
+* Minor changes to program license
+  * Changed required image attribution in `Docs/License.html` [issue #63]
+  * Corrected copyright date & fix typo in licenses displayed by installer and help file [issue #65 & PR #72].
+* Bump per-user config file to version 19.
+* Documentation updates:
+  * Updated `README.md` re abandoned and new Git repo branches.
+  * Updated config file, database, export file & REML documentation re changes in this release [including issue #74].
+  * Help file updated with details of changes in this release.
+  * Updated development tool chain requirements in `Build.html`. 
+
 ## Release v4.20.2 of 04 November 2022
 
 * Fixes bug where an exception was raised when selecting a main menu item with the cursor keys then pressing F1. [issue 54]

From e3d402941e345c8e79e2f36b50401cbc2682cc2a Mon Sep 17 00:00:00 2001
From: Peter Johnson <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 19:00:53 +0000
Subject: [PATCH 076/264] Update CHANGELOG.md

Fix broken link to REML docs in v4.21.0 section
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36e25aaf7..b65c83ffd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ From v4.1.0 the version numbering has attempted to adhere to the principles of [
 
 ## Release v4.21.0 of 16 December 2022
 
-* Updated to support [REML version 5](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/version-4.21.0`/Docs/Design/reml.html) in snippet description & extra information [issue #71]:
+* Updated to support [REML version 5](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/version-4.21.0/Docs/Design/reml.html) in snippet description & extra information [issue #71]:
   * Numerous new character entities supported. 
   * New list tags: `<ol>`, `<ul>` & `<li>`.
 * Program now automatically detects new (supported) Delphi installations at startup and offers to register the compiler(s) to be used for test compiling snippets. This feature is on by default but can be turned off completely or for specifically excluded compilers [issue #19].

From 89d5e3a5a327cbd35815552cb67c51e16001839a Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 22:37:40 +0000
Subject: [PATCH 077/264] Revise build files to use _build dir & new zip name

Various files that are invloved in the Makefile build process were
updated to write output to _build/bin, _build/exe and _build/release
directories instead of Bin, Exe & Release in repo root.

CodeSnip.dproj was also update to ensure that builds using the IDE used
the same _build/bin & _build/exe directories.

Makefile was also updated to
(a) increase use of macros for path names
(b) name .zip files codesnip-exe and codesnip-portable-exe
(c) append any version number in VERSION define to zip file base names

Also fixed malformed quotes in a #define in CodeSnip.iss
---
 Src/CodeSnip.cfg.tplt    | 12 +++---
 Src/CodeSnip.dproj       |  8 ++--
 Src/Help/CodeSnip.hhp    |  2 +-
 Src/Install/CodeSnip.iss |  8 ++--
 Src/Makefile             | 82 ++++++++++++++++++++++++----------------
 5 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/Src/CodeSnip.cfg.tplt b/Src/CodeSnip.cfg.tplt
index b0cc9e8c9..15a6c786b 100644
--- a/Src/CodeSnip.cfg.tplt
+++ b/Src/CodeSnip.cfg.tplt
@@ -30,12 +30,12 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"..\Exe"
--N0"..\Bin"
--U"..\Bin;3rdParty"
--O"..\Bin;3rdParty"
--I"..\Bin;3rdParty"
--R"..\Bin;3rdParty"
+-E"..\_build\exe"
+-N0"..\_build\bin"
+-U"..\_build\bin;3rdParty"
+-O"..\_build\bin;3rdParty"
+-I"..\_build\bin;3rdParty"
+-R"..\_build\bin;3rdParty"
 -w-SYMBOL_PLATFORM
 -w+EXPLICIT_STRING_CAST_LOSS
 -w+CVT_WIDENING_STRING_LOST
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index 628ac2cce..14d04cbd9 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -16,9 +16,9 @@
 		<PropertyGroup Condition="'$(Base)'!=''">
 			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
 			<DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
-			<DCC_ExeOutput>..\Exe</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\Bin;3rdParty;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-			<DCC_DependencyCheckOutputName>..\Exe\CodeSnip.exe</DCC_DependencyCheckOutputName>
+			<DCC_ExeOutput>..\_build\exe</DCC_ExeOutput>
+			<DCC_UnitSearchPath>..\_build\bin;3rdParty;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_DependencyCheckOutputName>..\_build\exe\CodeSnip.exe</DCC_DependencyCheckOutputName>
 			<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
 			<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
 			<DCC_Platform>x86</DCC_Platform>
@@ -29,7 +29,7 @@
 			<DCC_S>false</DCC_S>
 			<DCC_F>false</DCC_F>
 			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
-			<DCC_DcuOutput>..\Bin</DCC_DcuOutput>
+			<DCC_DcuOutput>..\_build\bin</DCC_DcuOutput>
 			<DCC_E>false</DCC_E>
 		</PropertyGroup>
 		<ItemGroup>
diff --git a/Src/Help/CodeSnip.hhp b/Src/Help/CodeSnip.hhp
index c9d4acebd..48d4ec0f2 100644
--- a/Src/Help/CodeSnip.hhp
+++ b/Src/Help/CodeSnip.hhp
@@ -8,7 +8,7 @@
 
 [OPTIONS]
 Compatibility=1.1
-Compiled file=..\..\Exe\CodeSnip.chm
+Compiled file=..\..\_build\exe\CodeSnip.chm
 Contents file=TOC.hhc
 Default topic=HTML\welcome.htm
 Display compile progress=No
diff --git a/Src/Install/CodeSnip.iss b/Src/Install/CodeSnip.iss
index 7b9f93944..47a85f471 100644
--- a/Src/Install/CodeSnip.iss
+++ b/Src/Install/CodeSnip.iss
@@ -2,7 +2,7 @@
 ; v. 2.0. If a copy of the MPL was not distributed with this file, You can
 ; obtain one at https://mozilla.org/MPL/2.0/
 ;
-; Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+; Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
 ;
 ; Install file generation script for use with Inno Setup.
 
@@ -25,10 +25,10 @@
 #define ReadMeFile "ReadMe.txt"
 #define LicenseFile "License.rtf"
 #define LicenseTextFile "License.html"
-#define OutDir SourcePath + "..\..\Exe"
+#define OutDir SourcePath + "..\..\_build\exe"
 #define SrcDocsPath SourcePath + "..\..\Docs\"
-#define SrcAssetsPath SourcePath + '\Assets\"
-#define SrcExePath SourcePath + "..\..\Exe\"
+#define SrcAssetsPath SourcePath + "\Assets\"
+#define SrcExePath SourcePath + "..\..\_build\exe\"
 #define ProgDataSubDir AppName + ".4"
 #define ExeProg SrcExePath + ExeFile
 #define AppVersion DeleteToVerStart(GetFileProductVersion(ExeProg))
diff --git a/Src/Makefile b/Src/Makefile
index ceaf21094..17b443abf 100644
--- a/Src/Makefile
+++ b/Src/Makefile
@@ -2,15 +2,22 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/
 #
-# Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+# Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
 #
 # Makefile for the CodeSnip project.
 
 
-# Define macros giving relative paths to other directories from location of
-# makefile
-BIN = ..\Bin
-EXE = ..\Exe
+# Define macros relative paths to various directories relative to the repo root
+BUILD_ROOT = _build
+BIN_ROOT = $(BUILD_ROOT)\bin
+EXE_ROOT = $(BUILD_ROOT)\exe
+RELEASE_ROOT = $(BUILD_ROOT)\release
+DOCS_ROOT = Docs
+SRC_ROOT = Src
+
+# Defines macros giving directories relative to location of the Makefile
+BIN_REL = ..\$(BIN_ROOT)
+EXE_REL = ..\$(EXE_ROOT)
 
 # Check for required environment variables
 
@@ -75,11 +82,10 @@ DELPHIDEFINES =
 
 # Implicit rules
 
-# Resource files are compiled to the directory specified by BIN macro, which
-# must have been set by the caller.
+# Resource files are compiled to the directory specified by BIN_REL macro.
 .rc.res:
   @echo +++ Compiling Resource file $< +++
-  @$(BRCC32) $< -fo$(BIN)\$(@F)
+  @$(BRCC32) $< -fo$(BIN_REL)\$(@F)
 
 # Version info files are compiled by VIEd. A temporary .rc file is left behind
 .vi.rc:
@@ -104,11 +110,12 @@ config:
   @copy /Y CodeSnip.cfg.tplt CodeSnip.cfg
   # Create build folders
   @cd ..
-  @if exist Bin rmdir /S /Q Bin
-  @mkdir Bin
-  @if not exist Exe mkdir Exe
-  @if not exist Release mkdir Release
-  @cd Src
+  @if not exist $(BUILD_ROOT) mkdir $(BUILD_ROOT)
+  @if exist $(BIN_ROOT) rmdir /S /Q $(BIN_ROOT)
+  @mkdir $(BIN_ROOT)
+  @if not exist $(EXE_ROOT) mkdir $(EXE_ROOT)
+  @if not exist $(RELEASE_ROOT) mkdir $(RELEASE_ROOT)
+  @cd $(SRC_ROOT)
 
 # Builds CodeSnip pascal files and links program
 pascal: CodeSnip.exe
@@ -118,14 +125,14 @@ pascal: CodeSnip.exe
 CodeSnip.exe:
   @echo +++ Compiling Pascal +++
 !ifdef PORTABLE
-  @if exist $(EXE)\$(@F) copy $(EXE)\$(@F) $(EXE)\$(@F).bak
+  @if exist $(EXE_REL)\$(@F) copy $(EXE_REL)\$(@F) $(EXE_REL)\$(@F).bak
 !endif
   @$(DCC32) $(@B).dpr -B  $(DELPHIDEFINES)
 !ifdef PORTABLE
-  @copy $(EXE)\$(@F) $(EXE)\$(@B)-p.exe /Y
-  @del $(EXE)\$(@F)
-  @if exist $(EXE)\$(@F).bak copy $(EXE)\$(@F).bak $(EXE)\$(@F)
-  @if exist $(EXE)\$(@F).bak del $(EXE)\$(@F).bak
+  @copy $(EXE_REL)\$(@F) $(EXE_REL)\$(@B)-p.exe /Y
+  @del $(EXE_REL)\$(@F)
+  @if exist $(EXE_REL)\$(@F).bak copy $(EXE_REL)\$(@F).bak $(EXE_REL)\$(@F)
+  @if exist $(EXE_REL)\$(@F).bak del $(EXE_REL)\$(@F).bak
 !endif
 
 # Builds help file
@@ -144,16 +151,16 @@ resources: $(VERINFOFILEBASE).res Resources.res HTML.res
 # Compiles HTMLres from .hrc file
 HTML.res: HTML.hrc
   @echo +++ Compiling HTML Resource manifest file +++
-  @$(HTMLRES) -mHTML.hrc -o$(BIN)\HTML.res -r -q
+  @$(HTMLRES) -mHTML.hrc -o$(BIN_REL)\HTML.res -r -q
 
 # Compiles type library from IDL
 typelib:
-  @$(GENTLB) .\ExternalObj.ridl -D$(BIN) -TExternalObj.tlb
+  @$(GENTLB) .\ExternalObj.ridl -D$(BIN_REL) -TExternalObj.tlb
 
 # Builds setup program
 setup:
 !ifndef PORTABLE
-  @del ..\Exe\CodeSnip-Setup-*
+  @del $(EXE_REL)\CodeSnip-Setup-*
   @$(ISCC) Install\CodeSnip.iss
 !else
   @echo **** Portable build - no setup file created ****
@@ -161,17 +168,26 @@ setup:
 
 # Creates auto generated files
 autogen:
-  @$(TLIBIMP) -P+ -Ps+ -D.\AutoGen -FtIntfExternalObj $(BIN)\ExternalObj.tlb
+  @$(TLIBIMP) -P+ -Ps+ -D.\AutoGen -FtIntfExternalObj $(BIN_REL)\ExternalObj.tlb
   @if exist .\AutoGen\IntfExternalObj.dcr del .\AutoGen\IntfExternalObj.dcr
 
 # Build release files (.zip)
+# If RELEASEFILENAME is defined by caller then it is used as name of zip file
+# otherwise default zip file name is used, which depends on whether PORTABLE
+# is defined.
+# If VERSION is defined by caller then it is appended to RELEASEFILENAME,
+# separated by a dash.
 !ifndef RELEASEFILENAME
-RELEASEFILENAME = dd-codesnip
-!ifdef PORTABLE
-RELEASEFILENAME = $(RELEASEFILENAME)-portable
+!ifndef PORTABLE
+RELEASEFILENAME = codesnip-exe
+!else
+RELEASEFILENAME = codesnip-portable-exe
+!endif
 !endif
+!ifdef VERSION
+RELEASEFILENAME = $(RELEASEFILENAME)-$(VERSION)
 !endif
-OUTFILE = Release\$(RELEASEFILENAME).zip
+OUTFILE = $(RELEASE_ROOT)\$(RELEASEFILENAME).zip
 release:
   @echo ---------------------
   @echo Creating Release File
@@ -179,14 +195,14 @@ release:
   @cd ..
   -@if exist $(OUTFILE) del $(OUTFILE)
 !ifndef PORTABLE
-  @$(ZIP) -j -9 $(OUTFILE) Exe\CodeSnip-Setup-*.exe Docs\ReadMe.txt
+  @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip-Setup-*.exe $(DOCS_ROOT)\ReadMe.txt
 !else
-  @$(ZIP) -j -9 $(OUTFILE) Exe\CodeSnip-p.exe
-  @$(ZIP) -j -9 $(OUTFILE) Exe\CodeSnip.chm
-  @$(ZIP) -j -9 $(OUTFILE) Docs\ReadMe.txt
-  @$(ZIP) -j -9 $(OUTFILE) Docs\License.html
+  @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip-p.exe
+  @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip.chm
+  @$(ZIP) -j -9 $(OUTFILE) $(DOCS_ROOT)\ReadMe.txt
+  @$(ZIP) -j -9 $(OUTFILE) $(DOCS_ROOT)\License.html
 !endif
-  @cd Src
+  @cd $(SRC_ROOT)
 
 # Clean up unwanted files
 clean:
@@ -200,4 +216,4 @@ clean:
   -@del /S *.tvsconfig 2>nul
   # remove __history folders
   -@for /F "usebackq" %i in (`dir /S /B /A:D ..\__history`) do @rmdir /S /Q %i
-  @cd Src
+  @cd $(SRC_ROOT)

From 1923cb53b909dff1970957c592380c7eca482343 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 17 Dec 2022 00:03:22 +0000
Subject: [PATCH 078/264] Revise CodeSnipTests.dproj to output to _build dir

CodeSnipTests.dproj now wirtes binary and exe files to respective
subdirectories of a _build directory.

NOTE: This is a different _build directory to the one used by the main
CodeSnip project.
---
 Tests/Src/DUnit/CodeSnipTests.dproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tests/Src/DUnit/CodeSnipTests.dproj b/Tests/Src/DUnit/CodeSnipTests.dproj
index 724362495..359ddcf60 100644
--- a/Tests/Src/DUnit/CodeSnipTests.dproj
+++ b/Tests/Src/DUnit/CodeSnipTests.dproj
@@ -18,14 +18,14 @@
 			<DCC_UnitSearchPath>$(BDS)\Source\DUnit\src;..\..\Bin\DUnit;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;$(DCC_UnitAlias)</DCC_UnitAlias>
 			<DCC_Define>TESTING;_CONSOLE_TESTRUNNER;$(DCC_Define)</DCC_Define>
-			<DCC_ExeOutput>..\..\Exe</DCC_ExeOutput>
+			<DCC_ExeOutput>..\..\_build\exe</DCC_ExeOutput>
 			<DCC_ImageBase>00400000</DCC_ImageBase>
 			<DCC_CVT_WIDENING_STRING_LOST>true</DCC_CVT_WIDENING_STRING_LOST>
 			<DCC_CVT_ACHAR_TO_WCHAR>true</DCC_CVT_ACHAR_TO_WCHAR>
 			<DCC_EXPLICIT_STRING_CAST_LOSS>true</DCC_EXPLICIT_STRING_CAST_LOSS>
 			<DCC_SYMBOL_PLATFORM>false</DCC_SYMBOL_PLATFORM>
 			<DCC_Platform>x86</DCC_Platform>
-			<DCC_DcuOutput>..\..\Bin\DUnit</DCC_DcuOutput>
+			<DCC_DcuOutput>..\..\_build\bin\DUnit</DCC_DcuOutput>
 			<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
 		</PropertyGroup>
 		<ItemGroup>

From 020199f7de4a90cabfe3b4f54323e96e042d260f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 23:42:37 +0000
Subject: [PATCH 079/264] Update .gitignore to ignore _build directory

---
 .gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c5a26ecfb..64f314858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,6 @@
 __history/
 
 # Project specific directories & files
-Bin
-Exe
-Release
+_build
 Src/CodeSnip.cfg
 Src/AutoGen/IntfExternalObj.pas

From 4611f3e7c0ae870ba612203722eebef23ead9035 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 16 Dec 2022 23:48:57 +0000
Subject: [PATCH 080/264] Update Build.html re changes to build process:

Use of _build directory for all binaries
New VERSION macro to add version numbers to release zip files
---
 Build.html | 83 ++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 21 deletions(-)

diff --git a/Build.html b/Build.html
index 679825b07..b918791bf 100644
--- a/Build.html
+++ b/Build.html
@@ -460,8 +460,7 @@ <h3>
           |
           +-- DUnit         - test source code that uses the DUnit framework</pre>
 <p>
-  If, by chance you also have <code>Bin</code>, <code>Exe</code> and / or
-  <code>Release</code> directories don't worry - all will become clear.
+  If, by chance you also have a <code>_build</code> directory don't worry - all will become clear.
   Git users may also see the usual <code>.git</code> hidden
   directory. If you have done some editing in the Delphi IDE you may also see
   occasional hidden <code>__history</code> folders.
@@ -498,18 +497,18 @@ <h3>
 
 <pre>./
   |
-  +-- Bin                   - receives object files for CodeSnip
-  |
-  ...
-  |
-  +-- Exe                   - receives executable code and compiled help file
-  |
-  +-- Release               - receives release files
+  +-- _build                - contains all the build files
+  |   |
+  |   +-- bin               - receives object files for CodeSnip
+  |   |
+  |   +-- exe               - receives executable code and compiled help file
+  |   |
+  |   +-- release           - receives release files
   |
   ...</pre>
 
 <p>
-  If the <code>Bin</code> folder already existed, it will have been emptied.
+  If the <code>_build/bin</code> folder already existed, it will have been emptied.
   In addition, <code>Make</code> will have created a <code>.cfg</code> file from
   template in the <code>Src</code> folder. This <code>.cfg</code> file is needed
   for DCC32 to run correctly. The file will be ignored by Git.
@@ -625,7 +624,7 @@ <h3>
 
 <p>
   The <em>CodeSnip</em> executable, named <code>CodeSnip.exe</code> will be
-  placed in the <code>Exe</code> folder.
+  placed in the <code>_build\exe</code> folder.
 </p>
 
 <h4>
@@ -640,7 +639,7 @@ <h4>
 <pre class="cmd"><span class="prompt">&gt;</span> Make -DPORTABLE codesnip</pre>
 
 <p>
-  Again the executable is placed in the <code>Exe</code> folder, but this time
+  Again the executable is placed in the <code>_build/exe</code> folder, but this time
   it is named <code>CodeSnip-p.exe</code>
 </p>
 
@@ -654,13 +653,16 @@ <h3>
 
 <pre class="cmd"><span class="prompt">&gt;</span> Make help</pre>
 
+<p>
+  The compiled help file will be written to the <code>_build\exe</code> folder.
+</p>
 <h3>
   Build the Setup Program
 </h3>
 
 <p>
   The setup program requires that the <em>CodeSnip</em> excutable and the
-  compiled help file are already present in the <code>Exe</code> directory.
+  compiled help file are already present in the <code>_build\exe</code> directory.
 </p>
 
 <p>
@@ -679,7 +681,7 @@ <h3>
 <p>
   The setup program is named <code>CodeSnip-Setup-x.x.x.exe</code>, where
   x.x.x is the version number extracted from <em>CodeSnip</em>'s version
-  information. It is placed in the <code>Exe</code> directory.
+  information. It is placed in the <code>_build/exe</code> directory.
 </p>
 
 <p>
@@ -704,6 +706,7 @@ <h3>
 
 <p>
   Make can create zip files containing all the files that are included in a release.
+  Zip files are written to the <code>_build/release</code> directory.
 </p>
 
 <h4>
@@ -723,13 +726,17 @@ <h4>
 <pre class="cmd"><span class="prompt">&gt;</span> Make release</pre>
 
 <p>
-  By default the release file is named <code>dd-codesnip.zip</code>. You can
+  By default the release file is named <code>codesnip-exe.zip</code>. You can
   change this name by defining the <code>RELEASEFILENAME</code> macro or
   enviroment variable. For example, you can name the file
   <code>MyRelease.zip</code> by doing:
 </p>
 
-<pre class="cmd"><span class="prompt">&gt;</span> Make -DRELEASEFILENAME=MyRelease.zip release</pre>
+<pre class="cmd"><span class="prompt">&gt;</span> Make -DRELEASEFILENAME=MyRelease release</pre>
+
+<p>
+  Note that the <code>.zip</code> extension should not be included in the file name.
+</p>
 
 <h4>
   Portable edition
@@ -754,7 +761,11 @@ <h4>
   <code>MyPortableRelease.zip</code> by doing:
 </p>
 
-<pre class="cmd"><span class="prompt">&gt;</span> Make -DPORTABLE -DRELEASEFILENAME=MyPortableRelease.zip release</pre>
+<pre class="cmd"><span class="prompt">&gt;</span> Make -DPORTABLE -DRELEASEFILENAME=MyPortableRelease release</pre>
+
+<p>
+  Once again note that the <code>.zip</code> extension should not be included in the file name.
+</p>
 
 <p class="note">
   <strong>Warning:</strong> If you are building both the standard and portable
@@ -763,6 +774,35 @@ <h4>
   built release will overwrite the first.
 </p>
 
+<h4>
+  Including version numbers in zip file names
+</h4>
+
+<p>
+  A version number can be suffixed to the release zip file name by defining the <code>VERSION</code> macro.
+  This macro works with both the <code>PORTABLE</code> and <code>RELEASEFILENAME</code> macros.
+</p>
+
+<p>
+  For example to appended version number 4.22.0 to the zip file name on a standard edition build, with the default
+  file name do:
+</p>
+
+<pre class="cmd"><span class="prompt">&gt;</span> Make -DVERSION=4.22.0 release</pre>
+
+<p>
+  This will create a zip file named <code>codesnip-exe-4.22.0.zip</code>.
+</p>
+
+<p>
+  A more complex example would be to append the same version number to a portable edition build named <code>MyPortableRelease</code>. Do:
+</p>
+
+<pre class="cmd"><span class="prompt">&gt;</span> Make -DPORTABLE -DRELEASEFILENAME=MyPortableRelease -DVERSION=4.22.0 release</pre>
+
+<p>
+  This time the resulting zip file will be named <code>MyPortableRelease-4.22.0.zip</code>.
+</p>
 
 <h3>
   Build and Release Everything
@@ -784,16 +824,17 @@ <h3>
 <span class="prompt">&gt;</span> Make setup
 <span class="prompt">&gt;</span> Make release</pre>
 
-<h4>
-  Portable edition
-</h4>
-
 <p>
   To perform a complete build of the portable edition of <em>CodeSnip</em> do
 </p>
 
 <pre class="cmd"><span class="prompt">&gt;</span> Make -DPORTABLE</pre>
 
+<p>
+  Note that the <code>RELEASEFILENAME</code> and <code>VERSION</code> macros that can be used for customising
+  zip file names can be used here too.
+</p>
+
 <h3>
   Clean Up
 </h3>

From eb65b892cb784212270a3d275b569e5f17df8b22 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 17 Dec 2022 01:24:01 +0000
Subject: [PATCH 081/264] Update StrWrap routines to take non -ve int params

StrWrap was accepting Integer maximum line lengths and indents, which
makes no sense. Unsurprisingly the routine was failing tests that passed
negative margin and maximum lengths.

So MaxLineLen and Margin parameters were changed from Integer to Word.
---
 Src/UStrUtils.pas | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Src/UStrUtils.pas b/Src/UStrUtils.pas
index 0d4eb057d..0bc25e56b 100644
--- a/Src/UStrUtils.pas
+++ b/Src/UStrUtils.pas
@@ -228,7 +228,7 @@ function StrSplit(const Str: UnicodeString; const Delim: UnicodeString;
 ///  offsets each line using spaces to form a left margin of size given by
 ///  Margin.</summary>
 ///  <remarks>Output lines are separated by CRLF.</remarks>
-function StrWrap(const Str: UnicodeString; const MaxLen, Margin: Integer):
+function StrWrap(const Str: UnicodeString; const MaxLen, Margin: UInt16):
   UnicodeString; overload;
 
 ///  <summary>Word wraps each paragraph of text in Paras so that each line of a
@@ -236,7 +236,7 @@ function StrWrap(const Str: UnicodeString; const MaxLen, Margin: Integer):
 ///  number of spaces gvien by Margin. Blanks lines are used to separate
 ///  output paragraphs iff SeparateParas is true.</summary>
 ///  <remarks>Output lines are separated by CRLF.</remarks>
-function StrWrap(const Paras: TStrings; const MaxLineLen, Margin: Integer;
+function StrWrap(const Paras: TStrings; const MaxLineLen, Margin: UInt16;
   const SeparateParas: Boolean): UnicodeString; overload;
 
 ///  <summary>Checks in string Str forms a valid sentence and, if not, adds a
@@ -773,7 +773,7 @@ function StrWindowsLineBreaks(const Str: UnicodeString): UnicodeString;
   Result := StrReplace(Result, LF, CRLF);
 end;
 
-function StrWrap(const Str: UnicodeString; const MaxLen, Margin: Integer):
+function StrWrap(const Str: UnicodeString; const MaxLen, Margin: UInt16):
   UnicodeString;
 var
   Word: UnicodeString;  // next word in input Str
@@ -823,7 +823,7 @@ function StrWrap(const Str: UnicodeString; const MaxLen, Margin: Integer):
   end;
 end;
 
-function StrWrap(const Paras: TStrings; const MaxLineLen, Margin: Integer;
+function StrWrap(const Paras: TStrings; const MaxLineLen, Margin: UInt16;
   const SeparateParas: Boolean): UnicodeString; overload;
 var
   Para: string;

From 6fead6b7df6238716e42396302e3d874f1a557b5 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 17 Dec 2022 01:32:02 +0000
Subject: [PATCH 082/264] Remove tests that compile now that StrWrap modified

Two tests passed negative Margin and MaxLineLen parameters to StrWrap
routine. Since such values make no sense, StrWrap was modified to make
these parameters unsigned: they were changed from Integer to UInt16.
---
 Tests/Src/DUnit/TestUStrUtils.pas | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Tests/Src/DUnit/TestUStrUtils.pas b/Tests/Src/DUnit/TestUStrUtils.pas
index ee38bb402..4be2b4ea6 100644
--- a/Tests/Src/DUnit/TestUStrUtils.pas
+++ b/Tests/Src/DUnit/TestUStrUtils.pas
@@ -1069,10 +1069,8 @@ procedure TTestStrUtilsRoutines.TestStrWrap_overload1;
   CheckEquals(ResA, StrWrap(Text, 10, 0), 'Test 5');
   CheckEquals(ResB, StrWrap(Text, 10, 2), 'Test 6');
   CheckEquals(ResC, StrWrap(Text, 15, 0), 'Test 7');
-  CheckEquals(ResC, StrWrap(Text, 15, -2), 'Test 8');
-  CheckEquals(ResD, StrWrap(Text, 1, 0), 'Test 9');
-  CheckEquals(ResD, StrWrap(Text, 0, 0), 'Test 10');
-  CheckEquals(ResD, StrWrap(Text, -1, 0), 'Test 11');
+  CheckEquals(ResD, StrWrap(Text, 1, 0), 'Test 8');
+  CheckEquals(ResD, StrWrap(Text, 0, 0), 'Test 9');
 end;
 
 procedure TTestStrUtilsRoutines.TestStrWrap_overload2;

From 31909d7e6d2af84eb83dfb47ea99a8dee9fc58c5 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 17 Dec 2022 02:09:57 +0000
Subject: [PATCH 083/264] Fix garbled (C) symbol in generated source code

Replaced literal (C) symbol in resourcestring statements with constant
name.

Defined COPYRIGHT constant in UConsts unit as the appropriate Unicode
hex character code.

Fixes #80
---
 Src/UConsts.pas           |  2 ++
 Src/USaveUnitMgr.pas      | 10 ++++++----
 Src/USnippetSourceGen.pas | 10 ++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Src/UConsts.pas b/Src/UConsts.pas
index d6bffd449..7715b2c0d 100644
--- a/Src/UConsts.pas
+++ b/Src/UConsts.pas
@@ -36,6 +36,8 @@ interface
   GT          = '>';    // greater-than / closing angle bracket character
   LT          = '<';    // less-than / opening angle bracket character
 
+  COPYRIGHT   = #$00A9;
+
   CRLF  = CR + LF;      // carriage return followed by line feed
   EOL   = CRLF;         // end of line character sequence for Windows systems
   EOL2  = EOL + EOL;    // 2 end of line sequences
diff --git a/Src/USaveUnitMgr.pas b/Src/USaveUnitMgr.pas
index 7b4e677d8..d1d16a05d 100644
--- a/Src/USaveUnitMgr.pas
+++ b/Src/USaveUnitMgr.pas
@@ -1,9 +1,9 @@
-{
+﻿{
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a class that manages generation, previewing and saving of a pascal
  * unit.
@@ -98,6 +98,7 @@ implementation
   // Project
   DB.UMetaData,
   UAppInfo,
+  UConsts,
   UUrl,
   UUtils;
 
@@ -115,8 +116,9 @@ implementation
   // Error message
   sErrorMsg = 'Filename is not valid for a Pascal unit';
   // Unit header comments
-  sLicense = 'The unit is copyright � %0:s by %1:s and is licensed under '
-    + 'the %2:s.';
+  sLicense = 'The unit is copyright '
+    + COPYRIGHT
+    + ' %0:s by %1:s and is licensed under the %2:s.';
   sMainDescription = 'This unit was generated automatically. It incorporates a '
     + 'selection of source code taken from the Code Snippets Database at %0:s.';
   sGenerated = 'Generated on : %0:s.';
diff --git a/Src/USnippetSourceGen.pas b/Src/USnippetSourceGen.pas
index 8dc71274e..952b5a1ee 100644
--- a/Src/USnippetSourceGen.pas
+++ b/Src/USnippetSourceGen.pas
@@ -1,9 +1,9 @@
-{
+﻿{
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a static class that generates source code for code snippet(s)
  * contained in a routine snippet or category view.
@@ -90,6 +90,7 @@ implementation
   DB.UMetaData,
   DB.USnippet,
   DB.USnippetKind,
+  UConsts,
   UAppInfo,
   UQuery,
   UUtils;
@@ -108,8 +109,9 @@ function TSnippetSourceGen.BuildHeaderComments: IStringList;
   // when snippets include those from main database
   sMainDBGenerator = 'This code snippet was generated by %0:s %1:s on %2:s.';
   sMainDBLicense = 'It includes code taken from the DelphiDabbler Code '
-    + 'Snippets database that is copyright � %0:s by %1:s and is licensed '
-    + 'under the %2:s.';
+    + 'Snippets database that is copyright '
+    + COPYRIGHT
+    + ' %0:s by %1:s and is licensed under the %2:s.';
   // when snippets are all from user defined database
   sUserGenerator = 'This user defined code snippet was generated by '
     + '%0:s %1:s on %2:s.';

From 71f013fd2344901a2fee4cc3be45e887d8eeb7f9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 28 Dec 2022 11:12:47 +0000
Subject: [PATCH 084/264] Remove information about semantic versioning.

CodeSnip isn't actually semantically versioned because it declares no
API and major version numbers can be bumped when there are major changes
that are not necessarily breaking changes.
---
 CHANGELOG.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b65c83ffd..a922e7060 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,11 @@
 # Changelog
 
-This is the change log for _DelphiDabbler CodeSnip_.
+This is the change log for _DelphiDabbler CodeSnip_. It begins with the first ever pre-release version of _CodeSnip_.
 
-All notable changes to this project are documented in this file.
-
-This change log begins with the first ever pre-release version of _CodeSnip_. Releases are listed in reverse version number order.
+Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
-From v4.1.0 the version numbering has attempted to adhere to the principles of [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
 ## Release v4.21.0 of 16 December 2022
 
 * Updated to support [REML version 5](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/version-4.21.0/Docs/Design/reml.html) in snippet description & extra information [issue #71]:

From 60bdfb1b11e8cd78911e76af85a56afa72554d09 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 1 Jan 2023 16:56:05 +0000
Subject: [PATCH 085/264] Update PJSysInfo vendor code to v5.19.0

Updates recognition of Windows 10/11 builds as of 31 Dec 2022.
---
 Src/3rdParty/PJSysInfo.pas | 778 +++++++++++++++++++++++++++----------
 1 file changed, 565 insertions(+), 213 deletions(-)

diff --git a/Src/3rdParty/PJSysInfo.pas b/Src/3rdParty/PJSysInfo.pas
index 9a93aff09..cf1110edc 100644
--- a/Src/3rdParty/PJSysInfo.pas
+++ b/Src/3rdParty/PJSysInfo.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2001-2022, Peter Johnson (https://gravatar.com/delphidabbler).
+ * Copyright (C) 2001-2023, Peter Johnson (https://gravatar.com/delphidabbler).
  *
  * This unit contains various static classes, constants, type definitions and
  * global variables for use in providing information about the host computer and
@@ -230,18 +230,19 @@ interface
 
   // These Windows-defined constants are required for use with the
   // GetProductInfo API call used with Windows Vista and later
-  // ** Thanks to Laurent Pierre for providing these definitions.
-  // ** Additional definitions were obtained from
-  //    https://msdn.microsoft.com/en-us/library/ms724358
+  // ** Thanks to Laurent Pierre for providing these definitions originally.
+  // ** Subsequent additions were obtained from https://tinyurl.com/3rhhbs2z
   PRODUCT_BUSINESS                            = $00000006;
   PRODUCT_BUSINESS_N                          = $00000010;
   PRODUCT_CLUSTER_SERVER                      = $00000012;
   PRODUCT_CLUSTER_SERVER_V                    = $00000040;
   PRODUCT_CORE                                = $00000065;
-  PRODUCT_CORE_N                              = $00000062;
   PRODUCT_CORE_COUNTRYSPECIFIC                = $00000063;
+  PRODUCT_CORE_N                              = $00000062;
   PRODUCT_CORE_SINGLELANGUAGE                 = $00000064;
   PRODUCT_DATACENTER_EVALUATION_SERVER        = $00000050;
+  PRODUCT_DATACENTER_A_SERVER_CORE            = $00000091;
+  PRODUCT_STANDARD_A_SERVER_CORE              = $00000092;
   PRODUCT_DATACENTER_SERVER                   = $00000008;
   PRODUCT_DATACENTER_SERVER_CORE              = $0000000C;
   PRODUCT_DATACENTER_SERVER_CORE_V            = $00000027;
@@ -250,18 +251,22 @@ interface
   PRODUCT_EDUCATION_N                         = $0000007A;
   PRODUCT_ENTERPRISE                          = $00000004;
   PRODUCT_ENTERPRISE_E                        = $00000046;
-  PRODUCT_ENTERPRISE_N_EVALUATION             = $00000054;
-  PRODUCT_ENTERPRISE_N                        = $0000001B;
   PRODUCT_ENTERPRISE_EVALUATION               = $00000048;
+  PRODUCT_ENTERPRISE_N                        = $0000001B;
+  PRODUCT_ENTERPRISE_N_EVALUATION             = $00000054;
+  PRODUCT_ENTERPRISE_S                        = $0000007D;
+  PRODUCT_ENTERPRISE_S_EVALUATION             = $00000081;
+  PRODUCT_ENTERPRISE_S_N                      = $0000007E;
+  PRODUCT_ENTERPRISE_S_N_EVALUATION           = $00000082;
   PRODUCT_ENTERPRISE_SERVER                   = $0000000A;
   PRODUCT_ENTERPRISE_SERVER_CORE              = $0000000E;
   PRODUCT_ENTERPRISE_SERVER_CORE_V            = $00000029;
   PRODUCT_ENTERPRISE_SERVER_IA64              = $0000000F;
   PRODUCT_ENTERPRISE_SERVER_V                 = $00000026;
-  PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT       = $0000003B;
   PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL       = $0000003C;
-  PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC    = $0000003D;
   PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC    = $0000003E;
+  PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT       = $0000003B;
+  PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC    = $0000003D;
   PRODUCT_HOME_BASIC                          = $00000002;
   PRODUCT_HOME_BASIC_E                        = $00000043;
   PRODUCT_HOME_BASIC_N                        = $00000005;
@@ -271,13 +276,19 @@ interface
   PRODUCT_HOME_PREMIUM_SERVER                 = $00000022;
   PRODUCT_HOME_SERVER                         = $00000013;
   PRODUCT_HYPERV                              = $0000002A;
+  PRODUCT_IOTENTERPRISE                       = $000000BC;
+  PRODUCT_IOTENTERPRISE_S                     = $000000BF;
+  PRODUCT_IOTUAP                              = $0000007B;
+  PRODUCT_IOTUAPCOMMERCIAL                    = $00000083;
   PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT    = $0000001E;
   PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING     = $00000020;
   PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY      = $0000001F;
   PRODUCT_MOBILE_CORE                         = $00000068;
   PRODUCT_MOBILE_ENTERPRISE                   = $00000085;
-  PRODUCT_MULTIPOINT_STANDARD_SERVER          = $0000004C;
   PRODUCT_MULTIPOINT_PREMIUM_SERVER           = $0000004D;
+  PRODUCT_MULTIPOINT_STANDARD_SERVER          = $0000004C;
+  PRODUCT_PRO_WORKSTATION                     = $000000A1;
+  PRODUCT_PRO_WORKSTATION_N                   = $000000A2;
   PRODUCT_PROFESSIONAL                        = $00000030;
   PRODUCT_PROFESSIONAL_E                      = $00000045;
   PRODUCT_PROFESSIONAL_N                      = $00000031;
@@ -296,8 +307,8 @@ interface
   PRODUCT_STANDARD_EVALUATION_SERVER          = $0000004F;
   PRODUCT_STANDARD_SERVER                     = $00000007;
   PRODUCT_STANDARD_SERVER_CORE                = $0000000D;
-  PRODUCT_STANDARD_SERVER_V                   = $00000024;
   PRODUCT_STANDARD_SERVER_CORE_V              = $00000028;
+  PRODUCT_STANDARD_SERVER_V                   = $00000024;
   PRODUCT_STANDARD_SERVER_SOLUTIONS           = $00000034;
   PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE      = $00000035;
   PRODUCT_STARTER                             = $0000000B;
@@ -313,10 +324,10 @@ interface
   PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER = $0000005F;
   PRODUCT_STORAGE_WORKGROUP_SERVER            = $00000016;
   PRODUCT_STORAGE_WORKGROUP_SERVER_CORE       = $0000002D;
-  PRODUCT_UNDEFINED                           = $00000000;
   PRODUCT_ULTIMATE                            = $00000001;
   PRODUCT_ULTIMATE_E                          = $00000047;
   PRODUCT_ULTIMATE_N                          = $0000001C;
+  PRODUCT_UNDEFINED                           = $00000000;
   PRODUCT_WEB_SERVER                          = $00000011;
   PRODUCT_WEB_SERVER_CORE                     = $0000001D;
   PRODUCT_UNLICENSED                          = $ABCDABCD;
@@ -333,19 +344,20 @@ interface
 
   // These constants are required when examining the
   // TSystemInfo.wProcessorArchitecture member.
-  // Only constants marked * are defined in the MS 2008 SDK
-  PROCESSOR_ARCHITECTURE_UNKNOWN    = $FFFF; // Unknown architecture.
+  // Only constants marked ** are defined in MS docs at 2022-12-31
+  PROCESSOR_ARCHITECTURE_UNKNOWN    = $FFFF; // Unknown architecture *
   PROCESSOR_ARCHITECTURE_INTEL          = 0; // x86 *
   PROCESSOR_ARCHITECTURE_MIPS           = 1; // MIPS architecture
   PROCESSOR_ARCHITECTURE_ALPHA          = 2; // Alpha architecture
   PROCESSOR_ARCHITECTURE_PPC            = 3; // PPC architecture
   PROCESSOR_ARCHITECTURE_SHX            = 4; // SHX architecture
-  PROCESSOR_ARCHITECTURE_ARM            = 5; // ARM  architecture
-  PROCESSOR_ARCHITECTURE_IA64           = 6; // Intel Itanium Processor Family *
+  PROCESSOR_ARCHITECTURE_ARM            = 5; // ARM architecture *
+  PROCESSOR_ARCHITECTURE_IA64           = 6; // Intel Itanium based *
   PROCESSOR_ARCHITECTURE_ALPHA64        = 7; // Alpha64 architecture
   PROCESSOR_ARCHITECTURE_MSIL           = 8; // MSIL architecture
   PROCESSOR_ARCHITECTURE_AMD64          = 9; // x64 (AMD or Intel) *
   PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 = 10; // IA32 on Win64 architecture
+  PROCESSOR_ARCHITECTURE_ARM64         = 12; // ARM64 architecture *
 
   // These constants are provided in case the obsolete
   // TSystemInfo.dwProcessorType needs to be used.
@@ -984,7 +996,7 @@ implementation
   // ** Laurent Pierre supplied original code on which this map is based
   //    It has been modified and extended using MSDN documentation at
   //    https://msdn.microsoft.com/en-us/library/ms724358
-  cProductMap: array[1..87] of record
+  cProductMap: array[1..99] of record
     Id: Cardinal; // product ID
     Name: string; // product name
   end = (
@@ -997,23 +1009,19 @@ implementation
     (Id: PRODUCT_CLUSTER_SERVER_V;
       Name: 'Server Hyper Core V';),
     (Id: PRODUCT_CORE;
-      Name: 'Core / Home';),
-    (Id: PRODUCT_CORE_N;
-      Name: 'Core N or Home N';),
+      Name: 'Home (Core)';),
     (Id: PRODUCT_CORE_COUNTRYSPECIFIC;
-      Name: 'Core / Home China';),
+      Name: 'Home (Core) China';),
+    (Id: PRODUCT_CORE_N;
+      Name: 'Home (Core) N';),
     (Id: PRODUCT_CORE_SINGLELANGUAGE;
-      Name: 'Core / Home Single Language';),
-    (Id: PRODUCT_MOBILE_CORE;
-      Name: 'Mobile'),
-    (Id: PRODUCT_MOBILE_ENTERPRISE;
-      Name: 'Mobile Enterprise'),
-    (Id: PRODUCT_EDUCATION;
-      Name: 'Education'),
-    (Id: PRODUCT_EDUCATION_N;
-      Name: 'Education N'),
+      Name: 'Home (Core) Single Language';),
     (Id: PRODUCT_DATACENTER_EVALUATION_SERVER;
       Name: 'Server Datacenter (evaluation installation)';),
+    (Id: PRODUCT_DATACENTER_A_SERVER_CORE;
+      Name: 'Server Datacenter, Semi-Annual Channel (core installation)';),
+    (Id: PRODUCT_STANDARD_A_SERVER_CORE;
+      Name: 'Server Standard, Semi-Annual Channel (core installation)';),
     (Id: PRODUCT_DATACENTER_SERVER;
       Name: 'Server Datacenter (full installation)';),
     (Id: PRODUCT_DATACENTER_SERVER_CORE;
@@ -1022,16 +1030,28 @@ implementation
       Name: 'Server Datacenter without Hyper-V (core installation)';),
     (Id: PRODUCT_DATACENTER_SERVER_V;
       Name: 'Server Datacenter without Hyper-V (full installation)';),
+    (Id: PRODUCT_EDUCATION;
+      Name: 'Education'),
+    (Id: PRODUCT_EDUCATION_N;
+      Name: 'Education N'),
     (Id: PRODUCT_ENTERPRISE;
       Name: 'Enterprise';),
     (Id: PRODUCT_ENTERPRISE_E;
       Name: 'Enterprise E';),
-    (Id: PRODUCT_ENTERPRISE_N_EVALUATION;
-      Name: 'Enterprise N (evaluation installation)';),
-    (Id: PRODUCT_ENTERPRISE_N;
-      Name: 'Enterprise N';),
     (Id: PRODUCT_ENTERPRISE_EVALUATION;
       Name: 'Server Enterprise (evaluation installation)';),
+    (Id: PRODUCT_ENTERPRISE_N;
+      Name: 'Enterprise N';),
+    (Id: PRODUCT_ENTERPRISE_N_EVALUATION;
+      Name: 'Enterprise N (evaluation installation)';),
+    (Id: PRODUCT_ENTERPRISE_S;
+      Name: 'Enterprise 2015 LTSB';),
+    (Id: PRODUCT_ENTERPRISE_S_EVALUATION;
+      Name: 'Enterprise 2015 LTSB Evaluation';),
+    (Id: PRODUCT_ENTERPRISE_S_N;
+      Name: 'Enterprise 2015 LTSB N';),
+    (Id: PRODUCT_ENTERPRISE_S_N_EVALUATION;
+      Name: 'Enterprise 2015 LTSB N Evaluation';),
     (Id: PRODUCT_ENTERPRISE_SERVER;
       Name: 'Server Enterprise (full installation)';),
     (Id: PRODUCT_ENTERPRISE_SERVER_CORE;
@@ -1042,14 +1062,14 @@ implementation
       Name: 'Server Enterprise for Itanium-based Systems';),
     (Id: PRODUCT_ENTERPRISE_SERVER_V;
       Name: 'Server Enterprise without Hyper-V (full installation)';),
-    (Id: PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT;
-      Name: 'Windows Essential Server Solution Management'),
     (Id: PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL;
       Name: 'Windows Essential Server Solution Additional'),
-    (Id: PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC;
-      Name: 'Windows Essential Server Solution Management SVC'),
     (Id: PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC;
       Name: 'Windows Essential Server Solution Additional SVC'),
+    (Id: PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT;
+      Name: 'Windows Essential Server Solution Management'),
+    (Id: PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC;
+      Name: 'Windows Essential Server Solution Management SVC'),
     (Id: PRODUCT_HOME_BASIC;
       Name: 'Home Basic';),
     (Id: PRODUCT_HOME_BASIC_E;
@@ -1067,25 +1087,43 @@ implementation
     (Id: PRODUCT_HOME_SERVER;
       Name: 'Home Storage Server';),
     (Id: PRODUCT_HYPERV;
-      Name: 'Hyper-V Server'),
+      Name: 'Hyper-V Server';),
+    (Id: PRODUCT_IOTENTERPRISE;
+      Name: 'IoT Enterprise';),
+    (Id: PRODUCT_IOTENTERPRISE_S;
+      Name: 'IoT Enterprise LTSC'),
+    (Id: PRODUCT_IOTUAP;
+      Name: 'IoT Core';),
+    (Id: PRODUCT_IOTUAPCOMMERCIAL;
+      Name: 'IoT Core Commercial';),
     (Id: PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT;
       Name: 'Essential Business Server Management Server';),
     (Id: PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING;
       Name: 'Essential Business Server Messaging Server';),
     (Id: PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY;
       Name: 'Essential Business Server Security Server';),
-    (Id: PRODUCT_MULTIPOINT_STANDARD_SERVER;
-      Name: 'MultiPoint Server Standard (full installation)';),
+    (Id: PRODUCT_MOBILE_CORE;
+      Name: 'Mobile'),
+    (Id: PRODUCT_MOBILE_ENTERPRISE;
+      Name: 'Mobile Enterprise'),
     (Id: PRODUCT_MULTIPOINT_PREMIUM_SERVER;
       Name: 'MultiPoint Server Premium (full installation)';),
+    (Id: PRODUCT_MULTIPOINT_STANDARD_SERVER;
+      Name: 'MultiPoint Server Standard (full installation)';),
+    (Id: PRODUCT_PRO_WORKSTATION;
+      Name: 'Pro for Workstations';),
+    (Id: PRODUCT_PRO_WORKSTATION_N;
+      Name: 'Pro for Workstations N';),
     (Id: PRODUCT_PROFESSIONAL;
-      Name: 'Professional';),
+      Name: 'Pro (Professional)';),
     (Id: PRODUCT_PROFESSIONAL_E;
       Name: 'Professional E';),
     (Id: PRODUCT_PROFESSIONAL_N;
-      Name: 'Professional N';),
+      Name: 'Pro (Professional) N';),
     (Id: PRODUCT_PROFESSIONAL_WMC;
       Name: 'Professional with Media Center';),
+    (Id: PRODUCT_SB_SOLUTION_SERVER;
+      Name: 'Small Business Server Essentials';),
     (Id: PRODUCT_SB_SOLUTION_SERVER_EM;
       Name: 'Server For SB Solutions EM';),
     (Id: PRODUCT_SERVER_FOR_SB_SOLUTIONS;
@@ -1095,11 +1133,9 @@ implementation
     (Id: PRODUCT_SERVER_FOR_SMALLBUSINESS;
       Name: 'Server for Essential Server Solutions';),
     (Id: PRODUCT_SERVER_FOR_SMALLBUSINESS_V;
-      Name: 'Server 2008 without Hyper-V for Essential Server Solutions';),
+      Name: 'Server without Hyper-V for Essential Server Solutions';),
     (Id: PRODUCT_SERVER_FOUNDATION;
       Name: 'Server Foundation';),
-    (Id: PRODUCT_SB_SOLUTION_SERVER;
-      Name: 'Small Business Server Essentials';),
     (Id: PRODUCT_SMALLBUSINESS_SERVER;
       Name: 'Small Business Server';),
     (Id: PRODUCT_SMALLBUSINESS_SERVER_PREMIUM;
@@ -1117,7 +1153,7 @@ implementation
     (Id: PRODUCT_STANDARD_SERVER_CORE_V;
       Name: 'Server Standard without Hyper-V (core installation)';),
     (Id: PRODUCT_STANDARD_SERVER_V;
-      Name: 'Server Standard without Hyper-V (full installation)';),
+      Name: 'Server Standard without Hyper-V';),
     (Id: PRODUCT_STANDARD_SERVER_SOLUTIONS;
       Name: 'Server Solutions Premium';),
     (Id: PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE;
@@ -1148,14 +1184,14 @@ implementation
       Name: 'Storage Server Workgroup';),
     (Id: PRODUCT_STORAGE_WORKGROUP_SERVER_CORE;
       Name: 'Storage Server Workgroup (core installation)';),
-    (Id: PRODUCT_UNDEFINED;
-      Name: 'An unknown product';),
     (Id: PRODUCT_ULTIMATE;
       Name: 'Ultimate';),
     (Id: PRODUCT_ULTIMATE_E;
       Name: 'Ultimate E';),
     (Id: PRODUCT_ULTIMATE_N;
       Name: 'Ultimate N';),
+    (Id: PRODUCT_UNDEFINED;
+      Name: 'An unknown product';),
     (Id: PRODUCT_WEB_SERVER;
       Name: 'Web Server (full installation)';),
     (Id: PRODUCT_WEB_SERVER_CORE;
@@ -1177,6 +1213,8 @@ implementation
   // Generally used in arrays
   TBuildNameMap = record
     Build: Integer;
+    LoRev: Integer;
+    HiRev: Integer;
     Name: string;
   end;
 
@@ -1186,21 +1224,37 @@   TBuildNameMap = record
     Sources:
       https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions
       https://en.wikipedia.org/wiki/Windows_NT
+      https://en.wikipedia.org/wiki/Windows_10_version_history
+      https://en.wikipedia.org/wiki/Windows_11_version_history
       https://en.wikipedia.org/wiki/Windows_Server
       https://en.wikipedia.org/wiki/Windows_Server_2019
       https://en.wikipedia.org/wiki/Windows_Server_2016
       https://tinyurl.com/y8tfadm2 (MS Windows Server release information)
+      https://tinyurl.com/usupsz4a (Win 11 Version Numbers & Build Versions)
       https://docs.microsoft.com/en-us/lifecycle/products/windows-server-2022
       https://tinyurl.com/yj5e72jt (MS Win 10 release info)
       https://tinyurl.com/kd3weeu7 (MS Server release info)
 
-
     Note:
       For Vista and Win 7 we have to add service pack number to these values to
       get actual build number. For Win 8 onwards we just use the build numbers
       as is.
   }
 
+  {
+    End of support (EOS) information for Windows Vista to Windows 8.1
+
+    Version | Mainstream EOS | Extended EOS
+    --------|----------------|-------------
+    Vista   | 2012-04-10     | 2017-04-11
+    7       | 2015-01-13     | 2020-01-14
+    8       | N/a            | 2016-01-12
+    8.1     | 2018-01-09     | 2023-01-10
+
+    See below for Windows 10 & 11 end of support information.
+  }
+
+
   // Windows Vista -------------------------------------------------------------
   WinVistaBaseBuild = 6000;
 
@@ -1213,68 +1267,176 @@   TBuildNameMap = record
 
   // Windows 10 ----------------------------------------------------------------
 
+  // Version 1507 previews
+  // Preview builds with major/minor version number 6.4
+  Win10_6point4Builds: array[0..2] of Integer = (9841, 9860, 9879);
+  // Preview builds with major/minor version number 10.0
+  Win10_1507_Preview_Builds: array[0..10] of Integer = (
+    9926, 10041, 10049, 10061, 10074, 10122, 10130, 10158, 10159, 10162, 10166
+  );
+
+  // Version 1511 previews
+  Win10_1511_Preview_Builds: array[0..4] of Integer = (
+    10525, 10532, 10547, 10565, 10576
+  );
+
+  // Version 1607 previews
+  Win10_1607_Preview_Builds: array[0..24] of Integer = (
+    11082, 11099, 11102, 14251, 14257, 14271, 14279, 14291, 14295, 14316,
+    14328, 14332, 14342, 14352, 14361, 14366, 14367, 14371, 14372, 14376,
+    14379, 14383, 14385, 14388, 14390
+  );
+
+  // Version 1703 previews
+  Win10_1703_Preview_Builds: array[0..26] of Integer = (
+    14901, 14905, 14915, 14926, 14931, 14936, 14942, 14946, 14951, 14955,
+    14959, 14965, 14971, 14986, 15002, 15007, 15014, 15019, 15025, 15031,
+    15042, 15046, 15048, 15055, 15058, 15060, 15061
+  );
+
+  // Version 1709 previews
+  Win10_1709_Preview_Builds: array[0..23] of Integer = (
+    16170, 16176, 16179, 16184, 16188, 16193, 16199, 16212, 16215, 16226,
+    16232, 16237, 16241, 16251, 16257, 16273, 16275, 16278, 16281, 16288,
+    16291, 16294, 16296, 16299 {rev 0 only}
+  );
+
+  // Version 1803 previews
+  Win10_1803_Preview_Builds: array[0..21] of Integer = (
+    16353, 16362, 17004, 17017, 17025, 17035, 17040, 17046, 17063, 17074,
+    17083, 17093, 17101, 17107, 17110, 17112, 17115, 17120, 17123, 17127,
+    17128, 17133
+  );
+
+  // Version 1809 previews
+  Win10_1809_Preview_Builds: array[0..33] of Integer = (
+    17604, 17618, 17623, 17627, 17634, 17639, 17643, 17650, 17655, 17661,
+    17666, 17672, 17677, 17682, 17686, 17692, 17704, 17711, 17713, 17723,
+    17728, 17730, 17733, 17735, 17738, 17741, 17744, 17746, 17751, 17754,
+    17755, 17758, 17760, 17763 {rev 0 only}
+  );
+
+  // Version 1903 previews
+  Win10_1903_Preview_Builds: array[0..30] of Integer = (
+    18204, 18214, 18219, 18234, 18237, 18242, 18247, 18252, 18262, 18267,
+    18272, 18277, 18282, 18290, 18298, 18305, 18309, 18312, 18317, 18323,
+    18329, 18334, 18342, 18343, 18346, 18348, 18351, 18353, 18356, 18358,
+    18361
+  );
+
+  // Single build number used for 3 purposes:
+  //   1903 preview - revs 0, 30, 53, 86, 113
+  //   1903 release - revs 116..1256
+  //   1909 preview - revs 10000, 10005, 10006, 10012, 10014, 10015,
+  //                       10019, 10022, 10024
+  Win10_19XX_Shared_Build = 18362;
+
+  // Version 1909 previews used build 18362 rev 10000 and later (see above)
+
+  // Version 2004 previews
+  Win10_2004_Preview_Builds: array[0..43] of Integer = (
+    18836, 18841, 18845, 18850, 18855, 18860, 18865, 18875, 18885, 18890,
+    18894, 18895, 18898, 18908, 18912, 18917, 18922, 18932, 18936, 18941,
+    18945, 18950, 18956, 18963, 18965, 18970, 18975, 18980, 18985, 18990,
+    18995, 18999, 19002, 19008, 19013, 19018, 19023, 19025, 19028, 19030,
+    19033, 19035, 19037,
+    19041 {revs 0, 21, 84, 113, 153, 172, 173, 207, 208 only}
+  );
+
+  // Version 20H2 previews: all used 19042, also used for release
+  Win10_20H2_Preview_Builds: array[0..0] of Integer = (
+    19042
+  );
+
+  {
+    End of support information for Windows 10 versions (as of 2022-12-31).
+      GAC = General Availablity Channel.
+      LTSC = Long Term Support Channel.
+
+    Version | GAC        | LTSC
+    --------|------------|------------
+    1507    | ended      | 2025-10-14
+    1511    | ended      | N/a
+    1607    | ended      | 2026-10-13
+    1703    | ended      | N/a
+    1709    | ended      | N/a
+    1803    | ended      | N/a
+    1809    | ended      | 2029-01-09
+    1903    | ended      | N/a
+    1909    | ended      | N/a
+    2004    | ended      | N/a
+    20H2    | 2023-09-05 | N/a
+    21H1    | ended      | N/a
+    21H2    | 2024-06-11 | 2032-01-13
+    22H2    | 2025-05-13 | N/a
+  }
+
   // Map of Win 10 builds from 1st release (version 1507) to version 20H2
+  //
+  // NOTE: The following versions that are still being maintained per the above
+  // table have HiRev = MaxInt while the unsupported versions have HiRev set to
+  // the final build number.
   Win10BuildMap: array[0..10] of TBuildNameMap = (
-    (Build: 10240; Name: 'Version 1507'),
-    (Build: 10586; Name: 'Version 1511: November Update'),
-    (Build: 14393; Name: 'Version 1607: Anniversary Update'),
-    (Build: 15063; Name: 'Version 1703: Creators Update'),
-    (Build: 16299; Name: 'Version 1709: Fall Creators Update'),
-    (Build: 17134; Name: 'Version 1803: April 2018 Update'),
-    (Build: 17763; Name: 'Version 1809: October 2018 Update'),
-    (Build: 18362; Name: 'Version 1903: May 2019 Update'),
-    (Build: 18363; Name: 'Version 1909: November 2019 Update'),
-    (Build: 19041; Name: 'Version 2004: May 2020 Update'),
-    // Note: Microsoft announced the official version name of build 19042 as
-    // '20H2', not '2010' which some had expected it to be
-    (Build: 19042; Name: 'Version 20H2: October 2020 Update')
+    (Build: 10240; LoRev: 16484; HiRev: MaxInt;
+      Name: 'Version 1507'),
+    (Build: 10586; LoRev: 0; HiRev: 1540;
+      Name: 'Version 1511: November Update'),
+    (Build: 14393; LoRev: 0; HiRev: MaxInt;
+      Name: 'Version 1607: Anniversary Update'),
+    (Build: 15063; LoRev: 0; HiRev: 2679;
+      Name: 'Version 1703: Creators Update'),
+    (Build: 16299; LoRev: 15; HiRev: 2166;
+      Name: 'Version 1709: Fall Creators Update'),
+    (Build: 17134; LoRev: 1; HiRev: 2208;
+      Name: 'Version 1803: April 2018 Update'),
+    (Build: 17763; LoRev: 1; HiRev: MaxInt;
+      Name: 'Version 1809: October 2018 Update'),
+    (Build: Win10_19XX_Shared_Build; LoRev: 116; HiRev: 1256;
+      Name: 'Version 1903: May 2019 Update'),
+    (Build: 18363; LoRev: 327; HiRev: 2274;
+      Name: 'Version 1909: November 2019 Update'),
+    (Build: 19041; LoRev: 264; HiRev: 1415;
+      Name: 'Version 2004: May 2020 Update'),
+    (Build: 19042; LoRev: 572; HiRev: MaxInt;
+      Name: 'Version 20H2: October 2020 Update')
   );
 
-  // Additional information is available for Win 10 buulds from version 21H1,
+  // Additional information is available for Win 10 builds from version 21H1,
   // as follows:
 
-  // Windows 10 version 21H1:
-  //  * revisions 844..964 were Beta builds
-  //  * later revisions were Public Release builds
-  Win1021H1Build = 19043;
+  // Windows 10 version 21H1 - see **REF3** in implementation for details
+  Win1021H1Build = 19043; // ** End of service 2022-12-13, rev 2364
 
-  // Windows 10 version 21H2:
-  //  * revisions 1147..1266 were Preview builds
-  //  * later revisions were Public Release builds
+  // Windows 10 version 21H2 - see **REF4** in implementation for details
   Win1021H2Build = 19044;
 
-  // Windows 10 version 22H2
-  // * revision 1865 was Release Preview build (KB5015878)
+  // Windows 10 version 22H2 - see **REF5** in implementation for details
   Win1022H2Build = 19045;
 
-  // Fast ring
-  Win10FastRing: array[0..21] of Integer = (
-    19536, 19541, 19546, 19551, 19555, 19559, 19564, 19569, 19577, 19582, 19587,
-    19592, 19603, 19608, 19613, 19619, 19624, 19628, 19631, 19635, 19640, 19645
-  );
-
-  // Dev channel
-  // Assuming all Dev channel releases had version string "Dev"
-  Win10DevChannel: array[0..44] of Integer = (
-    20150, 20152, 20161, 20170, 20175, 20180, 20185, 20190, 20197, 20201, 20206,
-    20211, 20215, 20221, 20226, 20231, 20236, 20241, 20246, 20251, 20257, 20262,
-    20270, 20277, 21277, 20279, 21286, 21292, 21296, 21301, 21313, 21318, 21322,
-    21327, 21332, 21337, 21343, 21354, 21359, 21364, 21370, 21376, 21382, 21387,
-    21390 // transitioned to Windows 11 after here
-  );
+  // Windows 10 slow ring, fast ring and skip-ahead channels were all expired
+  // well before 2022-12-31 and are not detected. (In fact there was never any
+  // detection of the slow ring and skip-ahead channels).
 
   // Windows 11 ----------------------------------------------------------------
 
-  // NOTE: Preview and beta & release versions of Windows 11 report version 10.0
+  // NOTE: All releases of Windows 11 report version 10.0
+
+  {
+    End of support (EOS) information for Windows 11 versions (as of 2022-12-31).
+
+    Version | Home, Pro  | Education,
+            | etc EOS    | Enterprise
+            |            | etc EOS
+    --------|------------|------------
+    21H2    | 2023-10-10 | 2024-10-08
+    22H2    | 2024-10-08 | 2025-10-14
+  }
 
-  // Windows 11 version Dev: 10.0.21996.1 (Insider version)
+  // 1st build released branded as Windows 11
+  // Insider version, Dev channel, v10.0.21996.1
   Win11DevBuild = 21996;
 
-  // Windows 11 version 21H2:
-  //  * Dev channel: revs 51,65,71
-  //  * Dev & Beta channels: revs 100,120,132,160,168
-  //  * Beta & Release Preview channels: revs 176,184
-  //  * Public Release: rev 194 and later
+  // Windows 11 version 21H2  - see **REF6** in implementation for details
   Win11v21H2Build = 22000;
 
   // Windows 11 version 22H2
@@ -1283,40 +1445,40 @@   TBuildNameMap = record
   // various other channels.
   // See **REF1** in implementation
   Win11v22H2Build = 22621;
-  // Build 22632 was added as an alternative Beta channel build as of rev 290:
-  //  * Beta channel: revs 290,436,440,450,575,586,590,598,601
+  // Build 22632 was added as an alternative Beta channel build as of rev 290.
+  // See **REF2** in implementation
   Win11v22H2BuildAlt = 22622;
 
-  // Dev channel release - different sources give different names.
-  // From what I can gather (and take this with a pinch of salt!):
-  // * Insider Dev channel releases from the RS_PRERELEASE branch weren't
-  //   matched to a Windows 11 release and had version string "Dev").
-  // * The NI_RELEASE channel was used from 2022/02/16 (build 2257).
-  // * From build 22567 the release string changed from "Dev" to "22H"
-
-  // Builds with version string "Dev"
-  Win11DevChannelDevBuilds: array[0..43] of Integer = (
-    // pre Win 11 release
-    22449, 22454, 22458, 22463, 22468,
-    // post Win 11 release, pre Win 11 22H2 beta release
-    22471, 22478, 22483, 22489, 22494, 22499, 22504, 22509, 22518, 22523, 22526,
-    22533, 22538, 22543, 22557, 22563,
-    // post Win 11 22H2 beta release
-    25115, 25120, 25126, 25131, 25136, 25140, 25145, 25151, 25158, 25163, 25169,
-    25174, 25179, 25182, 25188, 25193, 25197, 25201, 25206, 25211,
-    // post Win 11 22H2 release
-    25217, 25227, 25231
+  // Windows 11 Dev channel releases (with version string "Dev").
+  // For details see https://en.wikipedia.org/wiki/Windows_11_version_history
+  Win11DevChannelDevBuilds: array[0..14] of Integer = (
+    // pre Win 11 release (expired 2021/10/31):
+    //   22449, 22454, 22458, 22463,
+    // pre Win 11 release (expired 2022/09/15):
+    //   22468,
+    // post Win 11 release, pre Win 11 22H2 beta release (expired 2022/09/15):
+    //   22471, 22478, 22483, 22489, 22494, 22499, 22504, 22509, 22518, 22523,
+    //   22526, 22533, 22538, 22543, 22557, 22563,
+    // post Win 11 22H2 beta release (expired 2022/09/15):
+    //   25115, 25120, 25126, 25131, 25136, 25140, 25145, 25151, 25158, 25163,
+    //   25169, 25174, 25179,
+    // post Win 11 22H2 beta release (expiring 2023/09/15):
+    25182, 25188, 25193, 25197, 25201, 25206, 25211,
+    // post Win 11 22H2 release (expiring 2023/09/15):
+    25217, 25227, 25231, 25236, 25247, 25252, 25262, 25267
   );
-  // Builds with version string "22H2" in Dev channel
-  Win11DevChannel22H2Builds: array[0..2] of Integer = (
-    22567, 22572, 22579
-  );
-  // Builds with version string "22H2" in Dev & Beta channels
-  Win11DevBetaChannels22H2Builds: array[0..4] of Integer = (
-    22581, 22593, 22598, 22610, 22616
+
+  // Windows 11 Dev channel builds with version string "22H2"
+  // expired 2022/09/15):
+  //   22567, 22572, 22579
+
+  // Windows 11 Dev & Beta channel builds with version string "22H2"
+  Win11DevBetaChannels22H2Builds: array[0..1] of Integer = (
+    // expired 2022/09/15: 22581, 22593, 22598,
+    22610, 22616
   );
 
-  Win11FutureComponentBetaChannelBuilds: array[0..0] of Integer = (22623);
+  Win11FutureComponentBetaChannelBuild = 22623;
 
   Win11FirstBuild = Win11DevBuild;  // First build number of Windows 11
 
@@ -1330,25 +1492,52 @@   TBuildNameMap = record
   Win2019LastBuild = 18363;
   WinServerLastBuild = 19042;
 
+  {
+    End of support information for all Windows Server versions.
+
+    Version                            | End date
+    -----------------------------------|------------
+    Windows NT 3.1                     | 2000-12-31
+    Windows NT 3.5                     | 2001-12-31
+    Windows NT 3.51                    | 2001-12-31
+    Windows NT 4.0                     | 2004-12-31
+    Windows 2000                       | 2010-07-13
+    Windows Server 2003                | 2015-07-14
+    Windows Server 2003 R2             | 2015-07-14
+    Windows Server 2008                | 2020-01-14
+    Windows Server 2008 R2             | 2020-01-14
+    Windows Server 2012                | 2023-10-10
+    Windows Server 2012 R2             | 2023-10-10
+    Windows Server 2016, version 1607  | 2027-01-12
+    Windows Server 2016, version 1709  | 2019-04-09
+    Windows Server 2016, version 1803  | 2019-11-12
+    Windows Server 2019, version 1809  | 2029-01-09
+    Windows Server 2019, version 1903  | 2020-12-08
+    Windows Server 2019, version 1909  | 2021-05-11
+    Windows Server, version 2004       | 2021-12-14
+    Windows Server, version 20H2       | 2022-08-09
+    Windows Server 2022, version 21H2  | 2031-10-14
+  }
+
   // Map of Windows server releases that are named straightforwardly
   WinServerSimpleBuildMap: array[0..12] of TBuildNameMap = (
     // Windows Server 2016
-    (Build: 10074; Name: 'Technical Preview 2'),
-    (Build: 10514; Name: 'Technical Preview 3'),
-    (Build: 10586; Name: 'Technical Preview 4'),
-    (Build: 14300; Name: 'Technical Preview 5'),
-    (Build: 14393; Name: 'Version 1607'),
-    (Build: 16299; Name: 'Version 1709'),
-    (Build: Win2016LastBuild; Name: 'Version 1803'),
+    (Build: 10074; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 2'),
+    (Build: 10514; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 3'),
+    (Build: 10586; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 4'),
+    (Build: 14300; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 5'),
+    (Build: 14393; LoRev: 0; HiRev: MaxInt; Name: 'Version 1607'),
+    (Build: 16299; LoRev: 0; HiRev: MaxInt; Name: 'Version 1709'),
+    (Build: Win2016LastBuild; LoRev: 0; HiRev: MaxInt; Name: 'Version 1803'),
     // Windows Server 2019
-    (Build: 17763; Name: 'Version 1809'),
-    (Build: 18362; Name: 'Version 1903'),
-    (Build: Win2019LastBuild; Name: 'Version 1909'),
+    (Build: 17763; LoRev: 0; HiRev: MaxInt; Name: 'Version 1809'),
+    (Build: 18362; LoRev: 0; HiRev: MaxInt; Name: 'Version 1903'),
+    (Build: Win2019LastBuild; LoRev: 0; HiRev: MaxInt; Name: 'Version 1909'),
     // Windows Server (no year number)
-    (Build: 19041; Name: 'Version 2004'),
-    (Build: WinServerLastBuild; Name: 'Version 20H2'),
-    // Windows Sever 2022
-    (Build: 20348; Name: 'Version 21H2')
+    (Build: 19041; LoRev: 0; HiRev: MaxInt; Name: 'Version 2004'),
+    (Build: WinServerLastBuild; LoRev: 0; HiRev: MaxInt; Name: 'Version 20H2'),
+    // Windows Server 2022
+    (Build: 20348; LoRev: 0; HiRev: MaxInt; Name: 'Version 21H2')
   );
 
   // Windows server releases needing special handling
@@ -1412,6 +1601,14 @@   TBuildNameMap = record
   KEY_WOW64_64KEY = $0100;  // registry access flag not defined in all Delphis
 {$ENDIF}
 
+// Checks if integer V is in the range of values defined by VLo and VHi,
+// inclusive.
+function IsInRange(const V, VLo, VHi: Integer): Boolean;
+begin
+  Assert(VLo <= VHi);
+  Result := (V >= VLo) and (V <= VHi);
+end;
+
 // Tests Windows version (major, minor, service pack major & service pack minor)
 // against the given values using the given comparison condition and return
 // True if the given version matches the current one or False if not
@@ -1510,10 +1707,11 @@ function FindBuildNumberFrom(const BNs: array of Integer; var FoundBN: Integer):
 end;
 
 // Checks if any of the build numbers in the given array match that of the
-// current OS. If so the build number that was found then True is returned, and
-// the build number and it's associated text are passed back in the FoundBN and
-// FoundExtra parameters respectively. Otherwise False is returned, FoundBN is
-// set to 0 and FoundExtra is set to ''.
+// current OS AND if the OS revision number is in the specified range. If so
+// then the build number that was found then True is returned, and the build
+// number and it's associated text are passed back in the FoundBN and FoundExtra
+// parameters respectively. Otherwise False is returned, FoundBN is set to 0 and
+// FoundExtra is set to ''.
 function FindBuildNameAndExtraFrom(const Infos: array of TBuildNameMap;
   var FoundBN: Integer; var FoundExtra: string): Boolean;
 var
@@ -1524,7 +1722,8 @@ function FindBuildNameAndExtraFrom(const Infos: array of TBuildNameMap;
   Result := False;
   for I := Low(Infos) to High(Infos) do
   begin
-    if IsBuildNumber(Infos[I].Build) then
+    if IsBuildNumber(Infos[I].Build) and
+      IsInRange(InternalRevisionNumber, Infos[I].LoRev, Infos[I].HiRev) then
     begin
       FoundBN := Infos[I].Build;
       FoundExtra := Infos[I].Name;
@@ -1534,6 +1733,29 @@ function FindBuildNameAndExtraFrom(const Infos: array of TBuildNameMap;
   end;
 end;
 
+function FindWin10PreviewBuildNameAndExtraFrom(const Builds: array of Integer;
+  const Win10Version: string; var FoundBN: Integer; var FoundExtra: string):
+  Boolean;
+var
+  I: Integer;
+begin
+  FoundBN := 0;
+  FoundExtra := '';
+  Result := False;
+  for I := Low(Builds) to High(Builds) do
+  begin
+    if IsBuildNumber(Builds[I]) then
+    begin
+      FoundBN := Builds[I];
+      FoundExtra := Format(
+        'Version %s Preview Build %d', [Win10Version, FoundBN]
+      );
+      Result := True;
+      Break;
+    end;
+  end;
+end;
+
 // Checks if the OS has the given product type.
 // Assumes VerifyVersionInfo & VerSetConditionMask APIs functions are available
 function IsWindowsProductType(ProductType: Byte): Boolean;
@@ -1612,14 +1834,6 @@ function ExcludeTrailingPathDelimiter(const DirOrPath: string) : string;
 end;
 {$ENDIF}
 
-// Checks if integer V is in the range of values defined by VLo and VHi,
-// inclusive.
-function IsInRange(const V, VLo, VHi: Integer): Boolean;
-begin
-  Assert(VLo <= VHi);
-  Result := (V >= VLo) and (V <= VHi);
-end;
-
 // Returns the value of the given environment variable.
 function GetEnvVar(const VarName: string): string;
 var
@@ -1850,6 +2064,17 @@ procedure InitPlatformIdEx;
               // Windows 2016 Server tech preview 1
               InternalBuildNumber := Win2016TP1Build;
               InternalExtraUpdateInfo := 'Technical Preview 6';
+            end
+            else
+            begin
+              if FindBuildNumberFrom(
+                Win10_6point4Builds, InternalBuildNumber
+              ) then
+                // Early Win 10 preview builds report v6.4, not v10.0
+                InternalExtraUpdateInfo := Format(
+                  'Version 1507 Preview v6.4.%d.%d',
+                  [InternalBuildNumber, InternalRevisionNumber]
+                )
             end;
         end;
         if Win32ServicePackMajor > 0 then
@@ -1880,49 +2105,76 @@ procedure InitPlatformIdEx;
             end
             else if IsBuildNumber(Win1021H1Build) then
             begin
+              // **REF3**
               InternalBuildNumber := Win1021H1Build;
-              InternalExtraUpdateInfo := 'Version 21H1';
-              if IsInRange(InternalRevisionNumber, 844, 964) then
-                InternalExtraUpdateInfo := InternalExtraUpdateInfo + ' (beta)';
+              case InternalRevisionNumber of
+                985, 1023, 1052, 1055, 1081, 1082, 1083, 1110, 1151, 1165, 1202,
+                1237, 1266, 1288, 1320, 1348, 1387, 1415, 1466, 1469, 1503,
+                1526, 1566, 1586, 1620, 1645, 1682, 1706, 1708, 1741, 1766,
+                1767, 1806, 1826, 1865, 1889, 1949, 2006, 2075, 2130, 2132,
+                2193, 2194, 2251, 2311, 2364 {final build}:
+                  InternalExtraUpdateInfo := 'Version 21H1';
+                1147, 1149, 1200, 1263, 1319, 1379, 1381:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 21H1 [Release Preview Channel v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                844, 867, 899, 906, 928, 962, 964:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 21H1 [Beta Channel v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'Version 21H1 [Unknown release v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
             end
             else if IsBuildNumber(Win1021H2Build) then
             begin
+              // **REF4**
               // From 21H2 Windows 10 moves from a 6 monthly update cycle to a
               // yearly cycle
               InternalBuildNumber := Win1021H2Build;
-              InternalExtraUpdateInfo := 'Version 21H2';
-              if IsInRange(InternalRevisionNumber, 1147, 1266) then
-                InternalExtraUpdateInfo := InternalExtraUpdateInfo
-                  + ' (preview)';
+              case InternalRevisionNumber of
+                1288, 1348, 1387, 1415, 1466, 1469, 1503, 1526, 1566, 1586,
+                1620, 1645, 1682, 1706, 1708, 1741, 1766, 1767, 1806, 1826,
+                1865, 1889, 1949, 2006, 2075, 2130, 2132, 2193, 2194, 2251,
+                2311, 2364..MaxInt:
+                  InternalExtraUpdateInfo := 'Version 21H2';
+                1147, 1149, 1151, 1165, 1200, 1202, 1237, 1263, 1266, 1319,
+                1320, 1379, 1381, 1499, 1618, 1679, 1737, 1739, 1862, 1947,
+                2192:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 21H2 [Release Preview Channel v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'Version 21H2 [Unknown release v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
             end
             else if IsBuildNumber(Win1022H2Build) then
             begin
+              // **REF5**
               InternalBuildNumber := Win1022H2Build;
-              if IsInRange(InternalRevisionNumber, 1865, 2075) then
-                InternalExtraUpdateInfo := Format(
-                  'Version 22H2 [Release Preview v10.0.%d.%d]',
-                  [InternalBuildNumber, InternalRevisionNumber]
-                )
-              else
-                InternalExtraUpdateInfo := 'Version 22H2';
-            end
-            else if FindBuildNumberFrom(
-              Win10DevChannel, InternalBuildNumber
-            ) then
-            begin
-              // Windows 10 Dev Channel releases
-              InternalExtraUpdateInfo := Format(
-                'Dev Channel v10.0.%d.%d (Dev)',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
-            end
-            else if FindBuildNumberFrom(Win10FastRing, InternalBuildNumber) then
-            begin
-              // Windows 10 Fast Ring releases
-              InternalExtraUpdateInfo := Format(
-                'Fast ring v10.0.%d.%d',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
+              case InternalBuildNumber of
+                2006, 2130, 2132, 2193, 2194, 2251, 2311, 2364..MaxInt:
+                  InternalExtraUpdateInfo := 'Version 22H2';
+                1865, 1889, 1949, 2075, 2301:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [Release Preview Channel v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H1 [Unknown release v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
             end
             // Win 11 releases are reporting v10.0
             // Details taken from: https://tinyurl.com/usupsz4a
@@ -1936,6 +2188,7 @@ procedure InitPlatformIdEx;
             end
             else if IsBuildNumber(Win11v21H2Build) then
             begin
+              // **REF6**
               // There are several Win 11 releases with this build number
               // Which release we're talking about depends on the revision
               // number.
@@ -1943,8 +2196,10 @@ procedure InitPlatformIdEx;
               //     release of Win 11 -- well hidden eh?!
               InternalBuildNumber := Win11v21H2Build;
               case InternalRevisionNumber of
-                194..MaxInt:
-                  // Public releases of Windows 11 have build number >= 194
+                194, 258, 282, 348, 376, 434, 438, 469, 493, 527, 556, 593, 613,
+                652, 675, 708, 739, 740, 778, 795, 832, 856, 918, 978, 1042,
+                1098, 1100, 1165, 1219, 1281, 1335..MaxInt:
+                  // Public releases of Windows 11
                   InternalExtraUpdateInfo := 'Version 21H2';
                 51, 65, 71:
                   InternalExtraUpdateInfo := Format(
@@ -1956,12 +2211,17 @@ procedure InitPlatformIdEx;
                     'Version 21H2 [Dev & Beta Channels v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                176, 184:
+                176, 184, 346, 466, 526, 588:
                   InternalExtraUpdateInfo := Format(
                     'Version 21H2 '
                       + '[Beta & Release Preview Channels v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
+                651, 706, 776, 829, 917, 1041, 1163, 1279:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 21H1 Release Preview Channel v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
                 else
                   InternalExtraUpdateInfo := Format(
                     'Version 21H2 [Unknown release v10.0.%d.%d]',
@@ -1974,20 +2234,20 @@ procedure InitPlatformIdEx;
               // **REF1**
               InternalBuildNumber := Win11v22H2Build;
               case InternalRevisionNumber of
-                876..MaxInt, 382, 521, 525, 608, 674, 675, 755:
+                382, 521, 525, 608, 674, 675, 755, 819, 900, 963, 1038..MaxInt:
                   InternalExtraUpdateInfo := 'Version 22H2';
                 1:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta & Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                105, 169, 232, 317, 457, 607, 754:
+                105, 169, 232, 317, 457, 607, 754, 898:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 160, 290, 436, 440, 450, 575, 586, 590, 598, 601, 730, 741, 746,
-                870, 875:
+                870, 875, 885, 891, 1020, 1028, 1037:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2001,8 +2261,7 @@ procedure InitPlatformIdEx;
             end
             else if IsBuildNumber(Win11v22H2BuildAlt) then
             begin
-              // See comments with declarations of Win11v22H2Build and
-              // Win11v22H2BuildAlt for details of naming of revisions.
+              // **REF2**
               InternalBuildNumber := Win11v22H2BuildAlt;
               // Set fallback update info for unknown revisions
               case InternalRevisionNumber of
@@ -2028,16 +2287,6 @@ procedure InitPlatformIdEx;
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
-            else if FindBuildNumberFrom(
-              Win11DevChannel22H2Builds, InternalBuildNumber
-            ) then
-            begin
-              // Win11 Dev channel builds with version string "22H2"
-              InternalExtraUpdateInfo := Format(
-                'Dev Channel v10.0.%d.%d (22H2)',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
-            end
             else if FindBuildNumberFrom(
               Win11DevBetaChannels22H2Builds, InternalBuildNumber
             ) then
@@ -2048,15 +2297,114 @@ procedure InitPlatformIdEx;
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
-            else if FindBuildNumberFrom(
-              Win11FutureComponentBetaChannelBuilds, InternalBuildNumber
+            else if IsBuildNumber(Win11FutureComponentBetaChannelBuild) then
+            begin
+              InternalBuildNumber := Win11FutureComponentBetaChannelBuild;
+              case InternalRevisionNumber of
+                730, 741, 746, 870, 875, 885, 891, 1020, 1028, 1037..MaxInt:
+                  InternalExtraUpdateInfo := Format(
+                    'Future Component Update Beta v10.0.%d.%d',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'Future Component Update [Unknown Beta v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
+            end
+            // End with some much less likely cases
+            // NOTE: All the following tests MUST come after the last call to
+            //       FindBuildNameAndExtraFrom() for non-server OSs because some
+            //       build numbers are common to both sets of tests and the
+            //       following rely on FindBuildNameAndExtraFrom() to have
+            //       filtered out releases.
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_20H2_Preview_Builds, '20H2',
+              InternalBuildNumber, InternalExtraUpdateInfo
             ) then
             begin
-              InternalExtraUpdateInfo := Format(
-                'Future Component Update Beta v10.0.%d.%d',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
-            end;
+              // Nothing to do: required internal variables set in function call
+            end
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_2004_Preview_Builds, '2004',
+              InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
+            begin
+              // Nothing to do: required internal variables set in function call
+            end
+            else if IsBuildNumber(Win10_19XX_Shared_Build) then
+            begin
+              // If we get here the Win10_19XX_Shared_Build will either be a
+              // preview of Version 1903 or 1909
+              InternalBuildNumber := Win10_19XX_Shared_Build;
+              if IsInRange(InternalRevisionNumber, 0, 113) then
+                InternalExtraUpdateInfo := Format(
+                  'Version 1903 Preview Build %d.%d',
+                  [InternalBuildNumber, InternalRevisionNumber]
+                )
+              else if IsInRange(InternalRevisionNumber, 10000, 10024) then
+                InternalExtraUpdateInfo := Format(
+                  'Version 1909 Preview Build %d.%d',
+                  [InternalBuildNumber, InternalRevisionNumber]
+                );
+            end
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_1903_Preview_Builds, '1903',
+              InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
+            begin
+              // Nothing to do: required internal variables set in function call
+            end
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_1809_Preview_Builds, '1809',
+              InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
+            begin
+              // Nothing to do: required internal variables set in function call
+            end
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_1803_Preview_Builds, '1803',
+              InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
+            begin
+              // Nothing to do: required internal variables set in function call
+            end
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_1709_Preview_Builds, '1709',
+              InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
+            begin
+              // Nothing to do: required internal variables set in function call
+            end
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_1703_Preview_Builds, '1703',
+              InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
+            begin
+              // Nothing to do: required internal variables set in function call
+            end
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_1607_Preview_Builds, '1607',
+              InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
+            begin
+              // Nothing to do: required internal variables set in function call
+            end
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_1511_Preview_Builds, '1511',
+              InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
+            begin
+              // Nothing to do: required internal variables set in function call
+            end
+            else if FindWin10PreviewBuildNameAndExtraFrom(
+              Win10_1507_Preview_Builds, '1507',
+              InternalBuildNumber, InternalExtraUpdateInfo
+            ) then
+            begin
+              // Nothing to do: required internal variables set in function call
+            end
           end
           else // Win32ProductType in [VER_NT_DOMAIN_CONTROLLER, VER_NT_SERVER]
           begin
@@ -2671,6 +3019,8 @@ class function TPJOSInfo.Platform: TPJOSPlatform;
 end;
 
 class function TPJOSInfo.Product: TPJOSProduct;
+var
+  DummyBN: Integer;   // dummy build number
 begin
   Result := osUnknown;
   case Platform of
@@ -2754,12 +3104,14 @@ class function TPJOSInfo.Product: TPJOSProduct;
               else
                 Result := osWinSvr2012R2;
             4:
-              // Version 6.4 was used for Windows 2016 server tech preview 1.
-              // This version *may* only be detected by Windows if the
-              // application is "manifested" for the correct Windows version.
-              // See https://bit.ly/MJSO8Q.
               if IsServer then
-                Result := osWin10Svr;
+                // Version 6.4 was used for Windows 2016 server tech preview 1.
+                // This version *may* only be detected by Windows if the
+                // application is "manifested" for the correct Windows version.
+                // See https://bit.ly/MJSO8Q.
+                Result := osWin10Svr
+              else if FindBuildNumberFrom(Win10_6point4Builds, DummyBN) then
+                Result := osWin10;
             else
               // Higher minor version: must be an unknown later OS
               Result := osWinLater

From 5203fdc9aa10cec29b4e3fe899ddfa9f3acbb575 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 2 Apr 2023 18:47:21 +0100
Subject: [PATCH 086/264] Fix bug in StrCompressWhiteSpace function

Bug per issue in StrCompressWhiteSpace function.

Fixes #95
---
 Src/UStrUtils.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/UStrUtils.pas b/Src/UStrUtils.pas
index 0bc25e56b..61d52b8a9 100644
--- a/Src/UStrUtils.pas
+++ b/Src/UStrUtils.pas
@@ -404,7 +404,7 @@ function StrCompressWhiteSpace(const Str: UnicodeString): UnicodeString;
       Inc(ResCount);
       // Skip past any following white space
       Inc(Idx);
-      while TCharacter.IsWhiteSpace(Str[Idx]) do
+      while (Idx <= Length(Str)) and TCharacter.IsWhiteSpace(Str[Idx]) do
         Inc(Idx);
     end
     else

From 9ed3f8dcb253997bd917b38e185132f329cb233f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 18 Dec 2022 00:28:57 +0000
Subject: [PATCH 087/264] Refactor to generalise TCompilerSettings

TCompilerSettings was generalised to make it easier to add new
properties.
---
 Src/Compilers.USettings.pas | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/Src/Compilers.USettings.pas b/Src/Compilers.USettings.pas
index a4baee07f..23223d8dd 100644
--- a/Src/Compilers.USettings.pas
+++ b/Src/Compilers.USettings.pas
@@ -14,6 +14,9 @@
 interface
 
 uses
+  // Delphi
+  SysUtils,
+  // Project
   UBaseObjects,
   USettings;
 
@@ -24,7 +27,11 @@   TCompilerSettings = class(TNoConstructObject)
     const
       AllCompilersConfigSection = ssCompilers;
       PermitStartupDetectionKey = 'PermitStartupDetection';
+      ListFPCAtTopKey = 'Lists:FPCAtTop';
+      ListDelphiOldestFirstKey = 'Lists:DelphiOldestFirst';
     class function ReadStorage: ISettingsSection;
+    class procedure DoSaveProperty(const WriteProp: TProc<ISettingsSection>);
+    class procedure SaveProperty(const Key: string; const Value: Boolean);
     class function GetPermitStartupDetection: Boolean; static;
     class procedure SetPermitStartupDetection(const Value: Boolean); static;
   public
@@ -37,6 +44,16 @@ implementation
 
 { TCompilerSettings }
 
+class procedure TCompilerSettings.DoSaveProperty(
+  const WriteProp: TProc<ISettingsSection>);
+var
+  Stg: ISettingsSection;
+begin
+  Stg := ReadStorage;
+  WriteProp(Stg);
+  Stg.Save;
+end;
+
 class function TCompilerSettings.GetPermitStartupDetection: Boolean;
 begin
   Result := ReadStorage.GetBoolean(PermitStartupDetectionKey, True);
@@ -47,14 +64,21 @@ class function TCompilerSettings.ReadStorage: ISettingsSection;
   Result := Settings.ReadSection(AllCompilersConfigSection);
 end;
 
+class procedure TCompilerSettings.SaveProperty(const Key: string;
+  const Value: Boolean);
+begin
+  DoSaveProperty(
+    procedure(Stg: ISettingsSection)
+    begin
+      Stg.SetBoolean(Key, Value)
+    end
+  );
+end;
+
 class procedure TCompilerSettings.SetPermitStartupDetection(
   const Value: Boolean);
-var
-  Stg: ISettingsSection;
 begin
-  Stg := ReadStorage;
-  Stg.SetBoolean(PermitStartupDetectionKey, Value);
-  Stg.Save;
+  SaveProperty(PermitStartupDetectionKey, Value);
 end;
 
 end.

From 6728e64f9e086fff5cc586d674a3406b63b6322e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 15 Dec 2022 09:04:39 +0000
Subject: [PATCH 088/264] Add TODO at site of exception from last crash

Crash on 2022-12-14 after resuming from hibernation showed a nil pointer
exception from a nil IView instance in FrOverview.pas
---
 Src/FrOverview.pas | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Src/FrOverview.pas b/Src/FrOverview.pas
index c9f56b15d..aaa1e9e0d 100644
--- a/Src/FrOverview.pas
+++ b/Src/FrOverview.pas
@@ -979,6 +979,7 @@ function TOverviewFrame.TTVDraw.IsUserDefinedNode(
   ViewItem: IView;  // view item represented by node
 begin
   ViewItem := (Node as TViewItemTreeNode).ViewItem;
+  // TODO -cBug: Exception reported as issue #70 seems to be triggered here
   Result := ViewItem.IsUserDefined;
 end;
 

From 1fdc8124b1bb2a985758d2e74614218bd37ff29d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 23 Dec 2022 10:46:58 +0000
Subject: [PATCH 089/264] Add new TActiveText.FirstBlock method

This method returns the first whole block of the current active text
object. In most cases this will be the first paragraph, but in the case
of lists, it will be the whole list, including any child lists.
---
 Src/ActiveText.UMain.pas | 82 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/Src/ActiveText.UMain.pas b/Src/ActiveText.UMain.pas
index 8d6e54602..a75cba4ce 100644
--- a/Src/ActiveText.UMain.pas
+++ b/Src/ActiveText.UMain.pas
@@ -175,6 +175,16 @@   TActiveTextAttrNames = record
     ///  <summary>Appends elements from another given active text object to the
     ///  current object.</summary>
     procedure Append(const ActiveText: IActiveText);
+    ///  <summary>Returns a new IActiveText instance containing just the first
+    ///  block of the current object.</summary>
+    ///  <remarks>
+    ///  <para>The first block is the content of the block level tag that starts
+    ///  the active text. If this block has child blocks (for e.g. an unordered
+    ///  list) then they are included.</para>
+    ///  <para>If the current object is empty then an empty object is returned.
+    ///  </para>
+    ///  </remarks>
+    function FirstBlock: IActiveText;
     ///  <summary>Checks if the active text object contains any elements.
     ///  </summary>
     function IsEmpty: Boolean;
@@ -474,6 +484,17 @@   TActiveText = class(TInterfacedObject,
     ///  </summary>
     ///  <remarks>Method of IActiveText.</remarks>
     procedure Append(const ActiveText: IActiveText);
+    ///  <summary>Returns a new IActiveText instance containing just the first
+    ///  block of the current object.</summary>
+    ///  <remarks>
+    ///  <para>The first block is the content of the block level tag that starts
+    ///  the active text. If this block has child blocks (for e.g. an unordered
+    ///  list) then they are included.</para>
+    ///  <para>If the current object is empty then an empty object is returned.
+    ///  </para>
+    ///  <para>Method of IActiveText.</para>
+    ///  </remarks>
+    function FirstBlock: IActiveText;
     ///  <summary>Checks if the element list is empty.</summary>
     ///  <remarks>Method of IActiveText.</remarks>
     function IsEmpty: Boolean;
@@ -719,6 +740,67 @@ destructor TActiveText.Destroy;
   inherited;
 end;
 
+function TActiveText.FirstBlock: IActiveText;
+
+  function IsBlockWithState(Elem: IActiveTextElem; State: TActiveTextElemState):
+    Boolean;
+  var
+    ActionElem: IActiveTextActionElem;
+  begin
+    Result := False;
+    if not Supports(Elem, IActiveTextActionElem, ActionElem) then
+      Exit;
+    if TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) <> dsBlock then
+      Exit;
+    if ActionElem.State <> State then
+      Exit;
+    Result := True;
+  end;
+
+  function IsBlockOpener(Elem: IActiveTextElem): Boolean; inline;
+  begin
+    Result := IsBlockWithState(Elem, fsOpen);
+  end;
+
+  function IsBlockCloser(Elem: IActiveTextElem): Boolean; inline;
+  begin
+    Result := IsBlockWithState(Elem, fsClose);
+  end;
+
+var
+  Depth: Cardinal;
+  Elem: IActiveTextElem;
+  Idx: Integer;
+begin
+  Result := TActiveText.Create;
+  if IsEmpty then
+    Exit;
+
+  Elem := GetElem(0);
+
+  if not IsBlockOpener(Elem) then
+  begin
+    Result.Append(Self);
+    Exit;
+  end;
+
+  Depth := 1;
+  Result.AddElem(Elem);
+  for Idx := 1 to Pred(GetCount) do
+  begin
+    Elem := GetElem(Idx);
+    Result.AddElem(Elem);
+    // NOTE: we're not checking for matching openers and closers
+    if IsBlockOpener(Elem) then
+      Inc(Depth);
+    if IsBlockCloser(Elem) then
+      Dec(Depth);
+    if Depth = 0 then
+      Break;
+  end;
+  // We're not checking for balancing block closer here either:
+end;
+
 function TActiveText.GetCount: Integer;
 begin
   Result := fElems.Count;

From 204465f27d48c0ed9dfb4614a40c024b4bfa7a66 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 19 Dec 2022 03:18:38 +0000
Subject: [PATCH 090/264] Adapt StrWrap to support different 1st line offset.

Add new, optional, FirstLineOffset parameter to one of the StrWrap
overloads that offsets first line relative to margin used for remaining
lines.

Leaving out the parameter reverts to old behaviour of adding same
margin for each line.
---
 Src/UStrUtils.pas | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/Src/UStrUtils.pas b/Src/UStrUtils.pas
index 61d52b8a9..b85d180d5 100644
--- a/Src/UStrUtils.pas
+++ b/Src/UStrUtils.pas
@@ -226,10 +226,19 @@ function StrSplit(const Str: UnicodeString; const Delim: UnicodeString;
 
 ///  <summary>Word wraps text Str to form lines of maximum length MaxLen and
 ///  offsets each line using spaces to form a left margin of size given by
-///  Margin.</summary>
-///  <remarks>Output lines are separated by CRLF.</remarks>
-function StrWrap(const Str: UnicodeString; const MaxLen, Margin: UInt16):
-  UnicodeString; overload;
+///  Margin. The first line is offset from the margin by FirstLineOffset spaces.
+///  </summary>
+///  <remarks>
+///  <para>FirstLineOffset offsets to the left of Margin if -ve and to the right
+///  of Margin if +ve.</para>
+///  <para>If FirstLineOffset is -ve then Abs(FirstLineOffset) must be less than
+///  or equal to Margin.</para>
+///  <para>If FirstLineOffset is +ve then FirstLineOffset + Margin must fit in
+///  a UInt16.</para>
+///  <para>Output lines are separated by CRLF.</para>
+///  </remarks>
+function StrWrap(const Str: UnicodeString; const MaxLen, Margin: UInt16;
+  const FirstLineOffset: Int16 = 0): UnicodeString; overload;
 
 ///  <summary>Word wraps each paragraph of text in Paras so that each line of a
 ///  paragraph has lines of maximum length MaxLineLen and is offset by the
@@ -773,8 +782,8 @@ function StrWindowsLineBreaks(const Str: UnicodeString): UnicodeString;
   Result := StrReplace(Result, LF, CRLF);
 end;
 
-function StrWrap(const Str: UnicodeString; const MaxLen, Margin: UInt16):
-  UnicodeString;
+function StrWrap(const Str: UnicodeString; const MaxLen, Margin: UInt16;
+  const FirstLineOffset: Int16): UnicodeString; overload;
 var
   Word: UnicodeString;  // next word in input Str
   Line: UnicodeString;  // current output line
@@ -783,14 +792,25 @@ function StrWrap(const Str: UnicodeString; const MaxLen, Margin: UInt16):
   // -------------------------------------------------------------------------
   ///  Adds a line of text to output, offseting line by Margin spaces
   procedure AddLine(const Line: string);
+  var
+    AdjustedMargin: UInt16;
   begin
+    AdjustedMargin := Margin;
     if Result <> '' then    // not first line: insert new line
-      Result := Result + EOL;
-    Result := Result + StrOfSpaces(Margin) + Line;
+      Result := Result + EOL
+    else // 1st line - adjust margin
+      AdjustedMargin := Margin + FirstLineOffset;
+    Result := Result + StrOfSpaces(AdjustedMargin) + Line;
   end;
   // -------------------------------------------------------------------------
 
 begin
+  // FirstLineOffset, if negative, must have absolute value <= Margin and
+  // FirstLineOffset, if positive, added to Margin must fit in UInt16
+  Assert((Margin + FirstLineOffset >= 0)
+    and (Margin + FirstLineOffset < High(Margin)),
+    'StrWrap: FirstLineOffset + Margin out of range'
+  );
   // Get all words in Str
   Words := TStringList.Create;
   try

From d903ff1f1eb8a25b217ab1b05643ee7fdbbc59b8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 21 Dec 2022 15:36:27 +0000
Subject: [PATCH 091/264] Add support for rendering REML lists as plain text

ActiveText.UTextRenderer has support added to parsing and rendering REML
lists and to format the resulting text with given margins and page
widths. This was provided in a new TActiveTextTextRenderer.RenderWrapped
method.

TActiveTextTextRenderer.Render was made private since it is now only
called internally.

USourceGen & UTextSnippetDoc were modified to use the above new method.

** This solution is a little kludgy and relies on parsing NBSP
characters emitted by TActiveTextTextRenderer.Render. This was done
originally because the formatting was being done in USourceGen and
UTextSnippetDoc which didn't have access to the inner workings of
TActiveTextTextRenderer. The formatting code was then moved into
TActiveTextTextRenderer and so there's probably a more elegant
solutuion available now.
---
 Src/ActiveText.UTextRenderer.pas | 289 +++++++++++++++++++++++++++++--
 Src/USourceGen.pas               |  86 +++++----
 Src/UTextSnippetDoc.pas          |  36 ++--
 3 files changed, 326 insertions(+), 85 deletions(-)

diff --git a/Src/ActiveText.UTextRenderer.pas b/Src/ActiveText.UTextRenderer.pas
index bd658666e..be9084294 100644
--- a/Src/ActiveText.UTextRenderer.pas
+++ b/Src/ActiveText.UTextRenderer.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements class that renders active text as plain text in fixed width, word
  * wrapped paragraphs.
@@ -15,17 +15,53 @@
 interface
 
 uses
-  SysUtils,
-  ActiveText.UMain;
+  SysUtils, Generics.Collections,
+  ActiveText.UMain,
+  UConsts;
 
 type
   TActiveTextTextRenderer = class(TObject)
+  public
+    const
+      ///  <summary>Special space character used to indicate the start of a list
+      ///  item.</summary>
+      ///  <remarks>This special character is a necessary kludge because some
+      ///  c odethat renders active text as formatted plain text strips away
+      ///  leading #32 characters as part of the formatting process. Therefore
+      ///  indentation in list items is lost if #32 characters are used for it.
+      ///  NBSP was chosen since it should render the same as a space if calling
+      ///  code doesn't convert it.</remarks>
+      LISpacer = NBSP;  // Do not localise. Must be <> #32
+      ///  <summary>Bullet character used when rendering unordered list items.
+      ///  </summary>
+      Bullet = '*';     // Do not localise. Must be <> #32 and <> LISpacer
   strict private
+    const
+      IndentDelta = 2;
+    type
+      TListKind = (lkNumber, lkBullet);
+      TListState = record
+      public
+        ListNumber: Cardinal;
+        ListKind: TListKind;
+        constructor Create(AListKind: TListKind);
+      end;
+      TLIState = record
+        IsFirstPara: Boolean;
+        constructor Create(AIsFirstPara: Boolean);
+      end;
     var
       fDisplayURLs: Boolean;
-      fInBlock: Boolean;
       fParaBuilder: TStringBuilder;
       fDocBuilder: TStringBuilder;
+      fBlocksStack: TStack<TActiveTextActionElemKind>;
+      fListStack: TStack<TListState>;
+      fLIStack: TStack<TLIState>;
+      fIndent: UInt16;
+      fInPara: Boolean;
+      fInListItem: Boolean;
+    function CanEmitInline: Boolean;
+    procedure AppendToPara(const AText: string);
     procedure InitialiseRender;
     procedure FinaliseRender;
     procedure OutputParagraph;
@@ -33,32 +69,66 @@   TActiveTextTextRenderer = class(TObject)
     procedure RenderBlockActionElem(Elem: IActiveTextActionElem);
     procedure RenderInlineActionElem(Elem: IActiveTextActionElem);
     procedure RenderURL(Elem: IActiveTextActionElem);
+    function Render(ActiveText: IActiveText): string;
   public
     constructor Create;
     destructor Destroy; override;
     property DisplayURLs: Boolean read fDisplayURLs write fDisplayURLs
       default False;
-    function Render(ActiveText: IActiveText): string;
+    function RenderWrapped(ActiveText: IActiveText; const PageWidth, LMargin,
+      ParaOffset: Cardinal; const Prefix: string = '';
+      const Suffix: string  = ''): string;
   end;
 
 
 implementation
 
 uses
+  // Delphi
+  Character,
+  // Project
+  UIStringList,
   UStrUtils;
 
 { TActiveTextTextRenderer }
 
+procedure TActiveTextTextRenderer.AppendToPara(const AText: string);
+begin
+  if AText = '' then
+    Exit;
+  fParaBuilder.Append(AText);
+  fInPara := True;
+end;
+
+function TActiveTextTextRenderer.CanEmitInline: Boolean;
+begin
+  if fBlocksStack.Count <= 0 then
+    Exit(False);
+  Result := not (fBlocksStack.Peek in [ekOrderedList, ekUnorderedList]);
+end;
+
 constructor TActiveTextTextRenderer.Create;
 begin
+  Assert(LISpacer <> ' ', ClassName + '.Create: LISpacer can''t be #32');
+  Assert(Bullet <> ' ', ClassName + '.Create: Bullet can''t be #32');
+  Assert(Bullet <> LISpacer, ClassName + '.Create: Bullet = LISpacer');
   inherited Create;
   fParaBuilder := TStringBuilder.Create;
   fDocBuilder := TStringBuilder.Create;
   fDisplayURLs := False;
+  fBlocksStack := TStack<TActiveTextActionElemKind>.Create;
+  fListStack := TStack<TListState>.Create;
+  fLIStack := TStack<TLIState>.Create;
+  fIndent := 0;
+  fInPara := False;
+  fInListItem := False;
 end;
 
 destructor TActiveTextTextRenderer.Destroy;
 begin
+  fLIStack.Free;
+  fListStack.Free;
+  fBlocksStack.Free;
   fDocBuilder.Free;
   fParaBuilder.Free;
   inherited;
@@ -76,11 +146,33 @@ procedure TActiveTextTextRenderer.InitialiseRender;
 end;
 
 procedure TActiveTextTextRenderer.OutputParagraph;
+var
+  LIState: TLIState;
 begin
   if fParaBuilder.Length = 0 then
     Exit;
-  fDocBuilder.AppendLine(StrTrim(fParaBuilder.ToString));
+  fDocBuilder.Append(StrOfChar(NBSP, fIndent));
+  if fInListItem and not fLIStack.Peek.IsFirstPara then
+    // Do we need fInListItem? - test for non-empty list stack?
+    // if we do need it, put it on list stack
+    fDocBuilder.Append(StrOfChar(NBSP, IndentDelta));
+  if fLIStack.Count > 0 then
+  begin
+    if not fLIStack.Peek.IsFirstPara then
+    begin
+      fDocBuilder.Append(StrOfChar(NBSP, IndentDelta));
+    end
+    else
+    begin
+      // Update item at top of stack
+      LIState := fLIStack.Pop;
+      LIState.IsFirstPara := False;
+      fLIStack.Push(LIState);
+    end;
+  end;
+  fDocBuilder.AppendLine(StrTrimRight(fParaBuilder.ToString));
   fParaBuilder.Clear;
+  fInPara := False;
 end;
 
 function TActiveTextTextRenderer.Render(ActiveText: IActiveText): string;
@@ -90,7 +182,6 @@ function TActiveTextTextRenderer.Render(ActiveText: IActiveText): string;
   ActionElem: IActiveTextActionElem;
 begin
   InitialiseRender;
-  fInBlock := False;
   for Elem in ActiveText do
   begin
     if Supports(Elem, IActiveTextTextElem, TextElem) then
@@ -109,16 +200,82 @@ function TActiveTextTextRenderer.Render(ActiveText: IActiveText): string;
 
 procedure TActiveTextTextRenderer.RenderBlockActionElem(
   Elem: IActiveTextActionElem);
+var
+  ListState: TListState;
 begin
   case Elem.State of
     fsOpen:
     begin
-      fInBlock := True;
+      fBlocksStack.Push(Elem.Kind);
+      case Elem.Kind of
+        ekPara: {Do nothing} ;
+        ekHeading: {Do nothing} ;
+        ekUnorderedList:
+        begin
+          if (fListStack.Count > 0) and (fInPara) then
+            OutputParagraph;
+          fListStack.Push(TListState.Create(lkBullet));
+          Inc(fIndent, IndentDelta);
+        end;
+        ekOrderedList:
+        begin
+          if (fListStack.Count > 0) and (fInPara) then
+            OutputParagraph;
+          fListStack.Push(TListState.Create(lkNumber));
+          Inc(fIndent, IndentDelta);
+       end;
+        ekListItem:
+        begin
+          // Update list number of current list
+          ListState := fListStack.Pop;
+          Inc(ListState.ListNumber, 1);
+          fListStack.Push(ListState);
+          // Push this list item to list item stack
+          fLIStack.Push(TLIState.Create(True));
+          // Act depending on current list kind
+          case fListStack.Peek.ListKind of
+            lkNumber:
+            begin
+              // Number list: start a new numbered item, with current number
+              fParaBuilder.Append(IntToStr(fListStack.Peek.ListNumber));
+              fParaBuilder.Append(NBSP);
+            end;
+            lkBullet:
+            begin
+              // Bullet list: start a new bullet point
+              fParaBuilder.Append(Bullet + NBSP);
+            end;
+          end;
+        end;
+      end;
     end;
     fsClose:
     begin
-      OutputParagraph;
-      fInBlock := False;
+      case Elem.Kind of
+        ekPara:
+          OutputParagraph;
+        ekHeading:
+          OutputParagraph;
+        ekUnorderedList:
+        begin
+          OutputParagraph;
+          fListStack.Pop;
+          Dec(fIndent, IndentDelta);
+        end;
+        ekOrderedList:
+        begin
+          OutputParagraph;
+          fListStack.Pop;
+          Dec(fIndent, IndentDelta);
+        end;
+        ekListItem:
+        begin
+          OutputParagraph;
+          fInListItem := False;
+          fLIStack.Pop;
+        end;
+      end;
+      fBlocksStack.Pop;
     end;
   end;
 end;
@@ -126,17 +283,27 @@ procedure TActiveTextTextRenderer.RenderBlockActionElem(
 procedure TActiveTextTextRenderer.RenderInlineActionElem(
   Elem: IActiveTextActionElem);
 begin
-  if not fInBlock then
+  if not CanEmitInline then
     Exit;
   if (Elem.Kind = ekLink) and (Elem.State = fsClose) and fDisplayURLs then
     RenderURL(Elem);
+  // else ignore element: formatting elements have no effect on plain text
 end;
 
 procedure TActiveTextTextRenderer.RenderTextElem(Elem: IActiveTextTextElem);
+var
+  TheText: string;
 begin
-  if not fInBlock then
+  if not CanEmitInline then
     Exit;
-  fParaBuilder.Append(Elem.Text);
+  TheText := Elem.Text;
+  // no white space emitted after block start until 1st non-white space
+  // character encountered
+  if not fInPara then
+    TheText := StrTrimLeft(Elem.Text);
+  if TheText = '' then
+    Exit;
+  AppendToPara(TheText);
 end;
 
 procedure TActiveTextTextRenderer.RenderURL(Elem: IActiveTextActionElem);
@@ -144,7 +311,101 @@ procedure TActiveTextTextRenderer.RenderURL(Elem: IActiveTextActionElem);
   sURL = ' (%s)';                     // formatting for URLs from hyperlinks
 begin
   Assert(Elem.Kind = ekLink, ClassName + '.RenderURL: Not a link element');
-  fParaBuilder.AppendFormat(sURL, [Elem.Attrs[TActiveTextAttrNames.Link_URL]]);
+  AppendToPara(Format(sURL, [Elem.Attrs[TActiveTextAttrNames.Link_URL]]));
+end;
+
+function TActiveTextTextRenderer.RenderWrapped(ActiveText: IActiveText;
+  const PageWidth, LMargin, ParaOffset: Cardinal; const Prefix, Suffix: string):
+  string;
+var
+  Paras: IStringList;
+  Para: string;
+  ParaIndent: UInt16;
+  WrappedPara: string;
+  Offset: Int16;
+
+  // Calculate indent of paragraph by counting LISpacer characters inserted by
+  // Render method
+  function CalcParaIndent: UInt16;
+  var
+    Ch: Char;
+  begin
+    Result := 0;
+    for Ch in Para do
+    begin
+      if Ch <> LISpacer then
+        Break;
+      Inc(Result);
+    end;
+  end;
+
+  // Calculate if we are currently processing a list item by detecting Bullet,
+  // digits and LISpacer characters inserted by Render method
+  function IsListItem: Boolean;
+  var
+    Remainder: string;
+    Digits: string;
+    Ch: Char;
+  begin
+    Result := False;
+    // Strip any leading spacer chars from start of para
+    Remainder := StrTrimLeftChars(Para, LISpacer);
+    // Check for bullet list: starts with bullet character then spacer
+    if StrStartsStr(Bullet + LISpacer, Remainder) then
+      Exit(True);
+    // Check for number list: starts with digit(s) then spacer
+    Digits := '';
+    for Ch in Remainder do
+      if TCharacter.IsDigit(Ch) then
+        Digits := Digits + Ch
+      else
+        Break;
+    if (Digits <> '') and
+      StrStartsStr(Digits + LISpacer, Remainder) then
+      Exit(True);
+  end;
+
+begin
+  Result := '';
+  Paras := TIStringList.Create(Prefix + Render(ActiveText) + Suffix, EOL, True);
+  for Para in Paras do
+  begin
+    if IsListItem then
+    begin
+      Offset := -ParaOffset;
+      ParaIndent := CalcParaIndent + LMargin + ParaOffset;
+    end
+    else
+    begin
+      Offset := 0;
+      ParaIndent := CalcParaIndent + LMargin;
+    end;
+    WrappedPara := StrWrap(
+      StrReplace(Para, LISpacer, ' '),
+      PageWidth - ParaIndent,
+      ParaIndent,
+      Offset
+    );
+    if Result <> '' then
+      Result := Result + EOL;
+    Result := Result + StrTrimRight(WrappedPara);
+  end;
+  Result := StrTrimRight(Result);
+end;
+
+{ TActiveTextTextRenderer.TListState }
+
+constructor TActiveTextTextRenderer.TListState.Create(AListKind: TListKind);
+begin
+  ListNumber := 0;
+  ListKind := AListKind;
+end;
+
+{ TActiveTextTextRenderer.TLIState }
+
+constructor TActiveTextTextRenderer.TLIState.Create(AIsFirstPara: Boolean);
+begin
+  IsFirstPara := AIsFirstPara;
 end;
 
 end.
diff --git a/Src/USourceGen.pas b/Src/USourceGen.pas
index a8c5f1cd7..3d10b57ef 100644
--- a/Src/USourceGen.pas
+++ b/Src/USourceGen.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that is used to generate Pascal source code containing
  * specified database snippets.
@@ -38,10 +38,10 @@ interface
   TSourceComments = class(TNoConstructObject)
   strict private
     ///  <summary>Formats the given comment text into lines with a fixed
-    ///  maximum width indented by the given number of spaces on the left.
-    ///  </summary>
-    class function FormatCommentLines(const Text: string;
-      const Indent: Cardinal): string;
+    ///  maximum width indented by the given number of spaces on the left,
+    ///  optionally truncated to the first paragraph.</summary>
+    class function FormatActiveTextCommentInner(ActiveText: IActiveText;
+      const Indent: Cardinal; const Truncate: Boolean): string;
   public
 
     ///  <summary>Returns a description of the given comment style.</summary>
@@ -250,7 +250,7 @@ implementation
 
 uses
   // Delphi
-  SysUtils,
+  SysUtils, Character,
   // Project
   ActiveText.UTextRenderer, DB.USnippetKind, UConsts, UExceptions, UPreferences,
   USnippetValidator, UStrUtils, UWarnings, Hiliter.UPasLexer;
@@ -272,7 +272,7 @@   TRoutineFormatter = class(TNoConstructObject)
 
     ///  <summary>Splits source code of a routine snippet into the head (routine
     ///  prototype) and body.</summary>
-    ///  <param name="Routine">TSnippet [in] Routine whose source code is to be
+    ///  <param name="Routine">TSnippet [in3] Routine whose source code is to be
     ///  split.</param>
     ///  <param name="Head">string [out] Set to routine prototype.</param>
     ///  <param name="Body">string [out] Body of routine that follows the
@@ -1136,17 +1136,25 @@ class function TSourceComments.CommentStyleDesc(
   Result := sDescriptions[Style];
 end;
 
-class function TSourceComments.FormatCommentLines(const Text: string;
-  const Indent: Cardinal): string;
+class function TSourceComments.FormatActiveTextCommentInner(
+  ActiveText: IActiveText; const Indent: Cardinal; const Truncate: Boolean):
+  string;
 var
-  Lines: TStringList;
+  Renderer: TActiveTextTextRenderer;
+  ProcessedActiveText: IActiveText;
 begin
-  Lines := TStringList.Create;
+  if Truncate then
+    ProcessedActiveText := ActiveText.FirstBlock
+  else
+    ProcessedActiveText := ActiveText;
+  Renderer := TActiveTextTextRenderer.Create;
   try
-    Lines.Text := Text;
-    Result := StrTrimRight(StrWrap(Lines, cLineWidth - Indent, Indent, False));
+    Renderer.DisplayURLs := False;
+    Result := Renderer.RenderWrapped(
+      ProcessedActiveText, cLineWidth, Indent, Indent
+    );
   finally
-    Lines.Free;
+    Renderer.Free;
   end;
 end;
 
@@ -1156,7 +1164,7 @@ class function TSourceComments.FormatHeaderComments(
   Line: string;         // loops thru each line of comments & exploded comments
   Lines: IStringList;   // comments after exploding multiple wrapped lines
 const
-  cLinePrefix = ' * ';  // prefixes each comment line
+  cLinePrefix = ' * ';  // prefixes each header omment line
 begin
   // Only create comment if some comment text is provided
   if Assigned(Comments) and (Comments.Count > 0) then
@@ -1182,38 +1190,24 @@ class function TSourceComments.FormatHeaderComments(
 
 class function TSourceComments.FormatSnippetComment(const Style: TCommentStyle;
   const TruncateComments: Boolean; const Text: IActiveText): string;
-var
-  Renderer: TActiveTextTextRenderer;
-  PlainText: string;
-  Lines: IStringList;
 begin
-  Renderer := TActiveTextTextRenderer.Create;
-  try
-    Renderer.DisplayURLs := False;
-    PlainText := Renderer.Render(Text);
-    if TruncateComments then
-    begin
-      // use first non-empty paragraph of Text as comment
-      Lines := TIStringList.Create(PlainText, string(sLineBreak), False);
-      if Lines.Count > 0 then
-        PlainText := Lines[0];
-    end;
-    case Style of
-      csNone:
-        Result := '';
-      csBefore:
-        Result := '{'
-          + EOL
-          + FormatCommentLines(PlainText, cIndent)
-          + EOL
-          + '}';
-      csAfter:
-        Result := FormatCommentLines(
-          '{' + PlainText + '}', cIndent
-        );
-    end;
-  finally
-    Renderer.Free;
+  case Style of
+    csNone:
+      Result := '';
+    csBefore:
+      Result := '{'
+        + EOL
+        + FormatActiveTextCommentInner(Text, cIndent, TruncateComments)
+        + EOL
+        + '}';
+    csAfter:
+      Result := StrOfChar(TActiveTextTextRenderer.LISpacer, cIndent)
+        + '{'
+        + EOL
+        + FormatActiveTextCommentInner(Text, 2 * cIndent, TruncateComments)
+        + EOL
+        + StrOfChar(TActiveTextTextRenderer.LISpacer, cIndent)
+        + '}';
   end;
 end;
 
diff --git a/Src/UTextSnippetDoc.pas b/Src/UTextSnippetDoc.pas
index ad6d1fbf7..87e72c4dd 100644
--- a/Src/UTextSnippetDoc.pas
+++ b/Src/UTextSnippetDoc.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that renders a document that describes a snippet as plain
  * text.
@@ -39,10 +39,8 @@   TTextSnippetDoc = class(TSnippetDoc)
       cIndent = 2;
   strict private
     ///  <summary>Renders given active text as word-wrapped paragraphs of width
-    ///  cPageWidth and given indent. Blank lines are added between paragraphs
-    ///  iff SpaceParas in True.</summary>
-    procedure RenderActiveText(ActiveText: IActiveText; const Indent: Cardinal;
-      const SpaceParas: Boolean);
+    ///  cPageWidth.</summary>
+    procedure RenderActiveText(ActiveText: IActiveText);
   strict protected
     ///  <summary>Initialises plain text document.</summary>
     procedure InitialiseDoc; override;
@@ -88,9 +86,9 @@ implementation
 
 uses
   // Delphi
-  SysUtils,
+  SysUtils, Character,
   // Project
-  ActiveText.UTextRenderer, UStrUtils;
+  ActiveText.UTextRenderer, UConsts, UStrUtils;
 
 
 { TTextSnippetDoc }
@@ -106,28 +104,16 @@ procedure TTextSnippetDoc.InitialiseDoc;
   fWriter := TStringWriter.Create;
 end;
 
-procedure TTextSnippetDoc.RenderActiveText(ActiveText: IActiveText;
-  const Indent: Cardinal; const SpaceParas: Boolean);
+procedure TTextSnippetDoc.RenderActiveText(ActiveText: IActiveText);
 var
   Renderer: TActiveTextTextRenderer;
-  Lines: TStringList;
 begin
   Renderer := TActiveTextTextRenderer.Create;
   try
     Renderer.DisplayURLs := True;
-    Lines := TStringList.Create;
-    try
-      Lines.Text := Renderer.Render(ActiveText);
-      fWriter.WriteLine(
-        StrTrimRight(
-          StrWrap(
-            Lines, cPageWidth - Indent, Indent, True
-          )
-        )
-      );
-    finally
-      Lines.Free;
-    end;
+    fWriter.WriteLine(
+      Renderer.RenderWrapped(ActiveText, cPageWidth, 0, cIndent)
+    );
   finally
     Renderer.Free;
   end;
@@ -153,14 +139,14 @@ procedure TTextSnippetDoc.RenderDBInfo(const Text: string);
 procedure TTextSnippetDoc.RenderDescription(const Desc: IActiveText);
 begin
   fWriter.WriteLine;
-  RenderActiveText(Desc, 0, True);
+  RenderActiveText(Desc);
 end;
 
 procedure TTextSnippetDoc.RenderExtra(const ExtraText: IActiveText);
 begin
   Assert(not ExtraText.IsEmpty, ClassName + '.RenderExtra: ExtraText is empty');
   fWriter.WriteLine;
-  RenderActiveText(ExtraText, 0, True);
+  RenderActiveText(ExtraText);
 end;
 
 procedure TTextSnippetDoc.RenderHeading(const Heading: string;

From 96ea2bbbaf7a3816d7b89682bce290202f89cb9b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 19 Dec 2022 03:26:35 +0000
Subject: [PATCH 092/264] Update UStrUtils tests re changes to StrWrap

---
 Tests/Src/DUnit/TestUStrUtils.pas | 41 +++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/Tests/Src/DUnit/TestUStrUtils.pas b/Tests/Src/DUnit/TestUStrUtils.pas
index 4be2b4ea6..b540f3171 100644
--- a/Tests/Src/DUnit/TestUStrUtils.pas
+++ b/Tests/Src/DUnit/TestUStrUtils.pas
@@ -64,7 +64,8 @@   TTestStrUtilsRoutines = class(TTestCase)
     procedure TestStrJoin;
     procedure TestStrExplode;
     procedure TestStrSplit;
-    procedure TestStrWrap_overload1;
+    procedure TestStrWrap_overload1_default_param;
+    procedure TestStrWrap_overload1_no_default_param;
     procedure TestStrWrap_overload2;
     procedure TestStrMakeSentence;
     procedure TestStrIf;
@@ -1037,7 +1038,7 @@ procedure TTestStrUtilsRoutines.TestStrWindowsLineBreaks;
   CheckEquals(#13#10#13#10#13#10, StrWindowsLineBreaks(#10#13#13#10), 'Test 8');
 end;
 
-procedure TTestStrUtilsRoutines.TestStrWrap_overload1;
+procedure TTestStrUtilsRoutines.TestStrWrap_overload1_default_param;
 const
   Text = 'The quick brown fox jumped-over-the lazy dog.';
   //      123456789012345678901234567890123456789012345
@@ -1073,6 +1074,42 @@ procedure TTestStrUtilsRoutines.TestStrWrap_overload1;
   CheckEquals(ResD, StrWrap(Text, 0, 0), 'Test 9');
 end;
 
+procedure TTestStrUtilsRoutines.TestStrWrap_overload1_no_default_param;
+const
+  Text = 'The quick brown fox jumped-over-the lazy dog.';
+  //      123456789012345678901234567890123456789012345
+  //               1         2         3         4
+  ResA = 'The quick' + EOL
+       + 'brown fox' + EOL
+       + 'jumped-over-the' + EOL
+       + 'lazy dog.';
+  ResB = '  The quick' + EOL
+       + '  brown fox' + EOL
+       + '  jumped-over-the' + EOL
+       + '  lazy dog.';
+  ResC = '    The quick' + EOL
+       + '  brown fox' + EOL
+       + '  jumped-over-the' + EOL
+       + '  lazy dog.';
+  ResD = '  The quick' + EOL
+       + '    brown fox' + EOL
+       + '    jumped-over-the' + EOL
+       + '    lazy dog.';
+
+begin
+  CheckEquals('', StrWrap('', 12, 0, 0), 'Test 1a');
+  CheckEquals('', StrWrap('', 12, 4, 2), 'Test 1b');
+  CheckEquals('', StrWrap('', 12, 4, -2), 'Test 1b');
+  CheckEquals('X', StrWrap('X', 12, 0), 'Test 2a');
+  CheckEquals('      X', StrWrap('X', 12, 4, 2), 'Test 2b');
+  CheckEquals('  X', StrWrap('X', 12, 4, -2), 'Test 2c');
+  CheckEquals('  X', StrWrap('    X', 12, 4, -2), 'Test 2c');
+  CheckEquals(ResA, StrWrap(Text, 12, 0, 0), 'Test 3a');
+  CheckEquals(ResB, StrWrap(Text, 12, 2, 0), 'Test 3b');
+  CheckEquals(ResC, StrWrap(Text, 12, 2, 2), 'Test 3b');
+  CheckEquals(ResD, StrWrap(Text, 12, 4, -2), 'Test 3b');
+end;
+
 procedure TTestStrUtilsRoutines.TestStrWrap_overload2;
 const
   Para1 = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';

From 976b6e5548cecd5eb228e2636a7be601f7d45773 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 21 Dec 2022 16:00:50 +0000
Subject: [PATCH 093/264] Missing text at end of detail pane list items fixed

Code added to track and detect if text is being written inside a list
item and to output any inline text as HTML between the end of a nested
list and the end of a list item.

Such detection is then used in logic that determines when to output such
orphaned text.

Fixes #82
---
 Src/ActiveText.UHTMLRenderer.pas | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Src/ActiveText.UHTMLRenderer.pas b/Src/ActiveText.UHTMLRenderer.pas
index daa25dc0d..05e3f862f 100644
--- a/Src/ActiveText.UHTMLRenderer.pas
+++ b/Src/ActiveText.UHTMLRenderer.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides a class that renders active text as HTML.
 }
@@ -17,9 +17,9 @@ interface
 
 uses
   // Delphi
-  SysUtils, Graphics, Generics.Collections,
+  SysUtils,
   // Project
-  ActiveText.UMain, UBaseObjects, UCSSBuilder, UHTMLUtils;
+  ActiveText.UMain, UHTMLUtils;
 
 
 type
@@ -65,6 +65,7 @@       TCSSStyles = class(TObject)
       fBuilder: TStringBuilder;
       fInBlock: Boolean;
       fTagInfoMap: TTagInfoMap;
+      fLINestingDepth: Cardinal;
     procedure InitialiseTagInfoMap;
     procedure InitialiseRender;
     procedure RenderTextElem(Elem: IActiveTextTextElem);
@@ -84,11 +85,6 @@       TCSSStyles = class(TObject)
 implementation
 
 
-uses
-  // Project
-  UColours, UCSSUtils, UFontHelper, UIStringList;
-
-
 { TActiveTextHTML }
 
 constructor TActiveTextHTML.Create;
@@ -96,6 +92,7 @@ constructor TActiveTextHTML.Create;
   inherited Create;
   fCSSStyles := TCSSStyles.Create;
   fBuilder := TStringBuilder.Create;
+  fLINestingDepth := 0;
   InitialiseTagInfoMap;
 end;
 
@@ -209,6 +206,8 @@ procedure TActiveTextHTML.RenderBlockActionElem(Elem: IActiveTextActionElem);
   case Elem.State of
     fsOpen:
     begin
+      if Elem.Kind = ekListItem then
+        Inc(fLINestingDepth);
       fBuilder.Append(MakeOpeningTag(Elem));
       fInBlock := True;
     end;
@@ -216,13 +215,15 @@ procedure TActiveTextHTML.RenderBlockActionElem(Elem: IActiveTextActionElem);
     begin
       fInBlock := False;
       fBuilder.AppendLine(MakeClosingTag(Elem));
+      if Elem.Kind = ekListItem then
+        Dec(fLINestingDepth);
     end;
   end;
 end;
 
 procedure TActiveTextHTML.RenderInlineActionElem(Elem: IActiveTextActionElem);
 begin
-  if not fInBlock then
+  if not fInBlock and (fLINestingDepth = 0) then
     Exit;
   case Elem.State of
     fsOpen:
@@ -234,7 +235,7 @@ procedure TActiveTextHTML.RenderInlineActionElem(Elem: IActiveTextActionElem);
 
 procedure TActiveTextHTML.RenderTextElem(Elem: IActiveTextTextElem);
 begin
-  if not fInBlock then
+  if not fInBlock and (fLINestingDepth = 0) then
     Exit;
   fBuilder.Append(THTML.Entities(Elem.Text));
 end;

From b8f1ceaabd706cf39009e23676d2ce623bc02717 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 21 Dec 2022 11:10:06 +0000
Subject: [PATCH 094/264] Add new NBSP constant to UConsts unit.

Constant for Unicode non-breaking space character
---
 Src/UConsts.pas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Src/UConsts.pas b/Src/UConsts.pas
index 7715b2c0d..449090022 100644
--- a/Src/UConsts.pas
+++ b/Src/UConsts.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines various character, string and resource id constants.
 }
@@ -36,7 +36,8 @@ interface
   GT          = '>';    // greater-than / closing angle bracket character
   LT          = '<';    // less-than / opening angle bracket character
 
-  COPYRIGHT   = #$00A9;
+  NBSP        = #$00A0; // non-breaking space
+  COPYRIGHT   = #$00A9; // copyright symbol
 
   CRLF  = CR + LF;      // carriage return followed by line feed
   EOL   = CRLF;         // end of line character sequence for Windows systems

From a58a8e402bea6a17bc5800472cafa3c7fba60120 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 3 Apr 2023 11:56:27 +0100
Subject: [PATCH 095/264] Update 3rd party PJSysInfo unit to v5.20.0

---
 Src/3rdParty/PJSysInfo.pas | 66 ++++++++++++++++++++++++++++++--------
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/Src/3rdParty/PJSysInfo.pas b/Src/3rdParty/PJSysInfo.pas
index cf1110edc..efd2c4de6 100644
--- a/Src/3rdParty/PJSysInfo.pas
+++ b/Src/3rdParty/PJSysInfo.pas
@@ -1451,7 +1451,7 @@   TBuildNameMap = record
 
   // Windows 11 Dev channel releases (with version string "Dev").
   // For details see https://en.wikipedia.org/wiki/Windows_11_version_history
-  Win11DevChannelDevBuilds: array[0..14] of Integer = (
+  Win11DevChannelDevBuilds: array[0..25] of Integer = (
     // pre Win 11 release (expired 2021/10/31):
     //   22449, 22454, 22458, 22463,
     // pre Win 11 release (expired 2022/09/15):
@@ -1465,7 +1465,15 @@   TBuildNameMap = record
     // post Win 11 22H2 beta release (expiring 2023/09/15):
     25182, 25188, 25193, 25197, 25201, 25206, 25211,
     // post Win 11 22H2 release (expiring 2023/09/15):
-    25217, 25227, 25231, 25236, 25247, 25252, 25262, 25267
+    25217, 25227, 25231, 25236, 25247, 25252, 25262, 25267, 25272, 25276, 25281,
+    25284, 25290, 25295, 25300, 25309, 23403, 23419, 23424
+  );
+
+  // Preview builds of Windows 11 in the Canary Channel
+  // For details see https://en.wikipedia.org/wiki/Windows_11_version_history
+  Win11CanaryPreviewBuilds: array[0..2] of Integer = (
+    // expiring 2023/09/15:
+    25314, 25324, 25330
   );
 
   // Windows 11 Dev channel builds with version string "22H2"
@@ -1478,7 +1486,8 @@   TBuildNameMap = record
     22610, 22616
   );
 
-  Win11FutureComponentBetaChannelBuild = 22623;
+  Win11Feb23ComponentBetaChannelBuild = 22623;
+  Win11FutureComponentBetaChannelBuild = 22624;
 
   Win11FirstBuild = Win11DevBuild;  // First build number of Windows 11
 
@@ -2141,11 +2150,11 @@ procedure InitPlatformIdEx;
                 1288, 1348, 1387, 1415, 1466, 1469, 1503, 1526, 1566, 1586,
                 1620, 1645, 1682, 1706, 1708, 1741, 1766, 1767, 1806, 1826,
                 1865, 1889, 1949, 2006, 2075, 2130, 2132, 2193, 2194, 2251,
-                2311, 2364..MaxInt:
+                2311, 2364, 2486, 2546, 2604, 2673, 2728, 2788 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 21H2';
                 1147, 1149, 1151, 1165, 1200, 1202, 1237, 1263, 1266, 1319,
                 1320, 1379, 1381, 1499, 1618, 1679, 1737, 1739, 1862, 1947,
-                2192:
+                2192, 2545:
                   InternalExtraUpdateInfo := Format(
                     'Version 21H2 [Release Preview Channel v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2162,9 +2171,10 @@ procedure InitPlatformIdEx;
               // **REF5**
               InternalBuildNumber := Win1022H2Build;
               case InternalBuildNumber of
-                2006, 2130, 2132, 2193, 2194, 2251, 2311, 2364..MaxInt:
+                2006, 2130, 2132, 2193, 2194, 2251, 2311, 2364, 2486, 2546,
+                2604, 2673, 2728, 2788 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 22H2';
-                1865, 1889, 1949, 2075, 2301:
+                1865, 1889, 1949, 2075, 2301, 2670, 2787:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview Channel v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2198,7 +2208,8 @@ procedure InitPlatformIdEx;
               case InternalRevisionNumber of
                 194, 258, 282, 348, 376, 434, 438, 469, 493, 527, 556, 593, 613,
                 652, 675, 708, 739, 740, 778, 795, 832, 856, 918, 978, 1042,
-                1098, 1100, 1165, 1219, 1281, 1335..MaxInt:
+                1098, 1100, 1165, 1219, 1281, 1335, 1455, 1516, 1574, 1641,
+                1696, 1761 .. MaxInt:
                   // Public releases of Windows 11
                   InternalExtraUpdateInfo := 'Version 21H2';
                 51, 65, 71:
@@ -2217,7 +2228,7 @@ procedure InitPlatformIdEx;
                       + '[Beta & Release Preview Channels v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                651, 706, 776, 829, 917, 1041, 1163, 1279:
+                651, 706, 776, 829, 917, 1041, 1163, 1279, 1515, 1639, 1757:
                   InternalExtraUpdateInfo := Format(
                     'Version 21H1 Release Preview Channel v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2234,20 +2245,22 @@ procedure InitPlatformIdEx;
               // **REF1**
               InternalBuildNumber := Win11v22H2Build;
               case InternalRevisionNumber of
-                382, 521, 525, 608, 674, 675, 755, 819, 900, 963, 1038..MaxInt:
+                382, 521, 525, 608, 674, 675, 755, 819, 900, 963, 1105, 1194,
+                1265, 1344, 1413, 1485, {placeholder->}1538 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 22H2';
                 1:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta & Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                105, 169, 232, 317, 457, 607, 754, 898:
+                105, 169, 232, 317, 457, 607, 754, 898, 1192, 1343, 1483:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 160, 290, 436, 440, 450, 575, 586, 590, 598, 601, 730, 741, 746,
-                870, 875, 885, 891, 1020, 1028, 1037:
+                870, 875, 885, 891, 1020, 1028, 1037, 1095, 1180, 1245, 1250,
+                1255, 1325, 1391, 1465, 1470, 1537:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2287,6 +2300,16 @@ procedure InitPlatformIdEx;
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
+            else if FindBuildNumberFrom(
+              Win11CanaryPreviewBuilds, InternalBuildNumber
+            ) then
+            begin
+              // Win11 Canary Channel builds
+              InternalExtraUpdateInfo := Format(
+                'Canary Channel v10.0.%d.%d (Dev)',
+                [InternalBuildNumber, InternalRevisionNumber]
+              );
+            end
             else if FindBuildNumberFrom(
               Win11DevBetaChannels22H2Builds, InternalBuildNumber
             ) then
@@ -2297,11 +2320,28 @@ procedure InitPlatformIdEx;
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
+            else if IsBuildNumber(Win11Feb23ComponentBetaChannelBuild) then
+            begin
+              InternalBuildNumber := Win11Feb23ComponentBetaChannelBuild;
+              case InternalRevisionNumber of
+                730, 741, 746, 870, 875, 885, 891, 1020, 1028, 1037, 1095,
+                1180, 1245, 1250, 1255, 1325 .. MaxInt:
+                  InternalExtraUpdateInfo := Format(
+                    'February 2023 Component Update Beta v10.0.%d.%d',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'February 2023 Component Update [Unknown Beta v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
+            end
             else if IsBuildNumber(Win11FutureComponentBetaChannelBuild) then
             begin
               InternalBuildNumber := Win11FutureComponentBetaChannelBuild;
               case InternalRevisionNumber of
-                730, 741, 746, 870, 875, 885, 891, 1020, 1028, 1037..MaxInt:
+                1391, 1465, 1470, 1537 .. MaxInt:
                   InternalExtraUpdateInfo := Format(
                     'Future Component Update Beta v10.0.%d.%d',
                     [InternalBuildNumber, InternalRevisionNumber]

From 08059c3264e0591fd548fb09216e95a6e0ff50b8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 4 Apr 2023 23:57:17 +0100
Subject: [PATCH 096/264] Update links in License.html

Fix displayed URLs that didn't match actual linked URLs.

Remove broken link, mark as deleted and added "[link broken]" text.
---
 Docs/License.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Docs/License.html b/Docs/License.html
index d4b0f895c..66df27d97 100644
--- a/Docs/License.html
+++ b/Docs/License.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip license.
 -->
@@ -1615,7 +1615,7 @@ <h2 id="toolbar-icons-mit">
   <p>Toolbar Icons is made available under the terms of the MIT License.
   See <a
     href="https://toolbaricons.sourceforge.net/"
-  >http://toolbaricons.sourceforge.net/</a> for more information.</p>
+  >https://toolbaricons.sourceforge.net/</a> for more information.</p>
 
   <p>Copyright &copy; 2010 Florian Haag</p>
 
@@ -1674,12 +1674,10 @@ <h1>
       </div>
       <ul>
         <li>
-          Silk Icon Set 1.3 by Mark James: <a
-            href="http://www.famfamfam.com/lab/icons/silk/"
-          >http://www.famfamfam.com/lab/icons/silk/</a>.
+          Silk Icon Set 1.3 by Mark James: <del>http://www.famfamfam.com/lab/icons/silk/</del> [link broken].
         </li>
         <li>
-          Silk Companion 1 by Damien Guard: <del>https://www.damieng.com/icons/silkcompanion</del> [link broken]
+          Silk Companion 1 by Damien Guard: <del>https://www.damieng.com/icons/silkcompanion</del> [link broken].
         </li>
         <li>
           Led Icon Set v1.0: <del>http://led24.de/iconset/</del> [link broken].
@@ -1714,7 +1712,7 @@ <h1>
     <li>
       Some program icons are based on Florian Haag's Toolbar Icons set at <a
         href="https://toolbaricons.sourceforge.net/"
-      >http://toolbaricons.sourceforge.net/</a>.
+      >https://toolbaricons.sourceforge.net/</a>.
     </li>
     <li>
       Some images used in the program's Easter Egg are based on public domain

From 088ad579c5d5e208932edd246caeb91a4a562e00 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 5 Apr 2023 00:19:44 +0100
Subject: [PATCH 097/264] Update copyright date in program license files

---
 Docs/License.html                        | 4 ++--
 Src/Help/HTML/license.htm                | 4 ++--
 Src/Install/Assets/License.rtf           | 2 +-
 Src/Res/HTML/dlg-about-program-tplt.html | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Docs/License.html b/Docs/License.html
index 66df27d97..f5cae9b16 100644
--- a/Docs/License.html
+++ b/Docs/License.html
@@ -225,7 +225,7 @@ <h2>
     Executable Program
   </h2>
   <p>
-    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2022 by <a
+    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2023 by <a
       href="https://gravatar.com/delphidabbler"
     >Peter D Johnson</a>.
   </p>
@@ -327,7 +327,7 @@ <h2>
       <div>
         This condition applies to all files in the
         <kbd>Src/Res/Img/Branding</kbd> directory, all of which are original
-        work copyright &copy; 2012-2022 by <a
+        work copyright &copy; 2012-2023 by <a
           href="https://gravatar.com/delphidabbler"
         >Peter D Johnson</a>.
       </div>
diff --git a/Src/Help/HTML/license.htm b/Src/Help/HTML/license.htm
index 50c1357c2..d9a261f15 100644
--- a/Src/Help/HTML/license.htm
+++ b/Src/Help/HTML/license.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic containing summary of CodeSnip license.
 -->
@@ -27,7 +27,7 @@ <h1>
       <a name="license"></a>Summary of End User License Agreement
     </h1>
     <p>
-      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2022 by Peter D
+      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2023 by Peter D
       Johnson, <a
         href="https://gravatar.com/delphidabbler"
         class="weblink"
diff --git a/Src/Install/Assets/License.rtf b/Src/Install/Assets/License.rtf
index 3795e0322..7d2008d00 100644
--- a/Src/Install/Assets/License.rtf
+++ b/Src/Install/Assets/License.rtf
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deftab709{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
 {\colortbl ;\red0\green0\blue255;}
 {\*\generator Riched20 10.0.18362}\viewkind4\uc1 
-\pard\sa113\f0\fs18\lang1033 DelphiDabbler CodeSnip is copyright \'a9 2005-2022 by Peter D Johnson, {{\field{\*\fldinst{HYPERLINK https://en.gravatar.com/delphidabbler }}{\fldrslt{https://en.gravatar.com/delphidabbler\ul0\cf0}}}}\f0\fs18 . \par
+\pard\sa113\f0\fs18\lang1033 DelphiDabbler CodeSnip is copyright \'a9 2005-2023 by Peter D Johnson, {{\field{\*\fldinst{HYPERLINK https://en.gravatar.com/delphidabbler }}{\fldrslt{https://en.gravatar.com/delphidabbler\ul0\cf0}}}}\f0\fs18 . \par
 The executable version of CodeSnip is made available under the terms of the Mozilla Public License 2.0 ({{\field{\*\fldinst{HYPERLINK https://www.mozilla.org/MPL/2.0/ }}{\fldrslt{https://www.mozilla.org/MPL/2.0/\ul0\cf0}}}}\f0\fs18 ). This means you can use, copy and distribute CodeSnip as you wish.\par
 You may also modify CodeSnip as you wish and you may distribute copies of your modified version under the terms of the Mozilla Public License. The only exception is that you may not use the CodeSnip name or branding (e.g. the program icon) in any modification you distribute unless you have the explicit permission of the copyright holder. \par
 For full information see the file \i License.html\i0  installed with this program.\fs24\lang2057\par
diff --git a/Src/Res/HTML/dlg-about-program-tplt.html b/Src/Res/HTML/dlg-about-program-tplt.html
index e11c7e3c5..e50a6a249 100644
--- a/Src/Res/HTML/dlg-about-program-tplt.html
+++ b/Src/Res/HTML/dlg-about-program-tplt.html
@@ -9,7 +9,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Template for content displayed in program tab of about dialog box.
 -->
@@ -47,7 +47,7 @@
   <body>
 
     <p>
-      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2020 by <a
+      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2023 by <a
         class="external-link"
         href="https://en.gravatar.com/delphidabbler"
       >Peter D Johnson</a>.

From e43816c6007ac3eed30d5e400f4889f278976218 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 5 Apr 2023 00:27:11 +0100
Subject: [PATCH 098/264] Fix out of range bug in UEncodings unit

Bug in 1st WideCharToMultiByte call in WideCharToChar function.

Fixes #97
---
 Src/UEncodings.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/UEncodings.pas b/Src/UEncodings.pas
index eb1586899..f33dad412 100644
--- a/Src/UEncodings.pas
+++ b/Src/UEncodings.pas
@@ -439,7 +439,7 @@ function WideCharToChar(const Source: WideChar; const CodePage: Integer;
   BufSize: Integer;
 begin
   BufSize := WideCharToMultiByte(
-    CodePage, 0, @Source, 1, @Dest[0], 0, nil, nil
+    CodePage, 0, @Source, 1, nil, 0, nil, nil
   );
   SetLength(Dest, BufSize + 1);
   if WideCharToMultiByte(

From 4111d58910abf10d41189d4fb54bdc051fbde3d6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 21 Dec 2022 15:36:27 +0000
Subject: [PATCH 099/264] Add support for rendering REML lists as plain text

ActiveText.UTextRenderer has support added to parsing and rendering REML
lists and to format the resulting text with given margins and page
widths. This was provided in a new TActiveTextTextRenderer.RenderWrapped
method.

TActiveTextTextRenderer.Render was made private since it is now only
called internally.

USourceGen & UTextSnippetDoc were modified to use the above new method.

** This solution is a little kludgy and relies on parsing NBSP
characters emitted by TActiveTextTextRenderer.Render. This was done
originally because the formatting was being done in USourceGen and
UTextSnippetDoc which didn't have access to the inner workings of
TActiveTextTextRenderer. The formatting code was then moved into
TActiveTextTextRenderer and so there's probably a more elegant
solutuion available now.

Generalised TActiveTextTextRenderer.CanEmitInline to determine which
elements can contain text by calling TActiveTextElemCaps rather than
hard wiring the elements.
---
 Src/ActiveText.UTextRenderer.pas | 289 +++++++++++++++++++++++++++++--
 Src/USourceGen.pas               |  86 +++++----
 Src/UTextSnippetDoc.pas          |  36 ++--
 3 files changed, 326 insertions(+), 85 deletions(-)

diff --git a/Src/ActiveText.UTextRenderer.pas b/Src/ActiveText.UTextRenderer.pas
index bd658666e..c060188e6 100644
--- a/Src/ActiveText.UTextRenderer.pas
+++ b/Src/ActiveText.UTextRenderer.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements class that renders active text as plain text in fixed width, word
  * wrapped paragraphs.
@@ -15,17 +15,53 @@
 interface
 
 uses
-  SysUtils,
-  ActiveText.UMain;
+  SysUtils, Generics.Collections,
+  ActiveText.UMain,
+  UConsts;
 
 type
   TActiveTextTextRenderer = class(TObject)
+  public
+    const
+      ///  <summary>Special space character used to indicate the start of a list
+      ///  item.</summary>
+      ///  <remarks>This special character is a necessary kludge because some
+      ///  c odethat renders active text as formatted plain text strips away
+      ///  leading #32 characters as part of the formatting process. Therefore
+      ///  indentation in list items is lost if #32 characters are used for it.
+      ///  NBSP was chosen since it should render the same as a space if calling
+      ///  code doesn't convert it.</remarks>
+      LISpacer = NBSP;  // Do not localise. Must be <> #32
+      ///  <summary>Bullet character used when rendering unordered list items.
+      ///  </summary>
+      Bullet = '*';     // Do not localise. Must be <> #32 and <> LISpacer
   strict private
+    const
+      IndentDelta = 2;
+    type
+      TListKind = (lkNumber, lkBullet);
+      TListState = record
+      public
+        ListNumber: Cardinal;
+        ListKind: TListKind;
+        constructor Create(AListKind: TListKind);
+      end;
+      TLIState = record
+        IsFirstPara: Boolean;
+        constructor Create(AIsFirstPara: Boolean);
+      end;
     var
       fDisplayURLs: Boolean;
-      fInBlock: Boolean;
       fParaBuilder: TStringBuilder;
       fDocBuilder: TStringBuilder;
+      fBlocksStack: TStack<TActiveTextActionElemKind>;
+      fListStack: TStack<TListState>;
+      fLIStack: TStack<TLIState>;
+      fIndent: UInt16;
+      fInPara: Boolean;
+      fInListItem: Boolean;
+    function CanEmitInline: Boolean;
+    procedure AppendToPara(const AText: string);
     procedure InitialiseRender;
     procedure FinaliseRender;
     procedure OutputParagraph;
@@ -33,32 +69,66 @@   TActiveTextTextRenderer = class(TObject)
     procedure RenderBlockActionElem(Elem: IActiveTextActionElem);
     procedure RenderInlineActionElem(Elem: IActiveTextActionElem);
     procedure RenderURL(Elem: IActiveTextActionElem);
+    function Render(ActiveText: IActiveText): string;
   public
     constructor Create;
     destructor Destroy; override;
     property DisplayURLs: Boolean read fDisplayURLs write fDisplayURLs
       default False;
-    function Render(ActiveText: IActiveText): string;
+    function RenderWrapped(ActiveText: IActiveText; const PageWidth, LMargin,
+      ParaOffset: Cardinal; const Prefix: string = '';
+      const Suffix: string  = ''): string;
   end;
 
 
 implementation
 
 uses
+  // Delphi
+  Character,
+  // Project
+  UIStringList,
   UStrUtils;
 
 { TActiveTextTextRenderer }
 
+procedure TActiveTextTextRenderer.AppendToPara(const AText: string);
+begin
+  if AText = '' then
+    Exit;
+  fParaBuilder.Append(AText);
+  fInPara := True;
+end;
+
+function TActiveTextTextRenderer.CanEmitInline: Boolean;
+begin
+  if fBlocksStack.Count <= 0 then
+    Exit(False);
+  Result := TActiveTextElemCaps.CanContainText(fBlocksStack.Peek);
+end;
+
 constructor TActiveTextTextRenderer.Create;
 begin
+  Assert(LISpacer <> ' ', ClassName + '.Create: LISpacer can''t be #32');
+  Assert(Bullet <> ' ', ClassName + '.Create: Bullet can''t be #32');
+  Assert(Bullet <> LISpacer, ClassName + '.Create: Bullet = LISpacer');
   inherited Create;
   fParaBuilder := TStringBuilder.Create;
   fDocBuilder := TStringBuilder.Create;
   fDisplayURLs := False;
+  fBlocksStack := TStack<TActiveTextActionElemKind>.Create;
+  fListStack := TStack<TListState>.Create;
+  fLIStack := TStack<TLIState>.Create;
+  fIndent := 0;
+  fInPara := False;
+  fInListItem := False;
 end;
 
 destructor TActiveTextTextRenderer.Destroy;
 begin
+  fLIStack.Free;
+  fListStack.Free;
+  fBlocksStack.Free;
   fDocBuilder.Free;
   fParaBuilder.Free;
   inherited;
@@ -76,11 +146,33 @@ procedure TActiveTextTextRenderer.InitialiseRender;
 end;
 
 procedure TActiveTextTextRenderer.OutputParagraph;
+var
+  LIState: TLIState;
 begin
   if fParaBuilder.Length = 0 then
     Exit;
-  fDocBuilder.AppendLine(StrTrim(fParaBuilder.ToString));
+  fDocBuilder.Append(StrOfChar(NBSP, fIndent));
+  if fInListItem and not fLIStack.Peek.IsFirstPara then
+    // Do we need fInListItem? - test for non-empty list stack?
+    // if we do need it, put it on list stack
+    fDocBuilder.Append(StrOfChar(NBSP, IndentDelta));
+  if fLIStack.Count > 0 then
+  begin
+    if not fLIStack.Peek.IsFirstPara then
+    begin
+      fDocBuilder.Append(StrOfChar(NBSP, IndentDelta));
+    end
+    else
+    begin
+      // Update item at top of stack
+      LIState := fLIStack.Pop;
+      LIState.IsFirstPara := False;
+      fLIStack.Push(LIState);
+    end;
+  end;
+  fDocBuilder.AppendLine(StrTrimRight(fParaBuilder.ToString));
   fParaBuilder.Clear;
+  fInPara := False;
 end;
 
 function TActiveTextTextRenderer.Render(ActiveText: IActiveText): string;
@@ -90,7 +182,6 @@ function TActiveTextTextRenderer.Render(ActiveText: IActiveText): string;
   ActionElem: IActiveTextActionElem;
 begin
   InitialiseRender;
-  fInBlock := False;
   for Elem in ActiveText do
   begin
     if Supports(Elem, IActiveTextTextElem, TextElem) then
@@ -109,16 +200,82 @@ function TActiveTextTextRenderer.Render(ActiveText: IActiveText): string;
 
 procedure TActiveTextTextRenderer.RenderBlockActionElem(
   Elem: IActiveTextActionElem);
+var
+  ListState: TListState;
 begin
   case Elem.State of
     fsOpen:
     begin
-      fInBlock := True;
+      fBlocksStack.Push(Elem.Kind);
+      case Elem.Kind of
+        ekPara: {Do nothing} ;
+        ekHeading: {Do nothing} ;
+        ekUnorderedList:
+        begin
+          if (fListStack.Count > 0) and (fInPara) then
+            OutputParagraph;
+          fListStack.Push(TListState.Create(lkBullet));
+          Inc(fIndent, IndentDelta);
+        end;
+        ekOrderedList:
+        begin
+          if (fListStack.Count > 0) and (fInPara) then
+            OutputParagraph;
+          fListStack.Push(TListState.Create(lkNumber));
+          Inc(fIndent, IndentDelta);
+       end;
+        ekListItem:
+        begin
+          // Update list number of current list
+          ListState := fListStack.Pop;
+          Inc(ListState.ListNumber, 1);
+          fListStack.Push(ListState);
+          // Push this list item to list item stack
+          fLIStack.Push(TLIState.Create(True));
+          // Act depending on current list kind
+          case fListStack.Peek.ListKind of
+            lkNumber:
+            begin
+              // Number list: start a new numbered item, with current number
+              fParaBuilder.Append(IntToStr(fListStack.Peek.ListNumber));
+              fParaBuilder.Append(NBSP);
+            end;
+            lkBullet:
+            begin
+              // Bullet list: start a new bullet point
+              fParaBuilder.Append(Bullet + NBSP);
+            end;
+          end;
+        end;
+      end;
     end;
     fsClose:
     begin
-      OutputParagraph;
-      fInBlock := False;
+      case Elem.Kind of
+        ekPara:
+          OutputParagraph;
+        ekHeading:
+          OutputParagraph;
+        ekUnorderedList:
+        begin
+          OutputParagraph;
+          fListStack.Pop;
+          Dec(fIndent, IndentDelta);
+        end;
+        ekOrderedList:
+        begin
+          OutputParagraph;
+          fListStack.Pop;
+          Dec(fIndent, IndentDelta);
+        end;
+        ekListItem:
+        begin
+          OutputParagraph;
+          fInListItem := False;
+          fLIStack.Pop;
+        end;
+      end;
+      fBlocksStack.Pop;
     end;
   end;
 end;
@@ -126,17 +283,27 @@ procedure TActiveTextTextRenderer.RenderBlockActionElem(
 procedure TActiveTextTextRenderer.RenderInlineActionElem(
   Elem: IActiveTextActionElem);
 begin
-  if not fInBlock then
+  if not CanEmitInline then
     Exit;
   if (Elem.Kind = ekLink) and (Elem.State = fsClose) and fDisplayURLs then
     RenderURL(Elem);
+  // else ignore element: formatting elements have no effect on plain text
 end;
 
 procedure TActiveTextTextRenderer.RenderTextElem(Elem: IActiveTextTextElem);
+var
+  TheText: string;
 begin
-  if not fInBlock then
+  if not CanEmitInline then
     Exit;
-  fParaBuilder.Append(Elem.Text);
+  TheText := Elem.Text;
+  // no white space emitted after block start until 1st non-white space
+  // character encountered
+  if not fInPara then
+    TheText := StrTrimLeft(Elem.Text);
+  if TheText = '' then
+    Exit;
+  AppendToPara(TheText);
 end;
 
 procedure TActiveTextTextRenderer.RenderURL(Elem: IActiveTextActionElem);
@@ -144,7 +311,101 @@ procedure TActiveTextTextRenderer.RenderURL(Elem: IActiveTextActionElem);
   sURL = ' (%s)';                     // formatting for URLs from hyperlinks
 begin
   Assert(Elem.Kind = ekLink, ClassName + '.RenderURL: Not a link element');
-  fParaBuilder.AppendFormat(sURL, [Elem.Attrs[TActiveTextAttrNames.Link_URL]]);
+  AppendToPara(Format(sURL, [Elem.Attrs[TActiveTextAttrNames.Link_URL]]));
+end;
+
+function TActiveTextTextRenderer.RenderWrapped(ActiveText: IActiveText;
+  const PageWidth, LMargin, ParaOffset: Cardinal; const Prefix, Suffix: string):
+  string;
+var
+  Paras: IStringList;
+  Para: string;
+  ParaIndent: UInt16;
+  WrappedPara: string;
+  Offset: Int16;
+
+  // Calculate indent of paragraph by counting LISpacer characters inserted by
+  // Render method
+  function CalcParaIndent: UInt16;
+  var
+    Ch: Char;
+  begin
+    Result := 0;
+    for Ch in Para do
+    begin
+      if Ch <> LISpacer then
+        Break;
+      Inc(Result);
+    end;
+  end;
+
+  // Calculate if we are currently processing a list item by detecting Bullet,
+  // digits and LISpacer characters inserted by Render method
+  function IsListItem: Boolean;
+  var
+    Remainder: string;
+    Digits: string;
+    Ch: Char;
+  begin
+    Result := False;
+    // Strip any leading spacer chars from start of para
+    Remainder := StrTrimLeftChars(Para, LISpacer);
+    // Check for bullet list: starts with bullet character then spacer
+    if StrStartsStr(Bullet + LISpacer, Remainder) then
+      Exit(True);
+    // Check for number list: starts with digit(s) then spacer
+    Digits := '';
+    for Ch in Remainder do
+      if TCharacter.IsDigit(Ch) then
+        Digits := Digits + Ch
+      else
+        Break;
+    if (Digits <> '') and
+      StrStartsStr(Digits + LISpacer, Remainder) then
+      Exit(True);
+  end;
+
+begin
+  Result := '';
+  Paras := TIStringList.Create(Prefix + Render(ActiveText) + Suffix, EOL, True);
+  for Para in Paras do
+  begin
+    if IsListItem then
+    begin
+      Offset := -ParaOffset;
+      ParaIndent := CalcParaIndent + LMargin + ParaOffset;
+    end
+    else
+    begin
+      Offset := 0;
+      ParaIndent := CalcParaIndent + LMargin;
+    end;
+    WrappedPara := StrWrap(
+      StrReplace(Para, LISpacer, ' '),
+      PageWidth - ParaIndent,
+      ParaIndent,
+      Offset
+    );
+    if Result <> '' then
+      Result := Result + EOL;
+    Result := Result + StrTrimRight(WrappedPara);
+  end;
+  Result := StrTrimRight(Result);
+end;
+
+{ TActiveTextTextRenderer.TListState }
+
+constructor TActiveTextTextRenderer.TListState.Create(AListKind: TListKind);
+begin
+  ListNumber := 0;
+  ListKind := AListKind;
+end;
+
+{ TActiveTextTextRenderer.TLIState }
+
+constructor TActiveTextTextRenderer.TLIState.Create(AIsFirstPara: Boolean);
+begin
+  IsFirstPara := AIsFirstPara;
 end;
 
 end.
diff --git a/Src/USourceGen.pas b/Src/USourceGen.pas
index a8c5f1cd7..3d10b57ef 100644
--- a/Src/USourceGen.pas
+++ b/Src/USourceGen.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that is used to generate Pascal source code containing
  * specified database snippets.
@@ -38,10 +38,10 @@ interface
   TSourceComments = class(TNoConstructObject)
   strict private
     ///  <summary>Formats the given comment text into lines with a fixed
-    ///  maximum width indented by the given number of spaces on the left.
-    ///  </summary>
-    class function FormatCommentLines(const Text: string;
-      const Indent: Cardinal): string;
+    ///  maximum width indented by the given number of spaces on the left,
+    ///  optionally truncated to the first paragraph.</summary>
+    class function FormatActiveTextCommentInner(ActiveText: IActiveText;
+      const Indent: Cardinal; const Truncate: Boolean): string;
   public
 
     ///  <summary>Returns a description of the given comment style.</summary>
@@ -250,7 +250,7 @@ implementation
 
 uses
   // Delphi
-  SysUtils,
+  SysUtils, Character,
   // Project
   ActiveText.UTextRenderer, DB.USnippetKind, UConsts, UExceptions, UPreferences,
   USnippetValidator, UStrUtils, UWarnings, Hiliter.UPasLexer;
@@ -272,7 +272,7 @@   TRoutineFormatter = class(TNoConstructObject)
 
     ///  <summary>Splits source code of a routine snippet into the head (routine
     ///  prototype) and body.</summary>
-    ///  <param name="Routine">TSnippet [in] Routine whose source code is to be
+    ///  <param name="Routine">TSnippet [in3] Routine whose source code is to be
     ///  split.</param>
     ///  <param name="Head">string [out] Set to routine prototype.</param>
     ///  <param name="Body">string [out] Body of routine that follows the
@@ -1136,17 +1136,25 @@ class function TSourceComments.CommentStyleDesc(
   Result := sDescriptions[Style];
 end;
 
-class function TSourceComments.FormatCommentLines(const Text: string;
-  const Indent: Cardinal): string;
+class function TSourceComments.FormatActiveTextCommentInner(
+  ActiveText: IActiveText; const Indent: Cardinal; const Truncate: Boolean):
+  string;
 var
-  Lines: TStringList;
+  Renderer: TActiveTextTextRenderer;
+  ProcessedActiveText: IActiveText;
 begin
-  Lines := TStringList.Create;
+  if Truncate then
+    ProcessedActiveText := ActiveText.FirstBlock
+  else
+    ProcessedActiveText := ActiveText;
+  Renderer := TActiveTextTextRenderer.Create;
   try
-    Lines.Text := Text;
-    Result := StrTrimRight(StrWrap(Lines, cLineWidth - Indent, Indent, False));
+    Renderer.DisplayURLs := False;
+    Result := Renderer.RenderWrapped(
+      ProcessedActiveText, cLineWidth, Indent, Indent
+    );
   finally
-    Lines.Free;
+    Renderer.Free;
   end;
 end;
 
@@ -1156,7 +1164,7 @@ class function TSourceComments.FormatHeaderComments(
   Line: string;         // loops thru each line of comments & exploded comments
   Lines: IStringList;   // comments after exploding multiple wrapped lines
 const
-  cLinePrefix = ' * ';  // prefixes each comment line
+  cLinePrefix = ' * ';  // prefixes each header omment line
 begin
   // Only create comment if some comment text is provided
   if Assigned(Comments) and (Comments.Count > 0) then
@@ -1182,38 +1190,24 @@ class function TSourceComments.FormatHeaderComments(
 
 class function TSourceComments.FormatSnippetComment(const Style: TCommentStyle;
   const TruncateComments: Boolean; const Text: IActiveText): string;
-var
-  Renderer: TActiveTextTextRenderer;
-  PlainText: string;
-  Lines: IStringList;
 begin
-  Renderer := TActiveTextTextRenderer.Create;
-  try
-    Renderer.DisplayURLs := False;
-    PlainText := Renderer.Render(Text);
-    if TruncateComments then
-    begin
-      // use first non-empty paragraph of Text as comment
-      Lines := TIStringList.Create(PlainText, string(sLineBreak), False);
-      if Lines.Count > 0 then
-        PlainText := Lines[0];
-    end;
-    case Style of
-      csNone:
-        Result := '';
-      csBefore:
-        Result := '{'
-          + EOL
-          + FormatCommentLines(PlainText, cIndent)
-          + EOL
-          + '}';
-      csAfter:
-        Result := FormatCommentLines(
-          '{' + PlainText + '}', cIndent
-        );
-    end;
-  finally
-    Renderer.Free;
+  case Style of
+    csNone:
+      Result := '';
+    csBefore:
+      Result := '{'
+        + EOL
+        + FormatActiveTextCommentInner(Text, cIndent, TruncateComments)
+        + EOL
+        + '}';
+    csAfter:
+      Result := StrOfChar(TActiveTextTextRenderer.LISpacer, cIndent)
+        + '{'
+        + EOL
+        + FormatActiveTextCommentInner(Text, 2 * cIndent, TruncateComments)
+        + EOL
+        + StrOfChar(TActiveTextTextRenderer.LISpacer, cIndent)
+        + '}';
   end;
 end;
 
diff --git a/Src/UTextSnippetDoc.pas b/Src/UTextSnippetDoc.pas
index ad6d1fbf7..87e72c4dd 100644
--- a/Src/UTextSnippetDoc.pas
+++ b/Src/UTextSnippetDoc.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that renders a document that describes a snippet as plain
  * text.
@@ -39,10 +39,8 @@   TTextSnippetDoc = class(TSnippetDoc)
       cIndent = 2;
   strict private
     ///  <summary>Renders given active text as word-wrapped paragraphs of width
-    ///  cPageWidth and given indent. Blank lines are added between paragraphs
-    ///  iff SpaceParas in True.</summary>
-    procedure RenderActiveText(ActiveText: IActiveText; const Indent: Cardinal;
-      const SpaceParas: Boolean);
+    ///  cPageWidth.</summary>
+    procedure RenderActiveText(ActiveText: IActiveText);
   strict protected
     ///  <summary>Initialises plain text document.</summary>
     procedure InitialiseDoc; override;
@@ -88,9 +86,9 @@ implementation
 
 uses
   // Delphi
-  SysUtils,
+  SysUtils, Character,
   // Project
-  ActiveText.UTextRenderer, UStrUtils;
+  ActiveText.UTextRenderer, UConsts, UStrUtils;
 
 
 { TTextSnippetDoc }
@@ -106,28 +104,16 @@ procedure TTextSnippetDoc.InitialiseDoc;
   fWriter := TStringWriter.Create;
 end;
 
-procedure TTextSnippetDoc.RenderActiveText(ActiveText: IActiveText;
-  const Indent: Cardinal; const SpaceParas: Boolean);
+procedure TTextSnippetDoc.RenderActiveText(ActiveText: IActiveText);
 var
   Renderer: TActiveTextTextRenderer;
-  Lines: TStringList;
 begin
   Renderer := TActiveTextTextRenderer.Create;
   try
     Renderer.DisplayURLs := True;
-    Lines := TStringList.Create;
-    try
-      Lines.Text := Renderer.Render(ActiveText);
-      fWriter.WriteLine(
-        StrTrimRight(
-          StrWrap(
-            Lines, cPageWidth - Indent, Indent, True
-          )
-        )
-      );
-    finally
-      Lines.Free;
-    end;
+    fWriter.WriteLine(
+      Renderer.RenderWrapped(ActiveText, cPageWidth, 0, cIndent)
+    );
   finally
     Renderer.Free;
   end;
@@ -153,14 +139,14 @@ procedure TTextSnippetDoc.RenderDBInfo(const Text: string);
 procedure TTextSnippetDoc.RenderDescription(const Desc: IActiveText);
 begin
   fWriter.WriteLine;
-  RenderActiveText(Desc, 0, True);
+  RenderActiveText(Desc);
 end;
 
 procedure TTextSnippetDoc.RenderExtra(const ExtraText: IActiveText);
 begin
   Assert(not ExtraText.IsEmpty, ClassName + '.RenderExtra: ExtraText is empty');
   fWriter.WriteLine;
-  RenderActiveText(ExtraText, 0, True);
+  RenderActiveText(ExtraText);
 end;
 
 procedure TTextSnippetDoc.RenderHeading(const Heading: string;

From 36bc98384821240ebe182bd5d9dbaa3aacd5fb2f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 21 Dec 2022 16:00:50 +0000
Subject: [PATCH 100/264] Missing text at end of detail pane list items fixed

Code added to track and detect if text is being written inside a list
item and to output any inline text as HTML between the end of a nested
list and the end of a list item.

Such detection is then used in logic that determines when to output such
orphaned text.

Fixes #82
---
 Src/ActiveText.UHTMLRenderer.pas | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Src/ActiveText.UHTMLRenderer.pas b/Src/ActiveText.UHTMLRenderer.pas
index daa25dc0d..05e3f862f 100644
--- a/Src/ActiveText.UHTMLRenderer.pas
+++ b/Src/ActiveText.UHTMLRenderer.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides a class that renders active text as HTML.
 }
@@ -17,9 +17,9 @@ interface
 
 uses
   // Delphi
-  SysUtils, Graphics, Generics.Collections,
+  SysUtils,
   // Project
-  ActiveText.UMain, UBaseObjects, UCSSBuilder, UHTMLUtils;
+  ActiveText.UMain, UHTMLUtils;
 
 
 type
@@ -65,6 +65,7 @@       TCSSStyles = class(TObject)
       fBuilder: TStringBuilder;
       fInBlock: Boolean;
       fTagInfoMap: TTagInfoMap;
+      fLINestingDepth: Cardinal;
     procedure InitialiseTagInfoMap;
     procedure InitialiseRender;
     procedure RenderTextElem(Elem: IActiveTextTextElem);
@@ -84,11 +85,6 @@       TCSSStyles = class(TObject)
 implementation
 
 
-uses
-  // Project
-  UColours, UCSSUtils, UFontHelper, UIStringList;
-
-
 { TActiveTextHTML }
 
 constructor TActiveTextHTML.Create;
@@ -96,6 +92,7 @@ constructor TActiveTextHTML.Create;
   inherited Create;
   fCSSStyles := TCSSStyles.Create;
   fBuilder := TStringBuilder.Create;
+  fLINestingDepth := 0;
   InitialiseTagInfoMap;
 end;
 
@@ -209,6 +206,8 @@ procedure TActiveTextHTML.RenderBlockActionElem(Elem: IActiveTextActionElem);
   case Elem.State of
     fsOpen:
     begin
+      if Elem.Kind = ekListItem then
+        Inc(fLINestingDepth);
       fBuilder.Append(MakeOpeningTag(Elem));
       fInBlock := True;
     end;
@@ -216,13 +215,15 @@ procedure TActiveTextHTML.RenderBlockActionElem(Elem: IActiveTextActionElem);
     begin
       fInBlock := False;
       fBuilder.AppendLine(MakeClosingTag(Elem));
+      if Elem.Kind = ekListItem then
+        Dec(fLINestingDepth);
     end;
   end;
 end;
 
 procedure TActiveTextHTML.RenderInlineActionElem(Elem: IActiveTextActionElem);
 begin
-  if not fInBlock then
+  if not fInBlock and (fLINestingDepth = 0) then
     Exit;
   case Elem.State of
     fsOpen:
@@ -234,7 +235,7 @@ procedure TActiveTextHTML.RenderInlineActionElem(Elem: IActiveTextActionElem);
 
 procedure TActiveTextHTML.RenderTextElem(Elem: IActiveTextTextElem);
 begin
-  if not fInBlock then
+  if not fInBlock and (fLINestingDepth = 0) then
     Exit;
   fBuilder.Append(THTML.Entities(Elem.Text));
 end;

From 02e85186bdc8c233c9c083a967da2ac7f5f16d38 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Apr 2023 02:31:57 +0100
Subject: [PATCH 101/264] Fix active text editor re revised active text docs

Modified code that converts from plain text to active text when user
switched from editing plain text to editing active text. The active text
document that is created from plain text is now wrapped in ekDocument
elements.
---
 Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas b/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
index 541f19416..13282fa4a 100644
--- a/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
+++ b/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
@@ -222,6 +222,7 @@ function TSnippetsActiveTextEdFrame.PlainTextToActiveText(Text: string):
   if Text = '' then
     Exit;
   Paragraphs := TIStringList.Create(Text, EOL2, False, True);
+  Result.AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsOpen));
   for Paragraph in Paragraphs do
   begin
     Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsOpen));
@@ -230,6 +231,7 @@ function TSnippetsActiveTextEdFrame.PlainTextToActiveText(Text: string):
     );
     Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsClose));
   end;
+  Result.AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsClose));
 end;
 
 procedure TSnippetsActiveTextEdFrame.Preview;

From 27155851e28dc52a0566d1da8e2fdcfc33dcdbc8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Apr 2023 02:35:56 +0100
Subject: [PATCH 102/264] Heavily overhaul REML writer and parser.

Major changes to REML parser to:

1. correctly deal with plain text outside of any REML blocks -> such
text is now included in ekBlock blocks.

2. create active text that conforms to the revised document structure
and rules.

REML Writer revised to handle new ekDocument and ekBlock active text
elements. Neither element has any equivalent REML tag. ekDocument is
simply ignored, while active text contained in ekBlock elements is
written out with no surrounding block tag.
---
 Src/UREMLDataIO.pas | 626 +++++++++++++++++++++++++++++---------------
 1 file changed, 417 insertions(+), 209 deletions(-)

diff --git a/Src/UREMLDataIO.pas b/Src/UREMLDataIO.pas
index c6ae83bbc..526369a89 100644
--- a/Src/UREMLDataIO.pas
+++ b/Src/UREMLDataIO.pas
@@ -34,11 +34,28 @@ interface
   }
   TREMLReader = class(TInterfacedObject, IActiveTextParser)
   strict private
-    fLexer: TTaggedTextLexer;     // Analyses REML markup
-    // Stack of tag params for use in closing tags
-    fParamStack: TStack<TActiveTextAttr>;
-    // Stack of block level tags
-    fBlockTagStack: TStack<TActiveTextActionElemKind>;
+    type
+      TBlockTagInfo = record
+      strict private
+        var
+          fTag: TActiveTextActionElemKind;
+          fHasContent: Boolean;
+      public
+        constructor Create(ATag: TActiveTextActionElemKind);
+        property Tag: TActiveTextActionElemKind read fTag;
+        property HasContent: Boolean read fHasContent write fHasContent;
+      end;
+    var
+      fLexer: TTaggedTextLexer;     // Analyses REML markup
+      // Stack of tag params for use in closing tags
+      fParamStack: TStack<TActiveTextAttr>;
+      // Stack of block level tags with record of whether block has yet got any
+      // content.
+      fBlockTagStack: TStack<TBlockTagInfo>;
+      // Stack of all compound tags
+      fTagStack: TStack<TActiveTextActionElemKind>;
+      // Flag indicating whether parsing an implied block
+      fIsImpliedBlock: Boolean;
     function TagInfo(const TagIdx: Integer; out TagName: string;
       out TagCode: Word; out IsContainer: Boolean): Boolean;
       {Callback that provides lexer with information about supported tags. Lexer
@@ -61,6 +78,27 @@   TREMLReader = class(TInterfacedObject, IActiveTextParser)
         @return True if entity information was provided or False to indicate no
           more entities.
       }
+    ///  <summary>Note that block tag at top of stack has had content written to
+    ///  it.</summary>
+    procedure NoteBlockTagHasContent;
+    procedure StartElem(const AActiveText: IActiveText;
+      const AElem: TActiveTextActionElemKind);
+    procedure EndElem(const AActiveText: IActiveText;
+      const AElem: TActiveTextActionElemKind);
+    procedure StartInlineElem(const AActiveText: IActiveText;
+      const AElem: TActiveTextActionElemKind);
+    procedure EndInlineElem(const AActiveText: IActiveText;
+      const AElem: TActiveTextActionElemKind);
+    procedure StartBlockElem(const AActiveText: IActiveText;
+      const AElem: TActiveTextActionElemKind);
+    procedure EndBlockElem(const AActiveText: IActiveText;
+      const AElem: TActiveTextActionElemKind);
+    procedure StartImpliedBlockElem(const AActiveText: IActiveText);
+    procedure EndImpliedBlockElem(const AActiveText: IActiveText);
+    procedure WriteText(const AActiveText: IActiveText; const AText: string);
+    procedure ParsePlainText(const AActiveText: IActiveText);
+    procedure ParseStartTag(const AActiveText: IActiveText);
+    procedure ParseEndTag(const AActiveText: IActiveText);
   public
     constructor Create;
       {Class constructor. Sets up object.
@@ -69,12 +107,12 @@   TREMLReader = class(TInterfacedObject, IActiveTextParser)
       {Class destructor. Finalises object.
       }
     { IActiveTextParser method }
-    procedure Parse(const Markup: string; const ActiveText: IActiveText);
       {Parses markup and updates active text object with details.
         @param Markup [in] Markup containing definition of active text. Must be
           in format understood by parser.
         @param ActiveText [in] Active text object updated by parser.
       }
+    procedure Parse(const Markup: string; const ActiveText: IActiveText);
   end;
 
   {
@@ -295,7 +333,8 @@ constructor TREMLReader.Create;
   inherited Create;
   fLexer := TTaggedTextLexer.Create(TagInfo, EntityInfo);
   fParamStack := TStack<TActiveTextAttr>.Create;
-  fBlockTagStack := TStack<TActiveTextActionElemKind>.Create;
+  fTagStack := TStack<TActiveTextActionElemKind>.Create;
+  fBlockTagStack := TStack<TBlockTagInfo>.Create;
 end;
 
 destructor TREMLReader.Destroy;
@@ -303,11 +342,80 @@ destructor TREMLReader.Destroy;
   }
 begin
   fBlockTagStack.Free;
+  fTagStack.Free;
   FreeAndNil(fParamStack);
   FreeAndNil(fLexer);
   inherited;
 end;
 
+procedure TREMLReader.EndBlockElem(const AActiveText: IActiveText;
+  const AElem: TActiveTextActionElemKind);
+resourcestring
+  // Error message
+  sMismatchedTag = 'Closing block tag does not match opening block tag.';
+begin
+  Assert(fBlockTagStack.Count > 0);
+  if fBlockTagStack.Peek.Tag <> AElem then
+    raise EActiveTextParserError.Create(sMismatchedTag);
+  EndElem(AActiveText, AElem);
+  fBlockTagStack.Pop;
+end;
+
+procedure TREMLReader.EndElem(const AActiveText: IActiveText;
+  const AElem: TActiveTextActionElemKind);
+var
+  ParamName: string;                  // name of a parameter
+  Attr: TActiveTextAttr;              // attributes of tag
+resourcestring
+  // Error message
+  sMismatchedTag = 'Closing tag does not match opening tag.';
+begin
+  Assert(fTagStack.Count > 0);
+  if AElem <> fTagStack.Peek then
+    raise EActiveTextParserError.Create(sMismatchedTag);
+  // Retrive any parameters and record element with any parameter
+  TREMLTags.LookupParamName(AElem, ParamName);
+  if ParamName <> '' then
+  begin
+    // We should have a param which must be stored in closing action
+    // element, but closing REML tags have no parameters. We solve this
+    // by popping the parameter value from the stack. This works because
+    // we use a stack for params and opening and closing tags are
+    // matched.
+    Assert(fParamStack.Count > 0);
+    Attr := fParamStack.Pop;
+    // Add closing action element
+    AActiveText.AddElem(
+      TActiveTextFactory.CreateActionElem(
+        AElem, TActiveTextFactory.CreateAttrs(Attr), fsClose
+      )
+    );
+  end
+  else
+  begin
+    // No parameter: simple add closing parameterless action element
+    AActiveText.AddElem(
+      TActiveTextFactory.CreateActionElem(AElem, fsClose)
+    );
+  end;
+  // Pop tag from tag stack
+  fTagStack.Pop;
+end;
+
+procedure TREMLReader.EndImpliedBlockElem(const AActiveText: IActiveText);
+begin
+  Assert(fIsImpliedBlock);
+  Assert(fBlockTagStack.Peek.Tag = ekBlock);
+  fIsImpliedBlock := False;
+  EndBlockElem(AActiveText, ekBlock);
+end;
+
+procedure TREMLReader.EndInlineElem(const AActiveText: IActiveText;
+  const AElem: TActiveTextActionElemKind);
+begin
+  EndElem(AActiveText, AElem);
+end;
+
 function TREMLReader.EntityInfo(const EntityIdx: Integer;
   out EntityName: string; out EntityChar: Char): Boolean;
   {Callback that provides lexer with information about supported character
@@ -326,176 +434,62 @@ function TREMLReader.EntityInfo(const EntityIdx: Integer;
   EntityChar := TREMLEntities.Chars[EntityIdx];
 end;
 
-procedure TREMLReader.Parse(const Markup: string;
-  const ActiveText: IActiveText);
-  {Parses markup and updates active text object with details.
-    @param Markup [in] Markup containing definition of active text. Must be in
-      format understood by parser.
-    @param ActiveText [in] Active text object updated by parser.
-  }
+procedure TREMLReader.NoteBlockTagHasContent;
 var
-  ParamName: string;                  // name of a parameter
-  ParamValue: string;                 // value of a parameter
-  TagId: TActiveTextActionElemKind;   // id of a tag
-  Attr: TActiveTextAttr;              // attributes of tag
-
-  function IsTextPermittedInParentBlock: Boolean;
-  begin
-    if fBlockTagStack.Count = 0 then
-      Exit(True);
-    Result := TActiveTextElemCaps.CanContainText(fBlockTagStack.Peek);
-  end;
-
-  function IsElemPermittedParentBlock(const Elem: TActiveTextActionElemKind):
-    Boolean;
-  begin
-    if fBlockTagStack.Count = 0 then
-      Exit(TActiveTextElemCaps.IsElemPermittedInRoot(Elem));
-    Result := TActiveTextElemCaps.IsRequiredParent(fBlockTagStack.Peek, Elem);
-  end;
-
-  function IsElemExcluded(const Elem: TActiveTextActionElemKind):
-    Boolean;
-  begin
-    if fBlockTagStack.Count = 0 then
-      Exit(False);
-    Result := TActiveTextElemCaps.IsExcludedElem(fBlockTagStack.Peek, Elem);
-  end;
+  Block: TBlockTagInfo;
+begin
+  Assert(fBlockTagStack.Count > 0);
+  if fBlockTagStack.Peek.HasContent then
+    Exit;
+  Block := fBlockTagStack.Pop;
+  Block.HasContent := True;
+  fBlockTagStack.Push(Block);
+end;
 
+procedure TREMLReader.Parse(const Markup: string;
+  const ActiveText: IActiveText);
 resourcestring
-  // Error message
-  sErrMissingParam = 'Expected a "%0:s" parameter value in tag "%1:s"';
-  sErrNesting = 'Illegal nesting of "%0:s" tag';
-  sBadParentBlock = 'Invalid parent block for tag %0:s';
-  sNoTextPermitted = 'Text is not permitted in enclosing block';
-  sMismatchedCloser = 'Mismatching closing block tag %0:s';
+  sMismatchedTags = 'There is not a closing tag for each opening tag';
+  sBadTagType = 'Unexpected tag type';
 begin
   Assert(Assigned(ActiveText), ClassName + '.Parse: ActiveText is nil');
+
+  // TODO: consider changing this so document tags are written
+  if Markup = '' then
+    Exit;
+
   fBlockTagStack.Clear;
+  fTagStack.Clear;
+  fParamStack.Clear;
+  fIsImpliedBlock := False;
+
   try
-    // Nothing to do if there is no markup
-    if Markup = '' then
-      Exit;
     // Use lexer to process markup
     fLexer.TaggedText := Markup;
-    // Scan REML a token at a time
+
+    StartBlockElem(ActiveText, ekDocument);
+
     while fLexer.NextItem <> ttsEOF do
     begin
       case fLexer.Kind of
-
         ttsText:
-        begin
-          if IsTextPermittedInParentBlock then
-          begin
-            // Plain text is allowed in parent block: add it
-            ActiveText.AddElem(
-              TActiveTextFactory.CreateTextElem(fLexer.PlainText)
-            );
-          end
-          else
-          begin
-            // Plain text not allowed in parent block: raise exception UNLESS
-            // text is only white space or empty, in which case we simply ignore
-            // the text. This is because white space will often occur after
-            // end tag of enclosed blocks
-            if not StrIsEmpty(fLexer.PlainText, True) then
-              raise EActiveTextParserError.Create(sNoTextPermitted);
-          end
-        end;
-
+          ParsePlainText(ActiveText);
         ttsCompoundStartTag:
-        begin
-          // Start of an action element
-          // Get tag id and any parameter
-          TagId := TActiveTextActionElemKind(fLexer.TagCode);
-
-          // Validate tag id
-          if IsElemExcluded(TagId) then
-            raise EActiveTextParserError.CreateFmt(
-              sErrNesting, [fLexer.TagName]
-            );
-          if not IsElemPermittedParentBlock(TagID) then
-            raise EActiveTextParserError.CreateFmt(
-              sBadParentBlock, [fLexer.TagName]
-            );
-
-          if TActiveTextElemCaps.DisplayStyleOf(TagId) = dsBlock then
-            fBlockTagStack.Push(TagId);
-          TREMLTags.LookupParamName(TagId, ParamName);
-          if ParamName <> '' then
-          begin
-            // We have a parameter: must not be empty
-            ParamValue := fLexer.TagParams.Values[ParamName];
-            if ParamValue = '' then
-              raise EActiveTextParserError.CreateFmt(
-                sErrMissingParam, [ParamName, fLexer.TagName]
-              );
-            // Record param for use by closing tag
-            Attr := TActiveTextAttr.Create(ParamName, ParamValue);
-            fParamStack.Push(Attr);
-            // Add opening action element
-            ActiveText.AddElem(
-              TActiveTextFactory.CreateActionElem(
-                TagId, TActiveTextFactory.CreateAttrs(Attr), fsOpen
-              )
-            );
-          end
-          else
-          begin
-            // No parameter: simply add opening parameterless action element
-            ActiveText.AddElem(
-              TActiveTextFactory.CreateActionElem(TagId, fsOpen)
-            );
-          end;
-        end;
-
+          ParseStartTag(ActiveText);
         ttsCompoundEndTag:
-        begin
-          // End of an action element
-          // Get elem id
-          TagId := TActiveTextActionElemKind(fLexer.TagCode);
-
-          // Validate elem
-          if TActiveTextElemCaps.DisplayStyleOf(TagId) = dsBlock then
-          begin
-            if fBlockTagStack.Peek <> TagId then
-              raise EActiveTextParserError.CreateFmt(
-                sMismatchedCloser, [fLexer.TagName]
-              );
-            fBlockTagStack.Pop;
-          end;
-
-          // Process params
-          TREMLTags.LookupParamName(TagId, ParamName);
-          if ParamName <> '' then
-          begin
-            // We should have a param which must be stored in closing action
-            // element, but closing REML tags have no parameters. We solve this
-            // by popping the parameter value from the stack. This works because
-            // we use a stack for params and opening and closing tags are
-            // matched.
-            Attr := fParamStack.Pop;
-            // Add closing action element
-            ActiveText.AddElem(
-              TActiveTextFactory.CreateActionElem(
-                TagId, TActiveTextFactory.CreateAttrs(Attr), fsClose
-              )
-            );
-          end
-          else
-          begin
-            // No parameter: simple add closing parameterless action element
-            ActiveText.AddElem(
-              TActiveTextFactory.CreateActionElem(TagId, fsClose)
-            );
-          end;
-        end;
-
+          ParseEndTag(ActiveText);
+        else
+          raise EActiveTextParserError.Create(sBadTagType);
       end;
     end;
 
-  except
+    if fIsImpliedBlock then
+      EndImpliedBlockElem(ActiveText);
+    EndBlockElem(ActiveText, ekDocument);
+    if fBlockTagStack.Count <> 0 then
+      raise EActiveTextParserError.Create(sMismatchedTags);
 
+  except
     // Handle exceptions: convert expected exceptions to EActiveTextParserError
     on E: ETaggedTextLexer do
       raise EActiveTextParserError.Create(E);
@@ -504,6 +498,177 @@ procedure TREMLReader.Parse(const Markup: string;
   end;
 end;
 
+procedure TREMLReader.ParseEndTag(const AActiveText: IActiveText);
+var
+  TagId: TActiveTextActionElemKind;   // id of a tag
+begin
+  Assert(flexer.Kind = ttsCompoundEndTag);
+  // Get tag id
+  TagId := TActiveTextActionElemKind(fLexer.TagCode);
+
+  if TActiveTextElemCaps.DisplayStyleOf(TagId) = dsBlock then
+  begin
+    // Closing block tag
+    if fIsImpliedBlock then
+      // An implied block is being written: close it
+      EndImpliedBlockElem(AActiveText);
+    // End read closing block
+    EndBlockElem(AActiveText, TagId)
+  end
+  else // TActiveTextElemCaps.DisplayStyleOf(TagId) = dsInline
+    // Closing inline tag: just close it
+    EndInlineElem(AActiveText, TagId);
+end;
+
+procedure TREMLReader.ParsePlainText(const AActiveText: IActiveText);
+var
+  Text: string;
+resourcestring
+  sNoTextPermitted = 'Text is not permitted in enclosing block';
+begin
+  Assert(fLexer.Kind = ttsText);
+  Text := fLexer.PlainText;
+  if TActiveTextElemCaps.CanContainText(fBlockTagStack.Peek.Tag) then
+    // Parent block accepts text: write it
+    WriteText(AActiveText, Text)
+  else if TActiveTextElemCaps.IsPermittedChildElem(
+    fBlockTagStack.Peek.Tag, ekBlock
+  ) then
+  begin
+    // Parent block can contain an ekBlock:
+    // create block if text is not strictly empty string, and add text to it
+    if not StrIsEmpty(Text) then
+    begin
+      StartImpliedBlockElem(AActiveText);
+      WriteText(AActiveText, Text);
+    end;
+  end
+  else if not StrIsEmpty(Text, True) then
+    // Unless text is just white space, report an error. We allow white space
+    // since there may be white space between tags. If there is white space we
+    // do nothing - we don't want to write white space.
+    raise EActiveTextParserError.Create(sNoTextPermitted);
+end;
+
+procedure TREMLReader.ParseStartTag(const AActiveText: IActiveText);
+var
+  TagId: TActiveTextActionElemKind;   // id of a tag
+resourcestring
+  // Error message
+  sErrMissingParam = 'Expected a "%0:s" parameter value in tag "%1:s"';
+  sErrNesting = 'Illegal nesting of "%0:s" tag';
+  sBadParentBlock = 'Invalid parent block for tag %0:s';
+  sNoTextPermitted = 'Text is not permitted in enclosing block';
+  sMismatchedCloser = 'Mismatching closing block tag %0:s';
+  sErrDocEndExpected = 'End of document expected';
+begin
+  Assert(fLexer.Kind = ttsCompoundStartTag);
+  // Get tag id
+  TagId := TActiveTextActionElemKind(fLexer.TagCode);
+  if TActiveTextElemCaps.DisplayStyleOf(TagId) = dsBlock then
+  begin
+    // Opening block tag found
+    // If writing an implied block, close the block before processing new block
+    if fIsImpliedBlock then
+      EndImpliedBlockElem(AActiveText);
+    // Output block tag if it is valid within parent block, else error
+    if TActiveTextElemCaps.IsPermittedChildElem(
+      fBlockTagStack.Peek.Tag, TagId
+    ) then
+      StartBlockElem(AActiveText, TagId)
+    else
+      raise EActiveTextParserError.CreateFmt(sBadParentBlock, [fLexer.TagName]);
+  end
+  else // TActiveTextElemCaps.DisplayStyleOf(TagId) = dsInline
+  begin
+    // Opeing inline tag found
+    if TActiveTextElemCaps.IsPermittedChildElem(
+        fBlockTagStack.Peek.Tag, TagId
+      ) then
+      // Tag is permitted within parent block: output it
+      StartInlineElem(AActiveText, TagId)
+    else if
+      TActiveTextElemCaps.IsPermittedChildElem(
+        fBlockTagStack.Peek.Tag, ekBlock
+      ) and
+      TActiveTextElemCaps.IsPermittedChildElem(ekBlock, TagId) then
+      begin
+        // Tag not directly permitted, but we can create an implied block iff:
+        // 1. parent block permits an ekBlock child element
+        // 2. ekBlock permits current tag as child element
+        StartImpliedBlockElem(AActiveText);
+        StartInlineElem(AActiveText, TagId);
+      end
+    else
+      // Tag not permitted in parent block: error
+      raise EActiveTextParserError.CreateFmt(sBadParentBlock, [fLexer.TagName]);
+  end;
+end;
+
+procedure TREMLReader.StartBlockElem(const AActiveText: IActiveText;
+  const AElem: TActiveTextActionElemKind);
+begin
+  Assert((TActiveTextElemCaps.DisplayStyleOf(AElem) = dsBlock));
+  StartElem(AActiveText, AElem);
+  fBlockTagStack.Push(TBlockTagInfo.Create(AElem));
+end;
+
+procedure TREMLReader.StartElem(const AActiveText: IActiveText;
+  const AElem: TActiveTextActionElemKind);
+var
+  ParamName: string;                  // name of a parameter
+  ParamValue: string;                 // value of a parameter
+  Attr: TActiveTextAttr;              // attributes of tag
+resourcestring
+  // Error message
+  sErrMissingParam = 'Expected a "%0:s" parameter value in tag "%1:s"';
+begin
+  // Find any parameters and record element with any parameter
+  TREMLTags.LookupParamName(AElem, ParamName);
+  if ParamName <> '' then
+  begin
+    // We have a parameter: must not be empty
+    ParamValue := fLexer.TagParams.Values[ParamName];
+    if ParamValue = '' then
+      raise EActiveTextParserError.CreateFmt(
+        sErrMissingParam, [ParamName, fLexer.TagName]
+      );
+    // Record param for use by closing tag
+    Attr := TActiveTextAttr.Create(ParamName, ParamValue);
+    fParamStack.Push(Attr);
+    // Add opening action element
+    AActiveText.AddElem(
+      TActiveTextFactory.CreateActionElem(
+        AElem, TActiveTextFactory.CreateAttrs(Attr), fsOpen
+      )
+    );
+  end
+  else
+  begin
+    // No parameter: simply add opening parameterless opening action element
+    AActiveText.AddElem(
+      TActiveTextFactory.CreateActionElem(AElem, fsOpen)
+    );
+  end;
+  // Push tag onto tag stack
+  fTagStack.Push(AElem);
+end;
+
+procedure TREMLReader.StartImpliedBlockElem(const AActiveText: IActiveText);
+begin
+  Assert(not fIsImpliedBlock);
+  StartBlockElem(AActiveText, ekBlock);
+  fIsImpliedBlock := True;
+end;
+
+procedure TREMLReader.StartInlineElem(const AActiveText: IActiveText;
+  const AElem: TActiveTextActionElemKind);
+begin
+  Assert(TActiveTextElemCaps.DisplayStyleOf(AElem) = dsInline);
+  StartElem(AActivetext, AElem);
+  NoteBlockTagHasContent;
+end;
+
 function TREMLReader.TagInfo(const TagIdx: Integer; out TagName: string;
   out TagCode: Word; out IsContainer: Boolean): Boolean;
   {Callback that provides lexer with information about supported tags. Lexer
@@ -525,6 +690,25 @@ function TREMLReader.TagInfo(const TagIdx: Integer; out TagName: string;
   end;
 end;
 
+procedure TREMLReader.WriteText(const AActiveText: IActiveText;
+  const AText: string);
+begin
+  // Don't write anything if text is strictly empty string
+  if not StrIsEmpty(AText) then
+  begin
+    AActiveText.AddElem(TActiveTextFactory.CreateTextElem(AText));
+    NoteBlockTagHasContent;
+  end;
+end;
+
+{ TREMLReader.TBlockTagInfo }
+
+constructor TREMLReader.TBlockTagInfo.Create(ATag: TActiveTextActionElemKind);
+begin
+  fTag := ATag;
+  fHasContent := False;
+end;
+
 { TREMLWriter }
 
 constructor TREMLWriter.InternalCreate;
@@ -549,30 +733,33 @@ class function TREMLWriter.Render(const ActiveText: IActiveText): string;
   SrcLine: string;
   DestLines: IStringList;
   DestLine: string;
+  RW: TREMLWriter;
 begin
-  with InternalCreate do
-    try
-      Text := '';
-      fLevel := 0;
-      for Elem in ActiveText do
-      begin
-        if Supports(Elem, IActiveTextTextElem, TextElem) then
-          Text := Text + RenderText(TextElem)
-        else if Supports(Elem, IActiveTextActionElem, TagElem) then
-          Text := Text + RenderTag(TagElem);
-      end;
-      SrcLines := TIStringList.Create(Text, EOL, False);
-      DestLines := TIStringList.Create;
-      for SrcLine in SrcLines do
-      begin
-        DestLine := StrTrimRight(SrcLine);
-        if not StrIsEmpty(DestLine) then
-          DestLines.Add(DestLine);
-      end;
-      Result := DestLines.GetText(EOL, False);
-    finally
-      Free;
+  if ActiveText.IsEmpty then
+    Exit('');
+  RW := TREMLWriter.InternalCreate;
+  try
+    Text := '';
+    RW.fLevel := 0;
+    for Elem in ActiveText do
+    begin
+      if Supports(Elem, IActiveTextTextElem, TextElem) then
+        Text := Text + RW.RenderText(TextElem)
+      else if Supports(Elem, IActiveTextActionElem, TagElem) then
+        Text := Text + RW.RenderTag(TagElem);
+    end;
+    SrcLines := TIStringList.Create(Text, EOL, False);
+    DestLines := TIStringList.Create;
+    for SrcLine in SrcLines do
+    begin
+      DestLine := StrTrimRight(SrcLine);
+      if not StrIsEmpty(DestLine) then
+        DestLines.Add(DestLine);
     end;
+    Result := DestLines.GetText(EOL, False);
+  finally
+    RW.Free;
+  end;
 end;
 
 function TREMLWriter.RenderTag(
@@ -582,54 +769,72 @@ function TREMLWriter.RenderTag(
     @return Required REML tag.
   }
 var
-  TagName: string;    // name of tag
+  TagName: string;      // name of tag
   ParamName: string;  // name of any parameter
 begin
-  if not TREMLTags.LookupTagName(TagElem.Kind, TagName) then
-    raise EBug.CreateFmt('%s.RenderTag: Invalid REML tag id', [ClassName]);
+  TREMLTags.LookupTagName(TagElem.Kind, TagName);
   Result := '';
   TREMLTags.LookupParamName(TagElem.Kind, ParamName);
   case TagElem.State of
     fsClose:
     begin
       // closing tag
-      Result := Format('</%s>', [TagName]);
-      if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsBlock then
+      if TagName <> '' then
       begin
-        Dec(fLevel);
-        Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
+        Result := Format('</%s>', [TagName]);
+        if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsBlock then
+        begin
+          Dec(fLevel);
+          Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
+          fIsStartOfTextLine := True;
+        end;
+      end
+      else
+      begin
+        Result := '';
         fIsStartOfTextLine := True;
       end;
     end;
     fsOpen:
     begin
       // opening tag: may have a parameter
-      if ParamName ='' then
-        Result := Format('<%s>', [TagName])
-      else
-        // have a parameter: value must be safely encoded
-        Result := Format(
-          '<%0:s %1:s="%2:s">',
-          [
-            TagName,
-            ParamName,
-            TextToREMLText(TagElem.Attrs[TActiveTextAttrNames.Link_URL])
-          ]
-        );
-      if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsBlock then
-      begin
-        Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
-        Inc(fLevel);
-        fIsStartOfTextLine := True;
-      end
-      else if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsInline then
+      if TagName <> '' then
       begin
-        if fIsStartOfTextLine then
+        if ParamName ='' then
+          Result := Format('<%s>', [TagName])
+        else
+          { TODO: revise to not assume parameter must be Link URL }
+          // have a parameter: value must be safely encoded
+          Result := Format(
+            '<%0:s %1:s="%2:s">',
+            [
+              TagName,
+              ParamName,
+              TextToREMLText(TagElem.Attrs[TActiveTextAttrNames.Link_URL])
+            ]
+          );
+        if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsBlock then
+        begin
+          Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
+          Inc(fLevel);
+          fIsStartOfTextLine := True;
+        end
+        else if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsInline then
         begin
-          Result := StrOfSpaces(IndentMult * fLevel) + Result;
-          fIsStartOfTextLine := False;
+          if fIsStartOfTextLine then
+          begin
+            Result := StrOfSpaces(IndentMult * fLevel) + Result;
+            fIsStartOfTextLine := False;
+          end;
         end;
       end;
+    end
+    else
+    begin
+      if TagElem.Kind = ekBlock then
+        fIsStartOfTextLine := True;
+      // ekDocument is a no-op and there should be no other elems here
+      Result := '';
     end;
   end;
 end;
@@ -695,6 +900,9 @@ function TREMLWriter.TextToREMLText(const Text: string): string;
   fTagMap[8] := TREMLTag.Create(ekUnorderedList, 'ul');
   fTagMap[9] := TREMLTag.Create(ekOrderedList, 'ol');
   fTagMap[10] := TREMLTag.Create(ekListItem, 'li');
+  // NOTE: ekBlock and ekDocument are not used REML
+  //   content of ekBlock is rendered as text outside any block
+  //   content of ekDocument is rendered without outputing a tag
 end;
 
 class destructor TREMLTags.Destroy;

From ac2f1388d35dd4a5e70195a3a6ce39941ab2631e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Apr 2023 02:42:26 +0100
Subject: [PATCH 103/264] Major overhaul of active text HTML renderer

Code now based in part on the REML active text writer. The REML based
code was simplified due to the fact that the HTML renderer has tags that
match the ekBlock and ekDocument elements, whereas REML doesn't.

HTML code is now indented to highlight the document structure (although
this doesn't matter really since the code is never displayed to the
user).
---
 Src/ActiveText.UHTMLRenderer.pas | 151 ++++++++++++++++---------------
 1 file changed, 79 insertions(+), 72 deletions(-)

diff --git a/Src/ActiveText.UHTMLRenderer.pas b/Src/ActiveText.UHTMLRenderer.pas
index 05e3f862f..8a00367b4 100644
--- a/Src/ActiveText.UHTMLRenderer.pas
+++ b/Src/ActiveText.UHTMLRenderer.pas
@@ -47,7 +47,6 @@       TTagInfo = class(TObject)
       TCSSStyles = class(TObject)
       strict private
         var
-          fWrapperClass: string;
           fElemClassMap: array[TActiveTextActionElemKind] of string;
         procedure SetElemClass(ElemKind: TActiveTextActionElemKind;
           const Value: string); inline;
@@ -55,7 +54,6 @@       TCSSStyles = class(TObject)
           inline;
       public
         constructor Create;
-        property WrapperClass: string read fWrapperClass write fWrapperClass;
         property ElemClasses[Kind: TActiveTextActionElemKind]: string
           read GetElemClass write SetElemClass;
       end;
@@ -63,27 +61,29 @@       TCSSStyles = class(TObject)
     var
       fCSSStyles: TCSSStyles;
       fBuilder: TStringBuilder;
-      fInBlock: Boolean;
+      fLevel: Integer;
       fTagInfoMap: TTagInfoMap;
+      fIsStartOfTextLine: Boolean;
       fLINestingDepth: Cardinal;
+    const
+      IndentMult = 2;
     procedure InitialiseTagInfoMap;
-    procedure InitialiseRender;
-    procedure RenderTextElem(Elem: IActiveTextTextElem);
-    procedure RenderBlockActionElem(Elem: IActiveTextActionElem);
-    procedure RenderInlineActionElem(Elem: IActiveTextActionElem);
-    procedure FinaliseRender;
+    function RenderTag(const TagElem: IActiveTextActionElem): string;
+    function RenderText(const TextElem: IActiveTextTextElem): string;
     function MakeOpeningTag(const Elem: IActiveTextActionElem): string;
     function MakeClosingTag(const Elem: IActiveTextActionElem): string;
   public
     constructor Create;
     destructor Destroy; override;
     function Render(ActiveText: IActiveText): string;
-    property Styles: TCSSStyles read fCSSStyles;
   end;
 
 
 implementation
 
+uses
+  UConsts, UIStringList, UStrUtils;
+
 
 { TActiveTextHTML }
 
@@ -107,22 +107,6 @@ destructor TActiveTextHTML.Destroy;
   inherited;
 end;
 
-procedure TActiveTextHTML.FinaliseRender;
-begin
-  fBuilder.AppendLine(THTML.ClosingTag('div'));
-end;
-
-procedure TActiveTextHTML.InitialiseRender;
-var
-  WrapperClassAttr: IHTMLAttributes;
-begin
-  if fCSSStyles.WrapperClass <> '' then
-    WrapperClassAttr := THTMLAttributes.Create('class', fCSSStyles.WrapperClass)
-  else
-    WrapperClassAttr := nil;
-  fBuilder.AppendLine(THTML.OpeningTag('div', WrapperClassAttr));
-end;
-
 procedure TActiveTextHTML.InitialiseTagInfoMap;
 var
   NullAttrs: TTagInfo.TTagAttrCallback;
@@ -131,7 +115,10 @@ procedure TActiveTextHTML.InitialiseTagInfoMap;
   ElemKind: TActiveTextActionElemKind;
 const
   Tags: array[TActiveTextActionElemKind] of string = (
-    'a', 'strong', 'em', 'var', 'p', 'span', 'h2', 'code', 'ul', 'ol', 'li'
+    'a' {ekLink}, 'strong' {ekStrong}, 'em' {ekEm}, 'var' {ekVar}, 'p' {ekPara},
+    'span' {ekWarning}, 'h2' {ekHeading}, 'code' {ekMono},
+    'ul' {ekUnorderedList}, 'ol' {ekUnorderedList}, 'li' {ekListItem},
+    'div' {ekBlock}, 'div' {ekDocument}
   );
 begin
   NullAttrs := function(Elem: IActiveTextActionElem): IHTMLAttributes
@@ -178,66 +165,84 @@ function TActiveTextHTML.MakeOpeningTag(const Elem: IActiveTextActionElem):
 
 function TActiveTextHTML.Render(ActiveText: IActiveText): string;
 var
-  Elem: IActiveTextElem;
-  TextElem: IActiveTextTextElem;
-  ActionElem: IActiveTextActionElem;
+  Elem: IActiveTextElem;          // each element in active text object
+  TextElem: IActiveTextTextElem;  // an active text text element
+  TagElem: IActiveTextActionElem; // an active text action element
+  Text: string;
+  SrcLines: IStringList;
+  SrcLine: string;
+  DestLines: IStringList;
+  DestLine: string;
 begin
-  fBuilder.Clear;
-  fInBlock := False;
-  InitialiseRender;
+  if ActiveText.IsEmpty then
+    Exit('');
+  Text := '';
+  fLevel := 0;
   for Elem in ActiveText do
   begin
     if Supports(Elem, IActiveTextTextElem, TextElem) then
-      RenderTextElem(TextElem)
-    else if Supports(Elem, IActiveTextActionElem, ActionElem) then
-    begin
-      if TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock then
-        RenderBlockActionElem(ActionElem)
-      else
-        RenderInlineActionElem(ActionElem);
-    end;
+      Text := Text + RenderText(TextElem)
+    else if Supports(Elem, IActiveTextActionElem, TagElem) then
+      Text := Text + RenderTag(TagElem);
   end;
-  FinaliseRender;
-  Result := fBuilder.ToString;
+  SrcLines := TIStringList.Create(Text, EOL, False);
+  DestLines := TIStringList.Create;
+  for SrcLine in SrcLines do
+  begin
+    DestLine := StrTrimRight(SrcLine);
+    if not StrIsEmpty(DestLine) then
+      DestLines.Add(DestLine);
+  end;
+  Result := DestLines.GetText(EOL, False);
 end;
 
-procedure TActiveTextHTML.RenderBlockActionElem(Elem: IActiveTextActionElem);
+function TActiveTextHTML.RenderTag(const TagElem: IActiveTextActionElem):
+  string;
 begin
-  case Elem.State of
-    fsOpen:
-    begin
-      if Elem.Kind = ekListItem then
-        Inc(fLINestingDepth);
-      fBuilder.Append(MakeOpeningTag(Elem));
-      fInBlock := True;
-    end;
+  Result := '';
+  case TagElem.State of
     fsClose:
     begin
-      fInBlock := False;
-      fBuilder.AppendLine(MakeClosingTag(Elem));
-      if Elem.Kind = ekListItem then
-        Dec(fLINestingDepth);
+      Result := MakeClosingTag(TagElem);
+      if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsBlock then
+      begin
+        Dec(fLevel);
+        Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
+        fIsStartOfTextLine := True;
+      end;
     end;
-  end;
-end;
-
-procedure TActiveTextHTML.RenderInlineActionElem(Elem: IActiveTextActionElem);
-begin
-  if not fInBlock and (fLINestingDepth = 0) then
-    Exit;
-  case Elem.State of
     fsOpen:
-      fBuilder.Append(MakeOpeningTag(Elem));
-    fsClose:
-      fBuilder.Append(MakeClosingTag(Elem));
+    begin
+      Result := MakeOpeningTag(TagElem);
+      if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsBlock then
+      begin
+        Result := EOL + StrOfSpaces(IndentMult * fLevel) + Result + EOL;
+        Inc(fLevel);
+        fIsStartOfTextLine := True;
+      end
+      else if TActiveTextElemCaps.DisplayStyleOf(TagElem.Kind) = dsInline then
+      begin
+        if fIsStartOfTextLine then
+        begin
+          Result := StrOfSpaces(IndentMult * fLevel) + Result;
+          fIsStartOfTextLine := False;
+        end;
+      end;
+    end;
   end;
 end;
 
-procedure TActiveTextHTML.RenderTextElem(Elem: IActiveTextTextElem);
+function TActiveTextHTML.RenderText(const TextElem: IActiveTextTextElem):
+  string;
 begin
-  if not fInBlock and (fLINestingDepth = 0) then
-    Exit;
-  fBuilder.Append(THTML.Entities(Elem.Text));
+  if fIsStartOfTextLine then
+  begin
+    Result := StrOfSpaces(IndentMult * fLevel);
+    fIsStartOfTextLine := False;
+  end
+  else
+    Result := '';
+  Result := Result + THTML.Entities(TextElem.Text);
 end;
 
 { TActiveTextHTML.TCSSStyles }
@@ -245,13 +250,15 @@ procedure TActiveTextHTML.RenderTextElem(Elem: IActiveTextTextElem);
 constructor TActiveTextHTML.TCSSStyles.Create;
 const
   DefaultClasses: array[TActiveTextActionElemKind] of string = (
-    'external-link', '', '', '', '', 'warning', '', '', '', '', ''
+    'external-link' {ekLink}, '' {ekStrong}, '' {ekEm}, '' {ekVar}, '' {ekPara},
+    'warning' {ekWarning}, '' {ekHeading}, '' {ekMono}, '' {ekUnorderedList},
+    '' {ekOrderedList}, '' {ekListItem}, '' {ekBlock},
+    'active-text' {ekDocument}
   );
 var
   ElemKind: TActiveTextActionElemKind;
 begin
   inherited Create;
-  fWrapperClass := 'active-text';
   for ElemKind := Low(TActiveTextActionElemKind)
     to High(TActiveTextActionElemKind) do
     SetElemClass(ElemKind, DefaultClasses[ElemKind]);

From c34fb83f2f92ce185585debec1eee02c03677175 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Apr 2023 02:23:54 +0100
Subject: [PATCH 104/264] Overhaul ActiveText.UMain unit

Add new action elements:
  ekDocument - wrapper for whole active text document
  ekBlock - generic block element

Changed rules of which elements can be permitted as as children of other
elements. The new action elements help to simplify the rules. In turn,
the simplification of rules makes writing parsers and renderers easier.

Revise IActiveText & TActiveText

Add new IActiveText.IsValidActiveTextDocument method with implementation
in TActiveText

Rewrite TActiveText.Append to produce a valid active text document
topped and tailed with ekDocumnent elements
---
 Src/ActiveText.UMain.pas | 298 ++++++++++++++++++++++++++++-----------
 1 file changed, 213 insertions(+), 85 deletions(-)

diff --git a/Src/ActiveText.UMain.pas b/Src/ActiveText.UMain.pas
index 8d6e54602..648420fee 100644
--- a/Src/ActiveText.UMain.pas
+++ b/Src/ActiveText.UMain.pas
@@ -124,13 +124,15 @@   TActiveTextAttrNames = record
     ekStrong,         // text formatted as strong (inline)
     ekEm,             // text formatted as emphasised (inline)
     ekVar,            // text formatted as variable (inline)
-    ekPara,           // delimits a paragraph (block level)
+    ekPara,           // delimits a paragraph (block)
     ekWarning,        // text formatted as a warning (inline)
     ekHeading,        // delimits a heading (block level)
     ekMono,           // text formatted as mono spaced (inline)
-    ekUnorderedList,  // container for unordered lists (block level)
-    ekOrderedList,    // container for ordered list (block level)
-    ekListItem        // list item (block level)
+    ekUnorderedList,  // container for unordered lists (block)
+    ekOrderedList,    // container for ordered list (block)
+    ekListItem,       // list item (block)
+    ekBlock,          // container for unexpected text outside block (block)
+    ekDocument        // contains whole document (block)
   );
 
 type
@@ -175,6 +177,16 @@   TActiveTextAttrNames = record
     ///  <summary>Appends elements from another given active text object to the
     ///  current object.</summary>
     procedure Append(const ActiveText: IActiveText);
+    ///  <summary>Returns a new IActiveText instance containing just the first
+    ///  block of the current object.</summary>
+    ///  <remarks>
+    ///  <para>The first block is the content of the block level tag that starts
+    ///  the active text. If this block has child blocks (for e.g. an unordered
+    ///  list) then they are included.</para>
+    ///  <para>If the current object is empty then an empty object is returned.
+    ///  </para>
+    ///  </remarks>
+    function FirstBlock: IActiveText;
     ///  <summary>Checks if the active text object contains any elements.
     ///  </summary>
     function IsEmpty: Boolean;
@@ -184,6 +196,11 @@   TActiveTextAttrNames = record
     ///  elements except for "para". This can rendered in plain text with no
     ///  loss of formatting.</remarks>
     function IsPlainText: Boolean;
+    ///  <summary>Checks if the active text object is a valid active text
+    ///  document.</summary>
+    ///  <remarks>A valid document is either empty or it is surrounded by
+    ///  matching ekDocument elements.</remarks>
+    function IsValidActiveTextDocument: Boolean;
     ///  <summary>Returns element at given index in active text object's element
     ///  list.</summary>
     function GetElem(Idx: Integer): IActiveTextElem;
@@ -283,22 +300,28 @@       TCaps = record
         var
           ///  <summary>Determines how element is to be displayed.</summary>
           DisplayStyle: TActiveTextDisplayStyle;
-          ///  <summary>Set of elements that may not occur inside the element.
-          ///  </summary>
-          Exclusions: TActiveTextActionElemKinds;
-          ///  <summary>Set of elements that are permitted as parents of the
-          ///  element.</summary>
-          ///  <remarks>An empty set is taken to mean any element is permitted.
-          ///  </remarks>
-          RequiredParents: TActiveTextActionElemKinds;
           ///  <summary>Specifies whether plain text can be contained within the
           ///  element.</summary>
           PermitsText: Boolean;
+          ///  <summary>Specifies the elements that are permitted as child
+          ///  elements of this element.
+          PermittedChildElems: TActiveTextActionElemKinds;
       end;
     const
       ///  <summary>Set of block level elements.</summary>
       BlockElems = [
-        ekPara, ekHeading, ekUnorderedList, ekOrderedList, ekListItem
+        ekPara, ekHeading, ekUnorderedList, ekOrderedList, ekListItem,
+        ekBlock, ekDocument
+      ];
+      ///  <summary>Set of block level elements that can directly contain text
+      ///  and inline elements.</summary>
+      TextContentBlocks = [
+        ekPara, ekHeading, ekBlock
+      ];
+      ///  <summary>Set of block level elements that can contain only blocks
+      ///  that are not container blocks.</summary>
+      ContainerBlocks = [
+        ekDocument, ekListItem
       ];
       ///  <summary>Set of inline elements.</summary>
       InlineElems = [
@@ -313,90 +336,94 @@       TCaps = record
             // ekLink
             //   may contain any inline elements but no block elements
             DisplayStyle: dsInline;
-            Exclusions: BlockElems;
-            RequiredParents: [];
             PermitsText: True;
+            PermittedChildElems: InlineElems - [ekLink];
           ),
           (
             // ekStrong
             //   may contain any inline elements but no block elements
             DisplayStyle: dsInline;
-            Exclusions: BlockElems;
-            RequiredParents: [];
             PermitsText: True;
+            PermittedChildElems: InlineElems;
           ),
           (
             // ekEm
             //   may contain any inline elements but no block elements
             DisplayStyle: dsInline;
-            Exclusions: BlockElems;
-            RequiredParents: [];
             PermitsText: True;
+            PermittedChildElems: InlineElems;
           ),
           (
             // ekVar
             //   may contain any inline elements but no block elements
             DisplayStyle: dsInline;
-            Exclusions: BlockElems;
-            RequiredParents: [];
             PermitsText: True;
+            PermittedChildElems: InlineElems;
           ),
           (
             // ekPara
             //   may contain any inline elements but no block elements
             DisplayStyle: dsBlock;
-            Exclusions: BlockElems;
-            RequiredParents: [];
             PermitsText: True;
+            PermittedChildElems: InlineElems;
           ),
           (
             // ekWarning
             //   may contain any inline elements but no block elements
             DisplayStyle: dsInline;
-            Exclusions: BlockElems;
-            RequiredParents: [];
             PermitsText: True;
+            PermittedChildElems: InlineElems;
           ),
           (
             // ekHeading
             //   may contain any inline elements but no block elements
             DisplayStyle: dsBlock;
-            Exclusions: BlockElems;
-            RequiredParents: [];
             PermitsText: True;
+            PermittedChildElems: InlineElems;
           ),
           (
             // ekMono
             //   may contain any inline elements but no block elements
             DisplayStyle: dsInline;
-            Exclusions: BlockElems;
-            RequiredParents: [];
             PermitsText: True;
+            PermittedChildElems: InlineElems;
           ),
           (
             // ekUnorderedList
             //   may contain only list item elements
             DisplayStyle: dsBlock;
-            Exclusions: AllElems - [ekListItem];
-            RequiredParents: [];
-            PermitsText: False
+            PermitsText: False;
+            PermittedChildElems: [ekListItem];
           ),
           (
             // ekOrderedList
             //   may contain only list item elements
             DisplayStyle: dsBlock;
-            Exclusions: AllElems - [ekListItem];
-            RequiredParents: [];
             PermitsText: False;
+            PermittedChildElems: [ekListItem];
           ),
           (
             // ekListItem
-            //   may contain any inline or block elements except another list
-            //   item
+            //   may contain only block elements, but not itself or other
+            //   block containers
+            DisplayStyle: dsBlock;
+            PermitsText: False;
+            PermittedChildElems: BlockElems - ContainerBlocks;
+          ),
+          (
+            // ekBlock
+            //   may contain any inline elements but no block elements
             DisplayStyle: dsBlock;
-            Exclusions: [ekListItem];
-            RequiredParents: [ekOrderedList, ekUnorderedList];
             PermitsText: True;
+            PermittedChildElems: InlineElems;
+          ),
+          (
+            // ekDocument
+            //   may contain only block elements, but not itself or other
+            //   block containers
+            DisplayStyle: dsBlock;
+            PermitsText: False;
+            PermittedChildElems: BlockElems - ContainerBlocks;
           )
         );
   public
@@ -406,24 +433,10 @@       TCaps = record
     ///  <summary>Checks whether the given element can contain text.</summary>
     class function CanContainText(const Elem: TActiveTextActionElemKind):
       Boolean; static;
-    ///  <summary>Checks whether the given Parent element can contain the given
-    ///  Child element.</summary>
-    class function CanContainElem(
-      const Parent, Child: TActiveTextActionElemKind): Boolean; static;
-    ///  <summary>Checks whether the given Parent element is required as a
-    ///  parent of the given Child element.</summary>
-    class function IsRequiredParent(
-      const Parent, Child: TActiveTextActionElemKind): Boolean; static;
-    ///  <summary>Checks whether the given element is permitted in the root of
-    ///  an active text document, i.e. outside any other block level element.
-    ///  </summary>
-    class function IsElemPermittedInRoot(const Elem: TActiveTextActionElemKind):
-      Boolean; static;
-    ///  <summary>Checks whether the given child element is excluded from being
-    ///  a child of the given parent element.</summary>
-    class function IsExcludedElem(
+    ///  <summary>Checks whether the given child element is permitted as a child
+    ///  of the given parent element.</summary>
+    class function IsPermittedChildElem(
       const Parent, Child: TActiveTextActionElemKind): Boolean; static;
-
   end;
 
 
@@ -434,7 +447,10 @@ implementation
   // Delphi
   SysUtils,
   // Project
-  IntfCommon;
+  IntfCommon,
+  UConsts,
+  UStrUtils,
+  UUtils;
 
 
 type
@@ -474,6 +490,17 @@   TActiveText = class(TInterfacedObject,
     ///  </summary>
     ///  <remarks>Method of IActiveText.</remarks>
     procedure Append(const ActiveText: IActiveText);
+    ///  <summary>Returns a new IActiveText instance containing just the first
+    ///  block of the current object.</summary>
+    ///  <remarks>
+    ///  <para>The first block is the content of the block level tag that starts
+    ///  the active text. If this block has child blocks (for e.g. an unordered
+    ///  list) then they are included.</para>
+    ///  <para>If the current object is empty then an empty object is returned.
+    ///  </para>
+    ///  <para>Method of IActiveText.</para>
+    ///  </remarks>
+    function FirstBlock: IActiveText;
     ///  <summary>Checks if the element list is empty.</summary>
     ///  <remarks>Method of IActiveText.</remarks>
     function IsEmpty: Boolean;
@@ -486,6 +513,14 @@   TActiveText = class(TInterfacedObject,
     ///  <para>Method of IActiveText.</para>
     ///  </remarks>
     function IsPlainText: Boolean;
+    ///  <summary>Checks if the active text object is a valid active text
+    ///  document.</summary>
+    ///  <remarks>
+    ///  <para>A valid document is either empty or it is surrounded by matching
+    ///  ekDocument elements.</para>
+    ///  <para>Method of IActiveText.</para>
+    ///  </remarks>
+    function IsValidActiveTextDocument: Boolean;
     ///  <summary>Returns element at given index in element list.</summary>
     ///  <remarks>Method of IActiveText.</remarks>
     function GetElem(Idx: Integer): IActiveTextElem;
@@ -681,15 +716,43 @@ function TActiveText.AddElem(const Elem: IActiveTextElem): Integer;
 end;
 
 procedure TActiveText.Append(const ActiveText: IActiveText);
+
+  function IsDocumentElem(Elem: IActiveTextElem): Boolean;
+  var
+    ActiveElem: IActiveTextActionElem;
+  begin
+    if not Supports(Elem, IActiveTextActionElem, ActiveElem) then
+      Exit(False);
+    Result := ActiveElem.Kind = ekDocument;
+  end;
+
 var
   Elem: IActiveTextElem;  // references each element in elems
-  NewElem: IActiveTextElem;
+  SelfCopy: IActiveText;  // temporary copy of this object
 begin
+  // *** Don't call Clone or Assign here: they call backinto this method.
+
+  // Make a copy of elements of self
+  SelfCopy := TActiveText.Create;
+  for Elem in fElems do
+    SelfCopy.AddElem((Elem as IClonable).Clone as IActiveTextElem);
+
+  // Clear own elems and add document start element
+  fElems.Clear;
+  AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsOpen));
+
+  // Copy own elements back to fElems, skipping ekDocument elems
+  for Elem in SelfCopy do
+    if not IsDocumentElem(Elem) then
+      AddElem((Elem as IClonable).Clone as IActiveTextElem);
+
+  // Copy active text to be assigned, skipping its ekDocument elems
   for Elem in ActiveText do
-  begin
-    NewElem := (Elem as IClonable).Clone as IActiveTextElem;
-    AddElem(NewElem);
-  end;
+    if not IsDocumentElem(Elem) then
+      AddElem((Elem as IClonable).Clone as IActiveTextElem);
+
+  // Add closing ekDocument Elem
+  AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsClose));
 end;
 
 procedure TActiveText.Assign(const Src: IInterface);
@@ -719,6 +782,78 @@ destructor TActiveText.Destroy;
   inherited;
 end;
 
+function TActiveText.FirstBlock: IActiveText;
+var
+  Elem: IActiveTextElem;
+  ActionElem: IActiveTextActionElem;
+  Block: IActiveTextActionElem;
+  Idx: Integer;
+  EndOfBlockFound: Boolean;
+  HasDocElems: Boolean;
+  FirstBlockIdx: Integer;
+begin
+  Result := TActiveText.Create;
+  if IsEmpty then
+    Exit;
+
+  HasDocElems := IsValidActiveTextDocument;
+  if HasDocElems then
+  begin
+    // We have ekDocument elements wrapping document: 1st true blue should be
+    // next element
+    if GetCount < 4 then
+      Exit;
+    FirstBlockIdx := 1;
+  end
+  else
+  begin
+    // No ekDocument elements: 1st true block is should be first element
+    if GetCount < 2 then
+      Exit;
+    FirstBlockIdx := 0;
+  end;
+
+  // Element at FirstBlockIdx must be a valid block opening element
+  Elem := GetElem(FirstBlockIdx);
+  GetIntf(Elem, IActiveTextElem, Block);
+  if not Assigned(Block)
+    or (TActiveTextElemCaps.DisplayStyleOf(Block.Kind) <> dsBlock)
+    or (Block.State <> fsOpen) then
+    raise EBug.Create(
+      ClassName + '.FirstBlock: block opener expected after ekDocument element'
+    );
+
+  // We have required block: add document opener element and block element
+  Result.AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsOpen));
+  Result.AddElem(Elem);
+
+  // Scan through remaining elements, copying them to output as we go. Halt when
+  // (or if) matching closing block found.
+  EndOfBlockFound := False;
+  Idx := Succ(FirstBlockIdx);
+  while Idx < Pred(GetCount) do
+  begin
+    Elem := GetElem(Idx);
+    Result.AddElem(Elem);
+    if Supports(Elem, IActiveTextActionElem, ActionElem)
+      and (ActionElem.Kind = Block.Kind)
+      and (ActionElem.State = fsClose) then
+    begin
+      EndOfBlockFound := True;
+      Break;
+    end;
+    Inc(Idx);
+  end;
+  // No closing block found
+  if not EndOfBlockFound then
+    raise EBug.Create(
+      ClassName + '.FirstBlock: Matching closer for first block not found'
+    );
+
+  // Add document close elem (closing block elem added in loop above)
+  Result.AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsClose));
+end;
+
 function TActiveText.GetCount: Integer;
 begin
   Result := fElems.Count;
@@ -747,12 +882,25 @@ function TActiveText.IsPlainText: Boolean;
   for Elem in fElems do
   begin
     if Supports(Elem, IActiveTextActionElem, ActionElem)
-      and (ActionElem.Kind <> ekPara) then
+      and not (ActionElem.Kind in [ekPara, ekDocument]) then
       Exit(False);
   end;
   Result := True;
 end;
 
+function TActiveText.IsValidActiveTextDocument: Boolean;
+var
+  DocStartElem, DocEndElem: IActiveTextActionElem;
+begin
+  if IsEmpty then
+    Exit(True);
+  Result := (GetCount >= 2)
+    and Supports(fElems[0], IActiveTextActionElem, DocStartElem)
+    and (DocStartElem.Kind = ekDocument) and (DocStartElem.State = fsOpen)
+    and Supports(fElems[Pred(GetCount)], IActiveTextActionElem, DocEndElem)
+    and (DocEndElem.Kind = ekDocument) and (DocEndElem.State = fsClose);
+end;
+
 function TActiveText.ToString: string;
 var
   Elem: IActiveTextElem;
@@ -773,7 +921,7 @@ function TActiveText.ToString: string;
         // from text at start of following block
         SB.AppendLine;
     end;
-    Result := SB.ToString;
+    Result := StrTrimRight(SB.ToString) + EOL;  // ensure single final EOL(s)
   finally
     SB.Free;
   end;
@@ -899,12 +1047,6 @@ function TActiveTextAttrs.GetEnumerator: TEnumerator<TPair<string, string>>;
 
 { TActiveTextElemCapsMap }
 
-class function TActiveTextElemCaps.CanContainElem(const Parent,
-  Child: TActiveTextActionElemKind): Boolean;
-begin
-  Result := not (Child in Map[Parent].Exclusions);
-end;
-
 class function TActiveTextElemCaps.CanContainText(
   const Elem: TActiveTextActionElemKind): Boolean;
 begin
@@ -917,24 +1059,10 @@ class function TActiveTextElemCaps.DisplayStyleOf(
   Result := Map[Elem].DisplayStyle;
 end;
 
-class function TActiveTextElemCaps.IsElemPermittedInRoot(
-  const Elem: TActiveTextActionElemKind): Boolean;
-begin
-  Result := Map[Elem].RequiredParents = [];
-end;
-
-class function TActiveTextElemCaps.IsExcludedElem(const Parent,
-  Child: TActiveTextActionElemKind): Boolean;
-begin
-  Result := Child in Map[Parent].Exclusions;
-end;
-
-class function TActiveTextElemCaps.IsRequiredParent(
+class function TActiveTextElemCaps.IsPermittedChildElem(
   const Parent, Child: TActiveTextActionElemKind): Boolean;
 begin
-  if Map[Child].RequiredParents = [] then
-    Exit(True);
-  Result := Parent in Map[Child].RequiredParents;
+  Result := Child in Map[Parent].PermittedChildElems;
 end;
 
 end.

From 66690fa86fa918d3a074a40576ff660daa12837a Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Apr 2023 02:29:39 +0100
Subject: [PATCH 105/264] Update TActiveTextValidator and private TErrorInfo

Validator was updated to check that any non-empty active text is topped
and tailed by ekDocument elements.

Rewrite TActiveTextValidator.ValidateDocumentStructure to call into
IActiveText.IsValidActiveTextDocument to do the heavy lifting.

Removed unused Element field from TErrorInfo private advanced record of
TActiveTextValidator. Modified constructor and calls to it accordingly.
---
 Src/ActiveText.UValidator.pas | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/Src/ActiveText.UValidator.pas b/Src/ActiveText.UValidator.pas
index 898fcc265..96aa2e77a 100644
--- a/Src/ActiveText.UValidator.pas
+++ b/Src/ActiveText.UValidator.pas
@@ -36,16 +36,11 @@       TErrorInfo = record
       public
         ///  <summary>Error code.</summary>
         Code: TErrorCode;
-        ///  <summary>Reference to element causing problem.</summary>
-        ///  <remarks>May be nil if error doesn't relate to an element.
-        ///  </remarks>
-        Element: IActiveTextElem;
         ///  <summary>Description of error.</summary>
         Description: string;
         ///  <summary>Constructs a record. Sets fields from parameter values.
         ///  </summary>
-        constructor Create(const ACode: TErrorCode; AElement: IActiveTextElem;
-          const ADescription: string); overload;
+        constructor Create(const ACode: TErrorCode; const ADescription: string);
       end;
   strict private
     ///  <summary>Validates given link element.</summary>
@@ -56,6 +51,14 @@       TErrorInfo = record
     ///  <returns>Boolean. True on success or False on failure.</returns>
     class function ValidateLink(LinkElem: IActiveTextActionElem;
       out ErrInfo: TErrorInfo): Boolean; static;
+    ///  <summary>Validates document structure.</summary>
+    ///  <param name="ActiveText">IActiveText [in] Active text to be validated.
+    ///  </param>
+    ///  <param name="ErrInfo">TErrorInfo [out] Contains error information if
+    ///  validation fails. Undefined if validation succeeds.</param>
+    ///  <returns>Boolean. True on success or False on failure.</returns>
+    class function ValidateDocumentStructure(ActiveText: IActiveText;
+      out ErrInfo: TErrorInfo): Boolean; static;
   public
     ///  <summary>Validates given active text.</summary>
     ///  <param name="ActiveText">IActiveText [in] Active text to be validated.
@@ -92,6 +95,9 @@ class function TActiveTextValidator.Validate(ActiveText: IActiveText;
 begin
   if ActiveText.IsEmpty then
     Exit(True);
+  // Validate document structure
+  if not ValidateDocumentStructure(ActiveText, ErrInfo) then
+    Exit(False);
   // Validate elements
   for Elem in ActiveText do
   begin
@@ -115,6 +121,16 @@ class function TActiveTextValidator.Validate(ActiveText: IActiveText): Boolean;
   Result := Validate(ActiveText, Dummy);
 end;
 
+class function TActiveTextValidator.ValidateDocumentStructure(
+  ActiveText: IActiveText; out ErrInfo: TErrorInfo): Boolean;
+resourcestring
+  sNoDocTags = 'Document must start and end with document tags';
+begin
+  Result := ActiveText.IsValidActiveTextDocument;
+  if not Result then
+    ErrInfo := TErrorInfo.Create(errBadStructure, sNoDocTags);
+end;
+
 class function TActiveTextValidator.ValidateLink(
   LinkElem: IActiveTextActionElem; out ErrInfo: TErrorInfo): Boolean;
 resourcestring
@@ -150,7 +166,7 @@   TProtocolInfo = record
         < Length(PI.Protocol) + PI.MinURLLength then
       begin
         ErrInfo := TErrorInfo.Create(
-          errBadLinkURL, LinkElem, Format(sURLLengthErr, [URL])
+          errBadLinkURL, Format(sURLLengthErr, [URL])
         );
         Exit(False);
       end;
@@ -160,17 +176,16 @@   TProtocolInfo = record
   // No supported protocol
   Result := False;
   ErrInfo := TErrorInfo.Create(
-    errBadLinkProtocol, LinkElem, Format(sURLProtocolErr, [URL])
+    errBadLinkProtocol, Format(sURLProtocolErr, [URL])
   );
 end;
 
 { TActiveTextValidator.TErrorInfo }
 
 constructor TActiveTextValidator.TErrorInfo.Create(const ACode: TErrorCode;
-  AElement: IActiveTextElem; const ADescription: string);
+  const ADescription: string);
 begin
   Code := ACode;
-  Element := AElement;
   Description := ADescription;
 end;
 

From 9b947edb67f045ed898bbde4e29a15bed5c6939c Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 6 Apr 2023 17:28:48 +0100
Subject: [PATCH 106/264] Heavily revise USnippetExtraHelper unit

1. Moved class that parses old style credits text into active text from
USnippetCreditsParser into the TSnippetExtraHelper.TCreditsParser
private class in USnippetExtraHelper.

2. Removed the now redundant USnippetCreditsParser unit from project.

3. Modify methods of TSnippetExtraHelper that create active text
documents to embed the active text between matched ekDocument elements.

4. Rewrote TSnippetExtraHelper.BuildActiveText to simply hand off the
work by calling to the TActiveTextFactory.CreateActiveText parser
overload, passing the REML parser.
---
 Src/CodeSnip.dpr              |   1 -
 Src/CodeSnip.dproj            |   1 -
 Src/USnippetCreditsParser.pas | 166 ------------------------
 Src/USnippetExtraHelper.pas   | 235 +++++++++++++++++++++-------------
 4 files changed, 143 insertions(+), 260 deletions(-)
 delete mode 100644 Src/USnippetCreditsParser.pas

diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index e12778a39..60436f1a5 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -317,7 +317,6 @@ uses
   USingleton in 'USingleton.pas',
   USnipKindListAdapter in 'USnipKindListAdapter.pas',
   USnippetAction in 'USnippetAction.pas',
-  USnippetCreditsParser in 'USnippetCreditsParser.pas',
   USnippetDoc in 'USnippetDoc.pas',
   USnippetExtraHelper in 'USnippetExtraHelper.pas',
   USnippetHTML in 'USnippetHTML.pas',
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index 14d04cbd9..af19fb220 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -519,7 +519,6 @@
 			<DCCReference Include="USingleton.pas"/>
 			<DCCReference Include="USnipKindListAdapter.pas"/>
 			<DCCReference Include="USnippetAction.pas"/>
-			<DCCReference Include="USnippetCreditsParser.pas"/>
 			<DCCReference Include="USnippetDoc.pas"/>
 			<DCCReference Include="USnippetExtraHelper.pas"/>
 			<DCCReference Include="USnippetHTML.pas"/>
diff --git a/Src/USnippetCreditsParser.pas b/Src/USnippetCreditsParser.pas
deleted file mode 100644
index 07e784073..000000000
--- a/Src/USnippetCreditsParser.pas
+++ /dev/null
@@ -1,166 +0,0 @@
-{
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at https://mozilla.org/MPL/2.0/
- *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
- *
- * Provides an implementation of IActiveTextParser that can parse the markup
- * used in Credits elements of data files and convert the markup into an active
- * text object.
-}
-
-
-unit USnippetCreditsParser;
-
-
-interface
-
-
-uses
-  // Project
-  ActiveText.UMain;
-
-
-type
-
-  ///  <summary>Class that parses markup used in Credits element read from
-  ///  snippets data files. Markup is translated into active text.</summary>
-  ///  <remarks>The Credits element may occur in main database files and v1 of
-  ///  the user database and export files.</remarks>
-  TSnippetCreditsParser = class(TInterfacedObject, IActiveTextParser)
-  strict private
-    var
-      ///  <summary>URL to be used in any link contained in markup.</summary>
-      fURL: string;
-  public
-    ///  <summary>Object constructor. Sets up object.</summary>
-    ///  <param name="URL">string [in] URL to be used in any hyperlinks defined
-    ///  by Credit markup.</param>
-    constructor Create(const URL: string);
-    ///  <summary>Parses markup and updates active text object.</summary>
-    ///  <param name="Markup">string [in] Markup containing definition of active
-    ///  text. Must be valid Credits element markup.</param>
-    ///  <param name="ActiveText">IActiveText [in] Active text object updated by
-    ///  parser.</param>
-    ///  <remarks>Implements IActiveTextParser.Parse.</remarks>
-    procedure Parse(const Markup: string; const ActiveText: IActiveText);
-  end;
-
-
-implementation
-
-
-{
-  About the "Credits" Markup
-  --------------------------
-  The markup is simple. It is just plain text with at most one group of text
-  delimited by '[' and ']' characters. The text enclosed in brackets represents
-  a hyperlink. The destination URL of the hyperlink is given by the URL
-  parameter passed to the constructor.
-
-  Examples:
-    "Some markup without a link."
-    "Some markup with a [link]."
-}
-
-
-uses
-  // Project
-  UStrUtils;
-
-
-{ TSnippetCreditsParser }
-
-constructor TSnippetCreditsParser.Create(const URL: string);
-begin
-  inherited Create;
-  fURL := URL;
-end;
-
-procedure TSnippetCreditsParser.Parse(const Markup: string;
-  const ActiveText: IActiveText);
-const
-  cOpenBracket  = '[';  // open bracket character that starts a link
-  cCloseBracket = ']';  // close bracket character that ends a link
-resourcestring
-  // Error messages
-  sUnexpectedCloser   = 'Unexpected closing bracket found';
-  sUnterminatedLink   = 'Unterminated link';
-  sEmptyLink          = 'Empty link definition';
-  sWrongBracketOrder  = 'Close bracket preceeds link open bracket';
-  sMultipleOpeners    = 'More than one open bracket is present';
-  sMultipleClosers    = 'More than one close bracket is present';
-  sNoURL              = 'No URL specified';
-var
-  OpenBracketPos: Integer;  // position of opening bracket in markup
-  CloseBracketPos: Integer; // position of closing bracket in markup
-  Prefix, Postfix: string;  // text before and after link (can be empty)
-  LinkText: string;         // link text
-begin
-  // Find open and closing brackets that delimit link text
-  OpenBracketPos := StrPos(cOpenBracket, Markup);
-  CloseBracketPos := StrPos(cCloseBracket, Markup);
-  if OpenBracketPos = 0 then
-  begin
-    // No links: plain text only
-    // check for errors
-    if CloseBracketPos > 0 then
-      raise EActiveTextParserError.Create(sUnexpectedCloser);
-    // record text element
-    ActiveText.AddElem(TActiveTextFactory.CreateTextElem(Markup));
-  end
-  else
-  begin
-    // We have a potential link
-    // check for errors
-    if CloseBracketPos = 0 then
-      raise EActiveTextParserError.Create(sUnterminatedLink);
-    if CloseBracketPos = OpenBracketPos + 1 then
-      raise EActiveTextParserError.Create(sEmptyLink);
-    if CloseBracketPos < OpenBracketPos then
-      raise EActiveTextParserError.Create(sWrongBracketOrder);
-    if StrCountDelims(cOpenBracket, Markup) > 1 then
-      raise EActiveTextParserError.Create(sMultipleOpeners);
-    if StrCountDelims(cCloseBracket, Markup) > 1 then
-      raise EActiveTextParserError.Create(sMultipleClosers);
-    // must have a URL
-    if fURL = '' then
-      raise EActiveTextParserError.Create(sNoURL);
-    // get the various components
-    LinkText := StrSlice(
-      Markup, OpenBracketPos + 1, CloseBracketPos - OpenBracketPos - 1
-    );
-    Assert(LinkText <> '',
-      ClassName + '.Parse: Link text is '' but has passed check');
-    Prefix := StrSliceLeft(Markup, OpenBracketPos - 1);
-    Postfix := StrSliceRight(Markup, Length(Markup) - CloseBracketPos);
-    // record the elements
-    if Prefix <> '' then
-      ActiveText.AddElem(TActiveTextFactory.CreateTextElem(Prefix));
-    ActiveText.AddElem(
-      TActiveTextFactory.CreateActionElem(
-        ekLink,
-        TActiveTextFactory.CreateAttrs(
-          TActiveTextAttr.Create(TActiveTextAttrNames.Link_URL, fURL)
-        ),
-        fsOpen
-      )
-    );
-    ActiveText.AddElem(TActiveTextFactory.CreateTextElem(LinkText));
-    ActiveText.AddElem(
-      TActiveTextFactory.CreateActionElem(
-        ekLink,
-        TActiveTextFactory.CreateAttrs(
-          TActiveTextAttr.Create(TActiveTextAttrNames.Link_URL, fURL)
-        ),
-        fsClose
-      )
-    );
-    if Postfix <> '' then
-      ActiveText.AddElem(TActiveTextFactory.CreateTextElem(Postfix));
-  end;
-end;
-
-end.
-
diff --git a/Src/USnippetExtraHelper.pas b/Src/USnippetExtraHelper.pas
index fafad6eea..f813d543a 100644
--- a/Src/USnippetExtraHelper.pas
+++ b/Src/USnippetExtraHelper.pas
@@ -29,11 +29,52 @@ interface
     text and vice versa.
   }
   TSnippetExtraHelper = class(TNoConstructObject)
+  strict private
+    type
+      ///  <summary>Class that parses markup used in Credits element read from
+      ///  snippets data files. Markup is translated into active text.</summary>
+      ///  <remarks>
+      ///  <para>Generated active text IS NOT embedded in an ekDocument block.
+      ///  </para>
+      ///  <para>The Credits element may occur in main database files and v1 of
+      ///  the user database and export files.</para>
+      ///  <para>Credits markup is simple. It is just plain text with at most
+      ///  one group of text delimited by '[' and ']' characters. The text
+      ///  enclosed in brackets represents a hyperlink. The destination URL of
+      ///  the hyperlink is given by the URL parameter passed to the
+      ///  constructor.</para>
+      ///  <para>Eamples:</para>
+      ///  <para><c>Some markup without a link.</c></para>
+      ///  <para><c>Some markup with a [link].</c></para>
+      ///  </remarks>
+      TCreditsParser = class(TInterfacedObject, IActiveTextParser)
+      strict private
+        var
+          ///  <summary>URL to be used in any link contained in markup.
+          ///  </summary>
+          fURL: string;
+      public
+        ///  <summary>Object constructor. Sets up object.</summary>
+        ///  <param name="URL">string [in] URL to be used in any hyperlinks
+        ///  defined by Credit markup.</param>
+        constructor Create(const URL: string);
+        ///  <summary>Parses markup and updates active text object.</summary>
+        ///  <param name="Markup">string [in] Markup containing definition of
+        ///  active text. Must be valid Credits element markup.</param>
+        ///  <param name="ActiveText">IActiveText [in] Active text object
+        ///  updated by parser.</param>
+        ///  <remarks>
+        ///  <para>NOTE: Does not wrap generated text in any block tags,
+        ///  including top level document tags.</para>
+        ///  <para>Implements IActiveTextParser.Parse.</para>
+        ///  </remarks>
+        procedure Parse(const Markup: string; const ActiveText: IActiveText);
+      end;
   public
     class function BuildActiveText(const PrefixText, CreditsMarkup,
       URL: string): IActiveText; overload;
-      {Builds an active text object containing some plain followed by active
-      text defined by markup in the "Credits" format.
+      {Builds an active text object containing some plain text followed by
+      active text defined by markup in the "Credits" format.
         @param PrefixText [in] PrefixText text. If not empty string this is
           added as plain text before any credits markup.
         @param CreditsMarkup [in] "Credits" markup. May contain a link indicated
@@ -71,7 +112,7 @@ implementation
   // Delphi
   SysUtils,
   // Project
-  UREMLDataIO, USnippetCreditsParser, UStrUtils;
+  UREMLDataIO, UStrUtils;
 
 
 { TSnippetExtraHelper }
@@ -92,6 +133,7 @@ class function TSnippetExtraHelper.BuildActiveText(const PrefixText,
 begin
   // Create new empty active text object
   Result := TActiveTextFactory.CreateActiveText;
+  Result.AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsOpen));
   if (PrefixText <> '') then
   begin
     // We have prefix text: add it to result as a paragraph containing a single
@@ -109,11 +151,12 @@ class function TSnippetExtraHelper.BuildActiveText(const PrefixText,
     Result.Append(
       TActiveTextFactory.CreateActiveText(
         StrMakeSentence(CreditsMarkup),
-        TSnippetCreditsParser.Create(URL)
+        TCreditsParser.Create(URL)
       )
     );
     Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsClose));
   end;
+  Result.AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsClose));
 end;
 
 class function TSnippetExtraHelper.BuildActiveText(
@@ -123,96 +166,10 @@ class function TSnippetExtraHelper.BuildActiveText(
     @return Required active text object. Will be an empty object if REML is
       empty string.
   }
-
-  // Check for an opening block tag
-  function IsBlockOpener(Elem: IActiveTextElem): Boolean;
-  var
-    ActionElem: IActiveTextActionElem;
-  begin
-    if not Supports(Elem, IActiveTextActionElem, ActionElem) then
-      Exit(False);
-    Result := (TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock)
-      and (ActionElem.State = fsOpen);
-  end;
-
-  // Check for a closing block tag
-  function IsBlockCloser(Elem: IActiveTextElem): Boolean;
-  var
-    ActionElem: IActiveTextActionElem;
-  begin
-    if not Supports(Elem, IActiveTextActionElem, ActionElem) then
-      Exit(False);
-    Result := (TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock)
-      and (ActionElem.State = fsClose);
-  end;
-
-  // Embed given content in a para block and append to result, unless content is
-  // empty when do nothing.
-  procedure AddNoneEmptyParaToResult(ParaContent: IActiveText);
-  begin
-    if ParaContent.IsEmpty then
-      Exit;
-    if StrTrim(ParaContent.ToString) = '' then
-      Exit;
-    Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsOpen));
-    Result.Append(ParaContent);
-    Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsClose));
-  end;
-
-var
-  ActiveText: IActiveText;              // receives active text built from REML
-  OutsideBlockActiveText: IActiveText;  // receives text outside of blocks
-  Elem: IActiveTextElem;                // each element in active text
-  Level: Integer;                       // depth of block levels
 begin
-  Result := TActiveTextFactory.CreateActiveText;
-  if REML = '' then
-    Exit;
   // Create active text by parsing REML
-  ActiveText := TActiveTextFactory.CreateActiveText(REML, TREMLReader.Create);
-  if ActiveText.IsEmpty then
-    Exit;
-  // Init block level & obj used to accumulate text outside blocks
-  Level := 0;
-  OutsideBlockActiveText := TActiveTextFactory.CreateActiveText;
-  for Elem in ActiveText do
-  begin
-    if IsBlockOpener(Elem) then
-    begin
-      // We have block opener tag. Check for any text that preceeded a level
-      // zero block and wrap it in a paragraph before writing the block opener
-      if Level = 0 then
-      begin
-        if not OutsideBlockActiveText.IsEmpty then
-        begin
-          AddNoneEmptyParaToResult(OutsideBlockActiveText);
-          OutsideBlockActiveText := TActiveTextFactory.CreateActiveText;
-        end;
-      end;
-      Result.AddElem(Elem);
-      Inc(Level); // drop down one level
-    end
-    else if IsBlockCloser(Elem) then
-    begin
-      // Block closer
-      Dec(Level);
-      Result.AddElem(Elem); // climb up one level
-    end
-    else
-    begin
-      // Not block opener or closer
-      // If we're outside any block, append elem to store of elems not included
-      // in blocks. If we're in a block, just add the elem to output
-      if Level = 0 then
-        OutsideBlockActiveText.AddElem(Elem)
-      else
-        Result.AddElem(Elem);
-    end;
-  end;
-  Assert(Level = 0, ClassName + '.BuildActiveText: Unbalanced blocks');
-  // Write any outstanding elems that occured outside a block
-  if not OutsideBlockActiveText.IsEmpty then
-    AddNoneEmptyParaToResult(OutsideBlockActiveText);
+  // .. the REML parser returns correct document or empty object if REML=''
+  Result := TActiveTextFactory.CreateActiveText(REML, TREMLReader.Create);
 end;
 
 class function TSnippetExtraHelper.BuildREMLMarkup(
@@ -232,11 +189,105 @@ class function TSnippetExtraHelper.PlainTextToActiveText(
   Text := StrTrim(Text);
   if Text = '' then
     Exit;
+  Result.AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsOpen));
   Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsOpen));
   Result.AddElem(
     TActiveTextFactory.CreateTextElem(Text)
   );
   Result.AddElem(TActiveTextFactory.CreateActionElem(ekPara, fsClose));
+  Result.AddElem(TActiveTextFactory.CreateActionElem(ekDocument, fsClose));
+end;
+
+{ TSnippetExtraHelper.TCreditsParser }
+
+constructor TSnippetExtraHelper.TCreditsParser.Create(const URL: string);
+begin
+  inherited Create;
+  fURL := URL;
+end;
+
+procedure TSnippetExtraHelper.TCreditsParser.Parse(const Markup: string;
+  const ActiveText: IActiveText);
+const
+  cOpenBracket  = '[';  // open bracket character that starts a link
+  cCloseBracket = ']';  // close bracket character that ends a link
+resourcestring
+  // Error messages
+  sUnexpectedCloser   = 'Unexpected closing bracket found';
+  sUnterminatedLink   = 'Unterminated link';
+  sEmptyLink          = 'Empty link definition';
+  sWrongBracketOrder  = 'Close bracket preceeds link open bracket';
+  sMultipleOpeners    = 'More than one open bracket is present';
+  sMultipleClosers    = 'More than one close bracket is present';
+  sNoURL              = 'No URL specified';
+var
+  OpenBracketPos: Integer;  // position of opening bracket in markup
+  CloseBracketPos: Integer; // position of closing bracket in markup
+  Prefix, Postfix: string;  // text before and after link (can be empty)
+  LinkText: string;         // link text
+begin
+  // Find open and closing brackets that delimit link text
+  OpenBracketPos := StrPos(cOpenBracket, Markup);
+  CloseBracketPos := StrPos(cCloseBracket, Markup);
+  if OpenBracketPos = 0 then
+  begin
+    // No links: plain text only
+    // check for errors
+    if CloseBracketPos > 0 then
+      raise EActiveTextParserError.Create(sUnexpectedCloser);
+    // record text element
+    ActiveText.AddElem(TActiveTextFactory.CreateTextElem(Markup));
+  end
+  else
+  begin
+    // We have a potential link
+    // check for errors
+    if CloseBracketPos = 0 then
+      raise EActiveTextParserError.Create(sUnterminatedLink);
+    if CloseBracketPos = OpenBracketPos + 1 then
+      raise EActiveTextParserError.Create(sEmptyLink);
+    if CloseBracketPos < OpenBracketPos then
+      raise EActiveTextParserError.Create(sWrongBracketOrder);
+    if StrCountDelims(cOpenBracket, Markup) > 1 then
+      raise EActiveTextParserError.Create(sMultipleOpeners);
+    if StrCountDelims(cCloseBracket, Markup) > 1 then
+      raise EActiveTextParserError.Create(sMultipleClosers);
+    // must have a URL
+    if fURL = '' then
+      raise EActiveTextParserError.Create(sNoURL);
+    // get the various components
+    LinkText := StrSlice(
+      Markup, OpenBracketPos + 1, CloseBracketPos - OpenBracketPos - 1
+    );
+    Assert(LinkText <> '',
+      ClassName + '.Parse: Link text is '' but has passed check');
+    Prefix := StrSliceLeft(Markup, OpenBracketPos - 1);
+    Postfix := StrSliceRight(Markup, Length(Markup) - CloseBracketPos);
+    // record the elements
+    if Prefix <> '' then
+      ActiveText.AddElem(TActiveTextFactory.CreateTextElem(Prefix));
+    ActiveText.AddElem(
+      TActiveTextFactory.CreateActionElem(
+        ekLink,
+        TActiveTextFactory.CreateAttrs(
+          TActiveTextAttr.Create(TActiveTextAttrNames.Link_URL, fURL)
+        ),
+        fsOpen
+      )
+    );
+    ActiveText.AddElem(TActiveTextFactory.CreateTextElem(LinkText));
+    ActiveText.AddElem(
+      TActiveTextFactory.CreateActionElem(
+        ekLink,
+        TActiveTextFactory.CreateAttrs(
+          TActiveTextAttr.Create(TActiveTextAttrNames.Link_URL, fURL)
+        ),
+        fsClose
+      )
+    );
+    if Postfix <> '' then
+      ActiveText.AddElem(TActiveTextFactory.CreateTextElem(Postfix));
+  end;
 end;
 
 end.

From bbaca9d24497bc07e9e6d1a5bab67f4e984d0ce5 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 7 Apr 2023 00:03:31 +0100
Subject: [PATCH 107/264] Fix bugs in rendering of source code comments

Revised TActiveTextTextRenderer and made more customisable.

Heavily revised code used in TSourceComments to generate source code
comments from snippet description active text. Also increased indent
size.

Update UTextSnippetDoc re change in TActiveTextTextRenderer & increased
indent size.
---
 Src/ActiveText.UTextRenderer.pas | 85 ++++++++++++++------------------
 Src/USourceGen.pas               | 54 ++++++++++++--------
 Src/UTextSnippetDoc.pas          |  5 +-
 3 files changed, 75 insertions(+), 69 deletions(-)

diff --git a/Src/ActiveText.UTextRenderer.pas b/Src/ActiveText.UTextRenderer.pas
index c060188e6..78c90800f 100644
--- a/Src/ActiveText.UTextRenderer.pas
+++ b/Src/ActiveText.UTextRenderer.pas
@@ -21,23 +21,21 @@ interface
 
 type
   TActiveTextTextRenderer = class(TObject)
-  public
+  strict private
     const
       ///  <summary>Special space character used to indicate the start of a list
       ///  item.</summary>
       ///  <remarks>This special character is a necessary kludge because some
-      ///  c odethat renders active text as formatted plain text strips away
+      ///  code that renders active text as formatted plain text strips away
       ///  leading #32 characters as part of the formatting process. Therefore
       ///  indentation in list items is lost if #32 characters are used for it.
-      ///  NBSP was chosen since it should render the same as a space if calling
-      ///  code doesn't convert it.</remarks>
+      ///  NBSP was chosen since it should render the same as a space if not
+      ///  removed.</remarks>
       LISpacer = NBSP;  // Do not localise. Must be <> #32
       ///  <summary>Bullet character used when rendering unordered list items.
       ///  </summary>
       Bullet = '*';     // Do not localise. Must be <> #32 and <> LISpacer
-  strict private
-    const
-      IndentDelta = 2;
+      DefaultIndentDelta = 2;
     type
       TListKind = (lkNumber, lkBullet);
       TListState = record
@@ -60,6 +58,7 @@       TLIState = record
       fIndent: UInt16;
       fInPara: Boolean;
       fInListItem: Boolean;
+      fIndentDelta: UInt8;
     function CanEmitInline: Boolean;
     procedure AppendToPara(const AText: string);
     procedure InitialiseRender;
@@ -75,9 +74,10 @@       TLIState = record
     destructor Destroy; override;
     property DisplayURLs: Boolean read fDisplayURLs write fDisplayURLs
       default False;
-    function RenderWrapped(ActiveText: IActiveText; const PageWidth, LMargin,
-      ParaOffset: Cardinal; const Prefix: string = '';
-      const Suffix: string  = ''): string;
+    property IndentDelta: UInt8 read fIndentDelta write fIndentDelta
+      default DefaultIndentDelta;
+    function RenderWrapped(ActiveText: IActiveText; const PageWidth,
+      LMargin: Cardinal): string;
   end;
 
 
@@ -122,6 +122,7 @@ constructor TActiveTextTextRenderer.Create;
   fIndent := 0;
   fInPara := False;
   fInListItem := False;
+  fIndentDelta := DefaultIndentDelta;
 end;
 
 destructor TActiveTextTextRenderer.Destroy;
@@ -200,6 +201,21 @@ function TActiveTextTextRenderer.Render(ActiveText: IActiveText): string;
 
 procedure TActiveTextTextRenderer.RenderBlockActionElem(
   Elem: IActiveTextActionElem);
+
+  procedure OpenListContainer(const ListKind: TListKind);
+  begin
+    if (fListStack.Count > 0) and (fInPara) then
+      OutputParagraph;
+    fListStack.Push(TListState.Create(ListKind));
+    Inc(fIndent, IndentDelta);
+  end;
+
+  procedure AddListMarker(const Marker: string);
+  begin
+    fParaBuilder.Append(Marker);
+    fParaBuilder.Append(StringOfChar(NBSP, IndentDelta - Length(Marker)));
+  end;
+
 var
   ListState: TListState;
 begin
@@ -208,22 +224,12 @@ procedure TActiveTextTextRenderer.RenderBlockActionElem(
     begin
       fBlocksStack.Push(Elem.Kind);
       case Elem.Kind of
-        ekPara: {Do nothing} ;
-        ekHeading: {Do nothing} ;
+        ekPara, ekHeading, ekBlock:
+          {Do nothing} ;
         ekUnorderedList:
-        begin
-          if (fListStack.Count > 0) and (fInPara) then
-            OutputParagraph;
-          fListStack.Push(TListState.Create(lkBullet));
-          Inc(fIndent, IndentDelta);
-        end;
+          OpenListContainer(lkBullet);
         ekOrderedList:
-        begin
-          if (fListStack.Count > 0) and (fInPara) then
-            OutputParagraph;
-          fListStack.Push(TListState.Create(lkNumber));
-          Inc(fIndent, IndentDelta);
-       end;
+          OpenListContainer(lkNumber);
         ekListItem:
         begin
           // Update list number of current list
@@ -235,16 +241,9 @@ procedure TActiveTextTextRenderer.RenderBlockActionElem(
           // Act depending on current list kind
           case fListStack.Peek.ListKind of
             lkNumber:
-            begin
-              // Number list: start a new numbered item, with current number
-              fParaBuilder.Append(IntToStr(fListStack.Peek.ListNumber));
-              fParaBuilder.Append(NBSP);
-            end;
+              AddListMarker(IntToStr(fListStack.Peek.ListNumber));
             lkBullet:
-            begin
-              // Bullet list: start a new bullet point
-              fParaBuilder.Append(Bullet + NBSP);
-            end;
+              AddListMarker(Bullet);
           end;
         end;
       end;
@@ -252,17 +251,9 @@ procedure TActiveTextTextRenderer.RenderBlockActionElem(
     fsClose:
     begin
       case Elem.Kind of
-        ekPara:
+        ekPara, ekHeading, ekBlock:
           OutputParagraph;
-        ekHeading:
-          OutputParagraph;
-        ekUnorderedList:
-        begin
-          OutputParagraph;
-          fListStack.Pop;
-          Dec(fIndent, IndentDelta);
-        end;
-        ekOrderedList:
+        ekUnorderedList, ekOrderedList:
         begin
           OutputParagraph;
           fListStack.Pop;
@@ -315,7 +306,7 @@ procedure TActiveTextTextRenderer.RenderURL(Elem: IActiveTextActionElem);
 end;
 
 function TActiveTextTextRenderer.RenderWrapped(ActiveText: IActiveText;
-  const PageWidth, LMargin, ParaOffset: Cardinal; const Prefix, Suffix: string):
+  const PageWidth, LMargin: Cardinal):
   string;
 var
   Paras: IStringList;
@@ -367,13 +358,13 @@ function TActiveTextTextRenderer.RenderWrapped(ActiveText: IActiveText;
 
 begin
   Result := '';
-  Paras := TIStringList.Create(Prefix + Render(ActiveText) + Suffix, EOL, True);
+  Paras := TIStringList.Create(Render(ActiveText), EOL, True);
   for Para in Paras do
   begin
     if IsListItem then
     begin
-      Offset := -ParaOffset;
-      ParaIndent := CalcParaIndent + LMargin + ParaOffset;
+      Offset := -IndentDelta;
+      ParaIndent := CalcParaIndent + LMargin + IndentDelta;
     end
     else
     begin
diff --git a/Src/USourceGen.pas b/Src/USourceGen.pas
index 3d10b57ef..ccf94698a 100644
--- a/Src/USourceGen.pas
+++ b/Src/USourceGen.pas
@@ -41,7 +41,7 @@   TSourceComments = class(TNoConstructObject)
     ///  maximum width indented by the given number of spaces on the left,
     ///  optionally truncated to the first paragraph.</summary>
     class function FormatActiveTextCommentInner(ActiveText: IActiveText;
-      const Indent: Cardinal; const Truncate: Boolean): string;
+      const LineWidth: Cardinal; const Truncate: Boolean): string;
   public
 
     ///  <summary>Returns a description of the given comment style.</summary>
@@ -60,7 +60,7 @@   TSourceComments = class(TNoConstructObject)
     ///  <returns>string.Formatted comment or empty string if Style = csNone.
     ///  </returns>
     class function FormatSnippetComment(const Style: TCommentStyle;
-      const TruncateComments: Boolean; const Text: IActiveText): string;
+      const TruncateComments: Boolean; Text: IActiveText): string;
 
     ///  <summary>Formats document's header text as a Pascal comment.</summary>
     ///  <param name="Comments">IStringList [in] List of paragraphs of header
@@ -259,9 +259,11 @@ implementation
 const
   ///  <summary>Maximum number of characters on a source code line.</summary>
   cLineWidth = 80;
-const
   ///  <summary>Size of indenting used for source code, in characters.</summary>
   cIndent = 2;
+  ///  <summary>Size of indenting used for rendering comments from active text.
+  ///  </summary>
+  cCommentIndent = 4;
 
 
 type
@@ -1137,11 +1139,13 @@ class function TSourceComments.CommentStyleDesc(
 end;
 
 class function TSourceComments.FormatActiveTextCommentInner(
-  ActiveText: IActiveText; const Indent: Cardinal; const Truncate: Boolean):
-  string;
+  ActiveText: IActiveText; const LineWidth: Cardinal;
+  const Truncate: Boolean): string;
 var
   Renderer: TActiveTextTextRenderer;
   ProcessedActiveText: IActiveText;
+  Lines: IStringList;
+  Line: string;
 begin
   if Truncate then
     ProcessedActiveText := ActiveText.FirstBlock
@@ -1150,9 +1154,17 @@ class function TSourceComments.FormatActiveTextCommentInner(
   Renderer := TActiveTextTextRenderer.Create;
   try
     Renderer.DisplayURLs := False;
-    Result := Renderer.RenderWrapped(
-      ProcessedActiveText, cLineWidth, Indent, Indent
+    Renderer.IndentDelta := cCommentIndent;
+    Result := '';
+    Lines := TIStringList.Create(
+      Renderer.RenderWrapped(ProcessedActiveText, LineWidth, 0),
+      EOL,
+      True,
+      False
     );
+    for Line in Lines do
+      Result := Result + StringOfChar(' ', cLineWidth - LineWidth) + Line + EOL;
+    Result := StrTrimRight(Result);
   finally
     Renderer.Free;
   end;
@@ -1189,25 +1201,27 @@ class function TSourceComments.FormatHeaderComments(
 end;
 
 class function TSourceComments.FormatSnippetComment(const Style: TCommentStyle;
-  const TruncateComments: Boolean; const Text: IActiveText): string;
+  const TruncateComments: Boolean; Text: IActiveText): string;
 begin
   case Style of
     csNone:
       Result := '';
     csBefore:
-      Result := '{'
-        + EOL
-        + FormatActiveTextCommentInner(Text, cIndent, TruncateComments)
-        + EOL
-        + '}';
+    begin
+      Result := '{' + EOL
+        + FormatActiveTextCommentInner(
+            Text, cLineWidth - cIndent, TruncateComments
+          )
+        + EOL + '}';
+    end;
     csAfter:
-      Result := StrOfChar(TActiveTextTextRenderer.LISpacer, cIndent)
-        + '{'
-        + EOL
-        + FormatActiveTextCommentInner(Text, 2 * cIndent, TruncateComments)
-        + EOL
-        + StrOfChar(TActiveTextTextRenderer.LISpacer, cIndent)
-        + '}';
+    begin
+      Result := StrOfChar(' ', cIndent) + '{' + EOL
+        + FormatActiveTextCommentInner(
+            Text, cLineWidth - 2 * cIndent, TruncateComments
+          )
+        + EOL + StringOfChar(' ', cIndent) + '}';
+    end;
   end;
 end;
 
diff --git a/Src/UTextSnippetDoc.pas b/Src/UTextSnippetDoc.pas
index 87e72c4dd..d046c38c0 100644
--- a/Src/UTextSnippetDoc.pas
+++ b/Src/UTextSnippetDoc.pas
@@ -36,7 +36,7 @@   TTextSnippetDoc = class(TSnippetDoc)
       cPageWidth = 80;
       ///  <summary>Size of a single level of indentation in characters.
       ///  </summary>
-      cIndent = 2;
+      cIndent = 4;
   strict private
     ///  <summary>Renders given active text as word-wrapped paragraphs of width
     ///  cPageWidth.</summary>
@@ -111,8 +111,9 @@ procedure TTextSnippetDoc.RenderActiveText(ActiveText: IActiveText);
   Renderer := TActiveTextTextRenderer.Create;
   try
     Renderer.DisplayURLs := True;
+    Renderer.IndentDelta := cIndent;
     fWriter.WriteLine(
-      Renderer.RenderWrapped(ActiveText, cPageWidth, 0, cIndent)
+      Renderer.RenderWrapped(ActiveText, cPageWidth, 0)
     );
   finally
     Renderer.Free;

From 2d3be989b2c2301eb1c37f7a5f02d1c4e2168280 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 7 Apr 2023 23:10:00 +0100
Subject: [PATCH 108/264] Support rendering lists in snippet RTF reports

Update URTFUtils to support 3 more RTF controls for controlling first
line offset, left indent and tabstops.

Add support to TRTFStyles for recording indentation and calculating the
identation required at a given identation depth.

Add new methods to TRTFBuilder to set indents and tab stops. (Also did
minor refactoring of SetParaSpacing method.)

Major rewrite of TActiveTextRTF to support lists. Added support for
rendering active text bullet and numbered lists in RTF. Also added
support for new ekBlock active text element.

Add styles for lists in TRTFSnippetDoc and adjusted some other styles to
suit. Also evised spacing between description and source code & added
"Source Code" heading. Updated and added some constants.
---
 Src/ActiveText.URTFRenderer.pas | 220 ++++++++++++++++++++++++++++++--
 Src/URTFBuilder.pas             |  31 ++++-
 Src/URTFSnippetDoc.pas          | 123 +++++++++++++-----
 Src/URTFStyles.pas              |  36 +++++-
 Src/URTFUtils.pas               |  10 +-
 5 files changed, 360 insertions(+), 60 deletions(-)

diff --git a/Src/ActiveText.URTFRenderer.pas b/Src/ActiveText.URTFRenderer.pas
index dc0267b79..44564d3b8 100644
--- a/Src/ActiveText.URTFRenderer.pas
+++ b/Src/ActiveText.URTFRenderer.pas
@@ -45,11 +45,34 @@   TActiveTextRTFStyleMap = class(TObject)
 type
   TActiveTextRTF = class(TObject)
   strict private
+    const
+      // Difference between indent levels in twips
+      IndentDelta = 360;
+      // RTF Bullet character
+      Bullet = #$2022;
+    type
+      TListKind = (lkNumber, lkBullet);
+      TListState = record
+      public
+        ListNumber: Cardinal;
+        ListKind: TListKind;
+        constructor Create(AListKind: TListKind);
+      end;
+      TLIState = record
+        IsFirstPara: Boolean;
+        Prefix: string;
+        constructor Create(AIsFirstPara: Boolean; const APrefix: string);
+      end;
     var
       fElemStyleMap: TActiveTextRTFStyleMap;
       fDisplayURLs: Boolean;
       fURLStyle: TRTFStyle;
-      fInBlock: Boolean;
+      fBlockStack: TStack<TActiveTextActionElemKind>;
+      fListStack: TStack<TListState>;
+      fIndentStack: TStack<SmallInt>;
+      fLIStack: TStack<TLIState>;
+      fIndentLevel: Byte;  // logical indent level
+      fInPara: Boolean;
     procedure SetElemStyleMap(const ElemStyleMap: TActiveTextRTFStyleMap);
     procedure Initialise(const Builder: TRTFBuilder);
     procedure RenderTextElem(Elem: IActiveTextTextElem;
@@ -60,6 +83,7 @@   TActiveTextRTF = class(TObject)
       const Builder: TRTFBuilder);
     procedure RenderURL(Elem: IActiveTextActionElem;
       const Builder: TRTFBuilder);
+    function CanEmitInline: Boolean;
   public
     constructor Create;
     destructor Destroy; override;
@@ -76,8 +100,10 @@ implementation
 
 
 uses
+  // Delphi
+  SysUtils, Generics.Defaults,
   // Project
-  SysUtils, Generics.Defaults;
+  UConsts, UStrUtils;
 
 
 { TActiveTextRTFStyleMap }
@@ -155,15 +181,32 @@ procedure TActiveTextRTFStyleMap.MakeMonochrome;
 
 { TActiveTextRTF }
 
+function TActiveTextRTF.CanEmitInline: Boolean;
+begin
+  if fBlockStack.Count <= 0 then
+    Exit(False);
+  Result := TActiveTextElemCaps.CanContainText(fBlockStack.Peek);
+end;
+
 constructor TActiveTextRTF.Create;
 begin
   inherited Create;
   fElemStyleMap := TActiveTextRTFStyleMap.Create;
   fURLStyle := TRTFStyle.CreateNull;
+  fBlockStack := TStack<TActiveTextActionElemKind>.Create;
+  fListStack := TStack<TListState>.Create;
+  fIndentStack := TStack<SmallInt>.Create;
+  fLIStack := TStack<TLIState>.Create;
+  fIndentLevel := 0;
+  fInPara := False;
 end;
 
 destructor TActiveTextRTF.Destroy;
 begin
+  fLIStack.Free;
+  fIndentStack.Free;
+  fListStack.Free;
+  fBlockStack.Free;
   fElemStyleMap.Free;
   inherited;
 end;
@@ -189,7 +232,6 @@ procedure TActiveTextRTF.Render(ActiveText: IActiveText;
   ActionElem: IActiveTextActionElem;
 begin
   Initialise(RTFBuilder);
-  fInBlock := False;
   for Elem in ActiveText do
   begin
     if Supports(Elem, IActiveTextTextElem, TextElem) then
@@ -206,19 +248,146 @@ procedure TActiveTextRTF.Render(ActiveText: IActiveText;
 
 procedure TActiveTextRTF.RenderBlockActionElem(Elem: IActiveTextActionElem;
   const Builder: TRTFBuilder);
+
+  procedure OpenListContainer(const ListKind: TListKind);
+  begin
+    fListStack.Push(TListState.Create(ListKind));
+    Inc(fIndentLevel);
+    Builder.BeginGroup;
+  end;
+
+  function IndentTwips: SmallInt;
+  begin
+    Result := fElemStyleMap[ekListItem].IndentLevelToTwips(fIndentLevel)
+  end;
+
+var
+  ListState: TListState;
+  LIState: TLIState;
+  Style: TRTFStyle;
 begin
   case Elem.State of
     fsOpen:
     begin
-      fInBlock := True;
-      Builder.BeginGroup;
-      Builder.ApplyStyle(fElemStyleMap[Elem.Kind]);
+      fInPara := False;
+      fBlockStack.Push(Elem.Kind);
+      case Elem.Kind of
+        ekPara, ekHeading, ekBlock:
+        begin
+          Builder.BeginGroup;
+          Style := fElemStyleMap[Elem.Kind];
+          if fLIStack.Count > 0 then
+          begin
+            Builder.SetTabStops([IndentTwips]);
+            if fLIStack.Peek.IsFirstPara then
+            begin
+              Builder.SetIndents(
+                IndentTwips, -fElemStyleMap[ekListItem].IndentDelta
+              );
+              if (fListStack.Count > 0) then
+              begin
+                if fListStack.Peek.ListNumber = 1 then
+                begin
+                  Style.Capabilities := Style.Capabilities + [scParaSpacing];
+                  if fListStack.Peek.ListKind = lkNumber then
+                    Style.ParaSpacing := TRTFParaSpacing.Create(
+                      fElemStyleMap[ekOrderedList].ParaSpacing.Before, 0.0
+                    )
+                  else
+                    Style.ParaSpacing := TRTFParaSpacing.Create(
+                      fElemStyleMap[ekUnorderedList].ParaSpacing.Before, 0.0
+                    )
+                end
+                else if fListStack.Peek.ListNumber > 1 then
+                begin
+                  if Elem.Kind = ekHeading then
+                  begin
+                    Style.Capabilities := Style.Capabilities + [scParaSpacing];
+                    Style.ParaSpacing := fElemStyleMap[ekPara].ParaSpacing;
+                  end;
+                end;
+              end;
+              Builder.ApplyStyle(Style);
+              Builder.AddText(fLIStack.Peek.Prefix);
+              Builder.AddText(TAB);
+              fInPara := True;
+            end
+            else
+            begin
+              Builder.ApplyStyle(Style);
+              Builder.SetIndents(IndentTwips, 0);
+            end;
+          end
+          else
+          begin
+            Builder.ApplyStyle(Style);
+            Builder.SetIndents(IndentTwips, 0);
+          end;
+        end;
+        ekUnorderedList:
+          OpenListContainer(lkBullet);
+        ekOrderedList:
+          OpenListContainer(lkNumber);
+        ekListItem:
+        begin
+          // Update list number of current list
+          ListState := fListStack.Pop;
+          Inc(ListState.ListNumber, 1);
+          fListStack.Push(ListState);
+          Builder.BeginGroup;
+          Builder.ApplyStyle(fElemStyleMap[Elem.Kind]);
+          case fListStack.Peek.ListKind of
+            lkNumber:
+            begin
+              fLIStack.Push(
+                TLIState.Create(
+                  True, IntToStr(fListStack.Peek.ListNumber) + '.'
+                )
+              );
+            end;
+            lkBullet:
+            begin
+              fLIStack.Push(TLIState.Create(True, Bullet));
+            end;
+          end;
+          Builder.ClearParaFormatting;
+        end;
+      end;
     end;
     fsClose:
     begin
-      Builder.EndPara;
-      Builder.EndGroup;
-      fInBlock := False;
+      case Elem.Kind of
+        ekPara, ekHeading, ekBlock:
+        begin
+          if (fLIStack.Count > 0) and (fLIStack.Peek.IsFirstPara) then
+          begin
+            // Update item at top of LI stack to record not first para
+            LIState := fLIStack.Pop;
+            LIState.IsFirstPara := False;
+            fLIStack.Push(LIState);
+          end;
+          if fInPara then
+            Builder.EndPara;
+          Builder.EndGroup;
+        end;
+        ekUnorderedList, ekOrderedList:
+        begin
+          if fInPara then
+            Builder.EndPara;
+          Builder.EndGroup;
+          fListStack.Pop;
+          Dec(fIndentLevel);
+        end;
+        ekListItem:
+        begin
+          if fInPara then
+            Builder.EndPara;
+          Builder.EndGroup;
+          fLIStack.Pop;
+        end;
+      end;
+      fBlockStack.Pop;
+      fInPara := False;
     end;
   end;
 end;
@@ -226,7 +395,7 @@ procedure TActiveTextRTF.RenderBlockActionElem(Elem: IActiveTextActionElem;
 procedure TActiveTextRTF.RenderInlineActionElem(Elem: IActiveTextActionElem;
   const Builder: TRTFBuilder);
 begin
-  if not fInBlock then
+  if not CanEmitInline then
     Exit;
   case Elem.State of
     fsOpen:
@@ -245,10 +414,20 @@ procedure TActiveTextRTF.RenderInlineActionElem(Elem: IActiveTextActionElem;
 
 procedure TActiveTextRTF.RenderTextElem(Elem: IActiveTextTextElem;
   const Builder: TRTFBuilder);
+var
+  TheText: string;
 begin
-  if not fInBlock then
+  if not CanEmitInline then
     Exit;
-  Builder.AddText(Elem.Text);
+  TheText := Elem.Text;
+  // no white space emitted after block start until 1st non-white space
+  // character encountered
+  if not fInPara then
+    TheText := StrTrimLeft(Elem.Text);
+  if TheText = '' then
+    Exit;
+  Builder.AddText(TheText);
+  fInPara := True;
 end;
 
 procedure TActiveTextRTF.RenderURL(Elem: IActiveTextActionElem;
@@ -271,5 +450,22 @@ procedure TActiveTextRTF.SetElemStyleMap(
   fElemStyleMap.Assign(ElemStyleMap);
 end;
 
+{ TActiveTextRTF.TListState }
+
+constructor TActiveTextRTF.TListState.Create(AListKind: TListKind);
+begin
+  ListNumber := 0;
+  ListKind := AListKind;
+end;
+
+{ TActiveTextRTF.TLIState }
+
+constructor TActiveTextRTF.TLIState.Create(AIsFirstPara: Boolean;
+  const APrefix: string);
+begin
+  IsFirstPara := AIsFirstPara;
+  Prefix := APrefix;
+end;
+
 end.
 
diff --git a/Src/URTFBuilder.pas b/Src/URTFBuilder.pas
index f25efaf82..64e8cf664 100644
--- a/Src/URTFBuilder.pas
+++ b/Src/URTFBuilder.pas
@@ -179,6 +179,12 @@   TRTFBuilder = class(TObject)
     ///  <summary>Sets before and after spacing, in points, to be used for
     ///  subsequent paragraphs.</summary>
     procedure SetParaSpacing(const Spacing: TRTFParaSpacing);
+    ///  <summary>Sets left and first line indents, in twips to be used for
+    ///  subsequent paragraphs.</summary>
+    procedure SetIndents(const LeftIndent, FirstLineOffset: SmallInt);
+    ///  <summary>Sets tab stops, in twips, to be used for subsequent
+    ///  paragraphs.</summary>
+    procedure SetTabStops(const TabStops: array of SmallInt);
     ///  <summary>Sets paragraph and character styling for subsequent text
     ///  according to given RTF style.</summary>
     procedure ApplyStyle(const Style: TRTFStyle);
@@ -354,11 +360,30 @@ procedure TRTFBuilder.SetFontStyle(const Style: TFontStyles);
     AddControl(RTFControl(rcUnderline));
 end;
 
+procedure TRTFBuilder.SetIndents(const LeftIndent, FirstLineOffset: SmallInt);
+begin
+  AddControl(RTFControl(rcLeftIndent, LeftIndent));
+  AddControl(RTFControl(rcFirstLineOffset, FirstLineOffset));
+end;
+
 procedure TRTFBuilder.SetParaSpacing(const Spacing: TRTFParaSpacing);
+const
+  TwipsPerPoint = 20; // Note: 20 Twips in a point
+begin
+  AddControl(
+    RTFControl(rcSpaceBefore, FloatToInt(TwipsPerPoint * Spacing.Before))
+  );
+  AddControl(
+    RTFControl(rcSpaceAfter, FloatToInt(TwipsPerPoint * Spacing.After))
+  );
+end;
+
+procedure TRTFBuilder.SetTabStops(const TabStops: array of SmallInt);
+var
+  Tab: SmallInt;
 begin
-  // Note: 20 Twips in a point
-  AddControl(RTFControl(rcSpaceBefore, FloatToInt(20 * Spacing.Before)));
-  AddControl(RTFControl(rcSpaceAfter, FloatToInt(20 * Spacing.After)));
+  for Tab in TabStops do
+    AddControl(RTFControl(rcTabStop, Tab));
 end;
 
 { TRTFFontTable }
diff --git a/Src/URTFSnippetDoc.pas b/Src/URTFSnippetDoc.pas
index 375b10213..d947e4c01 100644
--- a/Src/URTFSnippetDoc.pas
+++ b/Src/URTFSnippetDoc.pas
@@ -39,8 +39,11 @@   TRTFSnippetDoc = class(TSnippetDoc)
       fBuilder: TRTFBuilder;
       ///  <summary>Flag indicates whether to output in colour.</summary>
       fUseColour: Boolean;
-
+      ///  <summary>Styles to apply to snippet description active text.
+      ///  </summary>
       fDescStyles: TActiveTextRTFStyleMap;
+      ///  <summary>Styles to apply to snippet extra information active text.
+      ///  </summary>
       fExtraStyles: TActiveTextRTFStyleMap;
       ///  <summary>Styling applied to URLs.</summary>
       fURLStyle: TRTFStyle;
@@ -49,14 +52,24 @@   TRTFSnippetDoc = class(TSnippetDoc)
       MainFontName = 'Tahoma';
       ///  <summary>Name of mono font.</summary>
       MonoFontName = 'Courier New';
-      ///  <summary>Size of heading font.</summary>
-      HeadingFontSize = 16;
-      ///  <summary>Size of paragraph font.</summary>
+      ///  <summary>Size of font used for database information in points.
+      ///  </summary>
+      DBInfoFontSize = 9; // points
+      ///  <summary>Size of heading font in points.</summary>
+      HeadingFontSize = 16; // points
+      ///  <summary>Size of sub-heading font in points.</summary>
+      ///  <remarks>Used in descripton and extra active text.</remarks>
+      SubHeadingFontSize = 12;
+      ///  <summary>Size of paragraph font in points.</summary>
       ParaFontSize = 10;
       ///  <summary>Paragraph spacing in points.</summary>
-      ParaSpacing = 12.0;
-      ///  <summary>Size of font used for database information.</summary>
-      DBInfoFontSize = 9;
+      ParaSpacing = 6.0;
+      ///  <summary>Spacing for non-paragrap blocks in points.</summary>
+      NoParaBlockSpacing = 0.0;
+      ///  <summary>Spacing of list blocks in points.</summary>
+      ListSpacing = ParaSpacing;
+      ///  <summary>Step size of indents and tabs in twips.</summary>
+      IndentDelta = TRTFStyle.DefaultIndentDelta;
   strict private
     ///  <summary>Initialises RTF style used when rendering active text as RTF.
     ///  </summary>
@@ -167,43 +180,71 @@ procedure TRTFSnippetDoc.InitStyles;
     [scColour], TRTFFont.CreateNull, 0.0, [], clExternalLink
   );
 
-  fExtraStyles.Add(
-     ekPara,
-     TRTFStyle.Create(
-       TRTFParaSpacing.Create(ParaSpacing, 0.0)
-     )
-  );
+  // Active text styles
+
+  // -- Active text block styles
+
   fDescStyles.Add(
-     ekPara,
-     TRTFStyle.Create(
-       TRTFParaSpacing.Create(0.0, ParaSpacing)
-     )
+    ekHeading,
+    TRTFStyle.Create(
+      [scParaSpacing, scFontStyles, scFontSize],
+      TRTFParaSpacing.Create(0.0, 0.0),
+      TRTFFont.CreateNull,
+      SubHeadingFontSize,
+      [fsBold],
+      clNone
+    )
   );
-
   fExtraStyles.Add(
     ekHeading,
     TRTFStyle.Create(
-      [scParaSpacing, scFontStyles],
+      [scParaSpacing, scFontStyles, scFontSize],
       TRTFParaSpacing.Create(ParaSpacing, 0.0),
       TRTFFont.CreateNull,
-      0.0,
+      SubHeadingFontSize,
       [fsBold],
       clNone
     )
   );
+
   fDescStyles.Add(
-    ekHeading,
+     ekPara,
+     TRTFStyle.Create(TRTFParaSpacing.Create(ParaSpacing, 0.0))
+  );
+  fExtraStyles.Add(ekPara, fDescStyles[ekPara]);
+
+  fDescStyles.Add(
+    ekBlock,
+    TRTFStyle.Create(TRTFParaSpacing.Create(NoParaBlockSpacing, 0.0))
+  );
+  fExtraStyles.Add(ekBlock, fDescStyles[ekBlock]);
+
+  fDescStyles.Add(
+    ekUnorderedList,
+    TRTFStyle.Create(TRTFParaSpacing.Create(ListSpacing, 0.0))
+  );
+  fExtraStyles.Add(ekUnorderedList, fDescStyles[ekUnorderedList]);
+
+  fDescStyles.Add(ekOrderedList, fDescStyles[ekUnorderedList]);
+  fExtraStyles.Add(ekOrderedList, fDescStyles[ekOrderedList]);
+
+  fDescStyles.Add(
+    ekListItem,
     TRTFStyle.Create(
-      [scParaSpacing, scFontStyles],
-      TRTFParaSpacing.Create(0.0, ParaSpacing),
+      [scIndentDelta],
+      TRTFParaSpacing.CreateNull,
       TRTFFont.CreateNull,
       0.0,
-      [fsBold],
-      clNone
+      [],
+      clNone,
+      360
     )
   );
+  fExtraStyles.Add(ekListItem, fDescStyles[ekListItem]);
 
-  fExtraStyles.Add(
+  // -- Active text inline styles
+
+  fDescStyles.Add(
     ekStrong,
     TRTFStyle.Create(
       [scFontStyles],
@@ -213,9 +254,9 @@ procedure TRTFSnippetDoc.InitStyles;
       clNone
     )
   );
-  fDescStyles.Add(ekStrong, fExtraStyles[ekStrong]);
+  fExtraStyles.Add(ekStrong, fDescStyles[ekStrong]);
 
-  fExtraStyles.Add(
+  fDescStyles.Add(
     ekEm,
     TRTFStyle.Create(
       [scFontStyles],
@@ -225,9 +266,9 @@ procedure TRTFSnippetDoc.InitStyles;
       clNone
     )
   );
-  fDescStyles.Add(ekEm, fExtraStyles[ekEm]);
+  fExtraStyles.Add(ekEm, fDescStyles[ekEm]);
 
-  fExtraStyles.Add(
+  fDescStyles.Add(
     ekVar,
     TRTFStyle.Create(
       [scFontStyles, scColour],
@@ -237,9 +278,9 @@ procedure TRTFSnippetDoc.InitStyles;
       clVarText
     )
   );
-  fDescStyles.Add(ekVar, fExtraStyles[ekVar]);
+  fExtraStyles.Add(ekVar, fDescStyles[ekVar]);
 
-  fExtraStyles.Add(
+  fDescStyles.Add(
     ekWarning,
     TRTFStyle.Create(
       [scFontStyles, scColour],
@@ -249,9 +290,9 @@ procedure TRTFSnippetDoc.InitStyles;
       clWarningText
     )
   );
-  fDescStyles.Add(ekWarning, fExtraStyles[ekWarning]);
+  fExtraStyles.Add(ekWarning, fDescStyles[ekWarning]);
 
-  fExtraStyles.Add(
+  fDescStyles.Add(
     ekMono,
     TRTFStyle.Create(
       [scFont],
@@ -261,7 +302,9 @@ procedure TRTFSnippetDoc.InitStyles;
       clNone
     )
   );
-  fDescStyles.Add(ekMono, fExtraStyles[ekMono]);
+  fExtraStyles.Add(ekMono, fDescStyles[ekMono]);
+
+  // Fixes for monochrome
 
   if not fUseColour then
   begin
@@ -356,7 +399,17 @@ procedure TRTFSnippetDoc.RenderHeading(const Heading: string;
 procedure TRTFSnippetDoc.RenderSourceCode(const SourceCode: string);
 var
   Renderer: IHiliteRenderer;  // renders highlighted source as RTF
+resourcestring
+  sHeading = 'Source Code:';
 begin
+  fBuilder.ResetCharStyle;
+  fBuilder.SetFont(MainFontName);
+  fBuilder.SetFontSize(ParaFontSize);
+  fBuilder.SetFontStyle([fsBold]);
+  fBuilder.SetParaSpacing(TRTFParaSpacing.Create(ParaSpacing, ParaSpacing));
+  fBuilder.AddText(sHeading);
+  fBuilder.ResetCharStyle;
+  fBuilder.EndPara;
   fBuilder.ClearParaFormatting;
   Renderer := TRTFHiliteRenderer.Create(fBuilder, fHiliteAttrs);
   TSyntaxHiliter.Hilite(SourceCode, Renderer);
diff --git a/Src/URTFStyles.pas b/Src/URTFStyles.pas
index 6142e8762..60e5dd89a 100644
--- a/Src/URTFStyles.pas
+++ b/Src/URTFStyles.pas
@@ -88,7 +88,8 @@   TRTFParaSpacing = record
     scFont,
     scFontSize,
     scFontStyles,
-    scColour
+    scColour,
+    scIndentDelta
   );
 
 type
@@ -97,24 +98,30 @@   TRTFParaSpacing = record
 type
   TRTFStyle = record
   public
+    const
+      DefaultIndentDelta = 360;
     var
       ParaSpacing: TRTFParaSpacing;
       Font: TRTFFont;
       FontSize: Double;
       FontStyles: TFontStyles;
       Colour: TColor;
+      IndentDelta: SmallInt;
       Capabilities: TRTFStyleCaps;
     constructor Create(const ACapabilities: TRTFStyleCaps;
       const AParaSpacing: TRTFParaSpacing; const AFont: TRTFFont;
       const AFontSize: Double; const AFontStyles: TFontStyles;
-      const AColour: TColor); overload;
+      const AColour: TColor; const AIndentDelta: SmallInt = DefaultIndentDelta);
+      overload;
     constructor Create(const ACapabilities: TRTFStyleCaps;
       const AFont: TRTFFont; const AFontSize:
-      Double; const AFontStyles: TFontStyles; const AColour: TColor); overload;
+      Double; const AFontStyles: TFontStyles; const AColour: TColor;
+      const AIndentDelta: SmallInt = DefaultIndentDelta); overload;
     constructor Create(const AParaSpacing: TRTFParaSpacing); overload;
     class function CreateNull: TRTFStyle; static;
     function IsNull: Boolean;
     procedure MakeMonochrome;
+    function IndentLevelToTwips(const ALevel: Byte): SmallInt;
     class operator Equal(const Left, Right: TRTFStyle): Boolean;
     class operator NotEqual(const Left, Right: TRTFStyle): Boolean;
   end;
@@ -186,7 +193,7 @@ class function TRTFParaSpacing.CreateNull: TRTFParaSpacing;
 constructor TRTFStyle.Create(const ACapabilities: TRTFStyleCaps;
   const AParaSpacing: TRTFParaSpacing; const AFont: TRTFFont;
   const AFontSize: Double; const AFontStyles: TFontStyles;
-  const AColour: TColor);
+  const AColour: TColor; const AIndentDelta: SmallInt);
 begin
   Capabilities := ACapabilities;
   ParaSpacing := AParaSpacing;
@@ -194,11 +201,13 @@ constructor TRTFStyle.Create(const ACapabilities: TRTFStyleCaps;
   FontSize := AFontSize;
   FontStyles := AFontStyles;
   Colour := AColour;
+  IndentDelta := AIndentDelta;
 end;
 
 constructor TRTFStyle.Create(const ACapabilities: TRTFStyleCaps;
   const AFont: TRTFFont; const AFontSize: Double;
-  const AFontStyles: TFontStyles; const AColour: TColor);
+  const AFontStyles: TFontStyles; const AColour: TColor;
+  const AIndentDelta: SmallInt);
 begin
   Create(
     ACapabilities - [scParaSpacing],
@@ -206,7 +215,8 @@ constructor TRTFStyle.Create(const ACapabilities: TRTFStyleCaps;
     AFont,
     AFontSize,
     AFontStyles,
-    AColour
+    AColour,
+    AIndentDelta
   );
 end;
 
@@ -231,7 +241,19 @@ class function TRTFStyle.CreateNull: TRTFStyle;
     and StrSameText(Left.Font.Name, Right.Font.Name)
     and SameValue(Left.FontSize, Right.FontSize)
     and (Left.FontStyles = Right.FontStyles)
-    and (Left.Colour = Right.Colour);
+    and (Left.Colour = Right.Colour)
+    and (Left.IndentDelta = Right.IndentDelta);
+end;
+
+function TRTFStyle.IndentLevelToTwips(const ALevel: Byte): SmallInt;
+var
+  Delta: SmallInt;
+begin
+  if scIndentDelta in Capabilities then
+    Delta := IndentDelta
+  else
+    Delta := DefaultIndentDelta;
+  Result := ALevel * Delta;
 end;
 
 function TRTFStyle.IsNull: Boolean;
diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index 927014dde..2b1834bc9 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Utility functions used when processing RTF.
 }
@@ -66,7 +66,10 @@ interface
     rcUnicodeChar,          // defines a Unicode character as signed 16bit value
     rcUnicodePair,          // introduces pair of ANSI and Unicode destinations
     rcUnicodeDest,          // introduces Unicode destination
-    rcIgnore                // denotes following control can be ignored
+    rcIgnore,               // denotes following control can be ignored
+    rcFirstLineOffset,      // first line indent in twips (relative to \li)
+    rcLeftIndent,           // left indent in twips
+    rcTabStop               // sets a tab stop in twips
   );
 
 type
@@ -193,7 +196,8 @@ implementation
     'rtf', 'ansi', 'ansicpg', 'deff', 'deflang', 'fonttbl', 'fprq', 'fcharset',
     'fnil', 'froman', 'fswiss', 'fmodern', 'fscript', 'fdecor', 'ftech',
     'colortbl', 'red', 'green', 'blue', 'info', 'title', 'pard', 'par', 'plain',
-    'f', 'cf', 'b', 'i', 'ul', 'fs', 'sb', 'sa', 'u', 'upr', 'ud', '*'
+    'f', 'cf', 'b', 'i', 'ul', 'fs', 'sb', 'sa', 'u', 'upr', 'ud', '*',
+    'fi', 'li', 'tx'
   );
 
 function RTFControl(const Ctrl: TRTFControl): ASCIIString;

From 45900e47d3a806c52b73230a6114abafecc90812 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 8 Apr 2023 00:47:12 +0100
Subject: [PATCH 109/264] Correct and revise REML documentation

Updated REML design document and REML help topic
---
 Docs/Design/reml.html  | 25 ++++++++++++++-----------
 Src/Help/HTML/reml.htm | 30 +++++++++++++++---------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/Docs/Design/reml.html b/Docs/Design/reml.html
index 9762decaf..51fb91de4 100644
--- a/Docs/Design/reml.html
+++ b/Docs/Design/reml.html
@@ -279,19 +279,19 @@ <h2>
   </p>
   <ul class="half-spaced">
     <li>
-      <code class="value">&lt;p&gt;...&lt;/p&gt;</code> &ndash; Renders the enclosed markup as a simple paragraph.
+      <code class="value">&lt;p&gt;...&lt;/p&gt;</code> &ndash; Renders the enclosed markup as a simple paragraph. 
     </li>
     <li>
       <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> &ndash; Renders the enclosed markup as a heading.
     </li>
     <li>
-      <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> &ndash; Renders the enclosed HTML as an ordered list. <span class="very-strong">Must</span> contain <code class="value">&lt;li&gt;...&lt;/li&gt</code> blocks and nothing else.
+      <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> &ndash; Renders the enclosed markup as an ordered list.
     </li>
     <li>
-      <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> &ndash; Renders the enclosed HTML as an unordered list. <span class="very-strong">Must</span> contain <code class="value">&lt;li&gt;...&lt;/li&gt</code> blocks and nothing else.
+      <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> &ndash; Renders the enclosed markup as an unordered list.
     </li>
     <li>
-      <code class="value">&lt;li&gt;...&lt;/li&gt;</code> &ndash; Renders the enclosed HTML as a list item. <span class="very-strong">Must</span> only be used within <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks.
+      <code class="value">&lt;li&gt;...&lt;/li&gt;</code> &ndash; Renders the enclosed markup as a list item.
     </li>
   </ul>
   <p>
@@ -308,7 +308,7 @@ <h2>
       <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks <span class="very-strong">must only</span> contain one or more <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks.
     </li>
     <li>
-      <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks <span class="very-strong">must not</span> contain <code class="value">&lt;p&gt;...&lt;/p&gt;</code>, <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> or other <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks directly, but <em>may</em> contain <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks.
+      <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks <span class="very-strong">must</span> only be used within <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks. <em>May</em> contain <code class="value">&lt;p&gt;...&lt;/p&gt;</code> and <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> blocks, but it is permitted to include text and inline tags directly without enclosing them one of the permitted blocks. Nested lists are permitted by including further <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> and <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> blocks.
     </li>
     <li>
       All text <em>should</em> be embedded within <code class="value">&lt;p&gt;...&lt;/p&gt;</code>, <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> or <code class="value">&lt;li&gt;...&lt;/li&gt;</code> block level tags, e.g. <code class="value">&lt;heading&gt;heading&lt;/heading&gt;&lt;p&gt;text&lt;/p&gt;</code> or simply <code class="value">&lt;p&gt;text&lt;/p&gt;</code>.
@@ -320,12 +320,15 @@ <h2>
   <p>
     Here is a valid example:
   </p>
-  <pre class="sample">&lt;p&gt;Hello World&lt;/p&gt;
-&lt;heading&gt;Hello&lt;/heading&gt;
+  <pre class="sample">&lt;heading&gt;Hello&lt;/heading&gt;
 &lt;p&gt;Hello World&lt;/p&gt;
 &lt;ol&gt;
   &lt;li&gt;one&lt;/li&gt;
-  &lt;li&gt;two&lt;/li&gt;
+  &lt;li&gt;&lt;p&gt;two&lt;/p&gt;&lt;/li&gt;
+  &lt;ul&gt;
+    &lt;li&gt;two A&lt;/li&gt;
+    &lt;li&gt;two B&lt;/li&gt;
+  &lt;ul&gt;
   &lt;li&gt;three&lt;/li&gt;
 &lt;/ol&gt;</pre>
   <p>
@@ -333,7 +336,7 @@ <h2>
   </p>
   <pre class="sample">wrong &lt;heading&gt;blah&lt;/heading&gt; wrong &lt;p&gt;blah&lt;/p&gt; wrong</pre>
   <p>
-    However interpreting code <em>may</em> interpret this permissively. If this is done the text outside blocks <span class="very-strong">must</span> be interpreted as if it was enclosed in <code class="value">&lt;p&gt;</code> and <code class="value">&lt;/p&gt;</code> tags. Therefore the above code would be interpreted as:
+    However interpreting code <em>may</em> interpret this permissively. If this is done the text outside blocks <em>should</em> be interpreted as if it was enclosed in <code class="value">&lt;p&gt;</code> and <code class="value">&lt;/p&gt;</code> tags. Therefore the above code would be interpreted as:
   </p>
   <pre class="sample">&lt;p&gt;wrong &lt;/p&gt;&lt;heading&gt;blah&lt;/heading&gt;&lt;p&gt;wrong &lt;/p&gt;&lt;p&gt;blah&lt;/p&gt;&lt;p&gt;wrong&lt;/p&gt;</pre>
   <aside>
@@ -375,13 +378,13 @@ <h2>
   </p>
   <ul class="unspaced">
     <li>
-      In-line tags <span class="very-strong">must</span> be embedded inside a block level tag. E.g. <code class="value">&lt;p&gt;one&lt;strong&gt;two&lt;/strong&gt;three&lt;/p&gt;</code>.
+      In-line tags <span class="very-strong">must</span> be embedded inside a valid block level tag. E.g. <code class="value">&lt;p&gt;one&lt;strong&gt;two&lt;/strong&gt;three&lt;/p&gt;</code>.
     </li>
     <li>
       Tags <span class="very-strong">must</span> match. E.g. <code class="value">&lt;em&gt;</code> must be matched with <code class="value">&lt;/em&gt;</code>.
     </li>
     <li>
-      Tags may be nested, providing the tags match. E.g. <code class="value">&lt;em&gt;blah &lt;var&gt;blah&lt;/var&gt;&lt;/em&gt;</code> is valid but <code class="value">&lt;em&gt;blah &lt;var&gt;blah&lt;/em&gt;&lt;/var&gt;</code> is not.
+      Tags may be nested, providing the tags are balanced. E.g. <code class="value">&lt;em&gt;blah &lt;var&gt;blah&lt;/var&gt;&lt;/em&gt;</code> is valid but <code class="value">&lt;em&gt;blah &lt;var&gt;blah&lt;/em&gt;&lt;/var&gt;</code> is not.
     </li>
   </ul>
   <p>
diff --git a/Src/Help/HTML/reml.htm b/Src/Help/HTML/reml.htm
index a3dc8260e..9c0117dd3 100644
--- a/Src/Help/HTML/reml.htm
+++ b/Src/Help/HTML/reml.htm
@@ -107,14 +107,13 @@ <h3>
         <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks.
       </li>
       <li>
-        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks must not
-        contain
-        <code class="value">&lt;p&gt;...&lt;/p&gt;</code>,
-        <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> or other
-        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks directly,
-        but may contain
-        <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and
-        <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks.
+        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks may contain
+        <code class="value">&lt;p&gt;...&lt;/p&gt;</code> and
+        <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> blocks,
+        but it is permitted to include text and inline tags directly without
+        enclosing them one of the permitted blocks. Nested lists are permitted
+        by including further <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code>
+        and <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> blocks.
       </li>
       <li>
         All text should be embedded within
@@ -132,12 +131,15 @@ <h3>
     <p>
       Here is a valid example:
     </p>
-    <pre class="sample">&lt;p&gt;Hello World&lt;/p&gt;
-&lt;heading&gt;Hello&lt;/heading&gt;
+    <pre class="sample">&lt;heading&gt;Hello&lt;/heading&gt;
 &lt;p&gt;Hello World&lt;/p&gt;
 &lt;ol&gt;
   &lt;li&gt;one&lt;/li&gt;
-  &lt;li&gt;two&lt;/li&gt;
+  &lt;li&gt;&lt;p&gt;two&lt;/p&gt;&lt;/li&gt;
+  &lt;ul&gt;
+    &lt;li&gt;two A&lt;/li&gt;
+    &lt;li&gt;two B&lt;/li&gt;
+  &lt;ul&gt;
   &lt;li&gt;three&lt;/li&gt;
 &lt;/ol&gt;</pre>
           <p>
@@ -148,10 +150,8 @@ <h3>
     <pre class="reml indent"><span class="hilite">blah</span>&lt;heading&gt;blah&lt;/heading&gt;<span class="hilite">blah</span>&lt;p&gt;blah&lt;/p&gt;<span class="hilite">blah</span></pre>
     <p>
       However, <em>CodeSnip</em> is quite permissive and, in many cases,
-      automatically adds
-      <code class="reml">&lt;p&gt;</code>...<code class="reml">&lt;/p&gt;</code>
-      tags for text that is not enclosed in block level tags. The above code is
-      interpreted as:
+      automatically adds block level tags for text that is not enclosed in block
+      level tags. The above code is interpreted similar ro:
     </p>
     <pre class="reml indent">&lt;p&gt;<span class="hilite">blah</span> &lt;/p&gt;
 &lt;heading&gt;blah&lt;/heading&gt;

From 3d9235dbe939c53c6eb8ac533fcd09a3ef8dfbdb Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 8 Apr 2023 01:17:38 +0100
Subject: [PATCH 110/264] Remove unused param from TRTF ctor stream overload

The TRTF constructor that took a stream, an encoding and a flag as
parameters was not using the encoding parameter. So it was removed.

Although this has been fixed, the constructor is not actually used and
could be removed.
---
 Src/URTFUtils.pas | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index 2b1834bc9..c7463e670 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -92,8 +92,8 @@   TRTF = record
     ///  <param name="ReadAll">Boolean [in] Flag that indicates if the whole
     ///  stream is to be read (True) or stream is to be read from current
     ///  position (False).</param>
-    constructor Create(const AStream: TStream; const AEncoding: TEncoding;
-      const ReadAll: Boolean = False); overload;
+    constructor Create(const AStream: TStream; const ReadAll: Boolean = False);
+      overload;
     ///  <summary>Initialises record from ASCII RTF code.</summary>
     ///  <param name="ARTFCode">ASCIIString [in] ASCII string containing RTF
     ///  code.</param>
@@ -295,8 +295,7 @@ function RTFUnicodeSafeDestination(const DestCtrl: TRTFControl;
 
 { TRTF }
 
-constructor TRTF.Create(const AStream: TStream; const AEncoding: TEncoding;
-  const ReadAll: Boolean);
+constructor TRTF.Create(const AStream: TStream; const ReadAll: Boolean);
 var
   ByteCount: Integer;
 begin

From 21f6e7cca09a7dc17a117498962132197a3da6e9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 8 Apr 2023 02:01:22 +0100
Subject: [PATCH 111/264] Fixed corrupted text snippet report

Precalculate longest compiler name and use that value to ensure compiler
table rows line up correctly.
---
 Src/UTextSnippetDoc.pas | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Src/UTextSnippetDoc.pas b/Src/UTextSnippetDoc.pas
index d046c38c0..b5119eae8 100644
--- a/Src/UTextSnippetDoc.pas
+++ b/Src/UTextSnippetDoc.pas
@@ -123,12 +123,21 @@ procedure TTextSnippetDoc.RenderActiveText(ActiveText: IActiveText);
 procedure TTextSnippetDoc.RenderCompilerInfo(const Heading: string;
   const Info: TCompileDocInfoArray);
 var
-  Idx: Integer; // loops compiler information table
+  MaxNameLength: Integer;
+  CompilerInfo: TCompileDocInfo;
 begin
+  // Calculate length of longest compiler name
+  MaxNameLength := 0;
+  for CompilerInfo in Info do
+    if Length(CompilerInfo.Compiler) > MaxNameLength then
+      MaxNameLength := Length(CompilerInfo.Compiler);
+  // Write out compilers with results
   fWriter.WriteLine;
   fWriter.WriteLine(Heading);
-  for Idx := Low(Info) to High(Info) do
-    fWriter.WriteLine('%-20s%s', [Info[Idx].Compiler, Info[Idx].Result]);
+  for CompilerInfo in Info do
+    fWriter.WriteLine(
+      '%-*s%s', [MaxNameLength + 4, CompilerInfo.Compiler, CompilerInfo.Result]
+    );
 end;
 
 procedure TTextSnippetDoc.RenderDBInfo(const Text: string);

From be39085a6fd15d55a478234bb9e041e9ca9c820e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 8 Apr 2023 17:10:09 +0100
Subject: [PATCH 112/264] New code to find max width of strings when rendered

Added new routines to return the maximum width of a list of strings when
rendered in a given font.

Two routines added: MaxStringWidthPx and MaxStringWidthTwips to return
the maximum string width in pixels and twips respectively.
---
 Src/UGraphicUtils.pas | 101 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 96 insertions(+), 5 deletions(-)

diff --git a/Src/UGraphicUtils.pas b/Src/UGraphicUtils.pas
index 917324f07..cd4dc1c87 100644
--- a/Src/UGraphicUtils.pas
+++ b/Src/UGraphicUtils.pas
@@ -17,10 +17,7 @@ interface
 
 uses
   // Delphi
-  Windows, Graphics,
-  // Project
-  UStructs;
-
+  Windows, Graphics;
 
 function CreateDisplayDC: HDC;
   {Creates a display device context.
@@ -45,6 +42,28 @@ function StringExtent(const S: string; const Font: TFont): TSize; overload;
     @return Structure containing width and height of string in pixels.
   }
 
+///  <summary>Returns width, in pixels, of the widest of the given strings when
+///  rendered a specified font.</summary>
+///  <param name="AStrings"><c>array of string</c> [in] Strings whose rendered
+///  width is to be measured.</param>
+///  <param name="AFont"><c>TFont</c> [in] Font in which strings are to be
+///  rendered.</param>
+///  <returns><c>SmallInt</c>. Width of widest string in array in pixels.
+///  </returns>
+function MaxStringWidthPx(const AStrings: array of string; const AFont: TFont):
+  SmallInt;
+
+///  <summary>Returns width, in twips, of the widest of the given strings when
+///  rendered a specified font.</summary>
+///  <param name="AStrings"><c>array of string</c> [in] Strings whose rendered
+///  width is to be measured.</param>
+///  <param name="AFont"><c>TFont</c> [in] Font in which strings are to be
+///  rendered.</param>
+///  <returns><c>SmallInt</c>. Width of widest string in array in twips.
+///  </returns>
+function MaxStringWidthTwips(const AStrings: array of string;
+  const AFont: TFont): SmallInt;
+
 function GetTextRect(const Text: string; const Canvas: TCanvas;
   const Rect: TRect; const Flags: Longint): TRect;
   {Gets rectangle of size required to display text in a specified canvas.
@@ -59,8 +78,10 @@ implementation
 
 
 uses
+  // Delphi
+  SysUtils,
   // Project
-  SysUtils;
+  UStructs;
 
 
 { Helper routines }
@@ -91,6 +112,43 @@ procedure FreeDisplayCanvas(var Canvas: TCanvas);
     end;
 end;
 
+///  <summary>Returns width of the widest of the given strings when rendered a
+///  specified font.</summary>
+///  <remarks>Width is calculated in pixels, but is converted to returned value
+///  by closure passed as a parameter.</remarks>
+///  <param name="AStrings"><c>array of string</c> [in] Strings whose rendered
+///  width is to be measured.</param>
+///  <param name="AFont"><c>TFont</c> [in] Font in which strings are to be
+///  rendered.</param>
+///  <param name="AConverter"><c>TFunc&lt;HDC, Integer, SmallInt&gt;</c> [in]
+///  Converter function used to convert result to required units, using the
+///  handle of the font canvas.</param>
+///  <returns><c>SmallInt</c>. Width of widest string in array in twips.
+///  </returns>
+function InternalMaxStringWidth(const AStrings: array of string;
+  const AFont: TFont; const AConverter: TFunc<HDC, Integer, SmallInt>):
+  SmallInt;
+var
+  Str: string;
+  StrWidth: Integer;
+  MaxStrWidth: Integer;
+  Canvas: TCanvas; // canvas used to measure text extent
+begin
+  MaxStrWidth := 0;
+  Canvas := CreateDisplayCanvas(AFont);
+  try
+    for Str in AStrings do
+    begin
+      StrWidth := Canvas.TextExtent(Str).cx;
+      if StrWidth > MaxStrWidth then
+        MaxStrWidth := StrWidth;
+    end;
+    Result := AConverter(Canvas.Handle, MaxStrWidth);
+  finally
+    FreeDisplayCanvas(Canvas);
+  end;
+end;
+
 { Public routines }
 
 function CreateDisplayDC: HDC;
@@ -144,6 +202,39 @@ function StringExtent(const S: string; const Font: TFont): TSize; overload;
   end;
 end;
 
+function MaxStringWidthTwips(const AStrings: array of string;
+  const AFont: TFont): SmallInt;
+begin
+  Result := InternalMaxStringWidth(
+    AStrings,
+    AFont,
+    function (CanvasHandle: HDC; MaxStrWidthPx: Integer): SmallInt
+    var
+      PxPerInchX: Integer;
+    const
+      TwipsPerInch = 1440;
+    begin
+      // convert pixels to twips
+      PxPerInchX := GetDeviceCaps(CanvasHandle, LOGPIXELSX);
+      Result := SmallInt(Round(MaxStrWidthPx * TwipsPerInch / PxPerInchX));
+    end
+  );
+end;
+
+function MaxStringWidthPx(const AStrings: array of string; const AFont: TFont):
+  SmallInt;
+begin
+  Result := InternalMaxStringWidth(
+    AStrings,
+    AFont,
+    function (CanvasHandle: HDC; StrWidthPx: Integer): SmallInt
+    begin
+      // no conversion
+      Result := SmallInt(StrWidthPx);
+    end
+  );
+end;
+
 function GetTextRect(const Text: string; const Canvas: TCanvas;
   const Rect: TRect; const Flags: Longint): TRect;
   {Gets rectangle of size required to display text in a specified canvas.

From 20714abdf4ce223880b9380f7f87dcdfa57f5916 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 8 Apr 2023 17:15:39 +0100
Subject: [PATCH 113/264] Fixed corrupted rich text formatted snippet report

Precalculate longest compiler name and use that value to set a tab to
ensure compiler table rows line up correctly. This value calculated
using new routine added to UGraphUtil in previous commit.
---
 Src/URTFSnippetDoc.pas | 44 +++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/Src/URTFSnippetDoc.pas b/Src/URTFSnippetDoc.pas
index d947e4c01..d857a15be 100644
--- a/Src/URTFSnippetDoc.pas
+++ b/Src/URTFSnippetDoc.pas
@@ -17,11 +17,9 @@ interface
 
 
 uses
-  // Delphi
-  Graphics,
   // Project
   ActiveText.UMain, ActiveText.URTFRenderer, Hiliter.UGlobals, UEncodings,
-  UIStringList, USnippetDoc, URTFBuilder, URTFStyles, URTFUtils;
+  UIStringList, USnippetDoc, URTFBuilder, URTFStyles;
 
 
 type
@@ -128,9 +126,9 @@ implementation
 
 uses
   // Delphi
-  SysUtils,
+  Graphics,
   // Project
-  Hiliter.UHiliters, UColours, UConsts, UPreferences, UStrUtils;
+  Hiliter.UHiliters, UColours, UConsts, UGraphicUtils, UPreferences;
 
 
 { TRTFSnippetDoc }
@@ -316,9 +314,35 @@ procedure TRTFSnippetDoc.InitStyles;
 
 procedure TRTFSnippetDoc.RenderCompilerInfo(const Heading: string;
   const Info: TCompileDocInfoArray);
+
+  // Calculate length of longest compiler name, in twips, when rendered on font
+  // to be used to display them
+  function MaxCompilerNameLenInTwips: SmallInt;
+  var
+    CompilerInfo: TCompileDocInfo;  // info about each compiler
+    CompilerNames: IStringList;     // list of all compiler names
+    Font: TFont;                    // font in which compile info displayed
+  begin
+    Font := TFont.Create;
+    try
+      Font.Name := MainFontName;
+      Font.Size := ParaFontSize;
+      CompilerNames := TIStringList.Create;
+      for CompilerInfo in Info do
+        CompilerNames.Add(CompilerInfo.Compiler);
+      Result := MaxStringWidthTwips(CompilerNames.ToArray, Font);
+    finally
+      Font.Free;
+    end;
+  end;
+
 var
-  Idx: Integer; // loops compiler information table
+  CompilerInfo: TCompileDocInfo;  // info about each compiler
+  TabStop: SmallInt;              // tab stop where compile result displayed
 begin
+  // Calculate tab stop where compile results are displayed
+  TabStop := (MaxCompilerNameLenInTwips div IndentDelta) * IndentDelta + IndentDelta;
+  // Display heading
   fBuilder.SetFontStyle([fsBold]);
   fBuilder.SetParaSpacing(
     TRTFParaSpacing.Create(ParaSpacing, ParaSpacing / 3)
@@ -328,13 +352,15 @@ procedure TRTFSnippetDoc.RenderCompilerInfo(const Heading: string;
   fBuilder.EndPara;
   fBuilder.ClearParaFormatting;
   fBuilder.SetFontSize(ParaFontSize);
-  for Idx := Low(Info) to High(Info) do
+  // Display compiler table
+  fBuilder.SetTabStops([TabStop]);
+  for CompilerInfo in Info do
   begin
-    fBuilder.AddText(Info[Idx].Compiler);
+    fBuilder.AddText(CompilerInfo.Compiler);
     fBuilder.AddText(TAB);
     fBuilder.BeginGroup;
     fBuilder.SetFontStyle([fsItalic]);
-    fBuilder.AddText(Info[Idx].Result);
+    fBuilder.AddText(CompilerInfo.Result);
     fBuilder.EndGroup;
     fBuilder.EndPara;
   end;

From 6fbc69c44731ff3691b7da3d63d6ea6f993c091e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 8 Apr 2023 22:04:20 +0100
Subject: [PATCH 114/264] Add new IActiveText.HasContent method

This method checks whether active text contains any text content. Added
following changes to the active text document format because the
existing IsEmpty returns false when a document contains only ekDocument
elements or only empty block elements.
---
 Src/ActiveText.UMain.pas | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Src/ActiveText.UMain.pas b/Src/ActiveText.UMain.pas
index 648420fee..19487745d 100644
--- a/Src/ActiveText.UMain.pas
+++ b/Src/ActiveText.UMain.pas
@@ -190,6 +190,8 @@   TActiveTextAttrNames = record
     ///  <summary>Checks if the active text object contains any elements.
     ///  </summary>
     function IsEmpty: Boolean;
+    ///  <summary>Checks if the active text object has text content.</summary>
+    function HasContent: Boolean;
     ///  <summary>Checks if the active text object contains only plain text.
     ///  </summary>
     ///  <remarks>Plain text is considered to be active text with no action
@@ -504,6 +506,9 @@   TActiveText = class(TInterfacedObject,
     ///  <summary>Checks if the element list is empty.</summary>
     ///  <remarks>Method of IActiveText.</remarks>
     function IsEmpty: Boolean;
+    ///  <summary>Checks if the active text object has text content.</summary>
+    ///  <remarks>Method of IActiveText.</remarks>
+    function HasContent: Boolean;
     ///  <summary>Checks if the active text object contains only plain text.
     ///  </summary>
     ///  <remarks>
@@ -869,6 +874,18 @@ function TActiveText.GetEnumerator: TEnumerator<IActiveTextElem>;
   Result := fElems.GetEnumerator;
 end;
 
+function TActiveText.HasContent: Boolean;
+var
+  Elem: IActiveTextElem;
+  TextElem: IActiveTextTextElem;
+begin
+  Result := False;
+  for Elem in fElems do
+    if Supports(Elem, IActiveTextTextElem, TextElem)
+      and (TextElem.Text <> '') then
+      Exit(True);
+end;
+
 function TActiveText.IsEmpty: Boolean;
 begin
   Result := fElems.Count = 0;

From 8e41ea9767b37438aa43b5a25731623ebf46a46b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 8 Apr 2023 22:10:33 +0100
Subject: [PATCH 115/264] Replace IActiveText.IsEmpty calls with HasContent

Replaced the IsEmpty method with HasContent (with negated logic) where
the IsEmpty method is no longer suitable following changes to active
text document layout resulting with some truly empty code that should
have been skipped being output.
---
 Src/ActiveText.UHTMLRenderer.pas               | 2 +-
 Src/DBIO.UXMLDataIO.pas                        | 2 +-
 Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas | 2 +-
 Src/UCodeImportExport.pas                      | 2 +-
 Src/UREMLDataIO.pas                            | 2 +-
 Src/URTFSnippetDoc.pas                         | 3 ++-
 Src/USnippetDoc.pas                            | 2 +-
 Src/UTextSnippetDoc.pas                        | 3 ++-
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Src/ActiveText.UHTMLRenderer.pas b/Src/ActiveText.UHTMLRenderer.pas
index 8a00367b4..b246dde09 100644
--- a/Src/ActiveText.UHTMLRenderer.pas
+++ b/Src/ActiveText.UHTMLRenderer.pas
@@ -174,7 +174,7 @@ function TActiveTextHTML.Render(ActiveText: IActiveText): string;
   DestLines: IStringList;
   DestLine: string;
 begin
-  if ActiveText.IsEmpty then
+  if not ActiveText.HasContent then
     Exit('');
   Text := '';
   fLevel := 0;
diff --git a/Src/DBIO.UXMLDataIO.pas b/Src/DBIO.UXMLDataIO.pas
index 2b1f1ebdf..ec5655760 100644
--- a/Src/DBIO.UXMLDataIO.pas
+++ b/Src/DBIO.UXMLDataIO.pas
@@ -950,7 +950,7 @@ procedure TXMLDataWriter.WriteSnippetProps(const SnippetName: string;
     );
     fXMLDoc.CreateElement(SnippetNode, cDisplayNameNode, Props.DisplayName);
     // extra node is only written if extra property has a value
-    if not Props.Extra.IsEmpty then
+    if Props.Extra.HasContent then
     begin
       fXMLDoc.CreateElement(
         SnippetNode,
diff --git a/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas b/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
index 13282fa4a..107430504 100644
--- a/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
+++ b/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
@@ -257,7 +257,7 @@ procedure TSnippetsActiveTextEdFrame.SetActiveText(Value: IActiveText);
       SetEditMode(emREML)
   else
     SetEditMode(fDefaultEditMode);
-  if not Value.IsEmpty then
+  if Value.HasContent then
   begin
     case fEditMode of
       emPlainText:
diff --git a/Src/UCodeImportExport.pas b/Src/UCodeImportExport.pas
index 72d2d8efd..7ba46f2d0 100644
--- a/Src/UCodeImportExport.pas
+++ b/Src/UCodeImportExport.pas
@@ -300,7 +300,7 @@ procedure TCodeExporter.WriteSnippet(const ParentNode: IXMLNode;
     SnippetNode, cHighlightSource, IntToStr(Ord(Snippet.HiliteSource))
   );
   // extra info is written only if present
-  if not Snippet.Extra.IsEmpty then
+  if Snippet.Extra.HasContent then
     fXMLDoc.CreateElement(
       SnippetNode,
       cExtraNode,
diff --git a/Src/UREMLDataIO.pas b/Src/UREMLDataIO.pas
index 526369a89..5e698383a 100644
--- a/Src/UREMLDataIO.pas
+++ b/Src/UREMLDataIO.pas
@@ -735,7 +735,7 @@ class function TREMLWriter.Render(const ActiveText: IActiveText): string;
   DestLine: string;
   RW: TREMLWriter;
 begin
-  if ActiveText.IsEmpty then
+  if not ActiveText.HasContent then
     Exit('');
   RW := TREMLWriter.InternalCreate;
   try
diff --git a/Src/URTFSnippetDoc.pas b/Src/URTFSnippetDoc.pas
index d857a15be..fd37204f5 100644
--- a/Src/URTFSnippetDoc.pas
+++ b/Src/URTFSnippetDoc.pas
@@ -398,7 +398,8 @@ procedure TRTFSnippetDoc.RenderExtra(const ExtraText: IActiveText);
 var
   RTFWriter: TActiveTextRTF;  // Object that generates RTF from active text
 begin
-  Assert(not ExtraText.IsEmpty, ClassName + '.RenderExtra: ExtraText is empty');
+  Assert(ExtraText.HasContent,
+    ClassName + '.RenderExtra: ExtraText has no content');
   RTFWriter := TActiveTextRTF.Create;
   try
     RTFWriter.ElemStyleMap := fExtraStyles;
diff --git a/Src/USnippetDoc.pas b/Src/USnippetDoc.pas
index 0e293ec24..1167c6754 100644
--- a/Src/USnippetDoc.pas
+++ b/Src/USnippetDoc.pas
@@ -177,7 +177,7 @@ function TSnippetDoc.Generate(const Snippet: TSnippet): TEncodedData;
   RenderTitledList(sXRefListTitle, SnippetsToStrings(Snippet.XRef));
   if Snippet.Kind <> skFreeform then
     RenderCompilerInfo(sCompilers, CompilerInfo(Snippet));
-  if not Snippet.Extra.IsEmpty then
+  if Snippet.Extra.HasContent then
     RenderExtra(Snippet.Extra);
   if not Snippet.UserDefined then
     // database info written only if snippet is from main database
diff --git a/Src/UTextSnippetDoc.pas b/Src/UTextSnippetDoc.pas
index b5119eae8..999619114 100644
--- a/Src/UTextSnippetDoc.pas
+++ b/Src/UTextSnippetDoc.pas
@@ -154,7 +154,8 @@ procedure TTextSnippetDoc.RenderDescription(const Desc: IActiveText);
 
 procedure TTextSnippetDoc.RenderExtra(const ExtraText: IActiveText);
 begin
-  Assert(not ExtraText.IsEmpty, ClassName + '.RenderExtra: ExtraText is empty');
+  Assert(ExtraText.HasContent,
+    ClassName + '.RenderExtra: ExtraText has no content');
   fWriter.WriteLine;
   RenderActiveText(ExtraText);
 end;

From d802d649c67334596685a9106b5e08f58a0bf5e0 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 8 Apr 2023 22:49:32 +0100
Subject: [PATCH 116/264] Prevent snippets editor from stripping REML p tags

If a single paragraph was entered in the snippet's editor's REML editor
in form <p>content here</p>, with no inline tags the <p> tags would be
stripped. This is undesirable because text outside of <p> tags may be
rendered differently to text in <p> tags, so stripping the tags could
change the rendering.

This behaviour is changed by this commit and <p> tags are now preserved.
---
 Src/ActiveText.UMain.pas | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Src/ActiveText.UMain.pas b/Src/ActiveText.UMain.pas
index 19487745d..2edf2a7f6 100644
--- a/Src/ActiveText.UMain.pas
+++ b/Src/ActiveText.UMain.pas
@@ -195,8 +195,8 @@   TActiveTextAttrNames = record
     ///  <summary>Checks if the active text object contains only plain text.
     ///  </summary>
     ///  <remarks>Plain text is considered to be active text with no action
-    ///  elements except for "para". This can rendered in plain text with no
-    ///  loss of formatting.</remarks>
+    ///  elements except for "document" or "block". This can rendered in plain
+    ///  text with no loss of formatting.</remarks>
     function IsPlainText: Boolean;
     ///  <summary>Checks if the active text object is a valid active text
     ///  document.</summary>
@@ -513,8 +513,8 @@   TActiveText = class(TInterfacedObject,
     ///  </summary>
     ///  <remarks>
     ///  <para>Plain text is considered to be active text with no action
-    ///  elements except for "para". This can rendered in plain text with no
-    ///  loss of formatting.</para>
+    ///  elements except for "document" or "block". This can rendered in plain
+    ///  text with no loss of formatting.</para>
     ///  <para>Method of IActiveText.</para>
     ///  </remarks>
     function IsPlainText: Boolean;
@@ -899,7 +899,7 @@ function TActiveText.IsPlainText: Boolean;
   for Elem in fElems do
   begin
     if Supports(Elem, IActiveTextActionElem, ActionElem)
-      and not (ActionElem.Kind in [ekPara, ekDocument]) then
+      and not (ActionElem.Kind in [ekBlock, ekDocument]) then
       Exit(False);
   end;
   Result := True;

From 222063429ccfd95d5cf60b9d9fb7de68b6cc1ec4 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 9 Apr 2023 12:40:47 +0100
Subject: [PATCH 117/264] Updated copyright dates to include 2023

Updated for all files that were updated to date in 2023 that had not
already had the date updated.
---
 Docs/Design/reml.html                          | 2 +-
 Src/ActiveText.UHTMLRenderer.pas               | 2 +-
 Src/ActiveText.UMain.pas                       | 2 +-
 Src/ActiveText.URTFRenderer.pas                | 2 +-
 Src/ActiveText.UTextRenderer.pas               | 2 +-
 Src/ActiveText.UValidator.pas                  | 2 +-
 Src/CodeSnip.dpr                               | 2 +-
 Src/Compilers.USettings.pas                    | 2 +-
 Src/DBIO.UXMLDataIO.pas                        | 2 +-
 Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas | 2 +-
 Src/FrOverview.pas                             | 2 +-
 Src/Help/HTML/reml.htm                         | 2 +-
 Src/UCodeImportExport.pas                      | 2 +-
 Src/UConsts.pas                                | 2 +-
 Src/UEncodings.pas                             | 2 +-
 Src/UGraphicUtils.pas                          | 2 +-
 Src/UREMLDataIO.pas                            | 2 +-
 Src/URTFBuilder.pas                            | 2 +-
 Src/URTFSnippetDoc.pas                         | 2 +-
 Src/URTFStyles.pas                             | 2 +-
 Src/URTFUtils.pas                              | 2 +-
 Src/USnippetDoc.pas                            | 2 +-
 Src/USnippetExtraHelper.pas                    | 2 +-
 Src/USourceGen.pas                             | 2 +-
 Src/UStrUtils.pas                              | 2 +-
 Src/UTextSnippetDoc.pas                        | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Docs/Design/reml.html b/Docs/Design/reml.html
index 51fb91de4..a84de371a 100644
--- a/Docs/Design/reml.html
+++ b/Docs/Design/reml.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 
 <!--
- * This file copyright (C) 2020-2021, Peter Johnson (gravatar.com/delphidabbler) and
+ * This file copyright (C) 2020-2023, Peter Johnson (gravatar.com/delphidabbler) and
  * is licensed under the MIT License: https://opensource.org/licenses/MIT
  *
  * DelphiDabbler Code Snippets Database Documentation: REML markup language
diff --git a/Src/ActiveText.UHTMLRenderer.pas b/Src/ActiveText.UHTMLRenderer.pas
index b246dde09..bf4dfc7c1 100644
--- a/Src/ActiveText.UHTMLRenderer.pas
+++ b/Src/ActiveText.UHTMLRenderer.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides a class that renders active text as HTML.
 }
diff --git a/Src/ActiveText.UMain.pas b/Src/ActiveText.UMain.pas
index 2edf2a7f6..eebd3db1e 100644
--- a/Src/ActiveText.UMain.pas
+++ b/Src/ActiveText.UMain.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides interfaces, a factory class and implementation of "active text".
  * Active text is text that can have actions performed on it. Actions may
diff --git a/Src/ActiveText.URTFRenderer.pas b/Src/ActiveText.URTFRenderer.pas
index 44564d3b8..216dcdf42 100644
--- a/Src/ActiveText.URTFRenderer.pas
+++ b/Src/ActiveText.URTFRenderer.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class and helpers that create RTF representations of active text
  * with customised styling.
diff --git a/Src/ActiveText.UTextRenderer.pas b/Src/ActiveText.UTextRenderer.pas
index 78c90800f..eaec317ff 100644
--- a/Src/ActiveText.UTextRenderer.pas
+++ b/Src/ActiveText.UTextRenderer.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements class that renders active text as plain text in fixed width, word
  * wrapped paragraphs.
diff --git a/Src/ActiveText.UValidator.pas b/Src/ActiveText.UValidator.pas
index 96aa2e77a..8cc68143c 100644
--- a/Src/ActiveText.UValidator.pas
+++ b/Src/ActiveText.UValidator.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a container record that provides methods to validate active text
  * object.
diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index 60436f1a5..9b900845b 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip application project file.
 }
diff --git a/Src/Compilers.USettings.pas b/Src/Compilers.USettings.pas
index 23223d8dd..3468c3693 100644
--- a/Src/Compilers.USettings.pas
+++ b/Src/Compilers.USettings.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2022-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that reads and writes settings that apply to all compilers.
 }
diff --git a/Src/DBIO.UXMLDataIO.pas b/Src/DBIO.UXMLDataIO.pas
index ec5655760..0d1c0c0fc 100644
--- a/Src/DBIO.UXMLDataIO.pas
+++ b/Src/DBIO.UXMLDataIO.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements classes that can read and write databases stored in XML format
  * with associated source code files.
diff --git a/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas b/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
index 107430504..65e3f116f 100644
--- a/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
+++ b/Src/FmSnippetsEditorDlg.FrActiveTextEditor.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * A frame that provides an editor for entering and ammending active text,
  * either as plain text or in markup.
diff --git a/Src/FrOverview.pas b/Src/FrOverview.pas
index aaa1e9e0d..e668c3007 100644
--- a/Src/FrOverview.pas
+++ b/Src/FrOverview.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a titled frame that displays lists of snippets, arranged in
  * different ways, and manages user interaction with the displayed items.
diff --git a/Src/Help/HTML/reml.htm b/Src/Help/HTML/reml.htm
index 9c0117dd3..4eedac417 100644
--- a/Src/Help/HTML/reml.htm
+++ b/Src/Help/HTML/reml.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic describing REML markup language.
 -->
diff --git a/Src/UCodeImportExport.pas b/Src/UCodeImportExport.pas
index 7ba46f2d0..7a197459e 100644
--- a/Src/UCodeImportExport.pas
+++ b/Src/UCodeImportExport.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements classes that can import and export user defined snippets from and
  * to XML.
diff --git a/Src/UConsts.pas b/Src/UConsts.pas
index 449090022..5c658e071 100644
--- a/Src/UConsts.pas
+++ b/Src/UConsts.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines various character, string and resource id constants.
 }
diff --git a/Src/UEncodings.pas b/Src/UEncodings.pas
index f33dad412..78fc4aa54 100644
--- a/Src/UEncodings.pas
+++ b/Src/UEncodings.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides support for certain character encodings used by the program.
 }
diff --git a/Src/UGraphicUtils.pas b/Src/UGraphicUtils.pas
index cd4dc1c87..00a6bb6ec 100644
--- a/Src/UGraphicUtils.pas
+++ b/Src/UGraphicUtils.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Utility routines used for working with graphics.
 }
diff --git a/Src/UREMLDataIO.pas b/Src/UREMLDataIO.pas
index 5e698383a..6924ab76c 100644
--- a/Src/UREMLDataIO.pas
+++ b/Src/UREMLDataIO.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements classes that render and parse Routine Extra Markup Language (REML)
  * code. This markup is used to read and store active text objects as used by
diff --git a/Src/URTFBuilder.pas b/Src/URTFBuilder.pas
index 64e8cf664..c0be9ede7 100644
--- a/Src/URTFBuilder.pas
+++ b/Src/URTFBuilder.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements various classes used to create content of a rich text document.
 }
diff --git a/Src/URTFSnippetDoc.pas b/Src/URTFSnippetDoc.pas
index fd37204f5..b4f41d63a 100644
--- a/Src/URTFSnippetDoc.pas
+++ b/Src/URTFSnippetDoc.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that renders a document that describes a snippet as rich
  * text.
diff --git a/Src/URTFStyles.pas b/Src/URTFStyles.pas
index 60e5dd89a..aa7d2fd2c 100644
--- a/Src/URTFStyles.pas
+++ b/Src/URTFStyles.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines structures that encapsulate RTF styling elements.
 }
diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index c7463e670..e567184cc 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Utility functions used when processing RTF.
 }
diff --git a/Src/USnippetDoc.pas b/Src/USnippetDoc.pas
index 1167c6754..17fbe309b 100644
--- a/Src/USnippetDoc.pas
+++ b/Src/USnippetDoc.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements an abstract base class that renders a text document that describes
  * a snippet. Should be overridden by classes that generate actual documents in
diff --git a/Src/USnippetExtraHelper.pas b/Src/USnippetExtraHelper.pas
index f813d543a..03764bfc3 100644
--- a/Src/USnippetExtraHelper.pas
+++ b/Src/USnippetExtraHelper.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that helps with parsing of a snippet's extra property as
  * active text and vice versa.
diff --git a/Src/USourceGen.pas b/Src/USourceGen.pas
index ccf94698a..3d9edf2a7 100644
--- a/Src/USourceGen.pas
+++ b/Src/USourceGen.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that is used to generate Pascal source code containing
  * specified database snippets.
diff --git a/Src/UStrUtils.pas b/Src/UStrUtils.pas
index b85d180d5..4e0e29584 100644
--- a/Src/UStrUtils.pas
+++ b/Src/UStrUtils.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Unicode string utility routines.
  *
diff --git a/Src/UTextSnippetDoc.pas b/Src/UTextSnippetDoc.pas
index 999619114..5b80fd32b 100644
--- a/Src/UTextSnippetDoc.pas
+++ b/Src/UTextSnippetDoc.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that renders a document that describes a snippet as plain
  * text.

From 52aaada83ea5278a799d88148b95f4f2d2f170f3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 9 Apr 2023 12:42:33 +0100
Subject: [PATCH 118/264] Bump version number to v4.21.1 build 268

---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index f255c1655..ee01e5c42 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.21.0
-build=267
+version=4.21.1
+build=268
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From 5b45ed275af0252b9ff71216b590a89650c87037 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 9 Apr 2023 12:50:25 +0100
Subject: [PATCH 119/264] Update "What's new" help topic

---
 Src/Help/HTML/new.htm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Src/Help/HTML/new.htm b/Src/Help/HTML/new.htm
index daa6de623..274304981 100644
--- a/Src/Help/HTML/new.htm
+++ b/Src/Help/HTML/new.htm
@@ -81,11 +81,18 @@ <h2>
         namespaces can be used.
       </li>
       <li>
-        <strong>[v4.3]</strong> The user defined snippets database can now be
+        <strong>[v4.3/v4.5.1]</strong> As of v4.3 the user defined snippets database can now be
         moved to a user specified directory. This useful for ensuring the
         database is backed up, for example by placing it in a <em>Dropbox</em>
         or <em>GoogleDrive</em> sub-folder. (This option is not available in the
-        portable edition.)
+        portable edition.) From v4.5.1 the database can also be relocated to a network drive.
+      </li>
+      <li>
+        <strong>[v4.7]</strong> Snippets can now be imported from the SWAG
+        (SourceWare Archive Group) collection of snippets.
+      </li>
+      <li>
+        <strong>[v4.20]</strong> The user defined database can now be deleted.
       </li>
     </ul>
     <h2>
@@ -186,6 +193,11 @@ <h2>
         The Welcome page has been completely redesigned to be cleaner and to
         provide more useful information about the databases and program.
       </li>
+      <li>
+        <strong>[v4.19.0/v4.20.0]</strong> From v4.19.0 the font size used in
+        the overview pane can be customised. The ability to change the font size
+        in the detail pane was added in v4.20.0.
+      </li>
     </ul>
     <h2>
       Favourites [v4.2]
@@ -232,6 +244,9 @@ <h2>
         required namespaces in the <em>Namespaces</em> tab of the
         <a href="dlg_configcompilers.htm">Configure Compilers</a> dialogue box.
       </li>
+      <li>
+        <strong>[v4.21.0]</strong> <em>CodeSnip</em> now detects newly installed Delphi compilers at start up.
+      </li>
     </ul>
     <h2>
       Other Features

From d4af4f3aa64c98109448fdb1d839998dcc1339bd Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 9 Apr 2023 12:50:57 +0100
Subject: [PATCH 120/264] Update change log with details of release v4.21.1

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a922e7060..afae53dcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,32 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
+## Release v4.21.1 of 09 April 2023
+
+* Completed implementation of support for [REML version 5](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/version-4.21.0/Docs/Design/reml.html) (ommitted from v4.20.0 in error) and fixed some bugs in the original implementation [issues #81 and #82], including:
+  * Heavily revised "active text" handling code and document model to fix support for lists introduced in v4.21.0.
+  * Added support for rendering lists in plain text reports and generated source code header comments.
+  * Added support for rendering lists in Rich Text Format for use in printed information and in reports copied to the clipboard.
+  * Overhauled HTML rendering code that generates HTML for display in the UI.
+  * Heavily revised parsing and generation of REML code.
+  * Updated "active text" validation code.
+* Prevented snippets editor from stripping REML `<p>` tags [issue #103].
+* Fixed garbled copyright symbols in generated source code [issue #80].
+* Fixed bug in code that compresses multiple white space into a single space [issue #95].
+* Fixed out of range error in code that handles text encodings [issue #97].
+* Fixed broken formatting of compiler result tables in text and rich text snippet reports & print outs [issue #101].
+* Updated copyright date displayed in about box [issue #98].
+* Updated operating system detection code to detect Windows 10/11 builds released in December 2022 and Q1 2023.
+* Some refactoring [including issue #83] 
+* Changed build process to create all files in `_build` directory and to use different zip file names [issue #78].
+* Documentation changes:
+  * Updated `Build.html` to document changes in build process.
+  * Updated `CHANGELOG.md` to fix broken link [issue #76] and to remove information about semantic versioning.
+  * Removed broken links in `Docs/License.html`.
+  * Updated copyright date in various license files [including issue #96].
+  * Fixed errors and oversights in REML documentation.
+* Removed some redundant tests that were failing due to passing invalid parameters to the revised _StrWrap_ routine [issue #79].
+
 ## Release v4.21.0 of 16 December 2022
 
 * Updated to support [REML version 5](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/version-4.21.0/Docs/Design/reml.html) in snippet description & extra information [issue #71]:

From 57d70dbc7832e8aebbf3a1c5fdedb0a38767f042 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 29 Apr 2023 08:33:57 +0100
Subject: [PATCH 121/264] Fix vulnerability in jQuery per dependabot alert

Uses patch suggested at in GitHub Dependabot alert 1
https://github.com/delphidabbler/codesnip/security/dependabot/1

Fixes #107
---
 Src/Res/Scripts/easteregg.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Src/Res/Scripts/easteregg.js b/Src/Res/Scripts/easteregg.js
index 103bd4ef4..b74a93bcd 100644
--- a/Src/Res/Scripts/easteregg.js
+++ b/Src/Res/Scripts/easteregg.js
@@ -13,6 +13,12 @@
 // Main function called when DOM has loaded. Runs prelinary animations up to
 // when introductory page is shown on unfolded screen
 $(document).ready(function(){
+  
+  //! Fix vulnerability using patch suggested in dependabot alert
+  //! https://github.com/delphidabbler/codesnip/security/dependabot/1 
+  jQuery.htmlPrefilter = function( html ) {
+    return html;
+  };
 
   var spt = null;  // showPrompt timeout
 

From f4d174805fcf7a1f4c2dd2532a0e9e3ac0ede4b3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 01:57:18 +0100
Subject: [PATCH 122/264] Add Src/Res/Img/AltBranding directory & images

This directory provides public domain placeholder images that can be
used in derived programs in place of CodeSnip's branding images that
are prohibited from use in derived programs.

There's also README.txt that explains the purpose of the directory.
---
 Src/Res/Img/AltBranding/CodeSnip.ico | Bin 0 -> 16572 bytes
 Src/Res/Img/AltBranding/README.txt   |  48 +++++++++++++++++++++++++++
 Src/Res/Img/AltBranding/Splash.gif   | Bin 0 -> 3053 bytes
 Src/Res/Img/AltBranding/icon.gif     | Bin 0 -> 157 bytes
 4 files changed, 48 insertions(+)
 create mode 100644 Src/Res/Img/AltBranding/CodeSnip.ico
 create mode 100644 Src/Res/Img/AltBranding/README.txt
 create mode 100644 Src/Res/Img/AltBranding/Splash.gif
 create mode 100644 Src/Res/Img/AltBranding/icon.gif

diff --git a/Src/Res/Img/AltBranding/CodeSnip.ico b/Src/Res/Img/AltBranding/CodeSnip.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a5a72e8e9309b3df6b49265c602d70b9b8f2c759
GIT binary patch
diff --git a/Src/Res/Img/AltBranding/README.txt b/Src/Res/Img/AltBranding/README.txt
new file mode 100644
index 000000000..81c75b353
--- /dev/null
+++ b/Src/Res/Img/AltBranding/README.txt
@@ -0,0 +1,48 @@
+About the Src/Res/Img/AltBranding directory
+===========================================
+
+If you are creating a fork of CodeSnip, or a program based on it, then
+the CodeSnip license does not permit you to use the images in the
+`Src/Res/Img/Branding` directory. But, since CodeSnip expects to find
+the files `CodeSnip.ico`, `icon.gif` and `Splash.gif` in that directory,
+simply deleting the images will cause CodeSnip to fail to build.
+
+Alternative versions of the above images are provided in the
+`Src/Res/Img/AltBranding` directory. These files are Public Domain, and
+therefore can be used and modified in derived programs.
+
+Simply copy the image files from the `Src/Res/Img/AltBranding` directory
+into `Src/Res/Img/Branding`, overwriting the existing files. CodeSnip
+can then be built successfully without using the prohibited files.
+
+It is not expected that the images will be used as-is. They are provided
+only as placeholders to enable CodeSnip to build successfully.
+Evetually you may want to edit the images to meet your needs.
+Alternatively, the CodeSnip source could be changed so that the images
+are not required at all.
+
+Because the files are Public Domain, you may relicense any modified
+version as you wish.
+
+
+Information about the files
+---------------------------
+
+`CodeSnip.ico`
+
+  This is the program's main icon.
+
+  It contains images at four different resolutions: 16×16, 32×32, 48×48
+  and 256×256 pixels.
+
+`icon.gif`
+
+  A 32×32 pixel GIF file that is displayed in the About box.
+
+`Splash.gif`
+
+  A 325×155 pixel GIF image that is displayed as a splash screen while
+  the program is loading.
+
+  The program's version number is overlaid in the bottom quarter of the
+  image.
diff --git a/Src/Res/Img/AltBranding/Splash.gif b/Src/Res/Img/AltBranding/Splash.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ea67c501cd09e253a14577155e012e53018d88a9
GIT binary patch
diff --git a/Src/Res/Img/AltBranding/icon.gif b/Src/Res/Img/AltBranding/icon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..47ce6d3540b230f74b743ecb0bd764eed867955d
GIT binary patch

From f32fa6c20aab8592b133aa9a22e28095c3074294 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 02:26:26 +0100
Subject: [PATCH 123/264] Overhaul and correct main license file.

Rewrite Source Code section to include all information from redundant
LICENSE files.

Modifications to some licenses.

Add Public Domain CC0 license to Open Source Licenses section.

Add DelphiDabbler Exclusive Use License to Proprietary Source Code
section & license branding files and Docs/License.html using it.

License files in new Src/Res/Img/AltBranding directory as Public Domain.

Delete MPL2.0 boilerplate comments from license file: it is no longer
MPL'd

Some other corrections and minor edits.
---
 Docs/License.html | 402 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 282 insertions(+), 120 deletions(-)

diff --git a/Docs/License.html b/Docs/License.html
index f5cae9b16..131c7a549 100644
--- a/Docs/License.html
+++ b/Docs/License.html
@@ -1,20 +1,20 @@
 ﻿<!DOCTYPE HTML>
 
 <!--
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at https://mozilla.org/MPL/2.0/
- *
  * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip license.
+ *
+ * This file MUST NOT be modified for use in derived programs.
+ * Display this file in a web browser and read its content for further
+ * information.
 -->
 
 <html lang="en">
 
 <head>
 
-<meta charset="UTF-8" />
+<meta charset="UTF-8">
 
 <title>
   CodeSnip License
@@ -221,6 +221,12 @@
   <h1>
     Overview
   </h1>
+  <p>
+    This license applies to the standard and portable editions <em>CodeSnip</em> in executable form and to <em>CodeSnip</em>'s source code.
+  </p>
+  <p>
+    An unaltered copy of this license <strong>must</strong> be distributed with any executable or source code form of <em>CodeSnip</em>.
+  </p>
   <h2>
     Executable Program
   </h2>
@@ -237,159 +243,206 @@ <h2>
     <em>CodeSnip</em> as you wish.
   </p>
   <p>
-    You may also modify <em>CodeSnip</em> as you wish and you may distribute
-    copies of your modified version under the terms of the license. The only exception is that you may not use the program's branding
-    (including the names &quot;DelphiDabbler&quot; and &quot;CodeSnip&quot;, the program's icon and the splash screen), in any modification you distribute,
-    unless you have the explicit permission of the copyright holder.
+    You may also modify <em>CodeSnip</em> and you may distribute copies of your modified version under the terms of the license, with the exception that you may not use the program's branding (including the names &quot;DelphiDabbler&quot; and &quot;CodeSnip&quot;, the program's icon and the splash screen), in any modification you distribute, unless you have the explicit permission of the copyright holder.
   </p>
   <h2>
     Source Code
   </h2>
   <p>
-    All of <em>CodeSnip</em>'s original source code, including third party code,
-    is available from the <a
-      href="https://github.com/delphidabbler/codesnip"
-    ><em>CodeSnip</em> GitHub repository</a>.
+    For the purposes of this license, the term &quot;source code&quot; refers to all files that are part of the <a href="https://github.com/delphidabbler/codesnip"><em>delphidabbler/codesnip</em></a> repository on GitHub. This includes all program code, documentation and image files.
   </p>
   <p>
-    Details of the license applying to a source code file will usually be
-    included in a comment within the file itself. If this is not the case any
-    file named <kbd>LICENSE</kbd> in the same directory, or a parent directory,
-    should contain the required information.
+    Unless explicitly mentioned in the <em>Exceptions</em> sub-section below, all source files are licensed under the <a href="#mpl-2.0">Mozilla Public License 2.0</a> (MPL 2.0).
   </p>
+  <h3>
+    Exceptions
+  </h3>
   <p>
-    Most of the source code is available under the <a href="#mpl-2.0">Mozilla
-    Public License 2.0</a> (MPL 2.0). Other relevant source code licenses are
-    listed below.
+    The following licenses apply to the specified files:
   </p>
   <ul>
     <li>
       <div class="license-name">
-        <a href="#md5">MD5 License</a>
+        <a href="#tlistviewex">Vadim Crit's TListViewEx License</a>
+      </div>
+      <div class="applies-to">
+        <kbd>Src/3rdParty/LVEx.pas</kbd>.
       </div>
       <div class="applies-to">
-        Applies to <kbd>Src/3rdParty/PJMD5.pas</kbd>, in addition to the <a
-          href="#mpl-2.0"
-        >Mozilla Public License 2.0</a>.
+        <kbd>Src/3rdParty/LVEx.res</kbd>.
       </div>
     </li>
     <li>
       <div class="license-name">
-        <a href="#tlistviewex">Vadim Crit's TListViewEx License</a>
+        <a href="#jquery">jQuery License</a>
       </div>
       <div class="applies-to">
-        Used by <kbd>Src/3rdParty/LVEx.pas</kbd> and
-        <kbd>Src/3rdParty/LVEx.res</kbd>.
+        <kbd>Src/Res/Scripts/3rdParty/jquery-1.12.4.min.js</kbd>.
       </div>
     </li>
     <li>
       <div class="license-name">
-        <a href="#jquery">jQuery License</a>
+        <a href="#jquery-cycle">jQuery Cycle Lite Plugin MIT License</a>
       </div>
       <div class="applies-to">
-        Used by <kbd>Src/Res/Scripts/3rdParty/jquery-1.8.0.min.js</kbd>
+        <kbd>Src/Res/Scripts/3rdParty/jquery.cycle.lite.js</kbd>.
+      </div>
+      <div class="indent">
+        Note that jQuery Cycle Lite is dual licensed under the MIT or GPL license. It is used here under the MIT license.
       </div>
     </li>
     <li>
       <div class="license-name">
-        <a href="#jquery-cycle">jQuery Cycle Lite Plugin License</a>
+        <a href="#CC-BY-SA-3.0">Creative Commons Attribution Share Alike 3.0 License</a>
+      </div>
+      <div class="applies-to">
+        All files in the <kbd>Src/Help/Images</kbd> directory.
+      </div>
+      <div class="applies-to">
+        All files in the <kbd>Src/Res/Img</kbd> directory.
       </div>
       <div class="applies-to">
-        Used by <kbd>Src/Res/Scripts/3rdParty/jquery.cycle.lite.js</kbd>
+        All files in the <kbd>Src/Res/Img/Egg</kbd> directory.
+      </div>
+      <aside>
+        <div>
+          This license requires that the images in the above directories should be attributed. To do this
+          simply note in your documentation, about box, web page or similar that
+          the images form part of the image set for DelphiDabbler <em>CodeSnip</em>
+          and provide a link to <a
+            href="https://delphidabbler.com/software/codesnip"
+          >https://delphidabbler.com/software/codesnip</a>.
+        </div>
+      </aside>
+      <div class="indent">
+        <div>
+          Some of the image files above include copies, modifications or remixes of third-party images supplied under the following licenses:
+        </div>
+        <ul>
+          <li>
+            <div class="license-name">
+              <a href="#CC-BY-2.5">Creative Commons Attribution 2.5 License</a>
+            </div>
+            <div class="applies-to">
+              Silk Icon set v1.3.
+            </div>
+            <div class="applies-to">
+              Silk Companion 1.
+            </div>
+          </li>
+          <li>
+            <div class="license-name">
+              <a href="#CC-BY-SA-3.0">Creative Commons Attribution Share Alike 3.0
+              License</a>
+            </div>
+            <div class="applies-to">
+              Led Icon Set.
+            </div>
+            <div class="applies-to">
+              Aha-Soft 16x16 Free Application Icons.
+            </div>
+          </li>
+          <li>
+            <div class="license-name">
+              <a href="#toolbar-icons-mit">Toolbar Icons MIT License</a>
+            </div>
+            <div class="applies-to">
+              Toolbar Icons.
+            </div>
+          </li>
+        </ul>
+      </div>
+      <div class="indent">
+        Those images originally supplied under the <a href="#CC-BY-2.5">Creative Commons Attribution 2.5 License</a> and the <a href="#toolbar-icons-mit">Toolbar Icons MIT License</a> have been relicensed under the <a href="#CC-BY-SA-3.0">Creative Commons Attribution Share Alike 3.0 License</a>, as is permitted by the licenses.
+      </div>
+    </li>
+    <li>
+      <div class="license-name">
+        <a href="#cc0">CC0 1.0 Universal Public Domain Dedication</a>
+      </div>
+      <div class="applies-to">
+        All files in the <kbd>Src/Res/Img/AltBranding</kbd> directory.
+      </div>
+      <aside>
+        <div>
+          These files are provided as placeholder replacements for the identically named files in the <kbd>Src/Res/Img/Branding</kbd> directory that are not permitted to be used in derived programs (&quot;Larger Works&quot;).
+        </div>
+      </aside>
+      <div class="applies-to">
+        <kbd>Src/CodeSnip.cfg.tplt</kbd>.
+      </div>
+      <div class="applies-to">
+        <kbd>Src/CodeSnip.dproj</kbd>.
+      </div>
+      <div class="applies-to">
+        <kbd>Src/CodeSnip.groupproj</kbd>.
+      </div>
+      <div class="applies-to">
+        <kbd>Src/CodeSnip.todo</kbd>.
+      </div>
+      <div class="applies-to">
+        All files in the <kbd>Tests/Src/DUnit</kbd> directory.
+      </div>
+    </li>
+    <li>
+      <div class="license-name">
+        <a href="#ddab-exclusive">DelphiDabbler Exclusive Use License</a>
+      </div>
+      <div class="applies-to">
+        <code>Docs/License.html</code> (this file).
+      </div>
+      <div class="indent">
+        Any derived applications (&quot;Larger Works&quot;) <strong>must</strong> include a license that is compatible with the terms of this license as it relates to any of <em>CodeSnip</em>'s source code that is used in the larger work.
+      </div>
+      <div class="applies-to">
+        All files in the <kbd>Src/Res/Img/Branding</kbd> directory.
+      </div>
+      <div class="indent">
+        These files comprise the program's icon and splash screen and <strong>must not</strong> be used in, or distributed with, derived programs.
+      </div>
+      <aside>
+        <div>
+          Identically named images from the <kbd>Src/Res/Img/AltBranding</kbd> directory may be used as replacements in derived programs (&quot;Larger Works&quot;). These images may be freely modified.
+        </div>
+      </aside>
+    </li>
+    <li>
+      <div class="license-name">
+        <a href="#md5">MD5 License</a>
+      </div>
+      <div class="applies-to">
+        <kbd>Src/3rdParty/PJMD5.pas</kbd>
+      </div>
+      <div class="indent">
+        The MD5 License applies to this file <em>in addition</em> to the <a href="#mpl-2.0">Mozilla Public License 2.0</a>.
       </div>
     </li>
   </ul>
+
+  <h3>
+    Automatically generated files
+  </h3>
   <p>
-    Some 3rd party source code requires attribution. See the
-    <a href="#required-notices">Required Notices</a> section below.
-  </p>
-  <h2>
-    Images
-  </h2>
-  <p>
-    Numerous images are used in the <em>CodeSnip</em> project. Some are
-    original while others are copied or modified from third party sources.
+    Some source files are automatically generated as part of the build process. Such files are not included in the <a href="https://github.com/delphidabbler/codesnip"><em>delphidabbler/codesnip</em></a> repository.
   </p>
   <p>
-    Copies of the images are available in the <a
-      href="https://github.com/delphidabbler/codesnip"
-    ><em>CodeSnip</em> GitHub Repository</a> in the
-    <kbd>Src/Help/Images</kbd> and <kbd>Src/Res/Img</kbd> directories and
-    sub-directories. These images are licensed as follows:
+    The license that applies to these files is the same as that of the generating file. The automatically generated files are:
   </p>
   <ul>
     <li>
-      <div>
-        The program's icon and splash screen may not be copied or modified and
-        may not be used in distribution of derived programs without explicit
-        permission of the copyright holder.
-      </div>
-      <div>
-        This condition applies to all files in the
-        <kbd>Src/Res/Img/Branding</kbd> directory, all of which are original
-        work copyright &copy; 2012-2023 by <a
-          href="https://gravatar.com/delphidabbler"
-        >Peter D Johnson</a>.
-      </div>
+      <kbd>Src/CodeSnip.cfg</kbd>, generated from <kbd>CodeSnip.cfg.tplt</kbd> (<a href="#cc0">CC0</a>).
     </li>
     <li>
-      <div>
-        Images found in the <kbd>Src/Help/Images</kbd>, <kbd>Src/Res/Img</kbd>
-        and <kbd>Src/Res/Img/Egg</kbd> directories, are licensed under the
-        <a href="#CC-BY-SA-3.0">Creative Commons Attribution Share Alike 3.0
-        License</a>.
-      </div>
-      <div>
-        This license requires that the images should be attributed. To do this
-        simply note in your documentation, about box, web page or similar that
-        the icons form part of the image set for DelphiDabbler <em>CodeSnip</em>
-        and provide a link to <a
-          href="https://delphidabbler.com/software/codesnip"
-        >https://delphidabbler.com/software/codesnip</a>.
-      </div>
-      <div>
-        These images include modifications and remixes of icons supplied under
-        the following licenses:
-      </div>
-      <ul>
-        <li>
-          <div class="license-name">
-            <a href="#CC-BY-2.5">Creative Commons Attribution 2.5 License</a>
-          </div>
-          <div class="applies-to">
-            Silk Icon set v1.3
-          </div>
-          <div class="applies-to">
-            Silk Companion 1
-          </div>
-        </li>
-        <li>
-          <div class="license-name">
-            <a href="#CC-BY-SA-3.0">Creative Commons Attribution Share Alike 3.0
-            License</a>
-          </div>
-          <div class="applies-to">
-            Led Icon Set
-          </div>
-          <div class="applies-to">
-            Aha-Soft 16x16 Free Application Icons
-          </div>
-        </li>
-        <li>
-          <div class="license-name">
-            <a href="#toolbar-icons-mit">Toolbar Icons MIT License</a>
-          </div>
-          <div class="applies-to">
-            Toolbar Icons
-          </div>
-        </li>
-      </ul>
+      <kbd>Src/AutoGen/IntfExternalObj.pas</kbd>, generated from <kbd>Src/ExternalObj.ridl</kbd>  (<a href="#mpl-2.0">MPL 2.0</a>).
     </li>
   </ul>
+  <h3>
+    Attribution
+  </h3>
   <p>
-    Some 3rd party image sets require attribution. See the
-    <a href="#required-notices">Required Notices</a> section below.
+    Some 3rd party source code and image sets require attribution. Such attributions are provided in the <a href="#required-notices">Required Notices</a> section below.
   </p>
+
 </section>
 
 <section id="open-source-licenses">
@@ -832,7 +885,7 @@ <h3>Exhibit B - &quot;Incompatible With Secondary Licenses&quot; Notice</h3>
     Licenses&quot;, as defined by the Mozilla Public License, v. 2.0.</p>
   </blockquote>
 
-  <hr />
+  <hr>
 
   <h2 id="md5">
     MD5 License
@@ -859,7 +912,7 @@ <h2 id="md5">
   <p>These notices must be retained in any copies of any part of this
   documentation and/or software.</p>
 
-  <hr />
+  <hr>
 
   <h2 id="tlistviewex">
     Vadim Crit's TListViewEx License
@@ -879,7 +932,7 @@ <h2 id="tlistviewex">
     the reference to the original author.</li>
   </ol>
 
-  <hr />
+  <hr>
 
   <h2 id="jquery">
     jQuery License
@@ -908,10 +961,10 @@ <h2 id="jquery">
   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   DEALINGS IN THE SOFTWARE.</p>
 
-  <hr />
+  <hr>
 
   <h2 id="jquery-cycle">
-    jQuery Cycle Lite Plugin License
+    jQuery Cycle Lite Plugin MIT License
   </h2>
 
   <p>Copyright 2008-2012 M. Alsup <a
@@ -937,7 +990,7 @@ <h2 id="jquery-cycle">
   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   DEALINGS IN THE SOFTWARE.</p>
 
-  <hr />
+  <hr>
 
   <h2 id="CC-BY-SA-3.0">
     Creative Commons Attribution Share Alike 3.0 License
@@ -1333,7 +1386,7 @@ <h3>Creative Commons Notice</h3>
   </aside>
   <!-- END CC NOTICE -->
 
-  <hr />
+  <hr>
 
   <h2 id="CC-BY-2.5">
     Creative Commons Attribution 2.5 License
@@ -1606,7 +1659,7 @@ <h2 id="CC-BY-2.5">
     >https://creativecommons.org/</a>.</p>
   </aside>
 
-  <hr />
+  <hr>
 
   <h2 id="toolbar-icons-mit">
     Toolbar Icons MIT License
@@ -1638,20 +1691,129 @@ <h2 id="toolbar-icons-mit">
   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   DEALINGS IN THE SOFTWARE.</p>
 
+  <hr>
+
+  <h2 id="cc0">
+    CC0 1.0 Universal Public Domain Dedication
+  </h2>
+
+  <aside>
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER.
+  </aside>
+
+  <h3>
+    Statement of Purpose
+  </h3>
+
+  <p>
+    The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+  </p>
+
+  <p>
+    Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+  </p>
+
+  <p>
+    For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+  </p>
+
+  <p>
+    <strong>1. Copyright and Related Rights.</strong> A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+  </p>
+
+  <ol type="i">
+    <li>
+      the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+    </li>
+    <li>
+      moral rights retained by the original author(s) and/or performer(s);
+    </li>
+    <li>
+      publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+    </li>
+    <li>
+      rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+    </li>
+    <li>
+      rights protecting the extraction, dissemination, use and reuse of data in a Work;
+    </li>
+    <li>
+      database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+    </li>
+    <li>
+      other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+    </li>
+  </ol>
+
+  <p>
+    <strong>2. Waiver.</strong> To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+  </p>
+
+  <p>
+    <strong>3. Public License Fallback.</strong> Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+  </p>
+
+  <p>
+    <strong>4. Limitations and Disclaimers.</strong>
+  </p>
+
+  <ol type="a">
+    <li>
+      No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+    </li>
+    <li>
+      Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+    </li>
+    <li>
+      Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+    </li>
+    <li>
+      Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
+    </li>
+  </ol>
+
 </section>
 
 <section id="proprietary-source-code">
+
   <h1>
     Proprietary Source Code
   </h1>
+
+  <h2>
+    Embarcadero
+  </h2>
+
   <p>
     <em>CodeSnip</em> is built using <em>Embarcadero Delphi XE</em>.
   </p>
+
   <p>
     Original and third party source code make calls to the proprietary Delphi
     run time library, parts of which are statically linked into the
     <em>CodeSnip</em> executable.
   </p>
+
+  <hr>
+
+  <h2 id="ddab-exclusive">
+    DelphiDabbler Exclusive Use License
+  </h2>
+
+  <p>
+    Files covered by this license are original work, copyright &copy; 2012-2023, <a href="https://gravatar.com/delphidabbler">Peter D Johnson</a>.
+  </p>
+
+  <p>
+    Such files <strong>must not</strong> be used, in either original or modified form, in any distribution of a derived program (&quot;Larger Work&quot;) without the written permission of the copyright holder. To seek to obtain such permission open an issue on the <em>CodeSnip</em> <a href="https://github.com/delphidabbler/codesnip/issues">Issue Tracker</a>.
+  </p>
+
+  <aside>
+    <p>
+      This restriction does not apply to modifications of <em>CodeSnip</em> that are for personal use only and that are not distributed publicly.
+    </p>
+  </aside>
+
 </section>
 
 <section id="required-notices">
@@ -1706,11 +1868,11 @@ <h1>
       >https://www.jrsoftware.org/isinfo.php</a>.
     </li>
     <li>
-      Some program icons are based on the public domain PixelBox icon collection:
+      Some images are based on the public domain PixelBox icon collection:
       <del>http://www.icojam.com/blog/?p=222</del> [link broken].
     </li>
     <li>
-      Some program icons are based on Florian Haag's Toolbar Icons set at <a
+      Some images are based on Florian Haag's Toolbar Icons set at <a
         href="https://toolbaricons.sourceforge.net/"
       >https://toolbaricons.sourceforge.net/</a>.
     </li>

From 1446d998634fdffcae8ff1fceffdee2877f8bc4b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 02:16:46 +0100
Subject: [PATCH 124/264] Rename two LICENSE files

Rename LICENSE file in repo root as LICENSE.md
Rename Src/Res/Img/Branding/LICENSE as README.txt
---
 LICENSE => LICENSE.md                        | 0
 Src/Res/Img/Branding/{LICENSE => README.txt} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE => LICENSE.md (100%)
 rename Src/Res/Img/Branding/{LICENSE => README.txt} (100%)

diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md
diff --git a/Src/Res/Img/Branding/LICENSE b/Src/Res/Img/Branding/README.txt
similarity index 100%
rename from Src/Res/Img/Branding/LICENSE
rename to Src/Res/Img/Branding/README.txt

From 91e63e43d18e8cb84cab740b8576b2cab807c923 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 02:35:37 +0100
Subject: [PATCH 125/264] Delete redundant LICENSE files.

---
 Docs/LICENSE                     |  9 ---------
 Src/3rdParty/LICENSE             | 12 ------------
 Src/AutoGen/LICENSE              |  7 -------
 Src/Help/Images/LICENSE          |  5 -----
 Src/Install/Assets/LICENSE       |  9 ---------
 Src/LICENSE                      | 20 --------------------
 Src/Res/Img/LICENSE              | 16 ----------------
 Src/Res/Scripts/3rdParty/LICENSE | 10 ----------
 Tests/Src/DUnit/LICENSE          |  3 ---
 9 files changed, 91 deletions(-)
 delete mode 100644 Docs/LICENSE
 delete mode 100644 Src/3rdParty/LICENSE
 delete mode 100644 Src/AutoGen/LICENSE
 delete mode 100644 Src/Help/Images/LICENSE
 delete mode 100644 Src/Install/Assets/LICENSE
 delete mode 100644 Src/LICENSE
 delete mode 100644 Src/Res/Img/LICENSE
 delete mode 100644 Src/Res/Scripts/3rdParty/LICENSE
 delete mode 100644 Tests/Src/DUnit/LICENSE

diff --git a/Docs/LICENSE b/Docs/LICENSE
deleted file mode 100644
index 6fd5af54f..000000000
--- a/Docs/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-All the files in the Docs directory, and all its sub-directories are governed by
-the following license.
-
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-All files are Copyright (C) 2012-2021, Peter Johnson
-(gravatar.com/delphidabbler).
diff --git a/Src/3rdParty/LICENSE b/Src/3rdParty/LICENSE
deleted file mode 100644
index e93ffd769..000000000
--- a/Src/3rdParty/LICENSE
+++ /dev/null
@@ -1,12 +0,0 @@
-Files in the Src/3rdParty directory are licensed as follows:
-
-LVEx.pas
---------
-This file, and the accompanying resource file (LVEx.res), are freeware copyright
-(c) 1999-2009 Vadim Crits. For details of the terms and conditions of use see
-Docs/License.html#tlistviewex.
-
-All Other Files
----------------
-All other files in the directory include licensing information in their
-comments.
\ No newline at end of file
diff --git a/Src/AutoGen/LICENSE b/Src/AutoGen/LICENSE
deleted file mode 100644
index db6ff5e35..000000000
--- a/Src/AutoGen/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Files in the Src/AutoGen directory are auto-generated from other files and are
-governed by the licenses that pertain to those files.
-
-For a list of such files see ReadMe.txt in this directory.
-
-The ReadMe.txt file itself has any copyright dedicated to the Public Domain.
-https://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file
diff --git a/Src/Help/Images/LICENSE b/Src/Help/Images/LICENSE
deleted file mode 100644
index 731dda904..000000000
--- a/Src/Help/Images/LICENSE
+++ /dev/null
@@ -1,5 +0,0 @@
-All image files in the Src/Help/Images directory are licensed under the Creative
-Commons Attribution Share Alike 3.0 License
-(https://creativecommons.org/licenses/by-sa/3.0/).
-
-A full copy of this license is available in Docs/License.html#CC-BY-SA-3.0.
diff --git a/Src/Install/Assets/LICENSE b/Src/Install/Assets/LICENSE
deleted file mode 100644
index fe6bd5582..000000000
--- a/Src/Install/Assets/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-All the files in the Src/Install/Assets directory are governed by the following
-license.
-
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-All files are copyright (C) 2012-2021, Peter Johnson
-(gravatar.com/delphidabbler).
diff --git a/Src/LICENSE b/Src/LICENSE
deleted file mode 100644
index 29f642273..000000000
--- a/Src/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-This file describes the licenses that apply to source code files in the Src
-directory and its sub-directories, unless the sub-directory or its closest
-parent directory also contains a LICENSE file, in which case that file takes
-precedence.
-
-Most files contain a comment that provides license information.
-
-Exceptions are:
-
-* All .dfm files are licensed under the same license as the related .pas file.
-  For example, if Foo.pas is licensed under the Mozilla Public License v2.0 then
-  the same license also applies to Foo.dfm.
-
-* The following files have any copyright dedicated to the Public Domain
-  https://creativecommons.org/publicdomain/zero/1.0/
-
-    - Src/CodeSnip.cfg.tplt
-    - Src/CodeSnip.dproj
-    - Src/CodeSnip.groupproj
-    - Src/CodeSnip.todo
\ No newline at end of file
diff --git a/Src/Res/Img/LICENSE b/Src/Res/Img/LICENSE
deleted file mode 100644
index 687e07ab3..000000000
--- a/Src/Res/Img/LICENSE
+++ /dev/null
@@ -1,16 +0,0 @@
-All image files in the Src/Res/Img and Src/Res/Img/Egg directories are made
-available under the Creative Commons Attribution Share Alike 3.0 License
-(https://creativecommons.org/licenses/by-sa/3.0/).
-
-A full copy of this license is available in Docs/License.html#CC-BY-SA-3.0.
-
-Some images have been derived or copied from files covered by the following
-licenses, all of which permit relicensing under the Creative Commons Attribution
-Share Alike 3.0 License:
-
-  * Creative Commons Attribution 2.5 License
-  * Creative Commons Attribution Share Alike 3.0 License
-  * MIT license
-
-Files in Src/Res/Img/Branding are licensed differently: See
-Src/Res/Img/Branding/LICENSE for details.
\ No newline at end of file
diff --git a/Src/Res/Scripts/3rdParty/LICENSE b/Src/Res/Scripts/3rdParty/LICENSE
deleted file mode 100644
index 717562f2a..000000000
--- a/Src/Res/Scripts/3rdParty/LICENSE
+++ /dev/null
@@ -1,10 +0,0 @@
-Files in the Src/Res/Scripts/3rdParty directory are licensed as follows.
-
-jquery.cycle.lite.js
---------------------
-Dual licensed under the MIT or GPL license. It is used here under the MIT
-license. See Docs/License.html#jquery-cycle for details.
-
-jquery-1.8.0.min.js
-------------------
-MIT license. See Docs/License.html#jquery for details.
\ No newline at end of file
diff --git a/Tests/Src/DUnit/LICENSE b/Tests/Src/DUnit/LICENSE
deleted file mode 100644
index 349a54e77..000000000
--- a/Tests/Src/DUnit/LICENSE
+++ /dev/null
@@ -1,3 +0,0 @@
-All files in the Tests/Src/DUnit directory have any copyright dedicated to the
-Public Domain.
-https://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file

From c7c36ad6d1de2f7eb7ad24e00d6997319f88b4da Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 03:21:03 +0100
Subject: [PATCH 126/264] Update Build.html

Most changes relate to revised CodeSnip license.

Add new "Conditions For Release of Modified Code" section to explain
changes to code required to remove CodeSnip branding etc.

Revise "Get the Source Code" sub-section and add note linking to above
new section.

Update source code tree to include new Src/Res/Img/AltBranding
directory.

Fix size of mono fonts used by code and pre tags.

Fix minor typo
---
 Build.html | 160 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 115 insertions(+), 45 deletions(-)

diff --git a/Build.html b/Build.html
index b918791bf..f7c5479f7 100644
--- a/Build.html
+++ b/Build.html
@@ -21,6 +21,9 @@
     body {
       font-family: sans-serif;
     }
+    code, pre {
+      font-size: 1rem;
+    }
     dt.spaced {
       margin-top: 0.5em;
     }
@@ -157,7 +160,7 @@ <h3>
   </dt>
   <dd>
     Type library importer tool. Used to create a Pascal unit that describes
-    code contained in <code>ExternalObj.idl</code>.
+    code contained in <code>ExternalObj.ridl</code>.
   </dd>
 </dl>
 
@@ -376,30 +379,34 @@ <h3>
 </h3>
 
 <p>
-  The source code is maintained in the <code><a href="https://github.com/delphidabbler/codesnip">delphidabbler/codesnip</a></code> Git respository on GitHub.
+  The source code is maintained in the <code><a href="https://github.com/delphidabbler/codesnip">delphidabbler/codesnip</a></code> Git respository on GitHub. Source code can be obtained in three ways:
 </p>
 
-<p>
-  If you are intending to contribute code to the project you need to:
-</p>
-
-<ol class="spaced">
-  <li>
-    Fork the project on GitHub.
-  </li>
+<ol>
   <li>
-    Create a new branch off the <code>development</code> branch.
+    <p>
+      Fork the project from GitHub and then clone your forked repository.
+    </p>
   </li>
   <li>
-    Make your changes on the branch you created.
+    <p>
+      Clone the existing repository using:
+    </p>
+    <pre class="cmd"><span class="prompt">&gt;</span> git clone https://github.com/delphidabbler/codesnip.git</pre>
   </li>
   <li>
-    Once finished raise a pull request for your code on the <code>delphidabbler/codesnip</code> repo.
+    <p>
+      Download the source of a specific release from the project's <a href="https://github.com/delphidabbler/codesnip/releases">Releases</a> section on GitHub &ndash; just choose the version you want.
+    </p>
   </li>
 </ol>
 
 <p>
-  If you only intend to use the code for your own purposes you can still fork the repository as above. Alternatively you can download the source code from the project's <a href="https://github.com/delphidabbler/codesnip/releases">Releases</a> section on GitHub &ndash; just choose the version you want.
+  If you are intending to contribute code to the project please read the most up to date version of the project's <a href="https://github.com/delphidabbler/codesnip/blob/develop/README.md">read-me file</a> before doing so.
+</p>
+
+<p class="note">
+  <strong>Important:</strong> If you are planning to fork <em>CodeSnip</em> and to develop and release your own application derived from the CodeSnip code base then some changes to the code are required under the terms of the <em>CodeSnip</em> license. See the <a href="#conditions">Conditions For Release of Modified Code</a> section below for details.
 </p>
 
 <h3>
@@ -412,53 +419,55 @@ <h3>
 
 <pre>./
   |
-  +-- Docs                  - documentation
+  +-- Docs                    - documentation
   |   |
-  |   +-- Design            - documents concerning program design
+  |   +-- Design              - documents concerning program design
   |      |
-  |      +-- FileFormats    - documentation of CodeSnip's file formats
+  |      +-- FileFormats      - documentation of CodeSnip's file formats
   |
-  +-- Src                   - main CodeSnip source code
+  +-- Src                     - main CodeSnip source code
   |   |
-  |   +-- 3rdParty          - third party &amp; DelphiDabbler library source code
+  |   +-- 3rdParty            - third party &amp; DelphiDabbler library source code
   |   |
-  |   +-- AutoGen           - receives automatically generated code
+  |   +-- AutoGen             - receives automatically generated code
   |   |
-  |   +-- Help              - help source files
+  |   +-- Help                - help source files
   |   |   |
-  |   |   +-- CSS           - CSS code for help files
+  |   |   +-- CSS             - CSS code for help files
   |   |   |
-  |   |   +-- HTML          - HTML files included in help file
+  |   |   +-- HTML            - HTML files included in help file
   |   |   |
-  |   |   +-- Images        - images included in help file
+  |   |   +-- Images          - images included in help file
   |   |
-  |   +-- Install           - setup script and support code
+  |   +-- Install             - setup script and support code
   |   |   |
-  |   |   +-- Assets        - files required for inclusion in install program
+  |   |   +-- Assets          - files required for inclusion in install program
   |   |
-  |   +-- Res               - container for files that are embedded in resources
+  |   +-- Res                 - container for files that are embedded in resources
   |       |
-  |       +-- CSS           - CSS files
+  |       +-- CSS             - CSS files
   |       |
-  |       +-- HTML          - HTML files
+  |       +-- HTML            - HTML files
   |       |
-  |       +-- Img           - image files
+  |       +-- Img             - image files
+  |       |   |
+  |       |   +-- AltBranding - image files used for 3rd party branding
   |       |   |
-  |       |   +-- Branding  - image files used for CodeSnip branding
+  |       |   +-- Branding    - image files used for CodeSnip branding only
   |       |   |
-  |       |   +-- Egg       - image files for 'Easter Egg'
+  |       |   +-- Egg         - image files for 'Easter Egg'
   |       |
-  |       +-- Misc          - other resources
+  |       +-- Misc            - other resources
   |       |
-  |       +-- Scripts       - scripting files
+  |       +-- Scripts         - scripting files
   |           |
-  |           +-- 3rdParty  - 3rd party scripting files
+  |           +-- 3rdParty    - 3rd party scripting files
   |
-  +-- Tests                 - contains test code
+  +-- Tests                   - contains test code
       |
-      +-- Src               - test source code
+      +-- Src                 - test source code
           |
-          +-- DUnit         - test source code that uses the DUnit framework</pre>
+          +-- DUnit           - test source code that uses the DUnit framework</pre>
 <p>
   If, by chance you also have a <code>_build</code> directory don't worry - all will become clear.
   Git users may also see the usual <code>.git</code> hidden
@@ -497,13 +506,13 @@ <h3>
 
 <pre>./
   |
-  +-- _build                - contains all the build files
+  +-- _build                  - contains all the build files
   |   |
-  |   +-- bin               - receives object files for CodeSnip
+  |   +-- bin                 - receives object files for CodeSnip
   |   |
-  |   +-- exe               - receives executable code and compiled help file
+  |   +-- exe                 - receives executable code and compiled help file
   |   |
-  |   +-- release           - receives release files
+  |   +-- release             - receives release files
   |
   ...</pre>
 
@@ -861,14 +870,14 @@ <h2>
 </p>
 
 <p>
-  To compile the tests, open the <code>.\Src\CodeSnip.groupproj</code> group
+  To compile the tests, open the <code>Src\CodeSnip.groupproj</code> group
   project file in the Delphi XE IDE. Now select the <em>CodeSnipTests.exe</em>
   target in the project manager and compile.
 </p>
 
 <p>
   If they were not already present <code>Bin</code> and <code>Exe</code>
-  sub-directories will have been created in the <code>.\Tests</code> directory.
+  sub-directories will have been created in the <code>Tests</code> directory.
   The <code>Exe</code> directory contains the <em>DUnit</em> test program while
   <code>Bin</code> contains intermediate binaries.
 </p>
@@ -876,7 +885,7 @@ <h2>
 <p>
   You can compile the tests as either a GUI application (default) or as a
   console application. For details please see the comments in
-  <code>.\Tests\Src\DUnit\CodeSnipTests.dpr</code>.
+  <code>Tests\Src\DUnit\CodeSnipTests.dpr</code>.
 </p>
 
 <h2>
@@ -893,6 +902,67 @@ <h2>
   directory.
 </p>
 
+<h2 id="conditions">
+  Conditions For Release of Modified Code
+</h2>
+
+<p>
+  If you are intending to release your own application based on the <em>CodeSnip</em> source code you <strong>must</strong> <em>either</em> change the source code as described below <em>or</em> seek written permission to use the DelphiDabbler CodeSnip branding. To seek such permission please use the <em>CodeSnip</em> <a href="https://github.com/delphidabbler/codesnip/issues">Issue Tracker</a> on GitHub.
+</p>
+
+<h3>
+  Required Changes
+</h3>
+
+<p>
+  The changes are required to remove DelphiDabbler CodeSnip copyrighted branding from the program, to prevent interference with existing CodeSnip installations and to remove any implied endorsement of the modified release. You <strong>must</strong>:
+</p>
+
+<ol>
+  <li>
+    <p>
+      Replace the files in the <code>Src\Res\Img\Branding</code> directory with copies of the identically named placeholder files in the <code>Src\Res\Img\AltBranding</code> directory. The placeholder files are Public Domain, so you may use them as-is, edit them or replace them. If you delete the files in <code>Src\Res\Img\Branding</code> without copying the placeholder files across then <em>CodeSnip</em> will fail to build.
+    </p>
+  </li>
+  <li>
+    <p>
+      Replace all relevant references, in source code and documentation, to the names &quot;CodeSnip&quot; and &quot;DelphiDabbler&quot; with your own company and program name. Relevant occurences are:
+    </p>
+    <ul>
+      <li>
+        Wherever the names may be displayed in the GUI.
+      </li>
+      <li>
+        Wherever the names may be displayed by the installer.
+      </li>
+      <li>
+        Wherever the names occur in directory names. In particular do not use the names in the program's <code>%ProgramData%</code> and <code>%AppData%</code> sub-directories.
+      </li>
+      <li>
+        Anywhere else that use of the names could imply endorsement of the modified code.
+      </li>
+    </ul>
+  </li>
+  <li>
+    <p>
+      Provide your own license file with content compatible with the requirements of the <em>CodeSnip</em> license as it relates to the code reused from the <em>CodeSnip</em> source tree. <strong>Do not</strong> edit or re-use <code>Docs/License.html</code>.
+    </p>
+  </li>
+  <li>
+    <p>
+      Modify source code and documentation where necessary to acknowledge the origins of the program's source code, documentation and images, in accordance with the <em>CodeSnip</em> license.
+    </p>
+  </li>
+</ol>
+
+<p>
+  Note that the <em>CodeSnip</em> license can be found in <code>Docs\License.html</code>.
+</p>
+
+<p>
+  If you are unsure about whether your changes meet the license requirements then you can seek clarification by creating an issue on the aforementioned <a href="https://github.com/delphidabbler/codesnip/issues">Issue Tracker</a>.
+</p>
+
 </body>
 
 </html>

From e3d2540b898dfb43487fb21d64d3534424e03462 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 03:56:35 +0100
Subject: [PATCH 127/264] Rewrite content of Src/Res/Img/Branding/README.txt

Summarises why file in Src/Res/Img/Branding can't be used in forked
versions of CodeSnip.
---
 Src/Res/Img/Branding/README.txt | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/Src/Res/Img/Branding/README.txt b/Src/Res/Img/Branding/README.txt
index 96a458c5e..080124e97 100644
--- a/Src/Res/Img/Branding/README.txt
+++ b/Src/Res/Img/Branding/README.txt
@@ -1,8 +1,19 @@
-All image files in the Src/Res/Img/Branding directory are copyright
-(C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+About the Src/Res/Img/Branding directory
+========================================
 
-The files may not be copied or modified and may not be used in the distribution
-of derived programs without explicit permission of the copyright holder.
+If you are creating a fork of CodeSnip, or a program based on it, the
+CodeSnip license does not permit you to use the images in this directory
+in such a project.
 
-This restriction does not apply to modifications of CodeSnip that are for
-personal use that are not distributed publicly.
\ No newline at end of file
+To assist with this problem, alternative versions of the above images
+are provided in the `Src/Res/Img/AltBranding` directory.
+
+For more information see:
+
+*   `Src/Res/Img/AltBranding/README.txt`
+
+*   `Build.html`, specifically the "Get the Source Code" sub-section and
+    the "Conditions For Release of Modified Code" section.
+
+*   `Docs/License.html` for full details of the license restrictions
+    applying to files in this directory.

From 01ecc986ca597628ad0fb30b0f44e7c31cc44439 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 04:12:06 +0100
Subject: [PATCH 128/264] Rewrite LICENSE.md

This document provides a summary of the license and links to the full
license text in Docs/License.html.
---
 LICENSE.md | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index 9074c751d..94996ab7c 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,20 +1,11 @@
-Licensing of CodeSnip's source and image files is on a per file basis.
+# CodeSnip License
 
-There are two ways that license information can be found:
+Executable releases of CodeSnip are released under the terms of the [Mozilla Public License 2.0](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Docs/License.html#mpl-2.0).
 
-1) By examining comments within source files. License information will be at or
-   near the beginning of the file.
+Much of CodeSnip's source code is released under the same license, although other open source licenses are also used.
 
-2) By reading any LICENSE file that exists in the same directory as the files
-   you are interested in, or if no such file exists, in a parent directory.
-   The "nearest" LICENSE file takes precedence.
+There are restrictions on using CodeSnip's branding in any independent forks of the program.
 
-   A LICENSE file is used to provide license information for source files that
-   have no (or unclear) embedded information and for images and other files that
-   do not have human-readable content.
+For definitive details see the [full license text](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Docs/License.html). 
 
-If any information is missing or incorrect please inform the author by filling
-in a bug report at https://github.com/delphidabbler/codesnip/issues
-
-If you are planning on re-using any of the CodeSnip source, detailed licensing
-information will be found in Docs/License.html.
\ No newline at end of file
+A copy of the full license text is included with each CodeSnip executable. The original document can be found in the file `Docs/License.html` in the [_delphidabbler/codesnip_](https://github.com/delphidabbler/codesnip) repository on GitHub.

From a199fcb042090d49cc89e997a9ffcaa520ba15d5 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 04:23:42 +0100
Subject: [PATCH 129/264] Revise License section of README.md

Rewrote section & added link to LICENSE.md.
---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 61d3680c7..306676c40 100644
--- a/README.md
+++ b/README.md
@@ -93,9 +93,11 @@ The program's current change log can be found in the file [`CHANGELOG.md`](https
 
 ## License
 
-The program's EULA, which gives full details of the license applying to the latest release, can be found in the file [`Docs\License.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Docs/License.html) in the `master` branch. The license has changed between releases, so if you need to see an older one, select the appropriate `version-x.x.x` tag and read the older version of the file.
+A summary of CodeSnip's license can be found in [`LICENSE.md`](https://github.com/delphidabbler/codesnip/blob/master/LICENSE.md).
 
-Most of the original code is made available under the [Mozilla Public License v2](https://www.mozilla.org/MPL/2.0/).
+The complete license text is in [`Docs\License.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Docs/License.html).
+
+> The linked files are in the `master` branch and relate to the latest release. However, the license has changed between releases, so if you need to see an older version, select the appropriate `version-x.x.x` tag to find the appropriate file.
 
 The [CodeSnip Compiling & Source Code FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md) may be useful if you have any queries about re-using CodeSnip source in other projects.
 

From c4b787162c405de5a6790f2fa47d8bf0b5528c9b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 09:51:09 +0100
Subject: [PATCH 130/264] Fix macro naming error in .vi files

Fixed typo <%ver.license> macro name (was <%var.license>).

Fixes #106
---
 Src/VCodeSnip.vi         | 4 ++--
 Src/VCodeSnipPortable.vi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
index 8dc6fb9de..ef0029546 100644
--- a/Src/VCodeSnip.vi
+++ b/Src/VCodeSnip.vi
@@ -2,7 +2,7 @@
 ; v. 2.0. If a copy of the MPL was not distributed with this file, You can
 ; obtain one at https://mozilla.org/MPL/2.0/
 ;
-; Copyright (C) 2008-2022, Peter Johnson (gravatar.com/delphidabbler).
+; Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
 ;
 ; Version information description file for CodeSnip.
 
@@ -24,7 +24,7 @@ Language=2057
 Character Set=1252
 
 [String File Info]
-Comments=<%var.license>
+Comments=<%ver.license>
 Company Name=<%ver.company>
 File Description=<%ver.description> (Standard Edition)
 File Version=<#F1>.<#F2>.<#F3> build <#F4>
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
index 90646ad38..7cb4de423 100644
--- a/Src/VCodeSnipPortable.vi
+++ b/Src/VCodeSnipPortable.vi
@@ -2,7 +2,7 @@
 ; v. 2.0. If a copy of the MPL was not distributed with this file, You can
 ; obtain one at https://mozilla.org/MPL/2.0/
 ;
-; Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
+; Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
 ;
 ; Version information description file for the portable edition of CodeSnip
 
@@ -24,7 +24,7 @@ Language=2057
 Character Set=1252
 
 [String File Info]
-Comments=<%var.license>
+Comments=<%ver.license>
 Company Name=<%ver.company>
 File Description=<%ver.description> (Portable Edition)
 File Version=<#F1>.<#F2>.<#F3> build <#F4>

From 31fd34f197d50aa3e59291aca969a7e1786fee9e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 30 Apr 2023 10:15:20 +0100
Subject: [PATCH 131/264] Remove broken web links from About Box

Removed broken links for "Silk Icon Set" and "16x16 Free Application
Icons" attributions.

Added <span> tags with title "broken link removed" to relevant
attributions.
---
 Src/Res/HTML/dlg-about-program-tplt.html | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Src/Res/HTML/dlg-about-program-tplt.html b/Src/Res/HTML/dlg-about-program-tplt.html
index e50a6a249..63a3a2cd4 100644
--- a/Src/Res/HTML/dlg-about-program-tplt.html
+++ b/Src/Res/HTML/dlg-about-program-tplt.html
@@ -77,30 +77,27 @@
         </li>
         <li>
           <div>
-            <em>CodeSnip</em> makes use of images from the following icon
+            <em>CodeSnip</em> makes use of images from the following image
             collections:
           </div>
           <ul>
             <li>
-              <a
-                href="http://www.famfamfam.com/lab/icons/silk/"
-                class="external-link"
-              >Silk Icon Set 1.3</a> by Mark James.
+              <span title="broken link removed">Silk Icon Set 1.3</span> by Mark
+              James.
             </li>
             <li>
-              Silk Companion 1 by Damien Guard.
+              <span title="broken link removed">Silk Companion 1</span> by Damien
+              Guard.
             </li>
             <li>
-              Led Icon Set v1.0.
+              <span title="broken link removed">Led Icon Set v1.0</span>.
             </li>
             <li>
-              16x16-free-application-icons by <a
-                href="https://www.aha-soft.com"
-                class="external-link"
-              >Aha-Soft</a>.
+              <span title="broken link removed">16&times;16 Free Application
+              Icons</span> by Aha-Soft.
             </li>
             <li>
-              PixelBox icon collection.
+              <span title="broken link removed">PixelBox icon collection</span>.
             </li>
             <li>
               <a

From 8cdcd0e7bccc12484a6baad475bc246d24772c54 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 1 May 2023 20:29:05 +0100
Subject: [PATCH 132/264] Add CONTRIBUTING.md

Provides information on how to contribute to the project.
Includes a code of conduct.
---
 CONTRIBUTING.md | 195 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..8531ff7e8
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,195 @@
+# Contributing
+
+Thanks for you interest in contributing to the CodeSnip project.
+
+## Contents
+
+* [Overview](#overview)
+* [Issues](#issues)
+* [Documentation](#documentation)
+* [Coding](#coding)
+* [About Pull Requests](#about-pull-requests)
+* [Licensing of Contributions](#licensing-of-contributions)
+* [Code of Conduct](#code-of-conduct)
+* [Attributions](#attributions)
+
+## Overview
+
+Contributions of all kinds are more than welcome.
+
+> 💡 You will need a GitHub account to be able to make contributions. [Sign up here](https://docs.github.com/en/get-started/signing-up-for-github/signing-up-for-a-new-github-account).
+
+There three main ways in which you can contribute, each of which is explained in its own section below. From easiest to hardest, they are:
+
+* [Issues](#issues) - report bugs and request new features.
+* [Documentation](#documentation) - improve the project's documentation.
+* [Coding](#coding) - modify the project's source code.
+
+Regardless of how you choose to contribute, please respect the project's [code of conduct](#code-of-conduct).
+
+## Issues
+
+The easiest way to make a contribution is to [create an issue](https://github.com/delphidabbler/codesnip/issues/new).
+
+You can use issues to:
+
+1. [Report a bug](#reporting-a-bug)
+2. [Request a new program feature](#requesting-a-new-feature)
+3. [Suggest changes to documentation](#suggesting-documentation-changes)
+
+It is helpful if you perform a cursory search of [existing issues](https://github.com/delphidabbler/codesnip/issues?q=is%3Aissue) to see if there is already a similar issue. If so then please add your thoughts as comments on that issue rather than open a new one.
+
+### Reporting a bug
+
+Before reporting a bug please make sure the bug exists in the [latest release](https://github.com/delphidabbler/codesnip/releases) of CodeSnip 4.
+
+To report a bug please provide as much information about the bug as possible, including the program's version number, what happened, what you expected to happen and what you were doing at the time. If possible, explain how to reproduce the bug.
+
+> 💡 You can find CodeSnip's version number in the program's About box (_Help | About_ menu option).
+
+If you have resolved an issue yourself please consider contributing your fix so that others can benefit from your work. Please read the [Coding](#coding) section before doing so.
+
+### Requesting a new feature
+
+If you think of a feature that you would like to see added to CodeSnip you can open an issue to request it.
+
+Please be as clear as possible about what you expect the feature to do and why you want it.
+
+Ideas about how to implement the feature are welcome. Even better, if you have implemented the feature yourself, you may be able to contribute the code. But please read the [Coding](#coding) section before doing so.
+
+### Suggesting documentation changes
+
+The third reason to create an issue is if you want to suggest new documentation or ammendments to existing documentation.
+
+There are two types of documentation within the CodeSnip repository. Firstly, there is general documentation that can be found in the [repository root](https://github.com/delphidabbler/codesnip/tree/develop) and in the [`Docs`](https://github.com/delphidabbler/codesnip/tree/develop/Docs) directory. Secondly, there are numerous HTML help files in the [`Src/Help/HTML`](https://github.com/delphidabbler/codesnip/tree/develop/Src/Help/HTML) directory.
+
+If you have written or corrected some documentation yourself please consider submitting it. See the [Documentation](#documentation) section below to find out how to do this.
+
+## Documentation
+
+Writing and editing documentation is a relatively easy way to start contributing. Providing simple clear or helpful documentation for users is critical. Things that *you* found hard to understand as a user, or difficult to work out, are excellent places to begin.
+
+There are two ways to contribute documentation. The preferred method is by means of a [pull request](#about-pull-requests). But, you can simply create an issue and attach documentation files to the issue comments. This approach is perfectly acceptable for a small number of files, and saves you having to install Git!
+
+## Coding
+
+Code contributions to the [CodeSnip 4 development tree](https://github.com/delphidabbler/codesnip/tree/develop) are always welcome, from fixing bugs to developing new features.
+
+> 🐘 Before going any further, let's address the elephant in the room. CodeSnip has to be compiled with the now rather ancient Delphi XE. It would be much better if development could move to a more recent version of Delphi, but that's proving to be extremely problematic. See [this FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md#faq-11) for an explanation.
+
+If you're still here, you will need to set up a valid build environment in order to compile CodeSnip from source. [`Build.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/develop/Build.html) tells you everything you need to know about configuring the environment, the tools you will need, and how compile CodeSnip using the provided `Makefile`.
+
+> 💡 Need ideas? You can [browse open issues](https://github.com/delphidabbler/codesnip/issues) and see if you can help with any of them. 
+
+Contributions should normally be made using [pull requests](#about-pull-requests).
+
+But, if you have just a few lines of code to suggest it _may_ be possible to accept the code within (or attached to) a comment on an issue. If in doubt, ask first by means of a comment. When including the code in a comment, please use [GitHub code fencing](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks) to format the code and make it easier to read. For example:
+
+    ```pascal
+    procedure TFoo.CoolNewMethod;
+    begin
+      // cool code here
+    end;
+    ```
+
+## About Pull Requests
+
+All pull requests *must* relate to an [open _accepted_ issue](https://github.com/delphidabbler/codesnip/issues?q=is%3Aissue+label%3Aaccepted++is%3Aopen+) on GitHub.
+
+If you wish to contribute code for which there is no existing issue you can create one. Please wait for the issue to be accepted by the project owner before submitting your pull request. Acceptance is indicated by attaching an "accepted" label to the issue and is signed off by means of a comment on the issue from the project owner.
+
+> 💡 Should you get stuck at any point please ask for help by leaving a comment on the  relevant issue.
+
+Before you can start you need to get the source code. Here's how:
+
+1. Fork the CodeSnip project into your own GitHub repository. 
+
+    ⭐***Important***⭐ _Ensure that all remote branches are included in the fork_, not just `master`. On GitHub this means clearing the "Copy the `master` branch only" check box before creating the fork.
+
+2. Clone the forked repository onto your own system using:
+   
+        $ git clone https://github.com/<account>/codesnip.git
+
+    where `<account>` is your GitHub user account ID.
+
+CodeSnip uses the [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) methodology. This means that you need to create your source code on a "feature" branch off the `develop` branch. Here's how:
+
+1. Pull the `develop` branch from your forked repository, and switch into it:
+
+        $ git pull origin develop
+        $ git switch develop
+
+2. Create and switch to a new feature branch, branched off `develop`.
+    
+    Name the branch `feature/` followed by the issue number to which it relates. Appending a hyphen followed by a brief description is useful too. Example branch names are  `feature/42-fix-ui-bug` or `feature/56`:
+
+        $ git branch feature/42-fix-ui-bug
+        $ git switch feature/42-fix-ui-bug
+
+3. Make your changes, whether to source code or documentation, and commit them to your feature branch. Clarity is prefered to terseness in commit messages. Please don't squash logically unrelated commits.
+
+4. If you are editing source code you need to ensure that it compiles and works as expected.
+
+    > 💡 Having trouble? Please make sure you have read [`Build.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/develop/Build.html). If that doesn't solve your problem then ask for help by creating a comment on the relevant issue.
+
+Once you have finished writing the code and are ready to submit it you need to prepare your forked repository:
+
+1. Use GitHub to ensure that the `develop` branch of your fork is up to date with the parent `delphidabbler/codesnip` repository's `develop` branch.
+
+2. Rebase your changes onto your forked repository's remote `develop` branch:
+
+        $ git rebase origin/develop feature/42-fix-ui-bug
+
+3. Resolve any conflicts arising from the rebase then push your changes to your forked repository:
+
+        $ git push origin feature/42-fix-ui-bug
+
+You are finally ready to open that pull request. Proceed as follows:
+
+1. Open your forked repository on GitHub. You should see a banner saying something like "feature/42-fix-ui-bug had recent pushes ..." along with a button that says "Compare and Pull Request". Click that button.
+
+2. You will be taken the "Comparing Changes" page on `delphidabbler/codesnip`.
+
+    ⭐***Important***⭐ Just below the page title is a line of drop-down buttons where you choose what to compare. Check the caption of the 2nd button from the left. If it reads anything other than "base: `develop`" (and it probably doesn't) then click the button and select `develop` from the list of branches that is displayed.
+    
+    > ⚠️ Pull requests based on `master`, or any branch other than `develop`, will not be accepted.
+
+3. Now complete the form and click the "Create Pull Request" button.
+
+That's it.
+
+Sit back and wait. Either your pull request will be accepted or you will receive comments requesting clarification or changes.
+
+Once your pull request is accepted you can delete the feature branch from both your local and forked remote fork.
+
+## Licensing of Contributions
+
+The license that applies to any existing file you edit will continue to apply to the edited file. Any existing license text or copyright statement **must not** be altered or removed, but you can add your own copyright line if desired.
+
+Any new file you contribute **must** either be licensed under the [Mozilla Public License v2.0](https://www.mozilla.org/MPL/2.0/) (MPL2) or have a license compatible with the MPL2. If a license is not specified then MPL2 will be assumed and will be applied to the file. You should insert a suitable copyright statement in the file.
+
+Any third party code used by your contributed code **must** also have a license compatible with the MPL2.
+
+> 💡 MPL2 boilerplate text, in several programming language's comment formats, can be found in the file [`Docs/MPL-2.0-Boilerplate.txt`](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/MPL-2.0-Boilerplate.txt). You will need to change the name of the copyright holder.
+
+## Code of Conduct
+
+This is a simple and straightforward code of conduct. What it boils down to is that if you're a decent person you're more than welcome here. Hateful, abusive and just plain rude people are not.
+
+To be more precise, anyone who contributes to the CodeSnip project is expected to display respect, empathy and politeness towards others.
+
+Certain behaviours will not be tolerated, and will result in an immediate ban. They are:
+
+* Racism and hate speech in any form.
+* The use of sexualized language or imagery, and sexual attention or advances of any kind.
+* Intolerance towards people of any religion or none.
+* Trolling, insulting or derogatory comments, and personal or political attacks.
+* Public or private harassment.
+* Publishing others' private information, such as a physical or email address, without their explicit permission.
+* Other conduct which could reasonably be considered inappropriate in a professional setting.
+
+## Attributions
+
+1. The list of unacceptable behaviours in the Code of Conduct was taken, in part, from the "Our Standards" section of the [Contributor Covenant Code of Conduct v2.1](https://www.contributor-covenant.org/version/2/1/code_of_conduct/).
+
+2. Some of the content of this document was inspired by and/or copied from the [Stumpy Contributing Guide](https://stumpy.readthedocs.io/en/latest/Contribute.html).
\ No newline at end of file

From 9d1311be95a4bed9d2005ae27c82e22dd907eb0f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 May 2023 07:54:43 +0100
Subject: [PATCH 133/264] Heavy overhaul of README.md

Much content revised, rewritten and restructured.

Some content replaced by references to CONTRIBUTING.md.

Footnotes revised to use GitHub Markdown's footnote feature to place
them at the end of the document.
---
 README.md | 85 +++++++++++++++++++++----------------------------------
 1 file changed, 33 insertions(+), 52 deletions(-)

diff --git a/README.md b/README.md
index 306676c40..8672ddf64 100644
--- a/README.md
+++ b/README.md
@@ -6,103 +6,84 @@ A code bank designed with Pascal in mind.
 * [Installation](#installation)
 * [Support](#support)
 * [Source Code](#source-code)
+* [Compiling](#compiling)
+* [Contributing](#contributing)
 * [Change Log](#change-log)
 * [License](#license)
-* [Bug Reports and Features](#bug-reports-and-features)
+* [Bug Reports and Feature Requests](#bug-reports-and-feature-requests)
 
 ## Overview
 
 CodeSnip is an open source code bank for storing and viewing your code snippets. While it can manage snippets in any source language, it is focused mainly on Pascal and Delphi code for which additional features are available.
 
-CodeSnip can import code from the DelphiDabbler [Code Snippets Database](https://github.com/delphidabbler/code-snippets).
-
 The program is available in both standard and portable editions.
 
-CodeSnip requires Windows 2000 or later and Internet Explorer 6 or later, although XP and IE 8 and later are recommended.
+CodeSnip can import code from the DelphiDabbler [Code Snippets Database](https://github.com/delphidabbler/code-snippets) and the [SWAG Pascal Code Collection](https://github.com/delphidabbler/swag).
 
 ## Installation
 
 The standard edition of CodeSnip is installed and removed using a Windows installer. Administrator privileges are required for installation.
 
-The portable edition has no installer. Simply follow the instructions in the [read me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt) that is included in the download zip file.
+The portable edition has no installer. Simply follow the instructions in the [read me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt) that is included in the download.
+
+The program _should_ run on Windows 2000, with Internet Explorer 6 or later, although XP and IE 8 and later are recommended. _But_ note that recent releases of CodeSnip have only been tested on Windows 10 & 11.
 
 ## Support
 
 The following support is available to CodeSnip users:
 
 * A comprehensive help file.
-* A [read-me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt)<sup> *</sup> that discusses installation, configuration, updating and known issues.
-* A [Using CodeSnip FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md).
-* A [Blog](https://codesnip-app.blogspot.co.uk/).
+* A [read-me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt) that discusses installation, configuration, updating and known issues. [^1]
+* The [Using CodeSnip FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md).
+* The [CodeSnip Blog](https://codesnip-app.blogspot.co.uk/).
+* CodeSnip's own [Web Page](https://delphidabbler.com/software/codesnip).
 
 There's also plenty of info available on how to compile CodeSnip from source - see below.
 
-> <sup>*</sup> This link takes you to the most recent version of the read-me file -- it can change from release to release.
+> [^1]: The linked read-me file is the most recent version. It can change from release to release.
 
 ## Source Code
 
-CodeSnip's source code is maintained in the [`delphidabbler/codesnip`](https://github.com/delphidabbler/codesnip) Git repository on GitHub†.
-
-The [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) methodology has been adopted, with the exception of some experimental branches.
-
-The following branches existed as of 2022/12/03:
-
-* [`master`](https://github.com/delphidabbler/codesnip/tree/master): Always reflects the state of the source code as of the latest release.‡ 
-* [`develop`](https://github.com/delphidabbler/codesnip/tree/develop): Main development branch. The head of this branch contains the latest v4 development code. Normal development of CodeSnip 4 takes place in `feature/xxx` branches off `develop`.
-* [`caboli`](https://github.com/delphidabbler/codesnip/tree/caboli): Experimental branch where an attempt is being made to (a) modernise the UI and (b) get the code to work properly when compiled with Delphi 11.
-* Abandoned branches:
-  * [`pagoda`](https://github.com/delphidabbler/codesnip/tree/pagoda): An abortive attempt at developing CodeSnip 5.
-  * [`pavilion`](https://github.com/delphidabbler/codesnip/tree/pavilion): Another attempt at working on CodeSnip 5 that branched off `pagoda`.
-  * [`belvedere`](https://github.com/delphidabbler/codesnip/tree/belvedere): A thiird, failed attempt to develop CodeSnip 5 as a ground up rewrite. Not related to `pagoda` & `pavilion`. 
-
-> † Up to and including v4.13.1 the source code was kept in a Subversion repository on SourceForge. It was converted to Git in October 2015 and imported into GitHub. All releases from v3.0.0 are marked by tags in the form `version-x.x.x` where `x.x.x` is the version number. None of the Subversion branches made it through the conversion to Git, so to see a full history look at the old [SourceForge repository](https://sourceforge.net/p/codesnip/code/).
+CodeSnip's source code is maintained in the [`delphidabbler/codesnip`](https://github.com/delphidabbler/codesnip) Git repository on GitHub. [^2]
 
-> ‡ All the converted Subversion code was committed to `master`, making it a copy of the old Subversion `trunk`. As such `master` contains various development commits along with numerous commits related to management of Subversion. After release 4.13.1, and the the first commit of this read-me file, `master` contains only commits relating to actual releases.
+The [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) methodology has been adopted for CodeSnip 4 development. The following branches are used:
 
-### Contributions
+* [`master`](https://github.com/delphidabbler/codesnip/tree/master): Always reflects the state of the source code as of the latest release. [^3]
+* [`develop`](https://github.com/delphidabbler/codesnip/tree/develop): The head of this branch contains the latest v4 development code. Normal development of CodeSnip 4 takes place in feature branches that are then merged into `develop`.
+* Feature branches, with names of the form `feature/<feature-name>`. Normally such branches are only used locally, but occasionally some feature branches may be pushed to the main repository.
 
-To contribute to CodeSnip 4 development please fork the repository on GitHub. Create a feature branch off the `develop` branch. Make your changes to your feature branch then submit a pull request via GitHub.
+You will find other branches in the repository. These are either experimental or abandoned. To find out more about them switch to the required branch and read its `README.md` file.
 
-:warning: **Do not create branches off `master`, always branch from `develop`.**
+> [^2]: Up to and including v4.13.1 the source code was kept in a Subversion repository on SourceForge. It was converted to Git in October 2015 and imported into GitHub. All releases from v3.0.0 are marked by tags in the form `version-x.x.x` where `x.x.x` is the version number. None of the Subversion branches made it through the conversion to Git, so to see a full history look at the old [SourceForge repository](https://sourceforge.net/p/codesnip/code/).
 
-:no_entry: Contributions to experimental branches are not being excepted just now.
+> [^3]: All the converted Subversion code was committed to `master`, making it a copy of the old Subversion `trunk`. As such `master` contains various development commits along with numerous commits related to management of Subversion. After release 4.13.1, and the the first commit of this read-me file, `master` contains only commits relating to actual releases.
 
-#### Licensing of contributions
+## Compiling
 
-The license that applies to any existing file you edit will continue to apply to the edited file. Any existing license text or copyright statement **must not** be altered or removed.
+If you want to compile CodeSnip 4 from source code you will need the rather long-in-the-tooth Delphi XE. See [this FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md#faq-11) to find out why.
 
-Any new file you contribute **must** either be licensed under the [Mozilla Public License v2.0](https://www.mozilla.org/MPL/2.0/) (MPL2) or have a license compatible with the MPL2. If a license is not specified then MPL2 will be assumed and will be applied to the file. You should insert a suitable copyright statement in the file.
+Full instructions on setting up the build environment are provided in [`Build.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/develop/Build.html).
 
-Any third party code used by your contributed code **must** also have a license compatible with the MPL2.
+## Contributing
 
-> MPL2 boilerplate text, in several programming language's comment formats, can be found in the file [`Docs/MPL-2.0-Boilerplate.txt`](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/MPL-2.0-Boilerplate.txt). You will need to change the name of the copyright holder.
+Please see [`CONTRIBUTING.md`](https://github.com/delphidabbler/codesnip/blob/develop/CONTRIBUTING.md) for details of how to contribute to the CodeSnip project.
 
-### Compiling
-
-`master` has a file in the root directory named [`Build.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Build.html) that gives detailed information about how to compile the current release of CodeSnip 4.
-
-There is also a [Compiling & Source Code FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md).
-
-CodeSnip 4 **must** be compiled with Delphi XE. See [Compiling & Source Code FAQ 11](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md#faq-11) for the reason why.
+⛔ Contributions to experimental and abandoned branches are not accepted.
 
 ## Change Log
 
-The program's current change log can be found in the file [`CHANGELOG.md`](https://github.com/delphidabbler/codesnip/blob/master/CHANGELOG.md) in the root of the `master` branch.
+The change log can be found in the file [`CHANGELOG.md`](https://github.com/delphidabbler/codesnip/blob/master/CHANGELOG.md). [^4]
 
-> Note that CodeSnip v4.15.1 and earlier did not have `CHANGELOG.md`. Instead, some versions maintained a separate change log for each major version in the `Docs/ChangeLogs` directory.
+> [^4]: CodeSnip v4.15.1 and earlier did not have `CHANGELOG.md`. Instead, some versions maintained a separate change log for each major version in the `Docs/ChangeLogs` directory.
 
 ## License
 
-A summary of CodeSnip's license can be found in [`LICENSE.md`](https://github.com/delphidabbler/codesnip/blob/master/LICENSE.md).
-
-The complete license text is in [`Docs\License.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Docs/License.html).
-
-> The linked files are in the `master` branch and relate to the latest release. However, the license has changed between releases, so if you need to see an older version, select the appropriate `version-x.x.x` tag to find the appropriate file.
+A summary of CodeSnip's license can be found in [`LICENSE.md`](https://github.com/delphidabbler/codesnip/blob/master/LICENSE.md) and the complete license text is in [`Docs\License.html`](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/master/Docs/License.html). [^5]
 
-The [CodeSnip Compiling & Source Code FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md) may be useful if you have any queries about re-using CodeSnip source in other projects.
+> [^5]: The linked license files relate to the latest release. However, the license file names and content can change between releases, so if you need to see an older version, select the relevant `version-x.x.x` tag to find the appropriate file.
 
-## Bug Reports and Features
+The [CodeSnip Compiling & Source Code FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md) may be useful if you have any queries about re-using the CodeSnip source code in other projects.
 
-You can report bugs or request new features using the [Issues section](https://github.com/delphidabbler/codesnip/issues) of the CodeSnip GitHub project. You will need a GitHub account to do this.
+## Bug Reports and Feature Requests
 
-Please do not report bugs unless you have checked whether the bug exists in the latest version of the program.
+Report bugs and requests for new features are welcome. Please see the [Issues section of `CONTRIBUTING.md`](https://github.com/delphidabbler/codesnip/blob/develop/CONTRIBUTING.md#issues) for information about how to proceed.

From b1cf6f3f1ce5b521a59d1210753cce26c7ccd7a6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 May 2023 22:52:22 +0100
Subject: [PATCH 134/264] Correct, update and edit Docs/ReadMe.txt

---
 Docs/ReadMe.txt | 62 +++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/Docs/ReadMe.txt b/Docs/ReadMe.txt
index 3346f91af..a2020254e 100644
--- a/Docs/ReadMe.txt
+++ b/Docs/ReadMe.txt
@@ -48,14 +48,15 @@ Installation
 ================================================================================
 
 CodeSnip requires Windows 2000 or later. It also requires MS Internet Explorer 6
-or later, but IE 8, 9 or 10 are strongly recommended.
+or later, although IE 8, 9 or 10 are strongly recommended. But note that recent
+releases have only been tested on Windows 10/11.
 
 Installing the Standard Edition
 -------------------------------
 
 You will need administrator privileges to run the setup program for the standard
 edition. If you are using a non-admin user account on Windows 2000 or XP you
-should run setup as administrator. By default Windows Vista to Windows 10 will
+should run setup as administrator. By default Windows Vista to Windows 11 will
 require an admin password if running as a standard user and setup will attempt
 to elevate the process. If UAC prompts are disabled you must run setup as
 administrator.
@@ -66,8 +67,8 @@ usual way. Uninstalling v3 or earlier after installing v4 will have no adverse
 affect on v4.
 
 CodeSnip's installation program is named codesnip-setup-4.x.x.exe, where x.x
-is the program's minor version number. The install program may be distributed in
-a zip file.
+is the program's minor version number. The install program is distributed in a
+zip file.
 
 Close any running instance of CodeSnip, run the install program then follow the
 on-screen instructions.
@@ -80,9 +81,9 @@ The installer makes the following changes to your system:
 + Files required by the uninstaller are stored in the main installation's Uninst
   sub-folder.
 
-+ The program's uninstall information is registered with the "Apps and Features"
-  (a.k.a. "Programs and Features", a.k.a. "Add / Remove Programs") control panel
-  applet.
++ The program's uninstall information is registered with the "Installed App"
+  (a.k.a. "Apps and Features", a.k.a. "Programs and Features", a.k.a. "Add /
+  Remove Programs") control panel app.
 
 + A program group may be created in the start menu (optional).
 
@@ -113,9 +114,10 @@ the program executable, the help file and various documentation files.
 
 Install the program using the following steps:
 
-1) Mount the storage medium on which you want to install CodeSnip.
+1) Mount any storage medium on which you want to install CodeSnip.
 
-2) Create a folder on the storage medium in which to copy the required files.
+2) Create a folder on the storage medium or on your computer's internal disk in
+   which to copy the required files.
 
 3) Copy the files CodeSnip-p.exe (the executable program) and CodeSnip.chm
    (the help file) into the folder you created.
@@ -143,12 +145,13 @@ Uninstallation
 Uninstalling the Standard Edition
 ---------------------------------
 
-CodeSnip can be uninstalled via "Apps and Features" (a.k.a. "Programs and
-Features", a.k.a. "Add / Remove Programs") from the Windows Control Panel or by
-choosing "Uninstall DelphiDabbler CodeSnip" from the program's start menu group.
+CodeSnip can be uninstalled via "Installed Apps" (a.k.a. "Apps and Features",
+a.k.a. "Programs and Features", a.k.a. "Add / Remove Programs") accessed from the
+Windows Control Panel or by choosing "Uninstall DelphiDabbler CodeSnip" from the
+program's start menu group.
 
 Administrator privileges will be required to uninstall CodeSnip. Windows Vista
-to Windows 10 with UAC prompts enabled will prompt for an admin password if
+to Windows 11 with UAC prompts enabled will prompt for an admin password if
 necessary.
 
 The uninstall program will delete any local copy of the online Code Snippets
@@ -205,12 +208,15 @@ Windows 32 version of Delphi (from Delphi 2 to Delphi 11.x Alexandria) and
 FreePascal, providing some simple rules are followed.
 
 When CodeSnip is first installed it knows nothing about the available compilers
-and so test compilations cannot be performed. You must tell CodeSnip about the
-available compilers by using the "Tools | Configure Compilers" menu option. The
-resulting dialogue can automatically detect all installed versions of supported
-Delphi compilers at the click of a button. Free Pascal, where installed, must be
-set up manually. The Welcome page displays a list of compilers it has been
-configured to work with.
+and so test compilations cannot be performed. If any supported Delphi compiler
+is detected when the program is first run you will be given the option of
+registering it. This does not work for Free Pascal.
+
+You can also tell CodeSnip about the available compilers by using the "Tools |
+Configure Compilers" menu option. The resulting dialogue can automatically
+detect all installed versions of supported Delphi compilers at the click of a
+button. Free Pascal, where installed, must be set up manually. The Welcome page
+displays a list of compilers it has been configured to work with.
 
 Compilers that do not use English as their output language will need further
 configuration. See the help file for information (look up "configure compilers
@@ -221,7 +227,7 @@ Each user can configure compilers differently.
 Delphi XE2 and later may need to be configured to search for required units in
 the correct namespaces. This is explained in the Add/Edit Snippet Dialogue Box
 help topic and in the FAQ at
-https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md#faq-1
+https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md#faq-7
 
 Any type of snippet other than "freeform" can be test compiled.
 
@@ -229,11 +235,8 @@ Any type of snippet other than "freeform" can be test compiled.
 Updating the Program
 ================================================================================
 
-Updates are published on:
-
-+ GitHub: https://github.com/delphidabbler/codesnip/releases
-
-+ SourceForge: https://sourceforge.net/projects/codesnip/files/
+Updates are published on GitHub. See 
+https://github.com/delphidabbler/codesnip/releases
 
 News of new updates is published on the CodeSnip Blog:
 https://codesnip-app.blogspot.com/.
@@ -324,9 +327,8 @@ If you wish to report a bug, please check the current reports on the bug
 tracker. If your bug hasn't already been reported or fixed please add a report
 using the "Add new" link on Tracker.
 
-Please note that version 4.15.1 and earlier are no longer supported, so don't
-report bugs for those versions. You should update the program first and only
-report the bug if it is still present.
+Please ensure that you have installed the latest version of CodeSnip and checked
+if the bug is still present before reporting it.
 
 
 Feedback
@@ -378,8 +380,8 @@ Thanks to:
 
 + Various contributors to the DelphiDabbler Code Snippets database. Names of
   contributors are listed in the program's About Box (use the "Help | About"
-  menu option then select the "About the Database" tab). If the list is empty
-  then updating the Code Snippets Database will download the details.
+  menu option then select the "About the Database" tab). The list will be empty
+  if the Code Snippets Database has not been installed.
 
 
 ================================================================================

From 55496f2b225f01be5f055993ad4caf55b97b5318 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:06:10 +0100
Subject: [PATCH 135/264] Update copyright date in header comments.

Date changed 2023 since these files were updated in the year.
---
 Build.html                   | 2 +-
 Src/Help/HTML/new.htm        | 2 +-
 Src/Res/Scripts/easteregg.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Build.html b/Build.html
index f7c5479f7..7176db3ff 100644
--- a/Build.html
+++ b/Build.html
@@ -6,7 +6,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Instructions for building CodeSnip from source.
 -->
diff --git a/Src/Help/HTML/new.htm b/Src/Help/HTML/new.htm
index 274304981..336bcd45c 100644
--- a/Src/Help/HTML/new.htm
+++ b/Src/Help/HTML/new.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic listing key new features of CodeSnip 4.
 -->
diff --git a/Src/Res/Scripts/easteregg.js b/Src/Res/Scripts/easteregg.js
index b74a93bcd..f15128421 100644
--- a/Src/Res/Scripts/easteregg.js
+++ b/Src/Res/Scripts/easteregg.js
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * JavaScript code used to perform animations in program's easter egg.
  * Requires jQuery and lite version of jQuery Cycle plug-in.

From 7cef4dc2289e0945ea59e1b70d2195e0b4b973ac Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:09:32 +0100
Subject: [PATCH 136/264] Update minimum required .vi file & VIEd version

FileVersion bumped to 2 in .vi files.

Change of file version requires VIEd v2.15.0 or later, so Build.html
changed reflect this.
---
 Build.html               | 2 +-
 Src/VCodeSnip.vi         | 2 +-
 Src/VCodeSnipPortable.vi | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Build.html b/Build.html
index 7176db3ff..fc6947166 100644
--- a/Build.html
+++ b/Build.html
@@ -196,7 +196,7 @@ <h3>
 <p>
   This tool is used to compile version information (<code>.vi</code>) files and
   any associated macro file(s) into intermediate resource source
-  (<code>.rc</code>) files. Version 2.14.0 or later is required. Version
+  (<code>.rc</code>) files. Version 2.15.0 or later is required. Version
   Information Editor can be obtained from
   <a
     href="https://github.com/delphidabbler/vied/releases"
diff --git a/Src/VCodeSnip.vi b/Src/VCodeSnip.vi
index ef0029546..51acab7f3 100644
--- a/Src/VCodeSnip.vi
+++ b/Src/VCodeSnip.vi
@@ -41,4 +41,4 @@ Special Build=
 Identifier=
 NumRCComments=0
 ResOutputDir=
-FileVersion=1
+FileVersion=2
diff --git a/Src/VCodeSnipPortable.vi b/Src/VCodeSnipPortable.vi
index 7cb4de423..744d7a432 100644
--- a/Src/VCodeSnipPortable.vi
+++ b/Src/VCodeSnipPortable.vi
@@ -41,4 +41,4 @@ Special Build=Portable
 Identifier=
 NumRCComments=0
 ResOutputDir=
-FileVersion=1
+FileVersion=2

From a5f8139f8bffc8f6f0db018d416ddd6fb99d2376 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:14:09 +0100
Subject: [PATCH 137/264] Bump version number to v4.21.2 build 269

---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index ee01e5c42..78ab7ae12 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.21.1
-build=268
+version=4.21.2
+build=269
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From ea20cb940fc563e28eccac09fe606170819cb645 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:34:50 +0100
Subject: [PATCH 138/264] Update change log with details of release v4.21.2

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afae53dcf..9297a5729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,15 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
+## Release v4.21.2 of 13 July 2023
+
+* Removed broken links and fixed unsafe links in the About box [issue #105].
+* Fixed bug in version information files that resulted in an error in the Comments section of the version information of both editions of _CodeSnip_ [issue 106].
+* Fixed potential XSS vulnerability in JQuery code used in Easter egg [issue #107].
+* Documentation changes:
+  * Rationalised, corrected, updated and clarified licensing information. These changes affected many documentation files. [issue #108].
+  * Overhauled `README.md` and `Docs/ReadMe.txt` and created a new `CONTRIBUTING.md` file that explains how to contribute in detail [issue #104].
+
 ## Release v4.21.1 of 09 April 2023
 
 * Completed implementation of support for [REML version 5](https://htmlpreview.github.io/?https://github.com/delphidabbler/codesnip/blob/version-4.21.0/Docs/Design/reml.html) (ommitted from v4.20.0 in error) and fixed some bugs in the original implementation [issues #81 and #82], including:

From 7b8edaeade91a96d907c01ce4d89baed120ad2e9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 14 Jul 2023 09:07:04 +0100
Subject: [PATCH 139/264] Fix errors in CHANGELOG.md re release v4.21.2

Fixes #120
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9297a5729..7ed3fc709 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,10 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
-## Release v4.21.2 of 13 July 2023
+## Release v4.21.2 of 14 July 2023
 
 * Removed broken links and fixed unsafe links in the About box [issue #105].
-* Fixed bug in version information files that resulted in an error in the Comments section of the version information of both editions of _CodeSnip_ [issue 106].
+* Fixed bug in version information files that resulted in an error in the Comments section of the version information of both editions of _CodeSnip_ [issue #106].
 * Fixed potential XSS vulnerability in JQuery code used in Easter egg [issue #107].
 * Documentation changes:
   * Rationalised, corrected, updated and clarified licensing information. These changes affected many documentation files. [issue #108].

From b127989131f15f56ea4e824a8ef275e53f12e120 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 14 Jul 2023 10:26:32 +0100
Subject: [PATCH 140/264] Refactor out all `with` statements.

Fixes #118
---
 Src/DB.UMain.pas               |  11 +--
 Src/FirstRun.FmV4ConfigDlg.pas |  18 ++--
 Src/FirstRun.FmWhatsNew.pas    |  16 +--
 Src/FmAboutDlg.pas             |  16 +--
 Src/FmActiveTextPreviewDlg.pas |  31 +++---
 Src/FmAddCategoryDlg.pas       |  16 +--
 Src/FmBugReportBaseDlg.pas     |  18 ++--
 Src/FmCodeExportDlg.pas        |  18 ++--
 Src/FmCodeImportDlg.pas        |  18 ++--
 Src/FmCompErrorDlg.pas         |  23 ++---
 Src/FmCompilersDlg.FrLog.pas   |  75 +++++++-------
 Src/FmDBUpdateDlg.pas          |  18 ++--
 Src/FmDeleteCategoryDlg.pas    |  18 ++--
 Src/FmDeleteUserDBDlg.pas      |  18 ++--
 Src/FmDependenciesDlg.pas      |  60 +++++------
 Src/FmDuplicateSnippetDlg.pas  |  20 ++--
 Src/FmEasterEgg.pas            |  16 +--
 Src/FmFavouritesDlg.pas        |  57 ++++++-----
 Src/FmFindCompilerDlg.pas      |  20 ++--
 Src/FmFindTextDlg.pas          |  20 ++--
 Src/FmFindXRefsDlg.pas         |  20 ++--
 Src/FmMain.pas                 | 176 ++++++++++++++++-----------------
 Src/FmNewHiliterNameDlg.pas    |  24 ++---
 Src/FmPreferencesDlg.pas       |  28 +++---
 Src/FmPreviewDlg.pas           |  22 +++--
 Src/FmPrintDlg.pas             |  16 +--
 Src/FmRenameCategoryDlg.pas    |  18 ++--
 Src/FmSWAGImportDlg.pas        |  16 +--
 Src/FmSelectionSearchDlg.pas   |  20 ++--
 Src/FmSnippetsEditorDlg.pas    |  69 ++++++-------
 Src/FmSplash.pas               |  17 ++--
 Src/FmTestCompileDlg.pas       |  20 ++--
 Src/FmTrappedBugReportDlg.pas  |  18 ++--
 Src/FmUserBugReportDlg.pas     |  16 +--
 Src/FmUserDataPathDlg.pas      |  19 ++--
 Src/FmUserHiliterMgrDlg.pas    |  22 +++--
 Src/FrCodeGenPrefs.pas         |  57 +++++------
 Src/FrDetailView.pas           |  15 +--
 Src/FrMemoPreview.pas          |  16 +--
 Src/Hiliter.UAttrs.pas         |  25 +++--
 Src/Hiliter.UHiliters.pas      |  16 +--
 Src/SWAG.UVersion.pas          |  30 +++---
 Src/UBrowseProtocol.pas        |  20 ++--
 Src/UCodeImportExport.pas      | 113 ++++++++++-----------
 Src/UConsoleApp.pas            |  23 +++--
 Src/UDataBackupMgr.pas         |  30 +++---
 Src/UDlgHelper.pas             |  18 ++--
 Src/UEncodings.pas             |  97 ++++++++----------
 Src/UHiddenWindow.pas          |   5 +-
 Src/UPrintMgr.pas              |  16 +--
 Src/USaveSnippetMgr.pas        |  16 +--
 Src/USaveSourceMgr.pas         |  71 +++++++------
 Src/USaveUnitMgr.pas           |  16 +--
 Src/USettings.pas              |  41 ++++----
 Src/USnippetSourceGen.pas      |  16 +--
 Src/UTestCompile.pas           |  30 +++---
 Src/UTestUnit.pas              |  22 +++--
 Src/UTestUnitDlgMgr.pas        |  15 +--
 Src/UVersionInfo.pas           |  76 +++++++-------
 Src/UWBCommandBars.pas         |  15 +--
 Src/UWaitForThreadUI.pas       |  18 ++--
 61 files changed, 967 insertions(+), 878 deletions(-)

diff --git a/Src/DB.UMain.pas b/Src/DB.UMain.pas
index f80860e59..6b61183e1 100644
--- a/Src/DB.UMain.pas
+++ b/Src/DB.UMain.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a singleton object and subsidiary classes that encapsulate the
  * snippets and categories in the CodeSnip database and user defined databases.
@@ -954,11 +954,9 @@ procedure TDatabase.Load;
   try
     // Load main database: MUST do this first since user database can
     // reference objects in main database
-    with TDatabaseIOFactory.CreateMainDBLoader do
-      Load(fSnippets, fCategories, Factory);
+    TDatabaseIOFactory.CreateMainDBLoader.Load(fSnippets, fCategories, Factory);
     // Load any user database
-    with TDatabaseIOFactory.CreateUserDBLoader do
-      Load(fSnippets, fCategories, Factory);
+    TDatabaseIOFactory.CreateUserDBLoader.Load(fSnippets, fCategories, Factory);
     fUpdated := False;
   except
     // If an exception occurs clear the database
@@ -984,8 +982,7 @@ procedure TDatabase.Save;
   // Create object that can provide required information about user database
   Provider := TUserDataProvider.Create(fSnippets, fCategories);
   // Use a writer object to write out the database
-  with TDatabaseIOFactory.CreateWriter do
-    Write(fSnippets, fCategories, Provider);
+  TDatabaseIOFactory.CreateWriter.Write(fSnippets, fCategories, Provider);
   fUpdated := False;
 end;
 
diff --git a/Src/FirstRun.FmV4ConfigDlg.pas b/Src/FirstRun.FmV4ConfigDlg.pas
index abc588a59..122d67563 100644
--- a/Src/FirstRun.FmV4ConfigDlg.pas
+++ b/Src/FirstRun.FmV4ConfigDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a wizard dialogue box that may be displayed on the first run of
  * CodeSnip v4 to get user to decide whether what data to bring forward from
@@ -289,14 +289,16 @@ function TV4ConfigDlg.DatabaseAvailable: Boolean;
 
 class procedure TV4ConfigDlg.Execute(AOwner: TComponent;
   const FirstRun: TFirstRun);
+var
+  Dlg: TV4ConfigDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      fFirstRun := FirstRun;
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fFirstRun := FirstRun;
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TV4ConfigDlg.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
diff --git a/Src/FirstRun.FmWhatsNew.pas b/Src/FirstRun.FmWhatsNew.pas
index 4c8f0e3ee..4cc6e9778 100644
--- a/Src/FirstRun.FmWhatsNew.pas
+++ b/Src/FirstRun.FmWhatsNew.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2020-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2020-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements dialogue box that may be displayed the first time CodeSnip 4.x.x
  * is run after an update. The dialogue box displays a HTML page that draws
@@ -114,13 +114,15 @@ procedure TWhatsNewDlg.CreateParams(var Params: TCreateParams);
 end;
 
 class procedure TWhatsNewDlg.Execute(AOwner: TComponent);
+var
+  Dlg: TWhatsNewDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 function TWhatsNewDlg.GetAligner: IFormAligner;
diff --git a/Src/FmAboutDlg.pas b/Src/FmAboutDlg.pas
index 421495c56..6584a4ffd 100644
--- a/Src/FmAboutDlg.pas
+++ b/Src/FmAboutDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements the program's About dialogue box.
 }
@@ -326,13 +326,15 @@ function TAboutDlg.ContribListHTML(ContribList: IStringList):
 end;
 
 class procedure TAboutDlg.Execute(AOwner: TComponent);
+var
+  Dlg: TAboutDlg;
 begin
-  with Create(AOwner) do
-    try
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := Create(AOwner);
+  try
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TAboutDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmActiveTextPreviewDlg.pas b/Src/FmActiveTextPreviewDlg.pas
index d35db88b1..747b40f20 100644
--- a/Src/FmActiveTextPreviewDlg.pas
+++ b/Src/FmActiveTextPreviewDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that displays active text rendered from REML markup
  * or plain text.
@@ -143,14 +143,16 @@ class procedure TActiveTextPreviewDlg.Execute(const AOwner: TComponent;
     @param AOwner [in] Component that owns this dialog box.
     @param ActiveText [in] Active text to be displayed as HTML.
   }
+var
+  Dlg: TActiveTextPreviewDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      fActiveText := ActiveText;
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fActiveText := ActiveText;
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TActiveTextPreviewDlg.HTMLEventHandler(Sender: TObject;
@@ -162,6 +164,7 @@ procedure TActiveTextPreviewDlg.HTMLEventHandler(Sender: TObject;
   }
 var
   ALink: IDispatch;   // reference to the any link that was clicked
+  ProtocolHander: TProtocol;
 resourcestring
   // Button captions for choice dialog box
   sClose = 'Close';
@@ -195,12 +198,12 @@ procedure TActiveTextPreviewDlg.HTMLEventHandler(Sender: TObject;
     ) = cViewLinkRes then
     begin
       // User wants to view link: use protocol handler to display it
-      with TProtocolFactory.CreateHandler(TAnchors.GetURL(ALink)) do
-        try
-          Execute;
-        finally
-          Free;
-        end;
+      ProtocolHander := TProtocolFactory.CreateHandler(TAnchors.GetURL(ALink));
+      try
+        ProtocolHander.Execute;
+      finally
+        ProtocolHander.Free;
+      end;
     end;
   end;
 end;
diff --git a/Src/FmAddCategoryDlg.pas b/Src/FmAddCategoryDlg.pas
index 791d24acd..27ebb3258 100644
--- a/Src/FmAddCategoryDlg.pas
+++ b/Src/FmAddCategoryDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that permits user to add a new user defined
  * category to the database.
@@ -133,13 +133,15 @@ class function TAddCategoryDlg.Execute(AOwner: TComponent): Boolean;
     @param AOwner [in] Component that owns dialog box.
     @param CatList [in] List of categories available for deletion.
   }
+var
+  Dlg: TAddCategoryDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TAddCategoryDlg.UpdateOKBtn;
diff --git a/Src/FmBugReportBaseDlg.pas b/Src/FmBugReportBaseDlg.pas
index f57d03eed..9d2a1161b 100644
--- a/Src/FmBugReportBaseDlg.pas
+++ b/Src/FmBugReportBaseDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides a base class and common functionality for bug report dialogue boxes.
 }
@@ -95,16 +95,18 @@ procedure TBugReportBaseDlg.GoToTracker;
   {Displays online bug tracker. Descendants should override to add extra
   functionality.
   }
+var
+  BrowseAction: TBrowseURL;
 begin
   // NOTE: Don't change actBugTracker to TBrowseURL and delete this. Subclasses
   // must be able to override this method.
-  with TBrowseURL.Create(nil) do
-    try
-      URL := TURL.CodeSnipBugTracker;
-      Execute;
-    finally
-      Free;
-    end;
+  BrowseAction := TBrowseURL.Create(nil);
+  try
+    BrowseAction.URL := TURL.CodeSnipBugTracker;
+    BrowseAction.Execute;
+  finally
+    BrowseAction.Free;
+  end;
 end;
 
 procedure TBugReportBaseDlg.lblBugTrackerClick(Sender: TObject);
diff --git a/Src/FmCodeExportDlg.pas b/Src/FmCodeExportDlg.pas
index 74c84943a..39cfdae8e 100644
--- a/Src/FmCodeExportDlg.pas
+++ b/Src/FmCodeExportDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that gets snippets to be exported and creates an
  * export file containing the selected snippets.
@@ -189,14 +189,16 @@ class procedure TCodeExportDlg.Execute(const AOwner: TComponent;
     @param Snippet [in] Reference to a snippet to pre-select in snippets check
       list box. If nil or not user-defined then no snippet is pre-selected.
   }
+var
+  Dlg: TCodeExportDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      SelectSnippet(Snippet);
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.SelectSnippet(Snippet);
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TCodeExportDlg.SelectSnippet(const Snippet: TSnippet);
diff --git a/Src/FmCodeImportDlg.pas b/Src/FmCodeImportDlg.pas
index 175ec525c..7315b29e8 100644
--- a/Src/FmCodeImportDlg.pas
+++ b/Src/FmCodeImportDlg.pas
@@ -1,9 +1,9 @@
-{
+﻿{
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a wizard dialogue box that handles the import of user defined
  * snippets into the database. Permits snippets from the import file to be
@@ -296,13 +296,15 @@ function TCodeImportDlg.CountImportSnippets: Integer;
 
 class function TCodeImportDlg.Execute(AOwner: TComponent;
   const ImportMgr: TCodeImportMgr): Boolean;
+var
+  Dlg: TCodeImportDlg;
 begin
-  with InternalCreate(AOwner, ImportMgr) do
-    try
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner, ImportMgr);
+  try
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 function TCodeImportDlg.GetFileNameFromEditCtrl: string;
diff --git a/Src/FmCompErrorDlg.pas b/Src/FmCompErrorDlg.pas
index 81bf7901d..ed1285957 100644
--- a/Src/FmCompErrorDlg.pas
+++ b/Src/FmCompErrorDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that displays compiler error and warning logs.
 }
@@ -180,18 +180,19 @@ class procedure TCompErrorDlg.Execute(const AOwner: TComponent;
   const ASnippet: TSnippet; const ACompilers: ICompilers);
 var
   Compiler: ICompiler;  // each supported compiler
+  Dlg: TCompErrorDlg;
 begin
   Assert(Assigned(ACompilers), ClassName + '.Execute: ACompilers is nil');
-  with InternalCreate(AOwner) do
-    try
-      fSnippet := ASnippet;
-      for Compiler in ACompilers do
-        if Compiler.HasErrorsOrWarnings then
-          fRequiredCompilers.Add(Compiler);
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fSnippet := ASnippet;
+    for Compiler in ACompilers do
+      if Compiler.HasErrorsOrWarnings then
+        Dlg.fRequiredCompilers.Add(Compiler);
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TCompErrorDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmCompilersDlg.FrLog.pas b/Src/FmCompilersDlg.FrLog.pas
index 0048f48c1..581cd2bb7 100644
--- a/Src/FmCompilersDlg.FrLog.pas
+++ b/Src/FmCompilersDlg.FrLog.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame used to change log file prefixes used for a compiler being
  * edited in TCompilersDlg.
@@ -126,46 +126,43 @@ procedure TCompilersDlgLogFrame.vleLogPrefixesDrawCell(Sender: TObject; ACol,
   // Get reference to value editor
   ValEd := Sender as TValueListEditor;
   ValEd.Canvas.Font := ValEd.Font;
-  with ValEd.Canvas do
+  if gdFixed in State then
   begin
-    if gdFixed in State then
-    begin
-      // Set colours for fixed cells (non-editable)
-      Brush.Color := clBtnFace;
-      Font.Color := ValEd.Font.Color;
-    end
-    else
-    begin
-      // Set colours for editable cell
-      Brush.Color := ValEd.Color;
-      Font.Color := ValEd.Font.Color;
-    end;
-    // Colour the current cell
-    FillRect(Rect);
-    if gdFixed in State then
-    begin
-      // draw vertical line at right edge of fixed cell to act as border
-      Pen.Color := clBtnShadow;
-      MoveTo(Rect.Right - 1, Rect.Top);
-      LineTo(Rect.Right - 1, Rect.Bottom);
-    end;
-    // Display required text
-    TextOut(
-      Rect.Left + 2 ,
-      Rect.Top + (ValEd.RowHeights[ARow] - TextHeight('X')) div 2,
-      ValEd.Cells[ACol, ARow]
+    // Set colours for fixed cells (non-editable)
+    ValEd.Canvas.Brush.Color := clBtnFace;
+    ValEd.Canvas.Font.Color := ValEd.Font.Color;
+  end
+  else
+  begin
+    // Set colours for editable cell
+    ValEd.Canvas.Brush.Color := ValEd.Color;
+    ValEd.Canvas.Font.Color := ValEd.Font.Color;
+  end;
+  // Colour the current cell
+  ValEd.Canvas.FillRect(Rect);
+  if gdFixed in State then
+  begin
+    // draw vertical line at right edge of fixed cell to act as border
+    ValEd.Canvas.Pen.Color := clBtnShadow;
+    ValEd.Canvas.MoveTo(Rect.Right - 1, Rect.Top);
+    ValEd.Canvas.LineTo(Rect.Right - 1, Rect.Bottom);
+  end;
+  // Display required text
+  ValEd.Canvas.TextOut(
+    Rect.Left + 2 ,
+    Rect.Top + (ValEd.RowHeights[ARow] - ValEd.Canvas.TextHeight('X')) div 2,
+    ValEd.Cells[ACol, ARow]
+  );
+  if (ACol = 0) and (ValEd.Selection.Top = ARow) then
+  begin
+    // This is a fixed cell which has selected editable cell adjacent to it
+    // draw an arrow at the RHS of this cell that points to selected cell
+    ValEd.Canvas.Pen.Color := clHighlight;
+    GraphUtil.DrawArrow(
+      ValEd.Canvas,
+      sdRight,
+      Point(Rect.Right - 8, (Rect.Top + Rect.Bottom) div 2 - 4), 4
     );
-    if (ACol = 0) and (ValEd.Selection.Top = ARow) then
-    begin
-      // This is a fixed cell which has selected editable cell adjacent to it
-      // draw an arrow at the RHS of this cell that points to selected cell
-      Pen.Color := clHighlight;
-      GraphUtil.DrawArrow(
-        ValEd.Canvas,
-        sdRight,
-        Point(Rect.Right - 8, (Rect.Top + Rect.Bottom) div 2 - 4), 4
-      );
-    end;
   end;
 end;
 
diff --git a/Src/FmDBUpdateDlg.pas b/Src/FmDBUpdateDlg.pas
index 80cd905b2..1ffc7347f 100644
--- a/Src/FmDBUpdateDlg.pas
+++ b/Src/FmDBUpdateDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a wizard dialogue box that handles the updating of the main
  * DelphiDabbler Code Snippets database.
@@ -345,14 +345,16 @@ procedure TDBUpdateDlg.DoUpdate;
 end;
 
 class function TDBUpdateDlg.Execute(AOwner: TComponent): Boolean;
+var
+  Dlg: TDBUpdateDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      ShowModal;
-      Result := fDataUpdated;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.ShowModal;
+    Result := Dlg.fDataUpdated;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TDBUpdateDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmDeleteCategoryDlg.pas b/Src/FmDeleteCategoryDlg.pas
index 06f150109..3f6a65b0f 100644
--- a/Src/FmDeleteCategoryDlg.pas
+++ b/Src/FmDeleteCategoryDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that permits user to select and delete a user
  * defined category.
@@ -137,14 +137,16 @@ class function TDeleteCategoryDlg.Execute(AOwner: TComponent;
     @param AOwner [in] Component that owns dialog box.
     @param CatList [in] List of categories available for deletion.
   }
+var
+  Dlg: TDeleteCategoryDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      fCategories := CatList;
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fCategories := CatList;
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TDeleteCategoryDlg.SelectionChangeHandler(Sender: TObject);
diff --git a/Src/FmDeleteUserDBDlg.pas b/Src/FmDeleteUserDBDlg.pas
index d6c04b056..d51be0681 100644
--- a/Src/FmDeleteUserDBDlg.pas
+++ b/Src/FmDeleteUserDBDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2022-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that asks user to confirm deletion of user-defined
  * snippets database.
@@ -84,14 +84,16 @@ procedure TDeleteUserDBDlg.ConfigForm;
 end;
 
 class function TDeleteUserDBDlg.Execute(AOwner: TComponent): Boolean;
+var
+  Dlg: TDeleteUserDBDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      ShowModal;
-      Result := fPermissionGranted;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.ShowModal;
+    Result := Dlg.fPermissionGranted;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 constructor TDeleteUserDBDlg.InternalCreate(AOwner: TComponent);
diff --git a/Src/FmDependenciesDlg.pas b/Src/FmDependenciesDlg.pas
index 0ee913675..e1705a01e 100644
--- a/Src/FmDependenciesDlg.pas
+++ b/Src/FmDependenciesDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that displays all the dependencies and dependents
  * of a snippet.
@@ -321,43 +321,47 @@ procedure TDependenciesDlg.DisplayCircularRefWarning;
 class function TDependenciesDlg.Execute(const AOwner: TComponent;
   const Snippet: TSnippet; const Tabs: TTabIDs; const PermitSelection: Boolean;
   const AHelpKeyword: string): ISearch;
+var
+  Dlg: TDependenciesDlg;
 begin
   Assert(Tabs <> [], ClassName + '.Execute: Tabs is []');
-  with InternalCreate(AOwner) do
-    try
-      fSnippetID := Snippet.ID;
-      fDisplayName := Snippet.DisplayName;
-      fDependsList := Snippet.Depends;
-      fTabs := Tabs;
-      fCanSelect := PermitSelection;
-      HelpKeyword := AHelpKeyword;
-      if ShowModal = mrOK then
-        Result := fSearch
-      else
-        Result := nil;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fSnippetID := Snippet.ID;
+    Dlg.fDisplayName := Snippet.DisplayName;
+    Dlg.fDependsList := Snippet.Depends;
+    Dlg.fTabs := Tabs;
+    Dlg.fCanSelect := PermitSelection;
+    Dlg.HelpKeyword := AHelpKeyword;
+    if Dlg.ShowModal = mrOK then
+      Result := Dlg.fSearch
+    else
+      Result := nil;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 class procedure TDependenciesDlg.Execute(const AOwner: TComponent;
   const SnippetID: TSnippetID; const DisplayName: string;
   const DependsList: TSnippetList; const Tabs: TTabIDs;
   const AHelpKeyword: string);
+var
+  Dlg: TDependenciesDlg;
 begin
   Assert(Tabs <> [], ClassName + '.Execute: Tabs is []');
-  with InternalCreate(AOwner) do
-    try
-      fSnippetID := SnippetID;
-      fDisplayName := DisplayName;
-      fDependsList := DependsList;
-      fTabs := Tabs;
-      fCanSelect := False;
-      HelpKeyword := AHelpKeyword;
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fSnippetID := SnippetID;
+    Dlg.fDisplayName := DisplayName;
+    Dlg.fDependsList := DependsList;
+    Dlg.fTabs := Tabs;
+    Dlg.fCanSelect := False;
+    Dlg.HelpKeyword := AHelpKeyword;
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TDependenciesDlg.FormDestroy(Sender: TObject);
diff --git a/Src/FmDuplicateSnippetDlg.pas b/Src/FmDuplicateSnippetDlg.pas
index b2e1fc13f..4c207e683 100644
--- a/Src/FmDuplicateSnippetDlg.pas
+++ b/Src/FmDuplicateSnippetDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box which can create a duplicate copy of asnippet.
 }
@@ -137,18 +137,20 @@ function TDuplicateSnippetDlg.DisallowedNames: IStringList;
 
 class function TDuplicateSnippetDlg.Execute(const AOwner: TComponent;
   const ASnippet: TSnippet): Boolean;
+var
+  Dlg: TDuplicateSnippetDlg;
 resourcestring
   sCaption = 'Duplicate %s';   // dialog box caption
 begin
   Assert(Assigned(ASnippet), ClassName + '.Execute: ASnippet is nil');
-  with InternalCreate(AOwner) do
-    try
-      Caption := Format(sCaption, [ASnippet.DisplayName]);
-      fSnippet := ASnippet;
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.Caption := Format(sCaption, [ASnippet.DisplayName]);
+    Dlg.fSnippet := ASnippet;
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TDuplicateSnippetDlg.HandleException(const E: Exception);
diff --git a/Src/FmEasterEgg.pas b/Src/FmEasterEgg.pas
index 54022636f..31bdf2b38 100644
--- a/Src/FmEasterEgg.pas
+++ b/Src/FmEasterEgg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a form that hosts the program's easter egg.
 }
@@ -107,13 +107,15 @@ class procedure TEasterEggForm.Execute(const AOwner: TComponent);
   {Displays easter egg modally.
     @param AOwner [in] Component that owns this form.
   }
+var
+  EggForm: TEasterEggForm;
 begin
-  with Create(AOwner) do
-    try
-      ShowModal;
-    finally
-      Free;
-    end;
+  EggForm := Create(AOwner);
+  try
+    EggForm.ShowModal;
+  finally
+    EggForm.Free;
+  end;
 end;
 
 procedure TEasterEggForm.FormClose(Sender: TObject; var Action: TCloseAction);
diff --git a/Src/FmFavouritesDlg.pas b/Src/FmFavouritesDlg.pas
index 865a1df9c..7213d1852 100644
--- a/Src/FmFavouritesDlg.pas
+++ b/Src/FmFavouritesDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2013-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2013-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that displays and manages the user's favourite
  * snippets.
@@ -406,39 +406,38 @@ procedure TFavouritesDlg.ConfigForm;
 end;
 
 procedure TFavouritesDlg.CreateLV;
+
+  procedure AddColumn(const ACaption: string; const AWidth: Integer);
+  var
+    Col: TListColumn;
+  begin
+    Col := fLVFavs.Columns.Add;
+    Col.Caption := ACaption;
+    Col.Width := AWidth;
+  end;
+
 resourcestring
   sSnippetName = 'Snippet';
   sLastAccessed = 'Last used';
 begin
   fLVFavs := TListViewEx.Create(Self);
-  with fLVFavs do
-  begin
-    Parent := pnlBody;
-    Height := 240;
-    Width := 360;
-    HideSelection := False;
-    ReadOnly := True;
-    RowSelect := True;
-    TabOrder := 0;
-    TabStop := True;
-    ViewStyle := vsReport;
-    SortImmediately := False;
-    with Columns.Add do
-    begin
-      Caption := sSnippetName;
-      Width := 180;
-    end;
-    with Columns.Add do
-    begin
-      Caption := sLastAccessed;
-      Width := 140;
-    end;
-    OnDblClick := LVDoubleClick;
-    OnCompare := LVFavouritesCompare;
-    OnCreateItemClass := LVFavouriteCreateItemClass;
-    OnCustomDrawItem := LVCustomDrawItem;
-    OnCustomDrawSubItem := LVCustomDrawSubItem;
-  end;
+  fLVFavs.Parent := pnlBody;
+  fLVFavs.Height := 240;
+  fLVFavs.Width := 360;
+  fLVFavs.HideSelection := False;
+  fLVFavs.ReadOnly := True;
+  fLVFavs.RowSelect := True;
+  fLVFavs.TabOrder := 0;
+  fLVFavs.TabStop := True;
+  fLVFavs.ViewStyle := vsReport;
+  fLVFavs.SortImmediately := False;
+  AddColumn(sSnippetName, 180);
+  AddColumn(sLastAccessed, 140);
+  fLVFavs.OnDblClick := LVDoubleClick;
+  fLVFavs.OnCompare := LVFavouritesCompare;
+  fLVFavs.OnCreateItemClass := LVFavouriteCreateItemClass;
+  fLVFavs.OnCustomDrawItem := LVCustomDrawItem;
+  fLVFavs.OnCustomDrawSubItem := LVCustomDrawSubItem;
 end;
 
 class procedure TFavouritesDlg.Display(AOwner: TComponent;
diff --git a/Src/FmFindCompilerDlg.pas b/Src/FmFindCompilerDlg.pas
index 562d03396..277c4ae9c 100644
--- a/Src/FmFindCompilerDlg.pas
+++ b/Src/FmFindCompilerDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that is used to select criteria for searches for
  * snippets that compile or don't compile with selected compilers.
@@ -321,15 +321,17 @@ class function TFindCompilerDlg.Execute(const AOwner: TComponent;
     @return True if user OKs and search object created or false if user
       cancels and search object is nil.
   }
+var
+  Dlg: TFindCompilerDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      Result := (ShowModal = mrOK);
-      ASearch := fSearch;
-      RefineExisting := fRefinePreviousSearch;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Result := (Dlg.ShowModal = mrOK);
+    ASearch := Dlg.fSearch;
+    RefineExisting := Dlg.fRefinePreviousSearch;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TFindCompilerDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmFindTextDlg.pas b/Src/FmFindTextDlg.pas
index e436dba08..383234cef 100644
--- a/Src/FmFindTextDlg.pas
+++ b/Src/FmFindTextDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that is used to select criteria for text searches.
  *
@@ -250,15 +250,17 @@ class function TFindTextDlg.Execute(const AOwner: TComponent;
     @return True if user OKs and search object created or false if user
       cancels and search object is nil.
   }
+var
+  Dlg: TFindTextDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      Result := (ShowModal = mrOK);
-      ASearch := fSearch;
-      RefineExisting := fRefinePreviousSearch;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Result := (Dlg.ShowModal = mrOK);
+    ASearch := Dlg.fSearch;
+    RefineExisting := Dlg.fRefinePreviousSearch;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TFindTextDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmFindXRefsDlg.pas b/Src/FmFindXRefsDlg.pas
index 2df4f6db5..0d301ef98 100644
--- a/Src/FmFindXRefsDlg.pas
+++ b/Src/FmFindXRefsDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that is used to select criteria for searches for
  * cross referenced snippets.
@@ -250,16 +250,18 @@ class function TFindXRefsDlg.Execute(const AOwner: TComponent;
     @return True if user OKs and search object created or false if user cancels
       and search object is nil.
   }
+var
+  Dlg: TFindXRefsDlg;
 begin
   Assert(Assigned(Snippet), ClassName + '.Execute: Snippet is nil');
-  with InternalCreate(AOwner) do
-    try
-      fSnippet := Snippet;
-      Result := (ShowModal = mrOK);
-      ASearch := fSearch;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fSnippet := Snippet;
+    Result := (Dlg.ShowModal = mrOK);
+    ASearch := Dlg.fSearch;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TFindXRefsDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 54ee4a6bf..59c28851a 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Application's main form. Handles the program's main window display and user
  * interaction.
@@ -948,13 +948,13 @@ procedure TMainForm.ActOverviewTabExecute(Sender: TObject);
 end;
 
 procedure TMainForm.ActOverviewTabUpdate(Sender: TObject);
+var
+  Action: TAction;
 begin
   // Action's Tag property specifies index of tab being updated
-  with Sender as TAction do
-  begin
-    Checked := fMainDisplayMgr.SelectedOverviewTab = Tag;
-    Enabled := True;
-  end;
+  Action := (Sender as TAction);
+  Action.Checked := fMainDisplayMgr.SelectedOverviewTab = Tag;
+  Action.Enabled := True;
 end;
 
 procedure TMainForm.actPreferencesExecute(Sender: TObject);
@@ -1299,14 +1299,15 @@ procedure TMainForm.FormCreate(Sender: TObject);
 end;
 
 procedure TMainForm.FormDestroy(Sender: TObject);
+var
+  EditableDB: IDatabaseEdit;
 begin
   inherited;
   // Save any changes to user database
-  with Database as IDatabaseEdit do
-  begin
-    if Updated then
-      Save;
-  end;
+  EditableDB := Database as IDatabaseEdit;
+  if EditableDB.Updated then
+    EditableDB.Save;
+
   // Unhook snippets event handler
   Database.RemoveChangeEventHandler(DBChangeHandler);
   // Save window state
@@ -1344,6 +1345,8 @@ procedure TMainForm.HandleExceptions(Sender: TObject; E: Exception);
 procedure TMainForm.InitForm;
 var
   WBExternal: IDispatch;        // external object of browser control
+  ActionSetter: ISetActions;
+  DetailCmdBarCfg, OverviewCmdBarCfg: ICommandBarConfig;
 begin
   try
     inherited;
@@ -1387,38 +1390,37 @@ procedure TMainForm.InitForm;
     // Create notifier object and assign actions triggered by its methods
     // note that actions created on fly are automatically freed
     fNotifier := TNotifier.Create;
-    with fNotifier as ISetActions do
-    begin
-      SetUpdateDbaseAction(actUpdateDbase);
-      SetDisplaySnippetAction(TActionFactory.CreateSnippetAction(Self));
-      SetDisplayCategoryAction(TActionFactory.CreateCategoryAction(Self));
-      SetConfigCompilersAction(actCompilers);
-      SetShowViewItemAction(
-        TActionFactory.CreateViewItemAction(Self, ActViewItemExecute)
-      );
-      SetOverviewStyleChangeActions(
-        [actViewCategorised, actViewAlphabetical, actViewSnippetKinds]
-      );
-      SetDetailPaneChangeAction(
-        TActionFactory.CreateDetailTabAction(Self, ActSelectDetailTabExecute)
-      );
-      SetEditSnippetAction(
-        TActionFactory.CreateEditSnippetAction(
-          Self, ActEditSnippetByNameExecute
-        )
-      );
-      SetNewSnippetAction(actAddSnippet);
-      SetNewsAction(actBlog);
-      SetAboutBoxAction(actAbout);
-    end;
+    ActionSetter := fNotifier as ISetActions;
+    ActionSetter.SetUpdateDbaseAction(actUpdateDbase);
+    ActionSetter.SetDisplaySnippetAction(
+      TActionFactory.CreateSnippetAction(Self)
+    );
+    ActionSetter.SetDisplayCategoryAction(
+      TActionFactory.CreateCategoryAction(Self)
+    );
+    ActionSetter.SetConfigCompilersAction(actCompilers);
+    ActionSetter.SetShowViewItemAction(
+      TActionFactory.CreateViewItemAction(Self, ActViewItemExecute)
+    );
+    ActionSetter.SetOverviewStyleChangeActions(
+      [actViewCategorised, actViewAlphabetical, actViewSnippetKinds]
+    );
+    ActionSetter.SetDetailPaneChangeAction(
+      TActionFactory.CreateDetailTabAction(Self, ActSelectDetailTabExecute)
+    );
+    ActionSetter.SetEditSnippetAction(
+      TActionFactory.CreateEditSnippetAction(
+        Self, ActEditSnippetByNameExecute
+      )
+    );
+    ActionSetter.SetNewSnippetAction(actAddSnippet);
+    ActionSetter.SetNewsAction(actBlog);
+    ActionSetter.SetAboutBoxAction(actAbout);
 
     // Customise web browser controls in Details pane
     WBExternal := TWBExternal.Create;
-    with frmDetail as IWBCustomiser do
-    begin
-      SetExternalObj(WBExternal);
-      SetDragDropHandler(TNulDropTarget.Create);
-    end;
+    (frmDetail as IWBCustomiser).SetExternalObj(WBExternal);
+    (frmDetail as IWBCustomiser).SetDragDropHandler(TNulDropTarget.Create);
 
     // Set notifier for objects that trigger notifications
     (WBExternal as ISetNotifier).SetNotifier(fNotifier);
@@ -1456,58 +1458,56 @@ procedure TMainForm.InitForm;
     );
 
     // Set up detail pane's popup menus
-    with frmDetail as ICommandBarConfig do
-    begin
+    DetailCmdBarCfg := frmDetail as ICommandBarConfig;
       // set images to use
-      SetImages(ilMain);
+    DetailCmdBarCfg.SetImages(ilMain);
       // detail view menus
-      AddAction(
-        TActionFactory.CreateLinkAction(Self),
-        [cDetailPopupMenuAnchor, cDetailPopupMenuImage]
-      );
-      AddSpacer([cDetailPopupMenuAnchor, cDetailPopupMenuImage]);
-      AddAction(actViewDependencies, cDetailPopupMenuIDs);
-      AddSpacer(cDetailPopupMenuIDs);
-      AddAction(actCopyInfo, cDetailPopupMenuIDs);
-      AddAction(actCopySnippet, cDetailPopupMenuIDs);
-      AddAction(actCopySource, cDetailPopupMenuIDs);
-      AddSpacer(cDetailPopupMenuIDs);
-      AddAction(actTestCompile, cDetailPopupMenuIDs);
-      AddSpacer(cDetailPopupMenuIDs);
-      AddAction(actSaveSnippet, cDetailPopupMenuIDs);
-      AddAction(actPrint, cDetailPopupMenuIDs);
-      AddSpacer(cDetailPopupMenuIDs);
-      AddAction(actCopy, cDetailPopupMenuTextSelect);
-      AddAction(actSelectAll, cDetailPopupMenuIDs);
-      AddSpacer(cDetailPopupMenuIDs);
-      AddAction(actCloseDetailsTab, cDetailPopupMenuIDs);
-      // tab set menu
-      AddAction(actCloseDetailsTab, cDetailTabSetPopupMenu);
-      AddAction(actCloseUnselectedDetailsTabs, cDetailTabSetPopupMenu);
-    end;
+    DetailCmdBarCfg.AddAction(
+      TActionFactory.CreateLinkAction(Self),
+      [cDetailPopupMenuAnchor, cDetailPopupMenuImage]
+    );
+    DetailCmdBarCfg.AddSpacer([cDetailPopupMenuAnchor, cDetailPopupMenuImage]);
+    DetailCmdBarCfg.AddAction(actViewDependencies, cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddSpacer(cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddAction(actCopyInfo, cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddAction(actCopySnippet, cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddAction(actCopySource, cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddSpacer(cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddAction(actTestCompile, cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddSpacer(cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddAction(actSaveSnippet, cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddAction(actPrint, cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddSpacer(cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddAction(actCopy, cDetailPopupMenuTextSelect);
+    DetailCmdBarCfg.AddAction(actSelectAll, cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddSpacer(cDetailPopupMenuIDs);
+    DetailCmdBarCfg.AddAction(actCloseDetailsTab, cDetailPopupMenuIDs);
+    // tab set menu
+    DetailCmdBarCfg.AddAction(actCloseDetailsTab, cDetailTabSetPopupMenu);
+    DetailCmdBarCfg.AddAction(
+      actCloseUnselectedDetailsTabs, cDetailTabSetPopupMenu
+    );
 
     // Set up overview pane's toolbar and popup menu
-    with frmOverview as ICommandBarConfig do
-    begin
-      SetImages(ilMain);
-      // add toolbar actions (in reverse order we want them!)
-      AddAction(actCollapseTree, cOverviewToolBar);
-      AddAction(actExpandTree, cOverviewToolBar);
-      // add popup menu actions
-      AddAction(actViewDependencies, cOverviewPopupMenu);
-      AddSpacer(cOverviewPopupMenu);
-      AddAction(actCopyInfo, cOverviewPopupMenu);
-      AddAction(actCopySnippet, cOverviewPopupMenu);
-      AddAction(actCopySource, cOverviewPopupMenu);
-      AddSpacer(cOverviewPopupMenu);
-      AddAction(actSaveSnippet, cOverviewPopupMenu);
-      AddAction(actPrint, cOverviewPopupMenu);
-      AddSpacer(cOverviewPopupMenu);
-      AddAction(actEditSnippet, cOverviewPopupMenu);
-      AddSpacer(cOverviewPopupMenu);
-      AddAction(actCollapseNode, cOverviewPopupMenu);
-      AddAction(actExpandNode, cOverviewPopupMenu);
-    end;
+    OverviewCmdBarCfg := frmOverview as ICommandBarConfig;
+    OverviewCmdBarCfg.SetImages(ilMain);
+    // add toolbar actions (in reverse order we want them!)
+    OverviewCmdBarCfg.AddAction(actCollapseTree, cOverviewToolBar);
+    OverviewCmdBarCfg.AddAction(actExpandTree, cOverviewToolBar);
+    // add popup menu actions
+    OverviewCmdBarCfg.AddAction(actViewDependencies, cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddSpacer(cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddAction(actCopyInfo, cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddAction(actCopySnippet, cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddAction(actCopySource, cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddSpacer(cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddAction(actSaveSnippet, cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddAction(actPrint, cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddSpacer(cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddAction(actEditSnippet, cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddSpacer(cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddAction(actCollapseNode, cOverviewPopupMenu);
+    OverviewCmdBarCfg.AddAction(actExpandNode, cOverviewPopupMenu);
 
     // Create object to handle compilation and assoicated UI and dialogues
     fCompileMgr := TMainCompileMgr.Create(Self);  // auto-freed
diff --git a/Src/FmNewHiliterNameDlg.pas b/Src/FmNewHiliterNameDlg.pas
index 7ff40df15..a7fcca8e5 100644
--- a/Src/FmNewHiliterNameDlg.pas
+++ b/Src/FmNewHiliterNameDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2013-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2013-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that enables the user to enter a syntax highlighter
  * name.
@@ -122,17 +122,19 @@ procedure TNewHiliterNameDlg.cbNamesChange(Sender: TObject);
 
 class function TNewHiliterNameDlg.Execute(Owner: TComponent;
   const Names: array of string; out NewName: string): Boolean;
+var
+  Dlg: TNewHiliterNameDlg;
 begin
-  with InternalCreate(Owner) do
-    try
-      fNames := TIStringList.Create(Names);
-      fNames.CaseSensitive := False;
-      Result := ShowModal = mrOK;
-      if Result then
-        NewName := fNewName;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(Owner);
+  try
+    Dlg.fNames := TIStringList.Create(Names);
+    Dlg.fNames.CaseSensitive := False;
+    Result := Dlg.ShowModal = mrOK;
+    if Result then
+      NewName := Dlg.fNewName;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TNewHiliterNameDlg.InitForm;
diff --git a/Src/FmPreferencesDlg.pas b/Src/FmPreferencesDlg.pas
index 7a2e0fb7d..cceb5b6ce 100644
--- a/Src/FmPreferencesDlg.pas
+++ b/Src/FmPreferencesDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that is used to set user preferences.
 }
@@ -265,19 +265,21 @@ function TPreferencesDlg.CustomHelpKeyword: string;
 class function TPreferencesDlg.Execute(AOwner: TComponent;
   const Pages: array of TPrefsFrameClass; out UpdateUI: Boolean;
   const Flags: UInt64): Boolean;
+var
+  Dlg: TPreferencesDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      fFrameFlags := Flags;
-      CreatePages(Pages);
-      Result := ShowModal = mrOK;
-      if Result then
-        UpdateUI := fUpdateUI
-      else
-        UpdateUI := False;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fFrameFlags := Flags;
+    Dlg.CreatePages(Pages);
+    Result := Dlg.ShowModal = mrOK;
+    if Result then
+      UpdateUI := Dlg.fUpdateUI
+    else
+      UpdateUI := False;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 class function TPreferencesDlg.Execute(AOwner: TComponent;
diff --git a/Src/FmPreviewDlg.pas b/Src/FmPreviewDlg.pas
index f5c987ffe..e9f924046 100644
--- a/Src/FmPreviewDlg.pas
+++ b/Src/FmPreviewDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that is used to preview or display plain text, HTML
  * and Rich text documents.
@@ -172,16 +172,18 @@ procedure TPreviewDlg.CopyToClipboard;
 class procedure TPreviewDlg.Execute(AOwner: TComponent;
   const ADocContent: TEncodedData; const ADocType: TPreviewDocType;
   const ADlgTitle: string);
+var
+  Dlg: TPreviewDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      fDlgTitle := ADlgTitle;
-      fDocContent := TEncodedData.Create(ADocContent);
-      fDocType := ADocType;
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fDlgTitle := ADlgTitle;
+    Dlg.fDocContent := TEncodedData.Create(ADocContent);
+    Dlg.fDocType := ADocType;
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 class function TPreviewDlg.FindParentTabSheet(const Frame: TFrame): TTabSheet;
diff --git a/Src/FmPrintDlg.pas b/Src/FmPrintDlg.pas
index 101f9fa33..5ef588f1c 100644
--- a/Src/FmPrintDlg.pas
+++ b/Src/FmPrintDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a print dialogue box.
 }
@@ -264,13 +264,15 @@ class function TPrintDlg.Execute(const AOwner: TComponent): Boolean;
     @param AOwner [in] Owner of dialog box.
     @return True if user OKs dialog box and False if user cancels.
   }
+var
+  Dlg: TPrintDlg;
 begin
-  with Create(AOwner) do
-    try
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := Create(AOwner);
+  try
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TPrintDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmRenameCategoryDlg.pas b/Src/FmRenameCategoryDlg.pas
index 50f8ea135..039d6905a 100644
--- a/Src/FmRenameCategoryDlg.pas
+++ b/Src/FmRenameCategoryDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that permits user to select and rename a user
  * defined category.
@@ -182,14 +182,16 @@ class function TRenameCategoryDlg.Execute(AOwner: TComponent;
     @param AOwner [in] Component that owns dialog box.
     @param CatList [in] List of categories available for renaming.
   }
+var
+  Dlg: TRenameCategoryDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      fCategories := CatList;
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fCategories := CatList;
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TRenameCategoryDlg.RenameCategory(const Category: TCategory;
diff --git a/Src/FmSWAGImportDlg.pas b/Src/FmSWAGImportDlg.pas
index ceb931628..ffe252edc 100644
--- a/Src/FmSWAGImportDlg.pas
+++ b/Src/FmSWAGImportDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2013-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2013-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a wizard dialogue box that lets the user select and import
  * packets from the DelphiDabbler implementation of the SWAG Pascal archive as
@@ -568,13 +568,15 @@ procedure TSWAGImportDlg.DisplayPacketsForCategory;
 end;
 
 class function TSWAGImportDlg.Execute(const AOwner: TComponent): Boolean;
+var
+  Dlg: TSWAGImportDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 function TSWAGImportDlg.GetDirNameFromEditCtrl: string;
diff --git a/Src/FmSelectionSearchDlg.pas b/Src/FmSelectionSearchDlg.pas
index 6e19a454a..a1dcf49bc 100644
--- a/Src/FmSelectionSearchDlg.pas
+++ b/Src/FmSelectionSearchDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that enables the user to the select the snippets
  * that are to be displayed.
@@ -194,15 +194,17 @@ class function TSelectionSearchDlg.Execute(const AOwner: TComponent;
       if user cancels.
     @return True if user OKs and false if user cancels.
   }
+var
+  Dlg: TSelectionSearchDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      SetSelectedSnippets(SelectedSnippets);
-      Result := (ShowModal = mrOK);
-      ASearch := fSearch;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.SetSelectedSnippets(SelectedSnippets);
+    Result := (Dlg.ShowModal = mrOK);
+    ASearch := Dlg.fSearch;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TSelectionSearchDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmSnippetsEditorDlg.pas b/Src/FmSnippetsEditorDlg.pas
index d212194c0..45e9bc7d7 100644
--- a/Src/FmSnippetsEditorDlg.pas
+++ b/Src/FmSnippetsEditorDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that enables the user to create or edit user
  * defined snippets.
@@ -531,17 +531,19 @@ class function TSnippetsEditorDlg.AddNewSnippet(AOwner: TComponent): Boolean;
       is aligned. May be nil.
     @return True if user OKs, False if cancels.
   }
+var
+  Dlg: TSnippetsEditorDlg;
 resourcestring
   sCaption = 'Add a Snippet';   // dialog box caption
 begin
-  with InternalCreate(AOwner) do
-    try
-      Caption := sCaption;
-      fSnippet := nil;
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.Caption := sCaption;
+    Dlg.fSnippet := nil;
+    Result := Dlg.ShowModal = mrOK;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TSnippetsEditorDlg.ArrangeForm;
@@ -710,17 +712,19 @@ class function TSnippetsEditorDlg.EditSnippet(AOwner: TComponent;
     @param Snippet [in] Reference to snippet to be edited.
     @return True if user OKs, False if cancels.
   }
+var
+  Instance: TSnippetsEditorDlg;
 resourcestring
   sCaption = 'Edit Snippet';  // dialogue box caption
 begin
-  with InternalCreate(AOwner) do
-    try
-      Caption := sCaption;
-      fSnippet := Snippet;
-      Result := ShowModal = mrOK;
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(AOwner);
+  try
+    Instance.Caption := sCaption;
+    Instance.fSnippet := Snippet;
+    Result := Instance.ShowModal = mrOK;
+  finally
+    Instance.Free;
+  end;
 end;
 
 procedure TSnippetsEditorDlg.FocusCtrl(const Ctrl: TWinControl);
@@ -944,23 +948,20 @@ function TSnippetsEditorDlg.UpdateData: TSnippetEditData;
   }
 begin
   Result.Init;
-  with Result do
-  begin
-    if StrTrim(edName.Text) <> StrTrim(edDisplayName.Text) then
-      Props.DisplayName := StrTrim(edDisplayName.Text)
-    else
-      Props.DisplayName := '';
-    Props.Cat := fCatList.CatID(cbCategories.ItemIndex);
-    Props.Kind := fSnipKindList.SnippetKind(cbKind.ItemIndex);
-    (Props.Desc as IAssignable).Assign(frmDescription.ActiveText);
-    Props.SourceCode := StrTrimRight(edSourceCode.Text);
-    Props.HiliteSource := chkUseHiliter.Checked;
-    (Props.Extra as IAssignable).Assign(frmExtra.ActiveText);
-    Props.CompilerResults := fCompilersLBMgr.GetCompileResults;
-    Refs.Units := fUnitsCLBMgr.GetCheckedUnits;
-    Refs.Depends := fDependsCLBMgr.GetCheckedSnippets;
-    Refs.XRef := fXRefsCLBMgr.GetCheckedSnippets;
-  end;
+  if StrTrim(edName.Text) <> StrTrim(edDisplayName.Text) then
+    Result.Props.DisplayName := StrTrim(edDisplayName.Text)
+  else
+    Result.Props.DisplayName := '';
+  Result.Props.Cat := fCatList.CatID(cbCategories.ItemIndex);
+  Result.Props.Kind := fSnipKindList.SnippetKind(cbKind.ItemIndex);
+  (Result.Props.Desc as IAssignable).Assign(frmDescription.ActiveText);
+  Result.Props.SourceCode := StrTrimRight(edSourceCode.Text);
+  Result.Props.HiliteSource := chkUseHiliter.Checked;
+  (Result.Props.Extra as IAssignable).Assign(frmExtra.ActiveText);
+  Result.Props.CompilerResults := fCompilersLBMgr.GetCompileResults;
+  Result.Refs.Units := fUnitsCLBMgr.GetCheckedUnits;
+  Result.Refs.Depends := fDependsCLBMgr.GetCheckedSnippets;
+  Result.Refs.XRef := fXRefsCLBMgr.GetCheckedSnippets;
 end;
 
 procedure TSnippetsEditorDlg.UpdateReferences;
diff --git a/Src/FmSplash.pas b/Src/FmSplash.pas
index bdf8d156e..de4b7bd34 100644
--- a/Src/FmSplash.pas
+++ b/Src/FmSplash.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements the program's splash screen.
 }
@@ -225,19 +225,20 @@ function TSplashAligner.GetMainFormBounds(const AForm: TCustomForm): TRectEx;
   }
 var
   State: TWindowState;  // window state read from storage
+  Settings: TOwnerWindowSettings;
 begin
   // We get main form's bounds from persistent storage: we have to do this since
   // the splash form may be displayed before main form is aligned.
   // If we can't read from persistent storage or form is maximized we centre
   // splash form in work area. This works because main form is also centred when
   // storage can't be read, and maximized form takes all of work area.
-  with TOwnerWindowSettings.Create(AForm) do
-    try
-      if not GetWdwState(Result, State) or (State = wsMaximized) then
-        Result := Screen.WorkAreaRect;  // we use workarea of primary monitor
-    finally
-      Free;
-    end;
+  Settings := TOwnerWindowSettings.Create(AForm);
+  try
+    if not Settings.GetWdwState(Result, State) or (State = wsMaximized) then
+      Result := Screen.WorkAreaRect;  // we use workarea of primary monitor
+  finally
+    Free;
+  end;
 end;
 
 { TOwnerWindowSettings }
diff --git a/Src/FmTestCompileDlg.pas b/Src/FmTestCompileDlg.pas
index b7a01db0d..5066e2bff 100644
--- a/Src/FmTestCompileDlg.pas
+++ b/Src/FmTestCompileDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box which test compiles a snippet and displays the
  * results.
@@ -314,17 +314,19 @@ procedure TTestCompileDlg.DisplayCompileResults(const Compilers: ICompilers);
 
 class procedure TTestCompileDlg.Execute(const AOwner: TComponent;
   const ACompileMgr: TCompileMgr; const ASnippet: TSnippet);
+var
+  Dlg: TTestCompileDlg;
 begin
   Assert(Assigned(ACompileMgr), ClassName + '.Execute: ACompileMgr is nil');
   Assert(Assigned(ASnippet), ClassName + '.Execute: ASnippet is nil');
-  with InternalCreate(AOwner) do
-    try
-      fCompileMgr := ACompileMgr;
-      fSnippet := ASnippet;
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fCompileMgr := ACompileMgr;
+    Dlg.fSnippet := ASnippet;
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TTestCompileDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmTrappedBugReportDlg.pas b/Src/FmTrappedBugReportDlg.pas
index 40403a497..6c1412954 100644
--- a/Src/FmTrappedBugReportDlg.pas
+++ b/Src/FmTrappedBugReportDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a bug report dialogue box that is displayed when unexpected
  * exceptions are detected.
@@ -166,15 +166,17 @@ class procedure TTrappedBugReportDlg.Execute(Owner: TComponent;
       dialog is aligned over the active form.
     @param ErrorObj [in] Exception that caused dialog box to be displayed.
   }
+var
+  Dlg: TTrappedBugReportDlg;
 begin
   Assert(Assigned(ErrorObj), ClassName + '.Execute: ErrorObj is nil');
-  with InternalCreate(Owner) do
-    try
-      fErrorObj := ErrorObj;
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(Owner);
+  try
+    Dlg.fErrorObj := ErrorObj;
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TTrappedBugReportDlg.GoToTracker;
diff --git a/Src/FmUserBugReportDlg.pas b/Src/FmUserBugReportDlg.pas
index 570bb65bc..bf180386d 100644
--- a/Src/FmUserBugReportDlg.pas
+++ b/Src/FmUserBugReportDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that informs users how to report bugs.
 }
@@ -75,13 +75,15 @@ class procedure TUserBugReportDlg.Execute(AOwner: TComponent);
       this component if it is a form. If Owner it is nil or not a form the
       dialog is aligned over the active form.
   }
+var
+  Dlg: TUserBugReportDlg;
 begin
-  with Create(AOwner) do
-    try
-      ShowModal;
-    finally
-      Free;
-    end;
+  Dlg := Create(AOwner);
+  try
+    Dlg.ShowModal;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 end.
diff --git a/Src/FmUserDataPathDlg.pas b/Src/FmUserDataPathDlg.pas
index 745577a3d..9c6bbbbbe 100644
--- a/Src/FmUserDataPathDlg.pas
+++ b/Src/FmUserDataPathDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2013-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2013-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that can be used to move the user database to a
  * different directory.
@@ -272,16 +272,21 @@ procedure TUserDataPathDlg.DoMove(const NewDir: string;
 end;
 
 class procedure TUserDataPathDlg.Execute(AOwner: TComponent);
+{$IFNDEF PORTABLE}
+var
+  Dlg: TUserDataPathDlg;
+{$ENDIF}
 begin
   {$IFDEF PORTABLE}
   raise EBug.Create(ClassName + '.Execute: Call forbidden in portable edition');
+  {$ELSE}
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.ShowModal
+  finally
+    Dlg.Free;
+  end;
   {$ENDIF}
-  with InternalCreate(AOwner) do
-    try
-      ShowModal
-    finally
-      Free;
-    end;
 end;
 
 procedure TUserDataPathDlg.FormCreate(Sender: TObject);
diff --git a/Src/FmUserHiliterMgrDlg.pas b/Src/FmUserHiliterMgrDlg.pas
index 2ee6db8a4..b71130b03 100644
--- a/Src/FmUserHiliterMgrDlg.pas
+++ b/Src/FmUserHiliterMgrDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2013-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2013-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that manages named user defined syntax
  * highlighters. It lists available named highlighters which can be selected for
@@ -152,16 +152,18 @@ procedure TUserHiliterMgrDlg.ArrangeForm;
 
 class function TUserHiliterMgrDlg.Execute(AOwner: TComponent;
   ANamedAttrs: INamedHiliteAttrs; out ASelected: IHiliteAttrs): Boolean;
+var
+  Dlg: TUserHiliterMgrDlg;
 begin
-  with InternalCreate(AOwner) do
-    try
-      fNamedAttrs := ANamedAttrs;
-      Result := ShowModal = mrOK;
-      if Result then
-        ASelected := fSelected;
-    finally
-      Free;
-    end;
+  Dlg := InternalCreate(AOwner);
+  try
+    Dlg.fNamedAttrs := ANamedAttrs;
+    Result := Dlg.ShowModal = mrOK;
+    if Result then
+      ASelected := Dlg.fSelected;
+  finally
+    Dlg.Free;
+  end;
 end;
 
 procedure TUserHiliterMgrDlg.InitForm;
diff --git a/Src/FrCodeGenPrefs.pas b/Src/FrCodeGenPrefs.pas
index 7814ad14b..be4d50516 100644
--- a/Src/FrCodeGenPrefs.pas
+++ b/Src/FrCodeGenPrefs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2010-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2010-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that allows user to set source code generation
  * preferences.
@@ -480,6 +480,16 @@ constructor TCodeGenPrefsFrame.Create(AOwner: TComponent);
 end;
 
 procedure TCodeGenPrefsFrame.CreateLV;
+
+  procedure AddColumn(const ACaption: string; const AWidth: Integer);
+  var
+    Col: TListColumn;
+  begin
+    Col := fLVWarnings.Columns.Add;
+    Col.Caption := ACaption;
+    Col.Width := AWidth;
+  end;
+
 resourcestring
   // column header captions
   sSymbolColCaption = 'Symbol';
@@ -487,36 +497,21 @@ procedure TCodeGenPrefsFrame.CreateLV;
   sStateColCaption = 'State';
 begin
   fLVWarnings := TListViewEx.Create(Self);
-  with fLVWarnings do
-  begin
-    Parent := Self;
-    Height := 150;
-    Left := 0;
-    HideSelection := False;
-    ReadOnly := True;
-    RowSelect := True;
-    TabOrder := 2;
-    ViewStyle := vsReport;
-    SortImmediately := False;
-    with Columns.Add do
-    begin
-      Caption := sSymbolColCaption;
-      Width := 240;
-    end;
-    with Columns.Add do
-    begin
-      Caption := sMinCompilerColCaption;
-      Width := 100;
-    end;
-    with Columns.Add do
-    begin
-      Caption := sStateColCaption;
-      Width := 50;
-    end;
-    OnSelectItem := LVWarningsSelected;
-    OnCompare := LVWarningsCompare;
-    OnCreateItemClass := LVWarningsCreateItemClass;
-  end;
+  fLVWarnings.Parent := Self;
+  fLVWarnings.Height := 150;
+  fLVWarnings.Left := 0;
+  fLVWarnings.HideSelection := False;
+  fLVWarnings.ReadOnly := True;
+  fLVWarnings.RowSelect := True;
+  fLVWarnings.TabOrder := 2;
+  fLVWarnings.ViewStyle := vsReport;
+  fLVWarnings.SortImmediately := False;
+  AddColumn(sSymbolColCaption, 240);
+  AddColumn(sMinCompilerColCaption, 100);
+  AddColumn(sStateColCaption, 50);
+  fLVWarnings.OnSelectItem := LVWarningsSelected;
+  fLVWarnings.OnCompare := LVWarningsCompare;
+  fLVWarnings.OnCreateItemClass := LVWarningsCreateItemClass;
 end;
 
 procedure TCodeGenPrefsFrame.Deactivate(const Prefs: IPreferences);
diff --git a/Src/FrDetailView.pas b/Src/FrDetailView.pas
index bb68e32d5..8aa41a592 100644
--- a/Src/FrDetailView.pas
+++ b/Src/FrDetailView.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that can display detailed views.
 }
@@ -129,6 +129,7 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
   MonoToContentFontRatio: Single; // ratio of size of mono font to content font
   DefContentFontSize: Integer;    // default size of content font
   DefMonoFontSize: Integer;       // default size of mono font
+  HiliterCSS: THiliterCSS;
 begin
   // NOTE:
   // We only set CSS properties that may need to use system colours or fonts
@@ -239,12 +240,12 @@ procedure TDetailViewFrame.BuildCSS(const CSSBuilder: TCSSBuilder);
 
     // Sets text styles and colours used by syntax highlighter
     HiliteAttrs := THiliteAttrsFactory.CreateUserAttrs;
-    with THiliterCSS.Create(HiliteAttrs) do
-      try
-        BuildCSS(CSSBuilder);
-      finally
-        Free;
-      end;
+    HiliterCSS := THiliterCSS.Create(HiliteAttrs);
+    try
+      HiliterCSS.BuildCSS(CSSBuilder);
+    finally
+      HiliterCSS.Free;
+    end;
 
     // Adjust .pas-source class to use required background colour
     CSSBuilder.Selectors['.' + THiliterCSS.GetMainCSSClassName]
diff --git a/Src/FrMemoPreview.pas b/Src/FrMemoPreview.pas
index 97c24e34a..6a8864b1d 100644
--- a/Src/FrMemoPreview.pas
+++ b/Src/FrMemoPreview.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements an abstract base class for frames used to display previews of
  * documents using controls that descend from TCustomMemo.
@@ -141,13 +141,15 @@ procedure TMemoPreviewFrame.SelectAll;
 procedure TMemoPreviewFrame.SetMargin;
   {Sets fixed size margin around control.
   }
+var
+  MemoHelper: TMemoHelper;
 begin
-  with TMemoHelper.Create(GetMemoCtrl) do
-    try
-      SetMargin(cPreviewMargin);
-    finally
-      Free;
-    end;
+  MemoHelper := TMemoHelper.Create(GetMemoCtrl);
+  try
+    MemoHelper.SetMargin(cPreviewMargin);
+  finally
+    MemoHelper.Free;
+  end;
 end;
 
 end.
diff --git a/Src/Hiliter.UAttrs.pas b/Src/Hiliter.UAttrs.pas
index 42ab29f1d..67a970123 100644
--- a/Src/Hiliter.UAttrs.pas
+++ b/Src/Hiliter.UAttrs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements classes that define syntax highlighter attributes along with an
  * object that provides a list of named highlighter attributes.
@@ -232,6 +232,7 @@   TNamedHiliterAttrs = class(TInterfacedObject,
 procedure THiliteAttrs.Assign(const Src: IInterface);
 var
   Elem: THiliteElement; // loops thru all highlight elements
+  Attrs: IHiliteAttrs;
 begin
   if Assigned(Src) then
   begin
@@ -240,13 +241,11 @@ procedure THiliteAttrs.Assign(const Src: IInterface);
         ClassName + '.Assign: Src does not support IHiliteAttrs'
       );
     // Src is assigned: copy its properties
-    with Src as IHiliteAttrs do
-    begin
-      Self.SetFontName(FontName);
-      Self.SetFontSize(FontSize);
-      for Elem := Low(THiliteElement) to High(THiliteElement) do
-        (Self.GetElement(Elem) as IAssignable).Assign(Elements[Elem]);
-    end;
+    Attrs := Src as IHiliteAttrs;
+    Self.SetFontName(Attrs.FontName);
+    Self.SetFontSize(Attrs.FontSize);
+    for Elem := Low(THiliteElement) to High(THiliteElement) do
+      (Self.GetElement(Elem) as IAssignable).Assign(Attrs.Elements[Elem]);
   end
   else
   begin
@@ -320,6 +319,8 @@ procedure THiliteAttrs.SetFontSize(const AFontSize: Integer);
 { THiliteElemAttrs }
 
 procedure THiliteElemAttrs.Assign(const Src: IInterface);
+var
+  ElemAttrs: IHiliteElemAttrs;
 begin
   if Assigned(Src) then
   begin
@@ -328,11 +329,9 @@ procedure THiliteElemAttrs.Assign(const Src: IInterface);
         ClassName + '.Assign: Src does not support IHiliteElemAttrs'
       );
     // Src is assigned: copy its properties
-    with Src as IHiliteElemAttrs do
-    begin
-      Self.SetForeColor(ForeColor);
-      Self.SetFontStyle(FontStyle);
-    end;
+    ElemAttrs := Src as IHiliteElemAttrs;
+    Self.SetForeColor(ElemAttrs.ForeColor);
+    Self.SetFontStyle(ElemAttrs.FontStyle);
   end
   else
   begin
diff --git a/Src/Hiliter.UHiliters.pas b/Src/Hiliter.UHiliters.pas
index 348fc58b1..f0a998300 100644
--- a/Src/Hiliter.UHiliters.pas
+++ b/Src/Hiliter.UHiliters.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides highlighter classes used to format and highlight source code in
  * various file formats. Contains a factory object and implementation of various
@@ -336,14 +336,16 @@ procedure TSyntaxHiliter.ElementHandler(Parser: THilitePasParser;
 
 class procedure TSyntaxHiliter.Hilite(const RawCode: string;
   Renderer: IHiliteRenderer);
+var
+  Instance: TSyntaxHiliter;
 begin
   Assert(Assigned(Renderer), ClassName + '.Create: Renderer is nil');
-  with InternalCreate(Renderer) do
-    try
-      DoHilite(RawCode);
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(Renderer);
+  try
+    Instance.DoHilite(RawCode);
+  finally
+    Instance.Free;
+  end;
 end;
 
 procedure TSyntaxHiliter.LineBeginHandler(Parser: THilitePasParser);
diff --git a/Src/SWAG.UVersion.pas b/Src/SWAG.UVersion.pas
index ed77c0d08..b4383ea95 100644
--- a/Src/SWAG.UVersion.pas
+++ b/Src/SWAG.UVersion.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2020-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2020-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides a class that reads and validates the SWAG collection's version
  * information from file.
@@ -107,13 +107,15 @@ implementation
 
 class function TSWAGVersion.GetVersion(const SWAGDir: TFileName):
   TVersionNumber;
+var
+  Instance: TSWAGVersion;
 begin
-  with InternalCreate(SWAGDir) do
-    try
-      Result := ReadAndValidateVersionFile;
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(SWAGDir);
+  try
+    Result := Instance.ReadAndValidateVersionFile;
+  finally
+    Instance.Free;
+  end;
 end;
 
 constructor TSWAGVersion.InternalCreate(const SWAGDir: TFileName);
@@ -158,13 +160,15 @@ function TSWAGVersion.ReadVersionStr: string;
 end;
 
 class procedure TSWAGVersion.ValidateVersionFile(const SWAGDir: TFileName);
+var
+  Instance: TSWAGVersion;
 begin
-  with InternalCreate(SWAGDir) do
-    try
-      ReadAndValidateVersionFile;
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(SWAGDir);
+  try
+    Instance.ReadAndValidateVersionFile;
+  finally
+    Instance.Free;
+  end;
 end;
 
 end.
diff --git a/Src/UBrowseProtocol.pas b/Src/UBrowseProtocol.pas
index 7878af4ce..e1ae9e3e5 100644
--- a/Src/UBrowseProtocol.pas
+++ b/Src/UBrowseProtocol.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a abstract base class for protocol handlers that access a URL
  * using a TBrowseURL action.
@@ -67,17 +67,19 @@ function TBrowseProtocol.Execute: Boolean;
     @return True.
     @except EProtocol raised if an exception occurs in browse action.
   }
+var
+  BrowseAction: TBrowseURL;
 begin
   // We execute the resource using an action
   try
-    with TBrowseURL.Create(nil) do
-      try
-        URL := NormaliseURL(Self.URL);
-        Execute;
-        Result := True;
-      finally
-        Free;
-      end;
+    BrowseAction := TBrowseURL.Create(nil);
+    try
+      BrowseAction.URL := NormaliseURL(Self.URL);
+      BrowseAction.Execute;
+      Result := True;
+    finally
+      BrowseAction.Free;
+    end;
   except
     // any exceptions converted to EProtocol
     on E: Exception do
diff --git a/Src/UCodeImportExport.pas b/Src/UCodeImportExport.pas
index 7a197459e..e43346daa 100644
--- a/Src/UCodeImportExport.pas
+++ b/Src/UCodeImportExport.pas
@@ -224,13 +224,15 @@ function TCodeExporter.Execute: TEncodedData;
 
 class function TCodeExporter.ExportSnippets(const SnipList: TSnippetList):
   TEncodedData;
+var
+  Instance: TCodeExporter;
 begin
-  with InternalCreate(SnipList) do
-    try
-      Result := Execute;
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(SnipList);
+  try
+    Result := Instance.Execute;
+  finally
+    Instance.Free;
+  end;
 end;
 
 procedure TCodeExporter.HandleException(const EObj: TObject);
@@ -418,54 +420,54 @@ procedure TCodeImporter.Execute(const Data: TBytes);
       fSnippetInfo[Idx].Name := SnippetNode.Attributes[cSnippetNameAttr];
       fSnippetInfo[Idx].Data :=
         (Database as IDatabaseEdit).GetEditableSnippetInfo;
-      with fSnippetInfo[Idx].Data do
-      begin
-        Props.Cat := TReservedCategories.ImportsCatID;
-        Props.Desc := GetDescription(SnippetNode);
-        Props.DisplayName := TXMLDocHelper.GetSubTagText(
-          fXMLDoc, SnippetNode, cDisplayNameNode
-        );
-        Props.SourceCode := TXMLDocHelper.GetSubTagText(
-          fXMLDoc, SnippetNode, cSourceCodeTextNode
-        );
-        Props.HiliteSource := TXMLDocHelper.GetHiliteSource(
-          fXMLDoc, SnippetNode, True
-        );
-        // how we read extra property depends on version of file
-        case fVersion of
-          1:
-            Props.Extra := TSnippetExtraHelper.BuildActiveText(
+      fSnippetInfo[Idx].Data.Props.Cat := TReservedCategories.ImportsCatID;
+      fSnippetInfo[Idx].Data.Props.Desc := GetDescription(SnippetNode);
+      fSnippetInfo[Idx].Data.Props.DisplayName := TXMLDocHelper.GetSubTagText(
+        fXMLDoc, SnippetNode, cDisplayNameNode
+      );
+      fSnippetInfo[Idx].Data.Props.SourceCode := TXMLDocHelper.GetSubTagText(
+        fXMLDoc, SnippetNode, cSourceCodeTextNode
+      );
+      fSnippetInfo[Idx].Data.Props.HiliteSource := TXMLDocHelper.GetHiliteSource(
+        fXMLDoc, SnippetNode, True
+      );
+      // how we read extra property depends on version of file
+      case fVersion of
+        1:
+          fSnippetInfo[Idx].Data.Props.Extra :=
+            TSnippetExtraHelper.BuildActiveText(
               TXMLDocHelper.GetSubTagText(fXMLDoc, SnippetNode, cCommentsNode),
               TXMLDocHelper.GetSubTagText(fXMLDoc, SnippetNode, cCreditsNode),
               TXMLDocHelper.GetSubTagText(fXMLDoc, SnippetNode, cCreditsUrlNode)
             );
-          else // later versions
-            Props.Extra := TSnippetExtraHelper.BuildActiveText(
+        else // later versions
+          fSnippetInfo[Idx].Data.Props.Extra :=
+            TSnippetExtraHelper.BuildActiveText(
               TXMLDocHelper.GetSubTagText(fXMLDoc, SnippetNode, cExtraNode)
             );
-        end;
-        // how we read kind property depends on version of file
-        case fVersion of
-          1, 2:
-            // for version 1 and 2, we have StandardFormat instead of Kind:
-            // map standard format value onto a kind
-            if TXMLDocHelper.GetStandardFormat(fXMLDoc, SnippetNode, False) then
-              Props.Kind := skRoutine
-            else
-              Props.Kind := skFreeform;
-          else // later versions
-            // for later versions we have Kind value: use Freeform if missing
-            Props.Kind := TXMLDocHelper.GetSnippetKind(
-              fXMLDoc, SnippetNode, skFreeForm
-            );
-        end;
-        Props.CompilerResults := TXMLDocHelper.GetCompilerResults(
+      end;
+      // how we read kind property depends on version of file
+      case fVersion of
+        1, 2:
+          // for version 1 and 2, we have StandardFormat instead of Kind:
+          // map standard format value onto a kind
+          if TXMLDocHelper.GetStandardFormat(fXMLDoc, SnippetNode, False) then
+            fSnippetInfo[Idx].Data.Props.Kind := skRoutine
+          else
+            fSnippetInfo[Idx].Data.Props.Kind := skFreeform;
+        else // later versions
+          // for later versions we have Kind value: use Freeform if missing
+          fSnippetInfo[Idx].Data.Props.Kind := TXMLDocHelper.GetSnippetKind(
+            fXMLDoc, SnippetNode, skFreeForm
+          );
+      end;
+      fSnippetInfo[Idx].Data.Props.CompilerResults :=
+        TXMLDocHelper.GetCompilerResults(
           fXMLDoc, SnippetNode
         );
-        GetUnits(SnippetNode, Refs.Units);
-        GetDepends(SnippetNode, Refs.Depends);
-        Refs.XRef.Clear;
-      end;
+      GetUnits(SnippetNode, fSnippetInfo[Idx].Data.Refs.Units);
+      GetDepends(SnippetNode, fSnippetInfo[Idx].Data.Refs.Depends);
+      fSnippetInfo[Idx].Data.Refs.XRef.Clear;
     end;
   except
     on E: EDOMParseError do
@@ -489,16 +491,17 @@ class procedure TCodeImporter.ImportData(out SnippetInfo: TSnippetInfoList;
   const Data: TBytes);
 var
   Idx: Integer; // loops through all imported snippets
+  Instance: TCodeImporter;
 begin
-  with InternalCreate do
-    try
-      Execute(Data);
-      SetLength(SnippetInfo, Length(fSnippetInfo));
-      for Idx := Low(fSnippetInfo) to High(fSnippetInfo) do
-        SnippetInfo[Idx].Assign(fSnippetInfo[Idx]);
-    finally
-      Free;
-    end;
+  Instance := InternalCreate;
+  try
+    Instance.Execute(Data);
+    SetLength(SnippetInfo, Length(Instance.fSnippetInfo));
+    for Idx := Low(Instance.fSnippetInfo) to High(Instance.fSnippetInfo) do
+      SnippetInfo[Idx].Assign(Instance.fSnippetInfo[Idx]);
+  finally
+    Instance.Free;
+  end;
 end;
 
 constructor TCodeImporter.InternalCreate;
diff --git a/Src/UConsoleApp.pas b/Src/UConsoleApp.pas
index c56b85db4..2c0b67f2d 100644
--- a/Src/UConsoleApp.pas
+++ b/Src/UConsoleApp.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * A class that encapsulates and executes a command line application and
  * optionally redirects the application's standard input, output and error.
@@ -349,17 +349,16 @@ function TConsoleApp.StartProcess(const CmdLine, CurrentDir: string;
 begin
   // Set up startup information structure
   FillChar(StartInfo, Sizeof(StartInfo),#0);
-  with StartInfo do
-  begin
-    cb := SizeOf(StartInfo);
-    dwFlags := STARTF_USESHOWWINDOW;
-    if (fStdIn <> 0) or (fStdOut <> 0) or (fStdErr <> 0) then
-      dwFlags := dwFlags or STARTF_USESTDHANDLES; // we are redirecting
-    hStdInput := fStdIn;                  // std handles (non-zero => redirect)
-    hStdOutput := fStdOut;
-    hStdError := fStdErr;
-    wShowWindow := cShowFlags[fVisible];  // show or hide window
-  end;
+  StartInfo.cb := SizeOf(StartInfo);
+  StartInfo.dwFlags := STARTF_USESHOWWINDOW;
+  if (fStdIn <> 0) or (fStdOut <> 0) or (fStdErr <> 0) then
+    // we are redirecting (at least one std handle is non zero)
+    StartInfo.dwFlags := StartInfo.dwFlags or STARTF_USESTDHANDLES;
+  // std handles (non-zero => redirect)
+  StartInfo.hStdInput := fStdIn;
+  StartInfo.hStdOutput := fStdOut;
+  StartInfo.hStdError := fStdErr;
+  StartInfo.wShowWindow := cShowFlags[fVisible];  // show or hide window
   // Make CmdLine parameter safe for passing to CreateProcess (Delphi 2009
   // and later). Need to ensure memory space is writeable because of issue with
   // CreateProcessW. Problem does not exist with CreateProcessA.
diff --git a/Src/UDataBackupMgr.pas b/Src/UDataBackupMgr.pas
index f9177e4b0..44046ed7c 100644
--- a/Src/UDataBackupMgr.pas
+++ b/Src/UDataBackupMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Static class that manages backups of data files. It can back up the local
  * database directory, restore the backup and delete it.
@@ -81,16 +81,18 @@ implementation
 class procedure TDataBackupMgr.Backup;
   {Backs up CodeSnip data files into a single file.
   }
+var
+  FolderBackup: TFolderBackup;
 begin
   EnsureFolders(BackupDir);
   SysUtils.DeleteFile(BackupFileName);
   EnsureFolders(DataDir);
-  with TFolderBackup.Create(DataDir, BackupFileName, cBakFileID) do
-    try
-      Backup;
-    finally
-      Free;
-    end;
+  FolderBackup := TFolderBackup.Create(DataDir, BackupFileName, cBakFileID);
+  try
+    FolderBackup.Backup;
+  finally
+    FolderBackup.Free;
+  end;
 end;
 
 class function TDataBackupMgr.BackupDir: string;
@@ -147,17 +149,19 @@ class procedure TDataBackupMgr.RestoreBackup;
   {Restores back up, replacing current data files. If no backup exists the
   database directory is cleared.
   }
+var
+  FolderBackup: TFolderBackup;
 begin
   EnsureFolders(DataDir);
   DeleteFilesFromDir(DataDir);
   if BackupExists then
   begin
-    with TFolderBackup.Create(DataDir, BackupFileName, cBakFileID) do
-      try
-        Restore;
-      finally
-        Free;
-      end;
+    FolderBackup := TFolderBackup.Create(DataDir, BackupFileName, cBakFileID);
+    try
+      FolderBackup.Restore;
+    finally
+      FolderBackup.Free;
+    end;
   end;
 end;
 
diff --git a/Src/UDlgHelper.pas b/Src/UDlgHelper.pas
index 5e29e6705..3ea91e43c 100644
--- a/Src/UDlgHelper.pas
+++ b/Src/UDlgHelper.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements "static" classes that help to manipulate dialogue boxes:
  *  + TDlgHelper sets a dialogue box's parent window.
@@ -380,25 +380,29 @@ procedure TDlgAligner.AdjustWindowPosition(const DlgBounds: TRectEx);
 end;
 
 class procedure TDlgAligner.Align(const Dlg, Host: TComponent);
+var
+  Instance: TDlgAligner;
 begin
   Assert(Assigned(Dlg), ClassName + '.Align: Dlg is nil');
-  with InternalCreate(Dlg, Host) do
+  Instance := InternalCreate(Dlg, Host);
   try
-    PerformAlignment;
+    Instance.PerformAlignment;
   finally
-    Free;
+    Instance.Free;
   end;
 end;
 
 class procedure TDlgAligner.Align(const DlgHandle: THandle;
   const Host: TComponent);
+var
+  Instance: TDlgAligner;
 begin
   Assert(IsWindow(DlgHandle), ClassName + '.Align: DlgHandle is not a window');
-  with InternalCreate(DlgHandle, Host) do
+  Instance := InternalCreate(DlgHandle, Host);
   try
-    PerformAlignment;
+    Instance.PerformAlignment;
   finally
-    Free;
+    Instance.Free;
   end;
 end;
 
diff --git a/Src/UEncodings.pas b/Src/UEncodings.pas
index 78fc4aa54..b8f6878bc 100644
--- a/Src/UEncodings.pas
+++ b/Src/UEncodings.pas
@@ -496,6 +496,7 @@ class function TEncodingHelper.CharSets: TStringDynArray;
   UTF16BEFactoryFn: TEncodingFactoryFn;
 begin
   // Set references to appropriate encoding factory functions
+
   DefaultFactoryFn :=
     function: TEncoding begin Result := TEncoding.Default; end;
   ASCIIFactoryFn :=
@@ -508,62 +509,46 @@ class function TEncodingHelper.CharSets: TStringDynArray;
     function: TEncoding begin Result := TEncoding.BigEndianUnicode; end;
 
   // Populate map for all encodings
-  with fMap[etSysDefault] do
-  begin
-    CharSet := '';
-    IsAnsi := True;
-    CodePage := ULocales.DefaultAnsiCodePage;
-    FactoryFn := DefaultFactoryFn;
-  end;
-  with fMap[etASCII] do
-  begin
-    CharSet := ASCIICharSetName;
-    IsAnsi := True;
-    CodePage := ASCIICodePage;
-    FactoryFn := ASCIIFactoryFn;
-  end;
-  with fMap[etISO88591] do
-  begin
-    CharSet := ISO88591CharSetName;
-    IsAnsi := True;
-    CodePage := ISO88591CodePage;
-    FactoryFn := MBCSFactoryFn(ISO88591CodePage);
-  end;
-  with fMap[etUTF8] do
-  begin
-    CharSet := UTF8CharSetName;
-    IsAnsi := True;
-    CodePage := UTF8CodePage;
-    FactoryFn := UTF8FactoryFn;
-  end;
-  with fMap[etUnicode] do
-  begin
-    CharSet := UTF16CharSetName;
-    IsAnsi := False;
-    CodePage := 0;
-    FactoryFn := UTF16FactoryFn;
-  end;
-  with fMap[etUTF16BE] do
-  begin
-    CharSet := UTF16BECharSetName;
-    IsAnsi := False;
-    CodePage := 0;
-    FactoryFn := UTF16BEFactoryFn;
-  end;
-  with fMap[etUTF16LE] do
-  begin
-    CharSet := UTF16LECharSetName;
-    IsAnsi := False;
-    CodePage := 0;
-    FactoryFn := UTF16FactoryFn;
-  end;
-  with fMap[etWindows1252] do
-  begin
-    CharSet := Windows1252CharSetName;
-    IsAnsi := True;
-    CodePage := Windows1252CodePage;
-    FactoryFn := MBCSFactoryFn(Windows1252CodePage);
-  end;
+
+  fMap[etSysDefault].CharSet := '';
+  fMap[etSysDefault].IsAnsi := True;
+  fMap[etSysDefault].CodePage := ULocales.DefaultAnsiCodePage;
+  fMap[etSysDefault].FactoryFn := DefaultFactoryFn;
+
+  fMap[etASCII].CharSet := ASCIICharSetName;
+  fMap[etASCII].IsAnsi := True;
+  fMap[etASCII].CodePage := ASCIICodePage;
+  fMap[etASCII].FactoryFn := ASCIIFactoryFn;
+
+  fMap[etISO88591].CharSet := ISO88591CharSetName;
+  fMap[etISO88591].IsAnsi := True;
+  fMap[etISO88591].CodePage := ISO88591CodePage;
+  fMap[etISO88591].FactoryFn := MBCSFactoryFn(ISO88591CodePage);
+
+  fMap[etUTF8].CharSet := UTF8CharSetName;
+  fMap[etUTF8].IsAnsi := True;
+  fMap[etUTF8].CodePage := UTF8CodePage;
+  fMap[etUTF8].FactoryFn := UTF8FactoryFn;
+
+  fMap[etUnicode].CharSet := UTF16CharSetName;
+  fMap[etUnicode].IsAnsi := False;
+  fMap[etUnicode].CodePage := 0;
+  fMap[etUnicode].FactoryFn := UTF16FactoryFn;
+
+  fMap[etUTF16BE].CharSet := UTF16BECharSetName;
+  fMap[etUTF16BE].IsAnsi := False;
+  fMap[etUTF16BE].CodePage := 0;
+  fMap[etUTF16BE].FactoryFn := UTF16BEFactoryFn;
+
+  fMap[etUTF16LE].CharSet := UTF16LECharSetName;
+  fMap[etUTF16LE].IsAnsi := False;
+  fMap[etUTF16LE].CodePage := 0;
+  fMap[etUTF16LE].FactoryFn := UTF16FactoryFn;
+
+  fMap[etWindows1252].CharSet := Windows1252CharSetName;
+  fMap[etWindows1252].IsAnsi := True;
+  fMap[etWindows1252].CodePage := Windows1252CodePage;
+  fMap[etWindows1252].FactoryFn := MBCSFactoryFn(Windows1252CodePage);
 end;
 
 class function TEncodingHelper.DefaultCharSet: string;
diff --git a/Src/UHiddenWindow.pas b/Src/UHiddenWindow.pas
index ed0d52494..7a39f1d8b 100644
--- a/Src/UHiddenWindow.pas
+++ b/Src/UHiddenWindow.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that provides a hidden window.
 }
@@ -82,8 +82,7 @@ procedure THiddenWindow.WndProc(var Msg: TMessage);
       processing.
   }
 begin
-  with Msg do
-    Result := DefWindowProc(Handle, Msg, WParam, LParam);
+  Msg.Result := DefWindowProc(Handle, Msg.Msg, Msg.WParam, Msg.LParam);
 end;
 
 end.
diff --git a/Src/UPrintMgr.pas b/Src/UPrintMgr.pas
index da15bf150..4c72fc589 100644
--- a/Src/UPrintMgr.pas
+++ b/Src/UPrintMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that manages printing of a document providing information
  * about certain view items.
@@ -117,15 +117,17 @@ constructor TPrintMgr.InternalCreate(ViewItem: IView);
 end;
 
 class procedure TPrintMgr.Print(ViewItem: IView);
+var
+  PrintMgr: TPrintMgr;
 begin
   Assert(Assigned(ViewItem), ClassName + '.Print: ViewItem is nil');
   Assert(CanPrint(ViewItem), ClassName + '.Print: ViewItem can''t be printed');
-  with InternalCreate(ViewItem) do
-    try
-      DoPrint;
-    finally
-      Free;
-    end;
+  PrintMgr := InternalCreate(ViewItem);
+  try
+    PrintMgr.DoPrint;
+  finally
+    PrintMgr.Free;
+  end;
 end;
 
 end.
diff --git a/Src/USaveSnippetMgr.pas b/Src/USaveSnippetMgr.pas
index c8df2e451..63dcb9b0e 100644
--- a/Src/USaveSnippetMgr.pas
+++ b/Src/USaveSnippetMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a class that manages generation, previewing and saving of a code
  * snippet.
@@ -119,13 +119,15 @@ procedure TSaveSnippetMgr.CheckFileName(const FileName: string;
 end;
 
 class procedure TSaveSnippetMgr.Execute(View: IView);
+var
+  Instance: TSaveSnippetMgr;
 begin
-  with InternalCreate(View) do
-    try
-      DoExecute;
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(View);
+  try
+    Instance.DoExecute;
+  finally
+    Instance.Free;
+  end;
 end;
 
 function TSaveSnippetMgr.GenerateSource(const CommentStyle: TCommentStyle;
diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index 21fbd40e6..9c7c8efca 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements abstract base class for classes that manage generation, previewing
  * and saving to disk of a source code files in various formats and encodings.
@@ -244,42 +244,39 @@ constructor TSaveSourceMgr.InternalCreate;
 begin
   inherited InternalCreate;
   fSourceFileInfo := TSourceFileInfo.Create;
-  with fSourceFileInfo do
-  begin
-    FileTypeInfo[sfText] := TSourceFileTypeInfo.Create(
-      '.txt',
-      GetFileTypeDesc(sfText),
-      [
-        TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding),
-        TSourceFileEncoding.Create(etUTF8, sUTF8Encoding),
-        TSourceFileEncoding.Create(etUTF16LE, sUTF16LEEncoding),
-        TSourceFileEncoding.Create(etUTF16BE, sUTF16BEEncoding)
-      ]
-    );
-    FileTypeInfo[sfPascal] := TSourceFileTypeInfo.Create(
-      '.pas',
-      GetFileTypeDesc(sfPascal),
-      [
-        TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding),
-        TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
-      ]
-    );
-    FileTypeInfo[sfHTML] := TSourceFileTypeInfo.Create(
-      '.html',
-      GetFileTypeDesc(sfHTML),
-      [
-        TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
-      ]
-    );
-    FileTypeInfo[sfRTF] := TSourceFileTypeInfo.Create(
-      '.rtf',
-      GetFileTypeDesc(sfRTF),
-      [
-        TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding)
-      ]
-   );
-    DefaultFileName := GetDefaultFileName;
-  end;
+  fSourceFileInfo.FileTypeInfo[sfText] := TSourceFileTypeInfo.Create(
+    '.txt',
+    GetFileTypeDesc(sfText),
+    [
+      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding),
+      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding),
+      TSourceFileEncoding.Create(etUTF16LE, sUTF16LEEncoding),
+      TSourceFileEncoding.Create(etUTF16BE, sUTF16BEEncoding)
+    ]
+  );
+  fSourceFileInfo.FileTypeInfo[sfPascal] := TSourceFileTypeInfo.Create(
+    '.pas',
+    GetFileTypeDesc(sfPascal),
+    [
+      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding),
+      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
+    ]
+  );
+  fSourceFileInfo.FileTypeInfo[sfHTML] := TSourceFileTypeInfo.Create(
+    '.html',
+    GetFileTypeDesc(sfHTML),
+    [
+      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
+    ]
+  );
+  fSourceFileInfo.FileTypeInfo[sfRTF] := TSourceFileTypeInfo.Create(
+    '.rtf',
+    GetFileTypeDesc(sfRTF),
+    [
+      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding)
+    ]
+ );
+  fSourceFileInfo.DefaultFileName := GetDefaultFileName;
 
   fSaveDlg := TSaveSourceDlg.Create(nil);
   fSaveDlg.Title := GetDlgTitle;
diff --git a/Src/USaveUnitMgr.pas b/Src/USaveUnitMgr.pas
index d1d16a05d..1cd7841d3 100644
--- a/Src/USaveUnitMgr.pas
+++ b/Src/USaveUnitMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a class that manages generation, previewing and saving of a pascal
  * unit.
@@ -199,13 +199,15 @@ destructor TSaveUnitMgr.Destroy;
 end;
 
 class procedure TSaveUnitMgr.Execute(const Snips: TSnippetList);
+var
+  Instance: TSaveUnitMgr;
 begin
-  with InternalCreate(Snips) do
-    try
-      DoExecute;
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(Snips);
+  try
+    Instance.DoExecute;
+  finally
+    Instance.Free;
+  end;
 end;
 
 function TSaveUnitMgr.GenerateSource(const CommentStyle: TCommentStyle;
diff --git a/Src/USettings.pas b/Src/USettings.pas
index 7de87b900..5e38e3227 100644
--- a/Src/USettings.pas
+++ b/Src/USettings.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements class that can store application settings in application wide and
  * per user persistent storage.
@@ -645,14 +645,16 @@ function TIniSettingsSection.ItemExists(const Name: string): Boolean;
 end;
 
 procedure TIniSettingsSection.Load;
+var
+  Ini: TIniFile;
 begin
   // Read all values from section in app's ini file to data item storage
-  with CreateIniFile do
-    try
-      ReadSectionValues(fSectionName, fValues);
-    finally
-      Free;
-    end;
+  Ini := CreateIniFile;
+  try
+    Ini.ReadSectionValues(fSectionName, fValues);
+  finally
+    Ini.Free;
+  end;
 end;
 
 function TIniSettingsSection.ParseConfigDate(const S: string): TDateTime;
@@ -674,20 +676,21 @@ function TIniSettingsSection.ParseConfigDate(const S: string): TDateTime;
 procedure TIniSettingsSection.Save;
 var
   Idx: Integer; // loops thru all data items in section
+  Ini: TIniFile;
 begin
   // Open application's ini file
-  with CreateIniFile do
-    try
-      // Delete any existing section with same name
-      EraseSection(fSectionName);
-      // Write all data items to ini file section
-      for Idx := 0 to Pred(fValues.Count) do
-        WriteString(
-          fSectionName, fValues.Names[Idx], fValues.ValueFromIndex[Idx]
-        );
-    finally
-      Free;
-    end;
+  Ini := CreateIniFile;
+  try
+    // Delete any existing section with same name
+    Ini.EraseSection(fSectionName);
+    // Write all data items to ini file section
+    for Idx := 0 to Pred(fValues.Count) do
+      Ini.WriteString(
+        fSectionName, fValues.Names[Idx], fValues.ValueFromIndex[Idx]
+      );
+  finally
+    Ini.Free;
+  end;
 end;
 
 procedure TIniSettingsSection.SetBoolean(const Name: string;
diff --git a/Src/USnippetSourceGen.pas b/Src/USnippetSourceGen.pas
index 952b5a1ee..e7739df85 100644
--- a/Src/USnippetSourceGen.pas
+++ b/Src/USnippetSourceGen.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a static class that generates source code for code snippet(s)
  * contained in a routine snippet or category view.
@@ -216,13 +216,15 @@ class function TSnippetSourceGen.Generate(View: IView;
       description to first paragraph in comments.
     @return Required source code.
   }
+var
+  Instance: TSnippetSourceGen;
 begin
-  with InternalCreate(View) do
-    try
-      Result := DoGenerate(CommentStyle, TruncateComments);
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(View);
+  try
+    Result := Instance.DoGenerate(CommentStyle, TruncateComments);
+  finally
+    Instance.Free;
+  end;
 end;
 
 procedure TSnippetSourceGen.Initialize(View: IView);
diff --git a/Src/UTestCompile.pas b/Src/UTestCompile.pas
index 2fdeceeec..210a74b6e 100644
--- a/Src/UTestCompile.pas
+++ b/Src/UTestCompile.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that performs a test compilation of a snippet using all supported and
  * installed versions of Delphi and returns details of success or failure.
@@ -112,13 +112,15 @@ class function TTestCompile.Compile(const ACompilers: ICompilers;
     @return Compilation results for each supported compiler (crQuery is returned
       for each supported compiler that is not installed).
   }
+var
+  Instance: TTestCompile;
 begin
-  with InternalCreate(ACompilers, ASnippet) do
-    try
-      Result := DoCompile;
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(ACompilers, ASnippet);
+  try
+    Result := Instance.DoCompile;
+  finally
+    Instance.Free;
+  end;
 end;
 
 class function TTestCompile.CompileSourceFile(const SrcFile: string;
@@ -162,13 +164,15 @@ procedure TTestCompile.GenerateSourceFile(out FileName: string);
   {Generates a source file for snippet under test.
     @param FileName [out] Name of the generated file.
   }
+var
+  TestUnit: TTestUnit;
 begin
-  with TTestUnit.Create(fSnippet) do
-    try
-      SaveUnit(FileName);
-    finally
-      Free;
-    end;
+  TestUnit := TTestUnit.Create(fSnippet);
+  try
+    TestUnit.SaveUnit(FileName);
+  finally
+    TestUnit.Free;
+  end;
 end;
 
 constructor TTestCompile.InternalCreate(const ACompilers: ICompilers;
diff --git a/Src/UTestUnit.pas b/Src/UTestUnit.pas
index 86506597c..eef7d44c5 100644
--- a/Src/UTestUnit.pas
+++ b/Src/UTestUnit.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that generates Pascal units for use in test compiling
  * snippets.
@@ -79,18 +79,20 @@ constructor TTestUnit.Create(const Snippet: TSnippet);
 end;
 
 function TTestUnit.GenerateUnitSource: string;
+var
+  Generator: TSourceGen;
 begin
   if fSnippet.Kind <> skUnit then
   begin
-    with TSourceGen.Create do
-      try
-        IncludeSnippet(fSnippet);
-        // Must use Self.UnitName below for Delphis that defined TObject.UnitName
-        // otherwise the TObject version is used.
-        Result := UnitAsString(Self.UnitName);
-      finally
-        Free;
-      end;
+    Generator := TSourceGen.Create;
+    try
+      Generator.IncludeSnippet(fSnippet);
+      // Must use Self.UnitName below for Delphis that defined TObject.UnitName
+      // otherwise the TObject version is used.
+      Result := Generator.UnitAsString(Self.UnitName);
+    finally
+      Generator.Free;
+    end;
   end
   else
     Result := fSnippet.SourceCode;
diff --git a/Src/UTestUnitDlgMgr.pas b/Src/UTestUnitDlgMgr.pas
index 34a0ce3a6..05025efe5 100644
--- a/Src/UTestUnitDlgMgr.pas
+++ b/Src/UTestUnitDlgMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a static class that manages and displays a test unit in a dialog
  * box.
@@ -60,16 +60,17 @@ class procedure TTestUnitDlgMgr.DisplayTestUnit(const Owner: TComponent;
   }
 var
   TestUnitSource: string;   // source code of test unit
+  TestUnit: TTestUnit;
 resourcestring
   sDlgTitle = 'Test Unit for %s'; // caption of dialog box
 begin
   // Generate unit source code
-  with TTestUnit.Create(Snippet) do
-    try
-      TestUnitSource := GenerateUnitSource;
-    finally
-      Free;
-    end;
+  TestUnit := TTestUnit.Create(Snippet);
+  try
+    TestUnitSource := TestUnit.GenerateUnitSource;
+  finally
+    TestUnit.Free;
+  end;
   // Convert source to higlighted XHTML document and display it
   TPreviewDlg.Execute(
     Owner,
diff --git a/Src/UVersionInfo.pas b/Src/UVersionInfo.pas
index 163f02361..c74fbdc01 100644
--- a/Src/UVersionInfo.pas
+++ b/Src/UVersionInfo.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides details of the application's version information and provides a
  * record used to manipulate version numbers.
@@ -200,27 +200,31 @@ class function TVersionInfo.FileVersionNumberStr: string;
   information.
     @return Version number string in form 9.9.9.9.
   }
+var
+  VI: TPJVersionInfo;
 begin
-  with TPJVersionInfo.Create(nil) do
-    try
-      // casts TPJVersionNumber directly to string
-      Result := FileVersionNumber;
-    finally
-      Free;
-    end;
+  VI := TPJVersionInfo.Create(nil);
+  try
+    // casts TPJVersionNumber directly to string
+    Result := VI.FileVersionNumber;
+  finally
+    VI.Free;
+  end;
 end;
 
 class function TVersionInfo.ProductVerNum: TVersionNumber;
   {Product version number from fixed file information.
     @return Required version number record.
   }
+var
+  VI: TPJVersionInfo;
 begin
-  with TPJVersionInfo.Create(nil) do
-    try
-      Result := ProductVersionNumber; // implicit type cast
-    finally
-      Free;
-    end;
+  VI := TPJVersionInfo.Create(nil);
+  try
+    Result := VI.ProductVersionNumber; // implicit type cast
+  finally
+    VI.Free;
+  end;
 end;
 
 class function TVersionInfo.ProductVersionNumberStr: string;
@@ -228,14 +232,16 @@ class function TVersionInfo.ProductVersionNumberStr: string;
   information.
     @return Version number string in form 9.9.9.9.
   }
+var
+  VI: TPJVersionInfo;
 begin
-  with TPJVersionInfo.Create(nil) do
-    try
-      // casts TPJVersionNumber directly to string
-      Result := ProductVersionNumber;
-    finally
-      Free;
-    end;
+  VI := TPJVersionInfo.Create(nil);
+  try
+    // casts TPJVersionNumber directly to string
+    Result := VI.ProductVersionNumber;
+  finally
+    VI.Free;
+  end;
 end;
 
 class function TVersionInfo.ProductVersionStr: string;
@@ -243,26 +249,30 @@ class function TVersionInfo.ProductVersionStr: string;
   ProductVersionNumberStr.
     @return Product version string.
   }
+var
+  VI: TPJVersionInfo;
 begin
-  with TPJVersionInfo.Create(nil) do
-    try
-      Result := ProductVersion;
-    finally
-      Free;
-    end;
+  VI := TPJVersionInfo.Create(nil);
+  try
+    Result := VI.ProductVersion;
+  finally
+    VI.Free;
+  end;
 end;
 
 class function TVersionInfo.SpecialBuildStr: string;
   {Gets special build information from string table.
     @return Required copyright information.
   }
+var
+  VI: TPJVersionInfo;
 begin
-  with TPJVersionInfo.Create(nil) do
-    try
-      Result := SpecialBuild;
-    finally
-      Free;
-    end;
+  VI := TPJVersionInfo.Create(nil);
+  try
+    Result := VI.SpecialBuild;
+  finally
+    VI.Free;
+  end;
 end;
 
 { TVersionNumber }
diff --git a/Src/UWBCommandBars.pas b/Src/UWBCommandBars.pas
index 0e79ac616..ba5d27c09 100644
--- a/Src/UWBCommandBars.pas
+++ b/Src/UWBCommandBars.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines various classes used to configure one or more command bars owned by
  * a web browser container. Command bars are UI elements used to issue commands,
@@ -246,6 +246,7 @@ function TWBDefaultPopupMenuWrapper.GetImageIndex(
   ImgTags: IDispatchList;   // all <img> children of parent
   ImgTag: IDispatch;        // <img> child of parent that contains required GIF
   Src: string;              // resource URL of GIF file
+  MenuImages: TGIFImageList;
 begin
   Result := -1;
   // Check if parent elem is a <div> or <span> with class "option"
@@ -267,12 +268,12 @@ function TWBDefaultPopupMenuWrapper.GetImageIndex(
   // Get matching bitmap from image list: add one from GIF file if not found
   Result := -1;
   if Menu.Images is TGIFImageList then
-    with Menu.Images as TGIFImageList do
-    begin
-      Result := ImageIndex(Src);
-      if Result = -1 then
-        Result := AddGIFImage(Src);
-    end;
+  begin
+    MenuImages := Menu.Images as TGIFImageList;
+    Result := MenuImages.ImageIndex(Src);
+    if Result = -1 then
+      Result := MenuImages.AddGIFImage(Src);
+  end;
 end;
 
 procedure TWBDefaultPopupMenuWrapper.GetLinkMenuItems(const Doc: IDispatch;
diff --git a/Src/UWaitForThreadUI.pas b/Src/UWaitForThreadUI.pas
index d6d20e13d..16d1738ab 100644
--- a/Src/UWaitForThreadUI.pas
+++ b/Src/UWaitForThreadUI.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that executes a thread and displays a dialog box if thread
  * takes more than a specified time to complete.
@@ -314,14 +314,18 @@ class procedure TWaitForThreadUI.Run(const AThread: TThread;
       displayed (optional)
     @param AMinDisplayTime [in] Minimum time to display form (optional).
   }
+var
+  Instance: TWaitForThreadUI;
 begin
   Assert(Assigned(AThread), ClassName + '.Run: AThread is nil');
-  with InternalCreate(AThread, AForm, APauseBeforeDisplay, AMinDisplayTime) do
-    try
-      Execute;
-    finally
-      Free;
-    end;
+  Instance := InternalCreate(
+    AThread, AForm, APauseBeforeDisplay, AMinDisplayTime
+  );
+  try
+    Instance.Execute;
+  finally
+    Instance.Free;
+  end;
 end;
 
 procedure TWaitForThreadUI.ShowForm;

From 54f88392085486699408bfbd29d715d6318755f7 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 14 Jul 2023 16:58:07 +0100
Subject: [PATCH 141/264] Fix splash screen bug due to with statement removal

There was a memory access bug caused when with statement was removed.
---
 Src/FmSplash.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/FmSplash.pas b/Src/FmSplash.pas
index de4b7bd34..1b44eaf04 100644
--- a/Src/FmSplash.pas
+++ b/Src/FmSplash.pas
@@ -237,7 +237,7 @@ function TSplashAligner.GetMainFormBounds(const AForm: TCustomForm): TRectEx;
     if not Settings.GetWdwState(Result, State) or (State = wsMaximized) then
       Result := Screen.WorkAreaRect;  // we use workarea of primary monitor
   finally
-    Free;
+    Settings.Free;
   end;
 end;
 

From 4edaefed72a3225ba86e34245133cbf53544c771 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:32:25 +0100
Subject: [PATCH 142/264] Reverse order of compiler list in compiler setup dlg

---
 Src/FmCompilersDlg.UCompilerListMgr.pas | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/Src/FmCompilersDlg.UCompilerListMgr.pas b/Src/FmCompilersDlg.UCompilerListMgr.pas
index 9359d0897..63ffefe0f 100644
--- a/Src/FmCompilersDlg.UCompilerListMgr.pas
+++ b/Src/FmCompilersDlg.UCompilerListMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that manages display of compiler names in an owner draw
  * list box.
@@ -34,6 +34,8 @@   TCompilerListMgr = class(TObject)
     ///  <summary>Reference to managed list box.</summary>
     ///  <remarks>Must be owner draw.</remarks>
     fLB: TListBox;
+    fMapIdxToComp: TArray<TCompilerID>;
+    fMapCompToIdx: array[TCompilerID] of Integer;
     ///  <summary>List of compilers to be displayed in list box.</summary>
     fCompilers: ICompilers;
     ///  <summary>Reference to OnSelect event handler.</summary>
@@ -87,11 +89,16 @@ implementation
 
 constructor TCompilerListMgr.Create(const LB: TListBox;
   const Compilers: ICompilers);
+var
+  CompID: TCompilerID;
 begin
   inherited Create;
   fLB := LB;
   fLB.OnClick := LBClickHandler;
   fLB.OnDrawItem := LBDrawItemHandler;
+  fLB.Clear;
+  for CompID := Low(TCompilerID) to High(TCompilerID) do
+    fLB.Items.Add('');
   fCompilers := Compilers;
 end;
 
@@ -103,19 +110,27 @@ procedure TCompilerListMgr.DoSelect;
 
 function TCompilerListMgr.GetSelected: ICompiler;
 begin
-  Result := fCompilers[TCompilerID(fLB.ItemIndex)];
+  Result := fCompilers[fMapIdxToComp[fLB.ItemIndex]];
 end;
 
 procedure TCompilerListMgr.Initialise;
 var
   CompID: TCompilerID;  // loops thru supported compilers
+  Idx: Integer;
 begin
   inherited;
+
   // Add empty list items - one per supported compiler. Note we don't need item
   // text since we handle drawing of list items ourselves and get details from
   // compiler objects.
+  SetLength(fMapIdxToComp, Length(fMapCompToIdx));
+  Idx := High(fMapIdxToComp);
   for CompID := Low(TCompilerID) to High(TCompilerID) do
-    fLB.Items.Add('');
+  begin
+    fMapIdxToComp[Idx] := CompID;
+    fMapCompToIdx[CompID] := Idx;
+    Dec(Idx);
+  end;
   // Select first compiler in list and trigger selection event for it
   fLB.ItemIndex := 0;
   DoSelect;
@@ -139,7 +154,7 @@ procedure TCompilerListMgr.LBDrawItemHandler(Control: TWinControl;
   ItemRect := Rect;
 
   // Compiler object associated with list item
-  Compiler := fCompilers[TCompilerID(Index)];
+  Compiler := fCompilers[fMapIdxToComp[Index]];
 
   // Use bold font if compiler available
   if Compiler.IsAvailable then
@@ -208,7 +223,7 @@ procedure TCompilerListMgr.Refresh(Compiler: ICompiler);
 var
   InvalidRect: TRectEx;
 begin
-  InvalidRect := fLB.ItemRect(Ord(Compiler.GetID));
+  InvalidRect := fLB.ItemRect(fMapCompToIdx[Compiler.GetID]);
   InvalidateRect(fLB.Handle, @InvalidRect, False);
 end;
 

From a2c5f68c1b39567304e869ddd0733454b4ca9100 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:33:25 +0100
Subject: [PATCH 143/264] Reverse order of compiler list in find compilers dlg

---
 Src/FmFindCompilerDlg.pas | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Src/FmFindCompilerDlg.pas b/Src/FmFindCompilerDlg.pas
index 277c4ae9c..958827bf5 100644
--- a/Src/FmFindCompilerDlg.pas
+++ b/Src/FmFindCompilerDlg.pas
@@ -55,6 +55,7 @@   TFindCompilerDlg = class(TGenericOKDlg, INoPublicConstruct)
     fSearchParams: TCompilerSearchParams; // Persistent compiler search options
     fSearch: ISearch;                     // Search entered by user
     fRefinePreviousSearch: Boolean;       // Whether to refine previous search
+    fMapIdxToComp: TArray<TCompilerID>;   // Maps list idx to comp ID of entry
 
     procedure UpdateOKBtn;
       {Updates state of OK button according to whether valid entries made in
@@ -363,13 +364,25 @@ procedure TFindCompilerDlg.InitForm;
   Option: TCompilerSearchOption;  // loops thru possible compiler search options
   SelOption: Integer;             // selected search option
   Compiler: ICompiler;            // references each compiler
+  CompID: TCompilerID;
 begin
   inherited;
+  // Set up index map that reverses order of compilers
+  SetLength(fMapIdxToComp, fCompilers.Count);
+  Idx := High(fMapIdxToComp);
+  for CompID := Low(TCompilerID) to High(TCompilerID) do
+  begin
+    fMapIdxToComp[Idx] := CompID;
+    Dec(Idx);
+  end;
+
   // Set up list of compilers and check appropriate ones
   // we store compiler ID in listbox's Objects[] property
-  for Compiler in fCompilers do
+  // Use mapping to reverse order of compilers in list
+  for Idx := Low(fMapIdxToComp) to High(fMapIdxToComp) do
   begin
-    Idx := lbCompilerVers.Items.AddObject(
+    Compiler := fCompilers[fMapIdxToComp[Idx]];
+    lbCompilerVers.Items.AddObject(
       Compiler.GetName, TObject(Compiler.GetID)
     );
     lbCompilerVers.Checked[Idx] := Compiler.GetID in fSearchParams.Compilers;

From db7e3b35902df44e8f9318e4ac7de96661a9cadc Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 14 Jul 2023 19:34:10 +0100
Subject: [PATCH 144/264] Remove redundant compiler settings keys

In an earlier commit list ordering keys were added to TCompilerSettings,
(either speculatively or by mistake). These keys were removed as they
are not used.
---
 Src/Compilers.USettings.pas | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Src/Compilers.USettings.pas b/Src/Compilers.USettings.pas
index 3468c3693..2a1fe77ae 100644
--- a/Src/Compilers.USettings.pas
+++ b/Src/Compilers.USettings.pas
@@ -27,8 +27,6 @@   TCompilerSettings = class(TNoConstructObject)
     const
       AllCompilersConfigSection = ssCompilers;
       PermitStartupDetectionKey = 'PermitStartupDetection';
-      ListFPCAtTopKey = 'Lists:FPCAtTop';
-      ListDelphiOldestFirstKey = 'Lists:DelphiOldestFirst';
     class function ReadStorage: ISettingsSection;
     class procedure DoSaveProperty(const WriteProp: TProc<ISettingsSection>);
     class procedure SaveProperty(const Key: string; const Value: Boolean);

From 6fa0d4c0961b54c12ead4a1dce5ca56b08d52f0a Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 7 Nov 2023 11:21:43 +0000
Subject: [PATCH 145/264] Add support for test compiling with Delphi 12

Added compiler to relevant Src/Compilers/* files.
Updated .ini and .xml file support code to persist compiler results.
Added Delphi 12 CompilerVersion const to codegen preferences page.

Fixes #121
---
 Src/Compilers.UBDS.pas      | 8 +++++++-
 Src/Compilers.UGlobals.pas  | 3 ++-
 Src/DBIO.UIniDataReader.pas | 1 +
 Src/FrCodeGenPrefs.pas      | 1 +
 Src/UXMLDocConsts.pas       | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Src/Compilers.UBDS.pas b/Src/Compilers.UBDS.pas
index 668916c19..a7c871984 100644
--- a/Src/Compilers.UBDS.pas
+++ b/Src/Compilers.UBDS.pas
@@ -152,6 +152,8 @@ function TBDSCompiler.GetIDString: string;
       Result := 'D104S';
     ciD11A:
       Result := 'D11A';
+    ciD12A:
+      Result := 'D12Y';
     else
       raise EBug.Create(ClassName + '.GetIDString: Invalid ID');
   end;
@@ -175,7 +177,8 @@ function TBDSCompiler.GetName: string;
   sDelphi102T = 'Delphi 10.2 Tokyo';
   sDelphi103R = 'Delphi 10.3 Rio';
   sDelphi104S = 'Delphi 10.4 Sydney';
-  sDelphi11A =  'Delphi 11.x Alexandria';
+  sDelphi11A  = 'Delphi 11.x Alexandria';
+  sDelphi12A  = 'Delphi 12 Athens';
 begin
   case GetID of
     ciDXE:
@@ -206,6 +209,8 @@ function TBDSCompiler.GetName: string;
       Result := sDelphi104S;
     ciD11A:
       Result := sDelphi11A;
+    ciD12A:
+      Result := sDelphi12A;
     else
       Result := Format(sCompilerName, [ProductVersion]);
   end;
@@ -240,6 +245,7 @@ function TBDSCompiler.InstallationRegKey: string;
     ciD103R   : Result := '\Software\Embarcadero\BDS\20.0';
     ciD104S   : Result := '\Software\Embarcadero\BDS\21.0';
     ciD11A    : Result := '\Software\Embarcadero\BDS\22.0';
+    ciD12A    : Result := '\Software\Embarcadero\BDS\23.0';
     else raise EBug.Create(ClassName + '.InstallationRegKey: Invalid ID');
   end;
 end;
diff --git a/Src/Compilers.UGlobals.pas b/Src/Compilers.UGlobals.pas
index 3600176bf..5fd63023d 100644
--- a/Src/Compilers.UGlobals.pas
+++ b/Src/Compilers.UGlobals.pas
@@ -44,6 +44,7 @@ interface
     ciD103R,                            // Delphi 10.3 Rio
     ciD104S,                            // Delphi 10.4 Sydney,
     ciD11A,                             // Delphi 11.x Alexandria
+    ciD12A,                             // Delphi 12 Athens
     ciFPC                               // Free Pascal
   );
 
@@ -57,7 +58,7 @@ interface
   cBDSCompilers = [
     ciD2005w32, ciD2006w32, ciD2007, ciD2009w32, ciD2010, ciDXE, ciDXE2,
     ciDXE3, ciDXE4, ciDXE5, ciDXE6, ciDXE7, ciDXE8, ciD10S, ciD101B, ciD102T,
-    ciD103R, ciD104S, ciD11A
+    ciD103R, ciD104S, ciD11A, ciD12A
   ];
 
 const
diff --git a/Src/DBIO.UIniDataReader.pas b/Src/DBIO.UIniDataReader.pas
index 989ab9fef..4d831156c 100644
--- a/Src/DBIO.UIniDataReader.pas
+++ b/Src/DBIO.UIniDataReader.pas
@@ -236,6 +236,7 @@ implementation
     'Delphi2010', 'DelphiXE', 'DelphiXE2', 'DelphiXE3', 'DelphiXE4',
     'DelphiXE5', 'DelphiXE6', 'DelphiXE7', 'DelphiXE8', 'Delphi10S',
     'Delphi101B', 'Delphi102T', 'Delphi103R', 'Delphi104S', 'Delphi11A',
+    'Delphi12A',
     'FPC'
   );
 
diff --git a/Src/FrCodeGenPrefs.pas b/Src/FrCodeGenPrefs.pas
index be4d50516..cff57d325 100644
--- a/Src/FrCodeGenPrefs.pas
+++ b/Src/FrCodeGenPrefs.pas
@@ -681,6 +681,7 @@ procedure TCodeGenPrefsFrame.PopulatePreDefCompilerMenu;
   AddMenuItem('Delphi 10.3 Rio', 33.0);
   AddMenuItem('Delphi 10.4 Sydney', 34.0);
   AddMenuItem('Delphi 11.x Alexandria', 35.0);
+  AddMenuItem('Delphi 12 Athens', 36.0);
 end;
 
 procedure TCodeGenPrefsFrame.PreDefCompilerMenuClick(Sender: TObject);
diff --git a/Src/UXMLDocConsts.pas b/Src/UXMLDocConsts.pas
index e84fe3455..53eb02cc7 100644
--- a/Src/UXMLDocConsts.pas
+++ b/Src/UXMLDocConsts.pas
@@ -68,7 +68,7 @@ interface
     'd2005', 'd2006', 'd2007', 'd2009', 'd2010',
     'dXE', 'dXE2', 'dXE3', 'dDX4' {error, but in use so can't fix},
     'dXE5', 'dXE6', 'dXE7', 'dXE8',
-    'd10s', 'd101b', 'd102t', 'd103r', 'd104s', 'd11a',
+    'd10s', 'd101b', 'd102t', 'd103r', 'd104s', 'd11a', 'd12y',
     'fpc'
   );
 

From 212fbaa14b44ebb0363dfae538a6012f6586c704 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 7 Nov 2023 11:47:34 +0000
Subject: [PATCH 146/264] Update file format docs re Delphi 12 support

---
 Docs/Design/FileFormats/config.html  | 9 +++++++++
 Docs/Design/FileFormats/export.html  | 9 +++++++++
 Docs/Design/FileFormats/main-db.html | 3 +++
 Docs/Design/FileFormats/user-db.html | 9 +++++++++
 4 files changed, 30 insertions(+)

diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
index 8c0061093..09f7d7114 100644
--- a/Docs/Design/FileFormats/config.html
+++ b/Docs/Design/FileFormats/config.html
@@ -259,6 +259,9 @@ <h4>
   <li>
     <em>D11A</em> &ndash; Delphi 11.x Alexandria
   </li>
+  <li>
+    <em>D12Y</em> &ndash; Delphi 12 Athens
+  </li>
   <li>
     <em>FPC</em> &ndash; Free Pascal
   </li>
@@ -613,6 +616,12 @@ <h4>
   <dd>
     Indicates whether Delphi 11.x Alexandria was included in the search.
   </dd>
+  <dt>
+    <code class="key">D12Y</code> (Boolean)
+  </dt>
+  <dd>
+    Indicates whether Delphi 12 Athens was included in the search.
+  </dd>
   <dt>
     <code class="key">FPC</code> (Boolean)
   </dt>
diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
index 5f57b1c60..81e956f14 100644
--- a/Docs/Design/FileFormats/export.html
+++ b/Docs/Design/FileFormats/export.html
@@ -606,6 +606,9 @@ <h2>
           <li>
             <em>d11a</em> &ndash; Delphi 11.x Alexandria compiler <span class="highlight">(v7.2 &amp; later)</span>
           </li>
+          <li>
+            <em>d12y</em> &ndash; Delphi 12 Athens compiler <span class="highlight">(v7.4 &amp; later)</span>
+          </li>
           <li>
             <em>fpc</em> &ndash; Free Pascal compiler <span class="highlight">(all versions)</span>
           </li>
@@ -984,6 +987,12 @@ <h2>
       <dd>
         Updated with CodeSnip v4.21.0 to add support for REML v5, which is backward compatible with REML v4.
       </dd>
+      <dt>
+        <em>Version 7.4 - 7 November 2023</em>
+      </dt>
+      <dd>
+        Updated in time for CodeSnip v4.22.0 to add support for Delphi 12 Athens.
+      </dd>
     </dl>
   </dd>
 </dl>
diff --git a/Docs/Design/FileFormats/main-db.html b/Docs/Design/FileFormats/main-db.html
index 867438356..b1d19aa47 100644
--- a/Docs/Design/FileFormats/main-db.html
+++ b/Docs/Design/FileFormats/main-db.html
@@ -419,6 +419,9 @@ <h4>
       <li>
         <code class="key">Delphi11A</code> – Delphi 11.x Alexandria compiler *
       </li>
+      <li>
+        <code class="key">Delphi12A</code> – Delphi 12 Athens compiler *
+      </li>
       <li>
         <code class="key">FPC</code> – Free Pascal compiler
       </li>
diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
index a5e03cfca..9ca2fe261 100644
--- a/Docs/Design/FileFormats/user-db.html
+++ b/Docs/Design/FileFormats/user-db.html
@@ -631,6 +631,9 @@ <h3 id="xml-file">
           <li>
             <em>d11a</em> &ndash; Delphi 11.x Alexandria compiler <span class="highlight">(v6.10 &amp; later)</span>
           </li>
+          <li>
+            <em>d12y</em> &ndash; Delphi 12 Athens compiler <span class="highlight">(v6.12 &amp; later)</span>
+          </li>
           <li>
             <em>fpc</em> &ndash; Free Pascal compiler <span class="highlight">(all versions)</span>
           </li>
@@ -1020,6 +1023,12 @@ <h2>
       <dd>
         Updated with CodeSnip v4.21.0 to add support for REML v5, which is backwards compatible with REML v4.
       </dd>
+      <dt>
+        <em>Version 6.12 - 7 November 2023</em>
+      </dt>
+      <dd>
+        Updated in time for CodeSnip v4.22.0 to add support for Delphi 12 Athens.
+      </dd>
     </dl>
   </dd>
 </dl>

From a048d1f9ecf6b86b14537fdea669d1e1c9069e91 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 7 Nov 2023 11:48:11 +0000
Subject: [PATCH 147/264] Update ReadMe.txt to note Delphi 12 support

---
 Docs/ReadMe.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Docs/ReadMe.txt b/Docs/ReadMe.txt
index a2020254e..b7806db53 100644
--- a/Docs/ReadMe.txt
+++ b/Docs/ReadMe.txt
@@ -14,8 +14,8 @@ online DelphiDabbler Code Snippets database as well as maintain a database of
 user-defined snippets.
 
 It displays details of each snippet in the database and can test-compile them
-with each installed Win32 version of Delphi from Delphi 2 to Delphi 11.x
-Alexandria and Free Pascal.
+with each installed Win32 version of Delphi from Delphi 2 to Delphi 12 Athens
+and Free Pascal.
 
 Compilable Pascal units can be created that contain selected snippets.
 
@@ -204,8 +204,8 @@ Configuring CodeSnip to Work With Your Compilers
 ================================================================================
 
 A feature of CodeSnip is its ability to test compile snippets with any installed
-Windows 32 version of Delphi (from Delphi 2 to Delphi 11.x Alexandria) and
-FreePascal, providing some simple rules are followed.
+Windows 32 version of Delphi (from Delphi 2 to Delphi 12 Athens) and FreePascal,
+providing some simple rules are followed.
 
 When CodeSnip is first installed it knows nothing about the available compilers
 and so test compilations cannot be performed. If any supported Delphi compiler

From 07405a21764172ee25e6c9977741a44291c157e7 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 7 Nov 2023 11:49:08 +0000
Subject: [PATCH 148/264] Update help topics re support for Delphi 12

---
 Src/Help/HTML/about_compiler_checks.htm | 2 +-
 Src/Help/HTML/dlg_configcompilers.htm   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/Help/HTML/about_compiler_checks.htm b/Src/Help/HTML/about_compiler_checks.htm
index 54ab897b0..5921eb7d8 100644
--- a/Src/Help/HTML/about_compiler_checks.htm
+++ b/Src/Help/HTML/about_compiler_checks.htm
@@ -34,7 +34,7 @@ <h1>
     </p>
     <p>
       The supported compilers are the Win32 Delphi compilers from Delphi 2 to
-      Delphi 11.x Alexandria and Free Pascal.
+      Delphi 12 Athens and Free Pascal.
     </p>
     <h2>
       Configuring CodeSnip
diff --git a/Src/Help/HTML/dlg_configcompilers.htm b/Src/Help/HTML/dlg_configcompilers.htm
index 73e6ad0be..f2faa3ee8 100644
--- a/Src/Help/HTML/dlg_configcompilers.htm
+++ b/Src/Help/HTML/dlg_configcompilers.htm
@@ -312,7 +312,7 @@ <h2>
     </h2>
     <p>
       <em>CodeSnip</em> can automatically detect the presence of Win 32 Delphi
-      compilers from Delphi 2 to Delphi 11.x Alexandria. Click the <em>Detect
+      compilers from Delphi 2 to Delphi 12 Athens. Click the <em>Detect
       Delphi Compilers</em> button to do this. Any supported installed version
       of Delphi will be recorded<sup>&dagger;</sup>. This can save considerable
 	  time and avoid errors.

From ead4e069a207db6d85c9ac72d23085057e703ca7 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 8 Nov 2023 02:10:40 +0000
Subject: [PATCH 149/264] Update license copyright date range to include 2023

---
 Docs/Design/FileFormats/config.html     | 2 +-
 Docs/Design/FileFormats/export.html     | 2 +-
 Docs/Design/FileFormats/main-db.html    | 2 +-
 Docs/Design/FileFormats/user-db.html    | 2 +-
 Src/Compilers.UBDS.pas                  | 2 +-
 Src/Compilers.UGlobals.pas              | 2 +-
 Src/DBIO.UIniDataReader.pas             | 2 +-
 Src/Help/HTML/about_compiler_checks.htm | 2 +-
 Src/Help/HTML/dlg_configcompilers.htm   | 2 +-
 Src/UXMLDocConsts.pas                   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
index 09f7d7114..d6a57c49a 100644
--- a/Docs/Design/FileFormats/config.html
+++ b/Docs/Design/FileFormats/config.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Configuration Files
 -->
diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
index 81e956f14..e60bfe00c 100644
--- a/Docs/Design/FileFormats/export.html
+++ b/Docs/Design/FileFormats/export.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Export
 -->
diff --git a/Docs/Design/FileFormats/main-db.html b/Docs/Design/FileFormats/main-db.html
index b1d19aa47..25dc2834a 100644
--- a/Docs/Design/FileFormats/main-db.html
+++ b/Docs/Design/FileFormats/main-db.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Main Database
 -->
diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
index 9ca2fe261..8a0e6945c 100644
--- a/Docs/Design/FileFormats/user-db.html
+++ b/Docs/Design/FileFormats/user-db.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: User Database
 -->
diff --git a/Src/Compilers.UBDS.pas b/Src/Compilers.UBDS.pas
index a7c871984..3ef1fde4c 100644
--- a/Src/Compilers.UBDS.pas
+++ b/Src/Compilers.UBDS.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that controls and provides information about Borland CodeGear and
  * Embarcadero "BDS" Win32 compilers.
diff --git a/Src/Compilers.UGlobals.pas b/Src/Compilers.UGlobals.pas
index 5fd63023d..7e660a166 100644
--- a/Src/Compilers.UGlobals.pas
+++ b/Src/Compilers.UGlobals.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Declares various types that describe the compiler and compilation results and
  * defines interfaces to compiler objects.
diff --git a/Src/DBIO.UIniDataReader.pas b/Src/DBIO.UIniDataReader.pas
index 4d831156c..90b0c9657 100644
--- a/Src/DBIO.UIniDataReader.pas
+++ b/Src/DBIO.UIniDataReader.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements code that reads the main CodeSnip database from .ini and .dat
  * files.
diff --git a/Src/Help/HTML/about_compiler_checks.htm b/Src/Help/HTML/about_compiler_checks.htm
index 5921eb7d8..ab4a5784f 100644
--- a/Src/Help/HTML/about_compiler_checks.htm
+++ b/Src/Help/HTML/about_compiler_checks.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic explaining compiler checks.
 -->
diff --git a/Src/Help/HTML/dlg_configcompilers.htm b/Src/Help/HTML/dlg_configcompilers.htm
index f2faa3ee8..787f3bec5 100644
--- a/Src/Help/HTML/dlg_configcompilers.htm
+++ b/Src/Help/HTML/dlg_configcompilers.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic for Configure Compilers dialogue box.
 -->
diff --git a/Src/UXMLDocConsts.pas b/Src/UXMLDocConsts.pas
index 53eb02cc7..122d13322 100644
--- a/Src/UXMLDocConsts.pas
+++ b/Src/UXMLDocConsts.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Constants defined node names and attributes used in the various XML documents
  * used by CodeSnip.

From 464cc5656a6d719845dbcc2b8d95cf92a15a2367 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 8 Nov 2023 02:31:53 +0000
Subject: [PATCH 150/264] Bump version number to v4.22.0 build 270

---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index 78ab7ae12..7fdf24930 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.21.2
-build=269
+version=4.22.0
+build=270
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From 16f0951b9d64e0da9de3a45ec6a31748b8f9f46f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 8 Nov 2023 02:32:33 +0000
Subject: [PATCH 151/264] Update change log with details of release v4.22.0

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ed3fc709..afb4a535e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,17 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
+## Release v4.22.0 of 08 November 2023
+
+* Added support for test compiling snippets with Delphi 12 Athens [issue #121].
+* Documentation changes re addition of support for Delphi 12:
+  * File format additions for config, export, user database and main database.
+  * `Docs/ReadMe.txt`.
+  * Relevant help topics.
+* Reversed order in which compilers are listed in the Configure Compilers and Find Compilers dialogue boxes so that the most recent version of Delphi is listed first [issue #51].
+* Refactored out all `with` statements from Pascal source code [issue #118].
+* Fixed error in `CHANGELOG.md` entry for release v4.21.2 [issue #120].
+
 ## Release v4.21.2 of 14 July 2023
 
 * Removed broken links and fixed unsafe links in the About box [issue #105].

From 8e83b561d1b7d12c236e6883b9b01bf086b5b278 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:23:59 +0100
Subject: [PATCH 152/264] Remove marketing names from later Delpji compilers

Fixes #125
---
 Src/Compilers.UBDS.pas | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Src/Compilers.UBDS.pas b/Src/Compilers.UBDS.pas
index 3ef1fde4c..509e0f993 100644
--- a/Src/Compilers.UBDS.pas
+++ b/Src/Compilers.UBDS.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that controls and provides information about Borland CodeGear and
  * Embarcadero "BDS" Win32 compilers.
@@ -172,13 +172,13 @@ function TBDSCompiler.GetName: string;
   sDelphiXE6 = 'Delphi XE6';
   sDelphiXE7 = 'Delphi XE7';
   sDelphiXE8 = 'Delphi XE8';
-  sDelphi10S = 'Delphi 10 Seattle';
-  sDelphi101B = 'Delphi 10.1 Berlin';
-  sDelphi102T = 'Delphi 10.2 Tokyo';
-  sDelphi103R = 'Delphi 10.3 Rio';
-  sDelphi104S = 'Delphi 10.4 Sydney';
-  sDelphi11A  = 'Delphi 11.x Alexandria';
-  sDelphi12A  = 'Delphi 12 Athens';
+  sDelphi10S = 'Delphi 10';       // Seattle
+  sDelphi101B = 'Delphi 10.1';    // Berlin
+  sDelphi102T = 'Delphi 10.2';    // Tokyo
+  sDelphi103R = 'Delphi 10.3';    // Rio
+  sDelphi104S = 'Delphi 10.4';    // Sydney
+  sDelphi11A  = 'Delphi 11.x';    // Alexandria
+  sDelphi12A  = 'Delphi 12.x';    // Athens
 begin
   case GetID of
     ciDXE:

From adb92d22ea7763172a72755f1d7f8f37910354cc Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:34:04 +0100
Subject: [PATCH 153/264] Add new &apos; REML entity

Fixes #99
---
 Src/UREMLDataIO.pas | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Src/UREMLDataIO.pas b/Src/UREMLDataIO.pas
index 6924ab76c..76974afc8 100644
--- a/Src/UREMLDataIO.pas
+++ b/Src/UREMLDataIO.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements classes that render and parse Routine Extra Markup Language (REML)
  * code. This markup is used to read and store active text objects as used by
@@ -1035,7 +1035,7 @@ class function TREMLEntities.CharToMnemonicEntity(const Ch: Char): string;
   {Class constructor. Creates map of mnemonic entities to equivalent characters.
   }
 begin
-  SetLength(fEntityMap, 34);
+  SetLength(fEntityMap, 35);
   // Supported character entities. All are optional unless otherwise stated
   // REML v1
   fEntityMap[0] := TREMLEntity.Create('amp', '&');   // required in REML
@@ -1074,6 +1074,8 @@ class function TREMLEntities.CharToMnemonicEntity(const Ch: Char): string;
   fEntityMap[31] := TREMLEntity.Create('laquo', '«');
   fEntityMap[32] := TREMLEntity.Create('raquo', '»');
   fEntityMap[33] := TREMLEntity.Create('iquest', '¿');
+  // REML v6
+  fEntityMap[34] := TREMLEntity.Create('apos', SINGLEQUOTE);
 end;
 
 class destructor TREMLEntities.Destroy;

From dfa315ba8548aaef718535b456e249018f74f1d1 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:46:36 +0100
Subject: [PATCH 154/264] Update REML docs & help topic re REML v6

* Updated affected file format documentation
* Updated REML documentation (reml.html)
* Updated help topic (reml.htm)

Also corrected omission in list of REML entities in reml.html
---
 Docs/Design/FileFormats/export.html  | 21 +++++++++++++++++----
 Docs/Design/FileFormats/main-db.html |  4 ++--
 Docs/Design/FileFormats/user-db.html | 19 ++++++++++++++++---
 Docs/Design/reml.html                | 27 ++++++++++++++++++++++++---
 Src/Help/HTML/reml.htm               |  6 +++---
 5 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
index e60bfe00c..29ca8a849 100644
--- a/Docs/Design/FileFormats/export.html
+++ b/Docs/Design/FileFormats/export.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Export
 -->
@@ -300,9 +300,13 @@ <h2>
         encoded in REML markup. REML v4 is supported.
       </li>
       <li>
-        <span class="highlight">version 7.3 and later:</span> Content is formatted text
+        <span class="highlight">version 7.3 and 7.4:</span> Content is formatted text
         encoded in REML markup. REML v5 is supported.
       </li>
+      <li>
+        <span class="highlight">version 7.5 and later:</span> Content is formatted text
+        encoded in REML markup. REML v6 is supported.
+      </li>
     </ul>
   </dd>
 
@@ -447,7 +451,10 @@ <h2>
               <span class="highlight">versions 5 to 7.2:</span> supports REML v4.
             </li>
             <li>
-              <span class="highlight">version 7.3 &amp; later:</span> supports REML v5.
+              <span class="highlight">version 7.3 &amp; 7.4:</span> supports REML v5.
+            </li>
+            <li>
+              <span class="highlight">version 7.5 &amp; later:</span> supports REML v6.
             </li>
           </ul>
         </li>
@@ -993,6 +1000,12 @@ <h2>
       <dd>
         Updated in time for CodeSnip v4.22.0 to add support for Delphi 12 Athens.
       </dd>
+      <dt>
+        <em>Version 7.5 - 2 April 2014</em>
+      </dt>
+      <dd>
+        Added support for REML v6, which is backward compatible with REML v4.
+      </dd>
     </dl>
   </dd>
 </dl>
@@ -1042,7 +1055,7 @@ <h2>
 </p>
 
 <p>
-  Readers of v2 files and later can parse REML as v5, since all versions of REML up to v5 are backwards compatible.
+  Readers of v2 files and later can parse REML as v6, since all versions of REML up to v6 are backwards compatible.
 </p>
 
 </section>
diff --git a/Docs/Design/FileFormats/main-db.html b/Docs/Design/FileFormats/main-db.html
index 25dc2834a..1b122069c 100644
--- a/Docs/Design/FileFormats/main-db.html
+++ b/Docs/Design/FileFormats/main-db.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Main Database
 -->
@@ -928,7 +928,7 @@ <h2>
 <ol>
   <li id="footnote-1">
     <p>
-      REML is a text markup language used to format text. REML version 5 is supported. The REML format is documented <a href="../reml.html">here</a>.
+      REML is a text markup language used to format text. REML version 6 is supported. The REML format is documented <a href="../reml.html">here</a>.
      </p>
   </li>
   <li id="footnote-2">
diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
index 8a0e6945c..4756169b2 100644
--- a/Docs/Design/FileFormats/user-db.html
+++ b/Docs/Design/FileFormats/user-db.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: User Database
 -->
@@ -325,9 +325,13 @@ <h3 id="xml-file">
         encoded in REML markup. REML v4 is supported.
       </li>
       <li>
-        <span class="highlight">version 6.11 &amp; later:</span> Content is formatted text
+        <span class="highlight">version 6.11 &amp; 6.12:</span> Content is formatted text
         encoded in REML markup. REML v5 is supported.
       </li>
+      <li>
+        <span class="highlight">version 6.13 &amp; later:</span> Content is formatted text
+        encoded in REML markup. REML v6 is supported.
+      </li>
     </ul>
   </dd>
 
@@ -472,7 +476,10 @@ <h3 id="xml-file">
               <span class="highlight">versions 5 &amp; 6.10:</span> supports REML v4.
             </li>
             <li>
-              <span class="highlight">version 6.11 &amp; later:</span> supports REML v5.
+              <span class="highlight">version 6.11 &amp; 6.12:</span> supports REML v5.
+            </li>
+            <li>
+              <span class="highlight">version 6.13 &amp; later:</span> supports REML v6.
             </li>
           </ul>
         </li>
@@ -1029,6 +1036,12 @@ <h2>
       <dd>
         Updated in time for CodeSnip v4.22.0 to add support for Delphi 12 Athens.
       </dd>
+      <dt>
+        <em>Version 6.13 - 2 April 2024</em>
+      </dt>
+      <dd>
+        Updated with CodeSnip v4.23.0 to add support for REML v6, which is backwards compatible with REML v4.
+      </dd>
     </dl>
   </dd>
 </dl>
diff --git a/Docs/Design/reml.html b/Docs/Design/reml.html
index a84de371a..b945f4332 100644
--- a/Docs/Design/reml.html
+++ b/Docs/Design/reml.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 
 <!--
- * This file copyright (C) 2020-2023, Peter Johnson (gravatar.com/delphidabbler) and
+ * This file copyright (C) 2020-2024, Peter Johnson (gravatar.com/delphidabbler) and
  * is licensed under the MIT License: https://opensource.org/licenses/MIT
  *
  * DelphiDabbler Code Snippets Database Documentation: REML markup language
@@ -251,7 +251,7 @@ <h1>
     The REML language is a SGML language similar to a greatly simplified XHTML. The are a small number of tags and character entities that can be used.
   </p>
   <aside>
-    <strong>Note:</strong> The language described here is REML v5. v4 is still in regular use in CodeSnip up to v4.20.x. Earlier versions are obsolete.
+    <strong>Note:</strong> The language described here is REML v6. v4 is still in regular use in CodeSnip up to v4.20.x. Earlier versions are obsolete.
   </aside>
 
 </section>
@@ -524,6 +524,10 @@ <h1>
         <td><code>&amp;deg;</code></td>
         <td>°</td>
       </tr>
+      <tr>
+        <td><code>&amp;cent;</code></td>
+        <td>¢</td>
+      </tr>
       <tr>
         <td><code>&amp;laquo;</code></td>
         <td>«</td>
@@ -536,6 +540,10 @@ <h1>
         <td><code>&amp;iquest;</code></td>
         <td>¿</td>
       </tr>
+      <tr>
+        <td><code>&amp;apos;</code></td>
+        <td>'</td>
+      </tr>
     </tbody>
   </table>
 
@@ -644,8 +652,21 @@ <h1>Change Log</h1>
     </li>
   </ul>
 
-</section>
+  <p>
+    <strong>v6 of 2024-04-02</strong>
+  </p>
+
+  <p>
+    Introduced in CodeSnip v4.23.0
+  </p>
 
+  <ul>
+    <li>
+      Added entity: <code class="value">&amp;apos;</code>.
+    </li>
+  </ul>
+  
+  </section>
 
 </body>
 
diff --git a/Src/Help/HTML/reml.htm b/Src/Help/HTML/reml.htm
index 4eedac417..f66afea9d 100644
--- a/Src/Help/HTML/reml.htm
+++ b/Src/Help/HTML/reml.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic describing REML markup language.
 -->
@@ -43,8 +43,8 @@ <h1>
     <p>
       <em>REML</em> is <em>CodeSnip</em>'s own little markup language that can
       be used to style the text of a snippet's description and / or extra
-      information. The latest version is v5, which is backwards compatible with
-	  all other versions.
+      information. The latest version is v6, which is backwards compatible with
+	    all other versions.
     </p>
     <h2>
       Language Details

From 258a196f5ad400b32cb6c21fee89aaf5c5e62f1e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 Apr 2024 13:33:49 +0100
Subject: [PATCH 155/264] Split UClassHelpers unit into three separate units

New units are:
* ClassHelpers.UActions
* ClassHelpers.UControls
* ClassHelpers.UGraphics
---
 Src/ClassHelpers.UActions.pas                 | 43 ++++++++++
 Src/ClassHelpers.UControls.pas                | 68 +++++++++++++++
 ...Helpers.pas => ClassHelpers.UGraphics.pas} | 84 ++-----------------
 Src/CodeSnip.dpr                              |  8 +-
 Src/CodeSnip.dproj                            |  4 +-
 5 files changed, 125 insertions(+), 82 deletions(-)
 create mode 100644 Src/ClassHelpers.UActions.pas
 create mode 100644 Src/ClassHelpers.UControls.pas
 rename Src/{UClassHelpers.pas => ClassHelpers.UGraphics.pas} (66%)

diff --git a/Src/ClassHelpers.UActions.pas b/Src/ClassHelpers.UActions.pas
new file mode 100644
index 000000000..d37881ac7
--- /dev/null
+++ b/Src/ClassHelpers.UActions.pas
@@ -0,0 +1,43 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Class helper for TCustomActionList
+ *
+ * Extracted in 2024 from original UClassHelpers unit (2012-2021)
+}
+
+unit ClassHelpers.UActions;
+
+interface
+
+uses
+  // Delphi
+  ActnList;
+
+type
+  ///  <summary>Class helper that adds a method to TCustomActionList that can
+  ///  update all the actions in the list.</summary>
+  TActionListHelper = class helper for TCustomActionList
+  public
+    ///  <summary>Updates all actions in the action list by calling their Update
+    ///  methods.</summary>
+    procedure Update;
+  end;
+
+implementation
+
+{ TActionListHelper }
+
+procedure TActionListHelper.Update;
+var
+  Action: TContainedAction; // each action in list
+begin
+  for Action in Self do
+    Action.Update;
+end;
+
+end.
diff --git a/Src/ClassHelpers.UControls.pas b/Src/ClassHelpers.UControls.pas
new file mode 100644
index 000000000..2ea885ee0
--- /dev/null
+++ b/Src/ClassHelpers.UControls.pas
@@ -0,0 +1,68 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Class helper for TControl.
+ *
+ * Extracted in 2024 from original UClassHelpers unit (2012-2021).
+}
+
+unit ClassHelpers.UControls;
+
+interface
+
+uses
+  // Delphi
+  Controls, Menus;
+
+type
+  ///  <summary>Class helper that adds functionality to TControl.</summary>
+  TControlHelper = class helper for TControl
+  public
+    ///  <summary>Gets reference to pop-up menu assigned to protected PopupMenu
+    ///  property.</summary>
+    function GetPopupMenu: TPopupMenu;
+    ///  <summary>Checks if protected PopupMenu property is assigned.</summary>
+    function HasPopupMenu: Boolean;
+    ///  <summary>Refreshes control's action. Any changes in action that affect
+    ///  state of control are reflected in control.</summary>
+    procedure RefreshAction;
+    ///  <summary>Refreshes all owned controls to reflect any changes in their
+    ///  associated actions.</summary>
+    procedure RefreshActions;
+  end;
+
+implementation
+
+{ TControlHelper }
+
+function TControlHelper.GetPopupMenu: TPopupMenu;
+begin
+  Result := PopupMenu;
+end;
+
+function TControlHelper.HasPopupMenu: Boolean;
+begin
+  Result := Assigned(PopupMenu);
+end;
+
+procedure TControlHelper.RefreshAction;
+begin
+  if Assigned(Action) then
+    ActionChange(Action, False);
+end;
+
+procedure TControlHelper.RefreshActions;
+var
+  Idx: Integer; // loops through all controls
+begin
+  for Idx := 0 to Pred(ComponentCount) do
+    if Components[Idx] is TControl then
+      (Components[Idx] as TControl).RefreshAction;
+end;
+
+end.
+
diff --git a/Src/UClassHelpers.pas b/Src/ClassHelpers.UGraphics.pas
similarity index 66%
rename from Src/UClassHelpers.pas
rename to Src/ClassHelpers.UGraphics.pas
index d18138ccc..d63866cc6 100644
--- a/Src/UClassHelpers.pas
+++ b/Src/ClassHelpers.UGraphics.pas
@@ -3,41 +3,20 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
- * Provides various class helpers for VCL classes.
+ * Provides class helpers for VCL image classes.
+ *
+ * Extracted from in 2024 original UClassHelpers unit (2012-2021).
 }
 
-
-unit UClassHelpers;
-
-{ TODO: Separate different helpers into their own units, within a ClassHelpers
-        scope. E.g. ClassHelpers.Controls, ClassHelper.Graphics }
+unit ClassHelpers.UGraphics;
 
 interface
 
-
 uses
   // Delphi
-  Controls, Menus, ImgList, Graphics, ActnList, GIFImg;
-
-
-type
-  ///  <summary>Class helper that adds functionality to TControl.</summary>
-  TControlHelper = class helper for TControl
-  public
-    ///  <summary>Gets reference to pop-up menu assigned to protected PopupMenu
-    ///  property.</summary>
-    function GetPopupMenu: TPopupMenu;
-    ///  <summary>Checks if protected PopupMenu property is assigned.</summary>
-    function HasPopupMenu: Boolean;
-    ///  <summary>Refreshes control's action. Any changes in action that affect
-    ///  state of control are reflected in control.</summary>
-    procedure RefreshAction;
-    ///  <summary>Refreshes all owned controls to reflect any changes in their
-    ///  associated actions.</summary>
-    procedure RefreshActions;
-  end;
+  ImgList, Graphics, GIFImg;
 
 type
   ///  <summary>Class helper that adds a method to TCustomImageList that can
@@ -62,16 +41,6 @@   TImageListHelper = class helper for TCustomImageList
       Size: Integer; MaskColour: TColor);
   end;
 
-type
-  ///  <summary>Class helper that adds a method to TCustomActionList that can
-  ///  update all the actions in the list.</summary>
-  TActionListHelper = class helper for TCustomActionList
-  public
-    ///  <summary>Updates all actions in the action list by calling their Update
-    ///  methods.</summary>
-    procedure Update;
-  end;
-
 type
   ///  <summary>Class helper that adds a method to TGIFImage that adds a similar
   ///  method to one present in 3rd party TGIFImage to load an image from
@@ -87,42 +56,12 @@   TGIFImageHelper = class helper for TGIFImage
       const ResType: PChar);
   end;
 
-
 implementation
 
-
 uses
   // Delphi
   Classes;
 
-
-{ TControlHelper }
-
-function TControlHelper.GetPopupMenu: TPopupMenu;
-begin
-  Result := PopupMenu;
-end;
-
-function TControlHelper.HasPopupMenu: Boolean;
-begin
-  Result := Assigned(PopupMenu);
-end;
-
-procedure TControlHelper.RefreshAction;
-begin
-  if Assigned(Action) then
-    ActionChange(Action, False);
-end;
-
-procedure TControlHelper.RefreshActions;
-var
-  Idx: Integer; // loops through all controls
-begin
-  for Idx := 0 to Pred(ComponentCount) do
-    if Components[Idx] is TControl then
-      (Components[Idx] as TControl).RefreshAction;
-end;
-
 { TImageListHelper }
 
 procedure TImageListHelper.LoadFromResource(ResType: PChar;
@@ -181,16 +120,6 @@ procedure TImageListHelper.LoadFromResource(ResType: PChar;
   end;
 end;
 
-{ TActionListHelper }
-
-procedure TActionListHelper.Update;
-var
-  Action: TContainedAction; // each action in list
-begin
-  for Action in Self do
-    Action.Update;
-end;
-
 { TGIFImageHelper }
 
 procedure TGIFImageHelper.LoadFromResource(const Module: HMODULE;
@@ -207,4 +136,3 @@ procedure TGIFImageHelper.LoadFromResource(const Module: HMODULE;
 end;
 
 end.
-
diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index 9b900845b..1fe24aca3 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip application project file.
 }
@@ -192,7 +192,7 @@ uses
   UBrowseProtocol in 'UBrowseProtocol.pas',
   UCategoryAction in 'UCategoryAction.pas',
   UCategoryListAdapter in 'UCategoryListAdapter.pas',
-  UClassHelpers in 'UClassHelpers.pas',
+  ClassHelpers.UControls in 'ClassHelpers.UControls.pas',
   UClipboardHelper in 'UClipboardHelper.pas',
   UCodeImportExport in 'UCodeImportExport.pas',
   UCodeImportMgr in 'UCodeImportMgr.pas',
@@ -372,7 +372,9 @@ uses
   FmDeleteUserDBDlg in 'FmDeleteUserDBDlg.pas' {DeleteUserDBDlg},
   Compilers.UAutoDetect in 'Compilers.UAutoDetect.pas',
   Compilers.USettings in 'Compilers.USettings.pas',
-  FmRegisterCompilersDlg in 'FmRegisterCompilersDlg.pas' {RegisterCompilersDlg};
+  FmRegisterCompilersDlg in 'FmRegisterCompilersDlg.pas' {RegisterCompilersDlg},
+  ClassHelpers.UGraphics in 'ClassHelpers.UGraphics.pas',
+  ClassHelpers.UActions in 'ClassHelpers.UActions.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index af19fb220..dc6c27915 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -394,7 +394,7 @@
 			<DCCReference Include="UBrowseProtocol.pas"/>
 			<DCCReference Include="UCategoryAction.pas"/>
 			<DCCReference Include="UCategoryListAdapter.pas"/>
-			<DCCReference Include="UClassHelpers.pas"/>
+			<DCCReference Include="ClassHelpers.UControls.pas"/>
 			<DCCReference Include="UClipboardHelper.pas"/>
 			<DCCReference Include="UCodeImportExport.pas"/>
 			<DCCReference Include="UCodeImportMgr.pas"/>
@@ -579,6 +579,8 @@
 			<DCCReference Include="FmRegisterCompilersDlg.pas">
 				<Form>RegisterCompilersDlg</Form>
 			</DCCReference>
+			<DCCReference Include="ClassHelpers.UGraphics.pas"/>
+			<DCCReference Include="ClassHelpers.UActions.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>

From af6208082e0e6c40af3c3a2da8d474cf7534534a Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 Apr 2024 13:49:04 +0100
Subject: [PATCH 156/264] Update all units affected by split of UClassHelpers

All units that referenced the now-removed UClassHelpers unit were
modified to use one or more of the new, rafactored ClassHelpers.xxx
units instead.
---
 Src/FmBase.pas                      | 5 +++--
 Src/FmCompilersDlg.FrSearchDirs.pas | 7 +++++--
 Src/FmMain.pas                      | 6 ++++--
 Src/FmPrintDlg.pas                  | 5 +++--
 Src/FmSplash.pas                    | 5 +++--
 Src/FrSnippetLayoutPrefs.pas        | 6 ++++--
 Src/UGIFImageList.pas               | 4 ++--
 Src/ULEDImageList.pas               | 4 ++--
 Src/USnipKindListAdapter.pas        | 2 +-
 9 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/Src/FmBase.pas b/Src/FmBase.pas
index 79574c9e6..a20163b2c 100644
--- a/Src/FmBase.pas
+++ b/Src/FmBase.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a form that provides the ancestor of all forms in the application.
  * Provides default names for form window classes along with various operations
@@ -136,7 +136,8 @@ implementation
   // Delphi
   SysUtils, Windows, Menus,
   // Project
-  UAppInfo, UBaseObjects, UClassHelpers, UFontHelper, UKeysHelper, UMenus,
+  ClassHelpers.UControls,
+  UAppInfo, UBaseObjects, UFontHelper, UKeysHelper, UMenus,
   UNulFormAligner, UStrUtils;
 
 {$R *.dfm}
diff --git a/Src/FmCompilersDlg.FrSearchDirs.pas b/Src/FmCompilersDlg.FrSearchDirs.pas
index 8774a4177..57b2195d3 100644
--- a/Src/FmCompilersDlg.FrSearchDirs.pas
+++ b/Src/FmCompilersDlg.FrSearchDirs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame used to edit lists of search directories used for a
  * compiler being edited in TCompilersDlg.
@@ -109,7 +109,10 @@ implementation
   // Delphi
   SysUtils, Windows, Graphics,
   // Project
-  UBrowseForFolderDlg, UClassHelpers, UCtrlArranger, UStrUtils;
+  ClassHelpers.UActions,
+  ClassHelpers.UControls,
+  ClassHelpers.UGraphics,
+  UBrowseForFolderDlg, UCtrlArranger, UStrUtils;
 
 {$R *.dfm}
 
diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 59c28851a..725d241aa 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Application's main form. Handles the program's main window display and user
  * interaction.
@@ -583,9 +583,11 @@ implementation
   // Delphi
   Windows, Graphics,
   // Project
+  ClassHelpers.UControls,
+  ClassHelpers.UGraphics,
   DB.UCategory, DB.UMain, DB.USnippet, FmSplash, FmTrappedBugReportDlg,
   FmWaitDlg, IntfFrameMgrs, UActionFactory, UAppInfo,
-  UClassHelpers, UCodeShareMgr, UCommandBars, UConsts, UCopyInfoMgr,
+  UCodeShareMgr, UCommandBars, UConsts, UCopyInfoMgr,
   UCopySourceMgr, UDatabaseLoader, UDatabaseLoaderUI, UDetailTabAction,
   UEditSnippetAction, UExceptions, UHelpMgr, UHistoryMenus, UKeysHelper,
   UMessageBox, UNotifier, UNulDropTarget, UPrintMgr, UQuery, USaveSnippetMgr,
diff --git a/Src/FmPrintDlg.pas b/Src/FmPrintDlg.pas
index 5ef588f1c..b34cdcab0 100644
--- a/Src/FmPrintDlg.pas
+++ b/Src/FmPrintDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a print dialogue box.
 }
@@ -76,7 +76,8 @@ implementation
   // Delphi
   Printers, Graphics,
   // Project
-  FmPreferencesDlg, FrPrintingPrefs, UClassHelpers, UConsts, UMessageBox,
+  ClassHelpers.UGraphics,
+  FmPreferencesDlg, FrPrintingPrefs, UConsts, UMessageBox,
   UPageSetupDlgMgr, UPrintInfo, UStructs, UStrUtils;
 
 
diff --git a/Src/FmSplash.pas b/Src/FmSplash.pas
index 1b44eaf04..eb2e1c034 100644
--- a/Src/FmSplash.pas
+++ b/Src/FmSplash.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements the program's splash screen.
 }
@@ -68,7 +68,8 @@ implementation
   // Delphi
   Windows, Graphics, GIFImg,
   // Project
-  UAppInfo, UClassHelpers, UColours, UStructs, UWindowSettings;
+  ClassHelpers.UGraphics,
+  UAppInfo, UColours, UStructs, UWindowSettings;
 
 
 {$R *.dfm}
diff --git a/Src/FrSnippetLayoutPrefs.pas b/Src/FrSnippetLayoutPrefs.pas
index f02ef779e..a16cc1da4 100644
--- a/Src/FrSnippetLayoutPrefs.pas
+++ b/Src/FrSnippetLayoutPrefs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that allows user to customise appearance of different
  * kinds of snippets in main display.
@@ -84,7 +84,9 @@ implementation
   // Delphi
   Windows, Graphics,
   // Project
-  FmPreferencesDlg, UClassHelpers, UCtrlArranger;
+  ClassHelpers.UControls,
+  ClassHelpers.UGraphics,
+  FmPreferencesDlg, UCtrlArranger;
 
 {$R *.dfm}
 
diff --git a/Src/UGIFImageList.pas b/Src/UGIFImageList.pas
index 3ba34c7c0..f3e26a199 100644
--- a/Src/UGIFImageList.pas
+++ b/Src/UGIFImageList.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Image list descendant that enables representations of GIF images loaded from
  * HTML resource to be added. Resource names are mapped to image indices.
@@ -70,7 +70,7 @@ implementation
 
 uses
   // Delphi
-  GIFImg, UClassHelpers,
+  GIFImg, ClassHelpers.UGraphics,
   // Project
   UComparers;
 
diff --git a/Src/ULEDImageList.pas b/Src/ULEDImageList.pas
index c5a7b9663..839b064fa 100644
--- a/Src/ULEDImageList.pas
+++ b/Src/ULEDImageList.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a custom image list that provides a list of LED images. Image list is
  * automatically loaded from resources when class is instantiated.
@@ -55,7 +55,7 @@ implementation
 
 uses
   // Project
-  UClassHelpers;
+  ClassHelpers.UGraphics;
 
 
 {
diff --git a/Src/USnipKindListAdapter.pas b/Src/USnipKindListAdapter.pas
index 47d03a6d6..745e819e1 100644
--- a/Src/USnipKindListAdapter.pas
+++ b/Src/USnipKindListAdapter.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that adapts a list of snippet kinds by providing an
  * alternative interface to the list, sorted by the name of the snippet kind.

From bdf2de81e70ba17faea5b1e8772dcefadc3433ff Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 Apr 2024 13:59:46 +0100
Subject: [PATCH 157/264] Correct user DB format docs re REML v6

Description of REML format that may be assumed by readers of DB format
v2 was change to from REML v5 to v6.
---
 Docs/Design/FileFormats/user-db.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
index 4756169b2..bc761983e 100644
--- a/Docs/Design/FileFormats/user-db.html
+++ b/Docs/Design/FileFormats/user-db.html
@@ -1100,7 +1100,7 @@ <h3>
 </ul>
 
 <p>
-  Readers of v2 and later files may parse REML from any file version as if it were REML v5, since all versions of REML up to v5 are compatible.
+  Readers of v2 and later files may parse REML from any file version as if it were REML v6, since all versions of REML up to v6 are compatible.
 </p>
 
 <h3>

From d7f14b28c3607552ef908e3378d3cb28e420e0d8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 Apr 2024 14:06:36 +0100
Subject: [PATCH 158/264] Bump version number to v4.23.0 build 271

---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index 7fdf24930..c9ae9dae3 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.22.0
-build=270
+version=4.23.0
+build=271
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From 656e9ddeee7f6421192e7d02c90042b76edc7246 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 Apr 2024 14:22:46 +0100
Subject: [PATCH 159/264] Update license copyright date to 2024

---
 Docs/License.html              | 6 +++---
 Src/Help/HTML/license.htm      | 4 ++--
 Src/Install/Assets/License.rtf | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Docs/License.html b/Docs/License.html
index 131c7a549..458ab8f79 100644
--- a/Docs/License.html
+++ b/Docs/License.html
@@ -1,7 +1,7 @@
 ﻿<!DOCTYPE HTML>
 
 <!--
- * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip license.
  *
@@ -231,7 +231,7 @@ <h2>
     Executable Program
   </h2>
   <p>
-    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2023 by <a
+    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2024 by <a
       href="https://gravatar.com/delphidabbler"
     >Peter D Johnson</a>.
   </p>
@@ -1801,7 +1801,7 @@ <h2 id="ddab-exclusive">
   </h2>
 
   <p>
-    Files covered by this license are original work, copyright &copy; 2012-2023, <a href="https://gravatar.com/delphidabbler">Peter D Johnson</a>.
+    Files covered by this license are original work, copyright &copy; 2012-2024, <a href="https://gravatar.com/delphidabbler">Peter D Johnson</a>.
   </p>
 
   <p>
diff --git a/Src/Help/HTML/license.htm b/Src/Help/HTML/license.htm
index d9a261f15..fc310ae74 100644
--- a/Src/Help/HTML/license.htm
+++ b/Src/Help/HTML/license.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic containing summary of CodeSnip license.
 -->
@@ -27,7 +27,7 @@ <h1>
       <a name="license"></a>Summary of End User License Agreement
     </h1>
     <p>
-      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2023 by Peter D
+      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2024 by Peter D
       Johnson, <a
         href="https://gravatar.com/delphidabbler"
         class="weblink"
diff --git a/Src/Install/Assets/License.rtf b/Src/Install/Assets/License.rtf
index 7d2008d00..5ef3433ff 100644
--- a/Src/Install/Assets/License.rtf
+++ b/Src/Install/Assets/License.rtf
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deftab709{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
 {\colortbl ;\red0\green0\blue255;}
 {\*\generator Riched20 10.0.18362}\viewkind4\uc1 
-\pard\sa113\f0\fs18\lang1033 DelphiDabbler CodeSnip is copyright \'a9 2005-2023 by Peter D Johnson, {{\field{\*\fldinst{HYPERLINK https://en.gravatar.com/delphidabbler }}{\fldrslt{https://en.gravatar.com/delphidabbler\ul0\cf0}}}}\f0\fs18 . \par
+\pard\sa113\f0\fs18\lang1033 DelphiDabbler CodeSnip is copyright \'a9 2005-2024 by Peter D Johnson, {{\field{\*\fldinst{HYPERLINK https://en.gravatar.com/delphidabbler }}{\fldrslt{https://en.gravatar.com/delphidabbler\ul0\cf0}}}}\f0\fs18 . \par
 The executable version of CodeSnip is made available under the terms of the Mozilla Public License 2.0 ({{\field{\*\fldinst{HYPERLINK https://www.mozilla.org/MPL/2.0/ }}{\fldrslt{https://www.mozilla.org/MPL/2.0/\ul0\cf0}}}}\f0\fs18 ). This means you can use, copy and distribute CodeSnip as you wish.\par
 You may also modify CodeSnip as you wish and you may distribute copies of your modified version under the terms of the Mozilla Public License. The only exception is that you may not use the CodeSnip name or branding (e.g. the program icon) in any modification you distribute unless you have the explicit permission of the copyright holder. \par
 For full information see the file \i License.html\i0  installed with this program.\fs24\lang2057\par

From 9c2e46a145b6ecc2f78b7e13db9528750a7c1a27 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 2 Apr 2024 14:23:30 +0100
Subject: [PATCH 160/264] Update change log with details of release v4.23.0

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afb4a535e..5aeb246be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
+## Release v4.23.0 of 02 April 2024
+
+* Removed marketing names (e.g. "Athens" or "Rio") from Delphi compiler names to save space when the compiler names are displayed in the UI [issue #125].
+* Added new `&apos;` entity to REML markup language and boosted REML version to v6 as a consequence [issue #99].
+* Refactored class helper code by splitting a single monolithic unit into three more specialised units [issue #90].
+* Updated documentation and related help topic re change to REML v6.
+
 ## Release v4.22.0 of 08 November 2023
 
 * Added support for test compiling snippets with Delphi 12 Athens [issue #121].

From 848d284bdc4450c811333bdc875213e658a54156 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 3 Apr 2024 11:54:58 +0100
Subject: [PATCH 161/264] Split Docs/ReadMe.txt into two different versions

Split into ReadMe-portable.txt relating to Portable edition and
ReadMe-standard.txt for Standard edition.

Both files were edited according to new purpose and to update content
where necessary.
---
 Docs/ReadMe-portable.txt                 | 257 +++++++++++++++++++++++
 Docs/{ReadMe.txt => ReadMe-standard.txt} | 174 ++++-----------
 2 files changed, 303 insertions(+), 128 deletions(-)
 create mode 100644 Docs/ReadMe-portable.txt
 rename Docs/{ReadMe.txt => ReadMe-standard.txt} (64%)

diff --git a/Docs/ReadMe-portable.txt b/Docs/ReadMe-portable.txt
new file mode 100644
index 000000000..e0883fa5c
--- /dev/null
+++ b/Docs/ReadMe-portable.txt
@@ -0,0 +1,257 @@
+================================================================================
+
+DELPHIDABBLER CODESNIP v4 PORTABLE EDITION README
+
+================================================================================
+
+
+What is CodeSnip?
+================================================================================
+
+DelphiDabbler CodeSnip 4 is a code snippets repository targetted at the Pascal /
+Delphi programming languages. It can download and display code snippets from the
+online DelphiDabbler Code Snippets database as well as maintain a database of
+user-defined snippets.
+
+It displays details of each snippet in the database and can test-compile them
+with each installed Win32 version of Delphi from Delphi 2 to Delphi 12.x and
+Free Pascal.
+
+Compilable Pascal units can be created that contain selected snippets.
+
+
+CodeSnip Editions
+================================================================================
+
+This document relates to the PORTABLE edition of CodeSnip. This edition can be
+run from any writeable removable storage medium (e.g. a USB memory stick) or
+from any folder on the computer's hard disk. It makes no changes to the host
+computer.
+
+There is also a standard edition of the program. This edition is installed on
+the user's computer using an installer. It records its presence in the registry
+and stores data in the system's application and user data directories. You can
+get the standard edition from the same place you downloaded the this edition.
+
+You can run both the standard and portable editions together on the same
+computer and even run them at the same time. However, each edition maintains its
+own settings and keeps its own copies of the snippets databases. To share user
+defined snippets you must export them from one edition and import into the
+other. CodeSnip provides no mechanism for keeping them synchronised.
+
+
+Installation
+================================================================================
+
+CodeSnip requires Windows 2000 or later. It also requires MS Internet Explorer 6
+or later, although IE 8, 9 or 10 are strongly recommended. Note that recent
+releases have only been tested on Windows 11.
+
+The portable edition of CodeSnip 4 is distributed in a zip file that contains
+the program executable, the help file and various documentation files.
+
+Install the program using the following steps:
+
+1) Mount any storage medium on which you want to install CodeSnip.
+
+2) Create a folder on the storage medium or on your computer's internal disk in
+   which to copy the required files.
+
+3) Copy the files CodeSnip-p.exe (the executable program) and CodeSnip.chm
+   (the help file) into the folder you created.
+
+   CodeSnip does not need the other files included in the zip file in order to
+   run, but you may find them useful. Copy them if you wish.
+
+Run the program by double clicking it. When it first runs it will create two
+sub-directories within the folder where you installed the program. These will
+be named AppData and UserData. Do not remove these directories or alter any of
+the contents because CodeSnip uses them to store configuration data along with
+your code snippets.
+
+No files are written outside the folder where you copied the files and the
+registry is not modified.
+
+** WARNING: When updating an existing portable installation with a new version
+of CodeSnip it is important that you do not change or delete the AppData and
+UserData folders. If you do this you risk loosing your settings and/or database.
+
+
+Uninstallation
+================================================================================
+
+Simply delete the folder where you installed the portable edition of CodeSnip
+along with all its contents.
+
+Be aware that any snippets you have created will be lost. If you want to keep
+them for use in another CodeSnip installation, either export them or back up the
+user database before deleting the folder. See the help file for details of how
+to do this.
+
+
+Downloading & Updating the Code Snippets Database
+================================================================================
+
+The online DelphiDabbler Code Snippets database is not installed with the
+program.
+
+CodeSnip's start-up screen shows details of any installed databases. If there is
+no copy of the online database then a link is displayed that enables the
+database to be installed. This link opens the "Install or Update DelphiDabbler
+Snippets Database" wizard dialogue box. The dialogue box explains how to
+download and install the database.
+
+You can download or update the database later by opening the same dialogue box
+using the "Database | Install or Update DelphiDabbler Snippets Database" menu
+option.
+
+
+Configuring CodeSnip to Work With Your Compilers
+================================================================================
+
+A feature of CodeSnip is its ability to test compile snippets with any installed
+Windows 32 version of Delphi (from Delphi 2 to Delphi.x) and FreePascal,
+providing some simple rules are followed.
+
+When CodeSnip is first installed it knows nothing about the available compilers
+and so test compilations cannot be performed. If any supported Delphi compiler
+is detected when the program is first run you will be given the option of
+registering it. This does not work for Free Pascal.
+
+You can also tell CodeSnip about the available compilers by using the "Tools |
+Configure Compilers" menu option. The resulting dialogue can automatically
+detect all installed versions of supported Delphi compilers at the click of a
+button. Free Pascal, where installed, must be set up manually. The Welcome page
+displays a list of compilers it has been configured to work with.
+
+Compilers that do not use English as their output language will need further
+configuration. See the help file for information (look up "configure compilers
+dialogue" in the help file index).
+
+Each user can configure compilers differently.
+
+Delphi XE2 and later may need to be configured to search for required units in
+the correct namespaces. This is explained in the Add/Edit Snippet Dialogue Box
+help topic and in the FAQ at
+https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md#faq-7
+
+Any type of snippet other than "freeform" can be test compiled.
+
+
+Updating the Program
+================================================================================
+
+Updates are published on GitHub. See
+https://github.com/delphidabbler/codesnip/releases
+
+News of new updates is published on the CodeSnip Blog:
+https://codesnip-app.blogspot.com/.
+
+
+Known Installation and Upgrading Issues
+================================================================================
+
++ If you have updated to CodeSnip v4.2.0 or later from any earlier v4 release,
+  and then run the earlier version of the program again, its saved main window
+  state, size, position and layout will have been lost and the program will
+  display in its default size.
+
++ If you have updated to CodeSnip v4.3.0 or later from v4.2.x or earlier any -NS
+  command line options you have specified on the "Switches" (aka "Command Line")
+  tab of the Configure Compilers dialogue box for Delphi XE2 or later will be
+  removed and equivalent entries will have been made on the "Namespaces" tab.
+
++ CodeSnip v4.16.0 and later cannot be registered. Any previous registration
+  information may be lost.
+
+
+License & Disclaimer
+================================================================================
+
+CodeSnip is made available under the terms of the Mozilla Public License v2.0.
+The license is explained in full in the file License.html that is installed with
+CodeSnip. A summary of the license can be viewed from the "Help | License" menu
+option.
+
+CodeSnip is supplied on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
+express or implied. See License.html for details.
+
+The source code of any snippet managed by CodeSnip, whether from the
+DelphiDabbler Code Snippets Database or the user database, is used WITHOUT
+WARRANTY OF ANY KIND, either express or implied. The code is used entirely at
+the user's own risk.
+
+The snippets from the DelphiDabbler Code Snippets Database are open source. See
+the "About The Database" tab of the About dialogue box for details of the
+applicable license. (You can display the About box from the "Help" menu.)
+
+The user is responsible to ensure that any code snippets managed by CodeSnip are
+used in accordance with any applicable license.
+
+
+Source Code
+================================================================================
+
+CodeSnip's source code is freely available. For details of how to obtain the
+source see the FAQ at
+https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md#faq-1
+
+The portable edition of CodeSnip shares the same source code base with the
+standard edition.
+
+The original source code of v4 is released under the Mozilla Public license
+v2.0 (see https://www.mozilla.org/MPL/) and other open source licenses. See the
+file "License.html" in the "Docs" directory of the repository for full licensing
+information.
+
+
+Bugs & Feature Requests
+================================================================================
+
+Please do report any bugs you find. Suggestions for new features are also
+welcomed.
+
+Both bug reports and feature requests are made using the GitHub issue tracker
+(GitHub account required). For details about using the issue tracker see
+https://github.com/delphidabbler/codesnip/blob/master/CONTRIBUTING.md#issues.
+
+
+FAQs
+================================================================================
+
+There are Frequently Asked Questions pages for CodeSnip on the web, at
+https://github.com/delphidabbler/codesnip-faq/blob/master/README.md
+
+
+Privacy
+================================================================================
+
+From v4.16.0 CodeSnip neither stores nor transmits any personally identifiable
+data.
+
+Do note though that CodeSnip can display web pages via your default web browser,
+but only in response to user input. No guarantee is made about any personal data
+collected by such web pages.
+
+
+Thanks
+================================================================================
+
+Thanks to:
+
++ David Mustard and Bill Miller for providing information that enabled me to add
+  Delphi 2007 and Delphi 2009 support, respectively, to the program.
+
++ geoffsmith82 and an anonymous contributor for information about getting
+  CodeSnip to work with Delphi XE2.
+
++ The authors of the third party source code and images used by the program. See
+  the program's about box or License.html for details.
+
++ Various contributors to the DelphiDabbler Code Snippets database. Names of
+  contributors are listed in the program's About Box (use the "Help | About"
+  menu option then select the "About the Database" tab). The list will be empty
+  if the Code Snippets Database has not been installed.
+
+
+================================================================================
diff --git a/Docs/ReadMe.txt b/Docs/ReadMe-standard.txt
similarity index 64%
rename from Docs/ReadMe.txt
rename to Docs/ReadMe-standard.txt
index b7806db53..5f5ea703f 100644
--- a/Docs/ReadMe.txt
+++ b/Docs/ReadMe-standard.txt
@@ -1,6 +1,6 @@
 ================================================================================
 
-DELPHIDABBLER CODESNIP v4 README
+DELPHIDABBLER CODESNIP v4 STANDARD EDITION README
 
 ================================================================================
 
@@ -14,30 +14,26 @@ online DelphiDabbler Code Snippets database as well as maintain a database of
 user-defined snippets.
 
 It displays details of each snippet in the database and can test-compile them
-with each installed Win32 version of Delphi from Delphi 2 to Delphi 12 Athens
-and Free Pascal.
+with each installed Win32 version of Delphi from Delphi 2 to Delphi 12.x and
+Free Pascal.
 
 Compilable Pascal units can be created that contain selected snippets.
 
-Features new to CodeSnip 4 are listed in the "What's New In CodeSnip 4" topic
-in the program's help file.
-
 
 CodeSnip Editions
 ================================================================================
 
-There are two different editions of CodeSnip 4 available:
-
-+ The standard edition, which is installed on the user's computer using an
-  installer and which records its presence in the registry and stores data in
-  the system's application and user data directories.
+This document relates to the STANDARD edition of CodeSnip. This edition is
+installed on the user's computer using a standard Windows installer and which
+records its presence in the registry and stores data in the system's application
+and user data directories.
 
-+ The portable edition that can be run from any writeable removable storage
-  medium (e.g. a USB memory stick) and that makes no changes to the host
-  computer. This edition has no installer and is simply copied onto the required
-  medium.
+There is also a portable edition of the program. This edition can be run from
+any writeable removable storage medium (e.g. a USB memory stick) or from any
+folder on the computer's hard disk. It makes no changes to the host computer.
+This edition has no installer and is simply copied to the required location.
 
-You can run both the standard and portable editions together on the same
+You can run both the portable and standard editions together on the same
 computer and even run them at the same time. However, each edition maintains its
 own settings and keeps its own copies of the snippets databases. To share user
 defined snippets you must export them from one edition and import into the
@@ -48,18 +44,14 @@ Installation
 ================================================================================
 
 CodeSnip requires Windows 2000 or later. It also requires MS Internet Explorer 6
-or later, although IE 8, 9 or 10 are strongly recommended. But note that recent
-releases have only been tested on Windows 10/11.
+or later, although IE 8, 9 or 10 are strongly recommended. Note that recent
+releases have only been tested on Windows 11.
 
-Installing the Standard Edition
--------------------------------
-
-You will need administrator privileges to run the setup program for the standard
-edition. If you are using a non-admin user account on Windows 2000 or XP you
-should run setup as administrator. By default Windows Vista to Windows 11 will
-require an admin password if running as a standard user and setup will attempt
-to elevate the process. If UAC prompts are disabled you must run setup as
-administrator.
+You will need administrator privileges to run the setup program. If you are
+using a non-admin user account on Windows 2000 or XP you should run setup as
+administrator. By default Windows Vista to Windows 11 will require admin
+privileges and setup will attempt to elevate the process if required. If UAC
+prompts are disabled you must run setup as administrator.
 
 CodeSnip v4 will install alongside any v3 or earlier release that may already be
 installed. If you want to replace the earlier version simply uninstall it in the
@@ -106,53 +98,15 @@ If you are updating to CodeSnip 4 from version 3 or earlier, CodeSnip will give
 you the option of bringing forward your old settings and / or user defined
 database. This happens the first time v4 is run for each user.
 
-Installing the Portable Edition
--------------------------------
-
-The portable edition of CodeSnip 4 is distributed in a zip file that contains
-the program executable, the help file and various documentation files.
-
-Install the program using the following steps:
-
-1) Mount any storage medium on which you want to install CodeSnip.
-
-2) Create a folder on the storage medium or on your computer's internal disk in
-   which to copy the required files.
-
-3) Copy the files CodeSnip-p.exe (the executable program) and CodeSnip.chm
-   (the help file) into the folder you created.
-
-   CodeSnip does not need the other files included in the zip file in order to
-   run, but you may find them useful. Copy them if you wish.
-
-Run the program by double clicking it. When it first runs it will create two
-sub-directories within the folder where you installed the program. These will
-be named AppData and UserData. Do not remove these directories or alter any of
-the contents. CodeSnip uses them to store configuration data along with your
-code snippets.
-
-No files are written outside the folder where you copied the files and the
-registry is not modified.
-
-** WARNING: When updating an existing portable installation with a new version
-of CodeSnip it is important that you do not change or delete the AppData and
-UserData folders. If you do this you risk loosing your settings and/or database.
-
 
 Uninstallation
 ================================================================================
 
-Uninstalling the Standard Edition
----------------------------------
-
-CodeSnip can be uninstalled via "Installed Apps" (a.k.a. "Apps and Features",
-a.k.a. "Programs and Features", a.k.a. "Add / Remove Programs") accessed from the
-Windows Control Panel or by choosing "Uninstall DelphiDabbler CodeSnip" from the
-program's start menu group.
+CodeSnip can be uninstalled using your version of Windows' application
+uninstaller, run from Control Panel. Alternatively you can choose "Uninstall
+DelphiDabbler CodeSnip" from the program's start menu group.
 
-Administrator privileges will be required to uninstall CodeSnip. Windows Vista
-to Windows 11 with UAC prompts enabled will prompt for an admin password if
-necessary.
+Administrator privileges will be required to uninstall CodeSnip.
 
 The uninstall program will delete any local copy of the online Code Snippets
 database but will leave any user defined database, configuration data and
@@ -161,16 +115,6 @@ delete the %AppData%\DelphiDabbler\CodeSnip.4 directory and all its contents for
 each user who ran CodeSnip. If any user has moved the user database directory
 those directories also need to be deleted.
 
-Uninstalling the Portable Edition
----------------------------------
-
-Simply delete the folder where you installed CodeSnip, with all its contents.
-
-Be aware that any snippets you have created will be lost. If you want to keep
-them for use in another CodeSnip installation either export them or back up the
-user database before deleting the folder. See the help file for details of how
-to do this.
-
 
 Downloading & Updating the Code Snippets Database
 ================================================================================
@@ -179,22 +123,19 @@ The online DelphiDabbler Code Snippets database is not installed with the
 program.
 
 CodeSnip's start-up screen shows details of any installed databases. If there is
-no copy of the online database a link is displayed that enables the database to
-be installed. This link opens the "Install or Update DelphiDabbler Snippets
-Database" wizard style dialogue box. The dialogue box explains how to download
-and install the database.
+no copy of the online database then a link is displayed that enables the
+database to be installed. This link opens the "Install or Update DelphiDabbler
+Snippets Database" wizard dialogue box. The dialogue box explains how to
+download and install the database.
 
 You can download or update the database later by opening the same dialogue box
 using the "Database | Install or Update DelphiDabbler Snippets Database" menu
 option.
 
-Standard Edition Only
----------------------
-
-When installing the standard edition, the setup program will detect if an older
-database installation is present and will give the option to carry it forward.
-When setup completes it checks for the presence of the database and puts up a
-message if it is not present.
+During installation the setup program will detect if an older database version
+is present and will give the option to carry it forward. When setup completes it
+checks for the presence of the database and puts up a message if it is not
+present.
 
 Database updates will apply to all users of the computer the next time they
 start CodeSnip.
@@ -204,7 +145,7 @@ Configuring CodeSnip to Work With Your Compilers
 ================================================================================
 
 A feature of CodeSnip is its ability to test compile snippets with any installed
-Windows 32 version of Delphi (from Delphi 2 to Delphi 12 Athens) and FreePascal,
+Windows 32 version of Delphi (from Delphi 2 to Delphi.x) and FreePascal,
 providing some simple rules are followed.
 
 When CodeSnip is first installed it knows nothing about the available compilers
@@ -235,7 +176,7 @@ Any type of snippet other than "freeform" can be test compiled.
 Updating the Program
 ================================================================================
 
-Updates are published on GitHub. See 
+Updates are published on GitHub. See
 https://github.com/delphidabbler/codesnip/releases
 
 News of new updates is published on the CodeSnip Blog:
@@ -288,7 +229,7 @@ DelphiDabbler Code Snippets Database or the user database, is used WITHOUT
 WARRANTY OF ANY KIND, either express or implied. The code is used entirely at
 the user's own risk.
 
-The snippets from the DelphiDabbler Code Snippets Database is open source. See
+The snippets from the DelphiDabbler Code Snippets Database are open source. See
 the "About The Database" tab of the About dialogue box for details of the
 applicable license. (You can display the About box from the "Help" menu.)
 
@@ -303,7 +244,8 @@ CodeSnip's source code is freely available. For details of how to obtain the
 source see the FAQ at
 https://github.com/delphidabbler/codesnip-faq/blob/master/SourceCode.md#faq-1
 
-The standard and portable editions of CodeSnip share the same source code.
+The standard edition of CodeSnip shares the same source code base with the
+portable edition.
 
 The original source code of v4 is released under the Mozilla Public license
 v2.0 (see https://www.mozilla.org/MPL/) and other open source licenses. See the
@@ -311,36 +253,15 @@ file "License.html" in the "Docs" directory of the repository for full licensing
 information.
 
 
-Bugs
+Bugs & Feature Requests
 ================================================================================
 
-Please do report any bugs you find.
-
-Bugs are recorded in tracker software. View the reported and fixed bugs via
-https://github.com/delphidabbler/codesnip/issues (GitHub account required).
-
-You can also access the bug tracker from CodeSnip by using the "Tools | Report
-Bug Online" menu option then following the link that appears in the resulting
-dialogue box.
-
-If you wish to report a bug, please check the current reports on the bug
-tracker. If your bug hasn't already been reported or fixed please add a report
-using the "Add new" link on Tracker.
+Please do report any bugs you find. Suggestions for new features are also
+welcomed.
 
-Please ensure that you have installed the latest version of CodeSnip and checked
-if the bug is still present before reporting it.
-
-
-Feedback
-================================================================================
-
-If you want to suggest new features please use the feature request tracker
-accessed from https://github.com/delphidabbler/codesnip/issues (GitHub account
-required). Please check whether anyone else has requested something similar and
-add a comment to their request if so.
-
-Always check the latest version of CodeSnip before requesting a feature just in
-case it has already been implemented!
+Both bug reports and feature requests are made using the GitHub issue tracker
+(GitHub account required). For details about using the issue tracker see
+https://github.com/delphidabbler/codesnip/blob/master/CONTRIBUTING.md#issues.
 
 
 FAQs
@@ -353,15 +274,12 @@ https://github.com/delphidabbler/codesnip-faq/blob/master/README.md
 Privacy
 ================================================================================
 
-As of v4.16.0 CodeSnip no longer stores or transmits any personally identifiable
+From v4.16.0 CodeSnip neither stores nor transmits any personally identifiable
 data.
 
-Because of this change the privacy statement that used to be provided with the
-program has been removed.
-
-Do note though that CodeSnip can display web pages via your default web
-browser, but only in response to user input. No guarantee is made about any
-personal data collected by such web pages.
+Do note though that CodeSnip can display web pages via your default web browser,
+but only in response to user input. No guarantee is made about any personal data
+collected by such web pages.
 
 
 Thanks

From 7f2f758efc9ef2785c51a92a0cee0c266ac330fe Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 3 Apr 2024 13:09:29 +0100
Subject: [PATCH 162/264] Release different ReadMe.txt for standard & portable

Makefile updated to copy appropriate ReadMe-portable.txt or
ReadMe-standard.txt as ReadMe.txt to release zip files for portable and
standard edition builds respectively.

Made similar changes to Inno Setup script to copy ReadMe-standard.txt
as ReadMe.txt into the install program.

Both versions of ReadMe.txt were temporarily stored in new
_build\release\~tmp~ directory.
---
 Src/Install/CodeSnip.iss |  3 ++-
 Src/Makefile             | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Src/Install/CodeSnip.iss b/Src/Install/CodeSnip.iss
index 47a85f471..3e154e1d0 100644
--- a/Src/Install/CodeSnip.iss
+++ b/Src/Install/CodeSnip.iss
@@ -29,6 +29,7 @@
 #define SrcDocsPath SourcePath + "..\..\Docs\"
 #define SrcAssetsPath SourcePath + "\Assets\"
 #define SrcExePath SourcePath + "..\..\_build\exe\"
+#define TmpPath SourcePath + "..\..\_build\release\~tmp~\"
 #define ProgDataSubDir AppName + ".4"
 #define ExeProg SrcExePath + ExeFile
 #define AppVersion DeleteToVerStart(GetFileProductVersion(ExeProg))
@@ -89,7 +90,7 @@ Name: {commonappdata}\{#AppPublisher}\{#ProgDataSubDir}\Database; permissions: e
 Source: {#SrcExePath}{#ExeFile}; DestDir: {app}
 Source: {#SrcExePath}{#HelpFile}; DestDir: {app}; Flags: ignoreversion
 Source: {#SrcDocsPath}{#LicenseTextFile}; DestDir: {app}; Flags: ignoreversion
-Source: {#SrcDocsPath}{#ReadMeFile}; DestDir: {app}; Flags: ignoreversion
+Source: {#TmpPath}{#ReadMeFile}; DestDir: {app}; Flags: ignoreversion
 Source: {#SrcAssetsPath}UpdatingPreview.rtf; Flags: dontcopy
 
 [Icons]
diff --git a/Src/Makefile b/Src/Makefile
index 17b443abf..ce6cb8cf8 100644
--- a/Src/Makefile
+++ b/Src/Makefile
@@ -12,12 +12,15 @@ BUILD_ROOT = _build
 BIN_ROOT = $(BUILD_ROOT)\bin
 EXE_ROOT = $(BUILD_ROOT)\exe
 RELEASE_ROOT = $(BUILD_ROOT)\release
+RELEASE_TMP_ROOT = $(RELEASE_ROOT)\~tmp~
 DOCS_ROOT = Docs
 SRC_ROOT = Src
 
 # Defines macros giving directories relative to location of the Makefile
 BIN_REL = ..\$(BIN_ROOT)
 EXE_REL = ..\$(EXE_ROOT)
+DOCS_REL = ..\$(DOCS_ROOT)
+RELEASE_TMP_REL = ..\$(RELEASE_TMP_ROOT)
 
 # Check for required environment variables
 
@@ -115,6 +118,7 @@ config:
   @mkdir $(BIN_ROOT)
   @if not exist $(EXE_ROOT) mkdir $(EXE_ROOT)
   @if not exist $(RELEASE_ROOT) mkdir $(RELEASE_ROOT)
+  @if not exist $(RELEASE_TMP_ROOT) mkdir $(RELEASE_TMP_ROOT)
   @cd $(SRC_ROOT)
 
 # Builds CodeSnip pascal files and links program
@@ -160,8 +164,10 @@ typelib:
 # Builds setup program
 setup:
 !ifndef PORTABLE
-  @del $(EXE_REL)\CodeSnip-Setup-*
+  copy $(DOCS_REL)\ReadMe-standard.txt $(RELEASE_TMP_REL)\ReadMe.txt
+  del $(EXE_REL)\CodeSnip-Setup-*
   @$(ISCC) Install\CodeSnip.iss
+  del $(RELEASE_TMP_REL)\ReadMe.txt
 !else
   @echo **** Portable build - no setup file created ****
 !endif
@@ -195,12 +201,16 @@ release:
   @cd ..
   -@if exist $(OUTFILE) del $(OUTFILE)
 !ifndef PORTABLE
-  @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip-Setup-*.exe $(DOCS_ROOT)\ReadMe.txt
+  copy $(DOCS_ROOT)\ReadMe-standard.txt $(RELEASE_TMP_ROOT)\ReadMe.txt
+  @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip-Setup-*.exe $(RELEASE_TMP_ROOT)\ReadMe.txt
+  del $(RELEASE_TMP_ROOT)\ReadMe.txt
 !else
+  copy $(DOCS_ROOT)\ReadMe-portable.txt $(RELEASE_TMP_ROOT)\ReadMe.txt
   @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip-p.exe
   @$(ZIP) -j -9 $(OUTFILE) $(EXE_ROOT)\CodeSnip.chm
-  @$(ZIP) -j -9 $(OUTFILE) $(DOCS_ROOT)\ReadMe.txt
+  @$(ZIP) -j -9 $(OUTFILE) $(RELEASE_TMP_ROOT)\ReadMe.txt
   @$(ZIP) -j -9 $(OUTFILE) $(DOCS_ROOT)\License.html
+  del $(RELEASE_TMP_ROOT)\ReadMe.txt
 !endif
   @cd $(SRC_ROOT)
 

From dc7cb79e3c82c94a6e8526949c73fec5957c01e3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 3 Apr 2024 14:49:25 +0100
Subject: [PATCH 163/264] Update copyright date in header comments

---
 Src/Install/CodeSnip.iss | 2 +-
 Src/Makefile             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/Install/CodeSnip.iss b/Src/Install/CodeSnip.iss
index 3e154e1d0..229db969a 100644
--- a/Src/Install/CodeSnip.iss
+++ b/Src/Install/CodeSnip.iss
@@ -2,7 +2,7 @@
 ; v. 2.0. If a copy of the MPL was not distributed with this file, You can
 ; obtain one at https://mozilla.org/MPL/2.0/
 ;
-; Copyright (C) 2006-2022, Peter Johnson (gravatar.com/delphidabbler).
+; Copyright (C) 2006-2024, Peter Johnson (gravatar.com/delphidabbler).
 ;
 ; Install file generation script for use with Inno Setup.
 
diff --git a/Src/Makefile b/Src/Makefile
index ce6cb8cf8..b8b69e3b5 100644
--- a/Src/Makefile
+++ b/Src/Makefile
@@ -2,7 +2,7 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/
 #
-# Copyright (C) 2009-2022, Peter Johnson (gravatar.com/delphidabbler).
+# Copyright (C) 2009-2024, Peter Johnson (gravatar.com/delphidabbler).
 #
 # Makefile for the CodeSnip project.
 

From bcaf6cc90084ff19a45480904d4227dccab4ea90 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 3 Apr 2024 15:08:59 +0100
Subject: [PATCH 164/264] Update Build.html re changes per issue #127

Updated re change from using single ReadMe.txt to using a version of the
files for each edition.

Made some other changes for clarity.
---
 Build.html | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/Build.html b/Build.html
index fc6947166..0f96ec05e 100644
--- a/Build.html
+++ b/Build.html
@@ -723,9 +723,13 @@ <h4>
 </h4>
 
 <p>
-  The release file for the standard edition of <em>CodeSnip</em> includes the
-  setup file along with  <code>ReadMe.txt</code> from the <code>Docs</code>
-  directory. Both files must exist.
+  The release zip file for the standard edition requires that the setup files is already
+  present in the <code>_build/exe</code> directory.
+</p>
+
+<p>
+  The release file includes the setup file along with <code>ReadMe.txt</code>
+  that is automatically generated from <code>Docs/ReadMe-standard.txt</code>.
 </p>
 
 <p>
@@ -752,9 +756,16 @@ <h4>
 </h4>
 
 <p>
-  The release file for the portable edition includes the portable executable
-  file, <code>CodeSnip-p.exe</code>, the help file <code>CodeSnip.chm</code> and
-  several files from the <code>Docs</code> directory. All must be present.
+  The release zip file for the portable edition cannot be created until the 
+  <em>CodeSnip</em> excutable and the compiled help file are already present in the
+  <code>_build\exe</code> directory.
+</p>
+
+<p>
+  The release file includes the portable executable file, <code>CodeSnip-p.exe</code>,
+  the help file <code>CodeSnip.chm</code>, <code>Docs/License.html</code> and
+  <code>ReadMe.txt</code> that is automatically generated from
+  <code>Docs/ReadMe-portable.txt</code>.
 </p>
 
 <p>

From 4e120754407cde6a4124e6ff0a85b979e933c3b3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 3 Apr 2024 15:46:38 +0100
Subject: [PATCH 165/264] Add Deploy.bat

Deployment script that creates release zip files for both editions of
CodeSnip and includes the version number passed on command line in zip
file names.

Fixes #128
---
 Deploy.bat | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 Deploy.bat

diff --git a/Deploy.bat b/Deploy.bat
new file mode 100644
index 000000000..23d95a425
--- /dev/null
+++ b/Deploy.bat
@@ -0,0 +1,99 @@
+:: This Source Code Form is subject to the terms of the Mozilla Public License,
+:: v. 2.0. If a copy of the MPL was not distributed with this file, You can
+:: obtain one at https://mozilla.org/MPL/2.0/
+::
+:: Copyright (C) 2024, Peter Johnson (gravatar.com/delphidabbler).
+::
+:: Deploy script for CodeSnip.
+::
+:: This script compiles release versions of the standard and portable editions
+:: of CodeSnip and places them into two different zip files ready for release.
+::
+:: This script uses Embarcadero Make. Various other programs are required to
+:: run Make. See Src/Makefile for details.
+::
+:: To use the script:
+::   1) Set the environment variables required for Make to succeed. See 
+::      Src/Makefile for details
+::   2) Change directory to that where this script is located.
+::   3) Run the script.
+::
+:: Usage:
+::   Deploy <version>
+:: where
+::   <version> is the version number of the release, e.g. 0.5.3-beta or 1.2.0.
+
+@echo off
+
+setlocal
+
+:: Check for required parameter
+if "%1"=="" goto paramerror
+
+:: Store parameter
+set Version=%1
+
+:: Store common make parameters
+set CommonParams=-DVERSION=%Version%
+
+:: Store standard edition make parameters
+set StandardParams=%CommonParams%
+
+:: Store portable edition make parameters
+set PortableParams=-DPORTABLE %CommonParams%
+
+:: Set command line
+set MakeCmd=Make
+set StandardMakeCmd=%MakeCmd% %StandardParams%
+set PortableMakeCmd=%MakeCmd% %PortableParams%
+
+echo ----------------------------------------------
+echo Deploying CodeSnip Standard And Portable Builds
+echo -----------------------------------------------
+echo.
+echo Standard edition Make command: %StandardMakeCmd%
+echo Portable edition Make command: %PortableMakeCmd%
+
+cd Src
+
+echo.
+echo.
+echo.
+echo =========================
+echo Building Standard edition
+echo =========================
+echo.
+echo.
+%StandardMakeCmd%
+
+echo.
+echo.
+echo.
+echo =========================
+echo Building Portable edition
+echo =========================
+echo.
+echo.
+%PortableMakeCmd%
+
+echo.
+echo.
+echo.
+echo ====================
+echo Deployment completed
+echo ====================
+
+goto end
+
+:: Error messages
+
+:paramerror
+echo.
+echo ***ERROR: Please specify a version number as a parameter
+echo.
+goto end
+
+:: End
+:end
+
+endlocal

From b52c7853ee4baed649c3c43875db84bbbabc5b80 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 3 Apr 2024 23:47:51 +0100
Subject: [PATCH 166/264] Change README.md re use per-edition ReadMe.txt files

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8672ddf64..3787b2439 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ CodeSnip can import code from the DelphiDabbler [Code Snippets Database](https:/
 
 The standard edition of CodeSnip is installed and removed using a Windows installer. Administrator privileges are required for installation.
 
-The portable edition has no installer. Simply follow the instructions in the [read me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt) that is included in the download.
+The portable edition has no installer. Simply follow the instructions in the [read me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe-portable.txt) that is included in the download.
 
 The program _should_ run on Windows 2000, with Internet Explorer 6 or later, although XP and IE 8 and later are recommended. _But_ note that recent releases of CodeSnip have only been tested on Windows 10 & 11.
 
@@ -33,14 +33,14 @@ The program _should_ run on Windows 2000, with Internet Explorer 6 or later, alt
 The following support is available to CodeSnip users:
 
 * A comprehensive help file.
-* A [read-me file](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe.txt) that discusses installation, configuration, updating and known issues. [^1]
+* A read-me file that discusses installation, configuration, updating and known issues. There are different versions of this file for each edition of CodeSnip: one for the [standard edition](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe-standard.txt) and another for the [portable edition](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe-portable.txt). [^1]
 * The [Using CodeSnip FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md).
 * The [CodeSnip Blog](https://codesnip-app.blogspot.co.uk/).
 * CodeSnip's own [Web Page](https://delphidabbler.com/software/codesnip).
 
 There's also plenty of info available on how to compile CodeSnip from source - see below.
 
-> [^1]: The linked read-me file is the most recent version. It can change from release to release.
+> [^1]: The linked read-me file is the most recent version. It can change from release to release. 
 
 ## Source Code
 

From 101592fb8af64b1be9fa85b8d93d2c597fd28a1c Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 4 Apr 2024 00:41:32 +0100
Subject: [PATCH 167/264] Update Build.html re addition of Deploy.bat script

Also fixed some errors and inconsistencies and tweaked some content.
---
 Build.html | 58 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/Build.html b/Build.html
index 0f96ec05e..ba8a9086f 100644
--- a/Build.html
+++ b/Build.html
@@ -6,7 +6,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Instructions for building CodeSnip from source.
 -->
@@ -513,12 +513,14 @@ <h3>
   |   +-- exe                 - receives executable code and compiled help file
   |   |
   |   +-- release             - receives release files
+  |       |
+  |       +-- ~tmp~           - store for temp files ceated in release process
   |
   ...</pre>
 
 <p>
   If the <code>_build/bin</code> folder already existed, it will have been emptied.
-  In addition, <code>Make</code> will have created a <code>.cfg</code> file from
+  In addition, <code>Make</code> will have created a <code>.cfg</code> file from a
   template in the <code>Src</code> folder. This <code>.cfg</code> file is needed
   for DCC32 to run correctly. The file will be ignored by Git.
 </p>
@@ -580,7 +582,7 @@ <h2>
   You have several options:
 </p>
 
-<ul class="spaced">
+<ol class="spaced">
   <li>
     Build the <em>CodeSnip</em> Executable
   </li>
@@ -599,10 +601,10 @@ <h2>
   <li>
     Clean Up.
   </li>
-</ul>
+</ol>
 
 <p>
-  Each of these options is described below. All except the last assume that
+  Each of these options is described below. All except options 5 and 6 assume that
   <code>Make config</code> has been run.
 </p>
 
@@ -648,7 +650,7 @@ <h4>
 <pre class="cmd"><span class="prompt">&gt;</span> Make -DPORTABLE codesnip</pre>
 
 <p>
-  Again the executable is placed in the <code>_build/exe</code> folder, but this time
+  Again the executable is placed in the <code>_build\exe</code> folder, but this time
   it is named <code>CodeSnip-p.exe</code>
 </p>
 
@@ -665,12 +667,17 @@ <h3>
 <p>
   The compiled help file will be written to the <code>_build\exe</code> folder.
 </p>
+
+<p>
+  The same help file is used for the standard and portable editions.
+</p>
+
 <h3>
   Build the Setup Program
 </h3>
 
 <p>
-  The setup program requires that the <em>CodeSnip</em> excutable and the
+  The setup program requires that the <em>CodeSnip</em> executable and the
   compiled help file are already present in the <code>_build\exe</code> directory.
 </p>
 
@@ -690,7 +697,7 @@ <h3>
 <p>
   The setup program is named <code>CodeSnip-Setup-x.x.x.exe</code>, where
   x.x.x is the version number extracted from <em>CodeSnip</em>'s version
-  information. It is placed in the <code>_build/exe</code> directory.
+  information. It is placed in the <code>_build\exe</code> directory.
 </p>
 
 <p>
@@ -715,7 +722,7 @@ <h3>
 
 <p>
   Make can create zip files containing all the files that are included in a release.
-  Zip files are written to the <code>_build/release</code> directory.
+  Zip files are written to the <code>_build\release</code> directory.
 </p>
 
 <h4>
@@ -724,12 +731,12 @@ <h4>
 
 <p>
   The release zip file for the standard edition requires that the setup files is already
-  present in the <code>_build/exe</code> directory.
+  present in the <code>_build\exe</code> directory.
 </p>
 
 <p>
   The release file includes the setup file along with <code>ReadMe.txt</code>
-  that is automatically generated from <code>Docs/ReadMe-standard.txt</code>.
+  that is automatically generated from <code>Docs\ReadMe-standard.txt</code>.
 </p>
 
 <p>
@@ -763,9 +770,9 @@ <h4>
 
 <p>
   The release file includes the portable executable file, <code>CodeSnip-p.exe</code>,
-  the help file <code>CodeSnip.chm</code>, <code>Docs/License.html</code> and
+  the help file <code>CodeSnip.chm</code>, <code>Docs\License.html</code> and
   <code>ReadMe.txt</code> that is automatically generated from
-  <code>Docs/ReadMe-portable.txt</code>.
+  <code>Docs\ReadMe-portable.txt</code>.
 </p>
 
 <p>
@@ -855,6 +862,31 @@ <h3>
   zip file names can be used here too.
 </p>
 
+<p>
+  There is also a quicker way to build a release, but you must provide a version number to use it. First navigate up
+  to the repository root. Then run
+</p>
+
+<pre class="cmd"><span class="prompt">&gt;</span> Deploy 9.9.9</pre>
+
+<p>
+  where <code>9.9.9</code> is the release version number.
+</p>
+
+<p>
+  This command will build both the standard and portable executables, the help file, the standard edition setup file
+  and finally create the release zip files for both editions, with the release version number incorporated in the file names.
+</p>
+
+<p>
+  Using <code>Deploy 9.9.9</code> is the equivalent of doing:
+</p>
+
+<pre class="cmd"><span class="prompt">&gt;</span> cd Src
+<span class="prompt">&gt;</span> Make -DVERSION=9.9.9
+<span class="prompt">&gt;</span> Make -DPORTABLE -DVERSION=9.9.9
+<span class="prompt">&gt;</span> cd ..</pre>
+  
 <h3>
   Clean Up
 </h3>

From b38d5fe1ff81e7bc7a767e22bc7141b1c641efa3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 4 Apr 2024 01:01:05 +0100
Subject: [PATCH 168/264] Update 3rd party PJSysInfo unit to v5.27.0

Fixes #126
---
 Src/3rdParty/PJSysInfo.pas | 348 +++++++++++++++++++++++++------------
 1 file changed, 241 insertions(+), 107 deletions(-)

diff --git a/Src/3rdParty/PJSysInfo.pas b/Src/3rdParty/PJSysInfo.pas
index efd2c4de6..88f726505 100644
--- a/Src/3rdParty/PJSysInfo.pas
+++ b/Src/3rdParty/PJSysInfo.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2001-2023, Peter Johnson (https://gravatar.com/delphidabbler).
+ * Copyright (C) 2001-2024, Peter Johnson (https://gravatar.com/delphidabbler).
  *
  * This unit contains various static classes, constants, type definitions and
  * global variables for use in providing information about the host computer and
@@ -21,8 +21,12 @@
  *  3: When run on operating systems up to and including Windows 8 running the
  *     host program in compatibility mode causes some variables and TPJOSInfo
  *     methods to be "spoofed" into returning information about the emulated
- *     OS. When run on Windows 8.1 and later details of the actual host
- *     operating system are always returned and the emulated OS is ignored.
+ *     OS. When run on Windows 8.1 details of the actual host operating system
+ *     are always returned and the emulated OS is ignored.
+ *
+ *  4: On Windows 10 and later the correct operating system will only be
+ *     reported if the application declares the operating systems it supports
+ *     in its manifest.
  *
  * ACKNOWLEDGEMENTS
  *
@@ -1226,11 +1230,12 @@   TBuildNameMap = record
       https://en.wikipedia.org/wiki/Windows_NT
       https://en.wikipedia.org/wiki/Windows_10_version_history
       https://en.wikipedia.org/wiki/Windows_11_version_history
+      https://blogs.windows.com/windows-insider/tag/windows-insider-program/
       https://en.wikipedia.org/wiki/Windows_Server
       https://en.wikipedia.org/wiki/Windows_Server_2019
       https://en.wikipedia.org/wiki/Windows_Server_2016
+      https://en.wikipedia.org/wiki/Windows_Server_2022
       https://tinyurl.com/y8tfadm2 (MS Windows Server release information)
-      https://tinyurl.com/usupsz4a (Win 11 Version Numbers & Build Versions)
       https://docs.microsoft.com/en-us/lifecycle/products/windows-server-2022
       https://tinyurl.com/yj5e72jt (MS Win 10 release info)
       https://tinyurl.com/kd3weeu7 (MS Server release info)
@@ -1239,6 +1244,10 @@   TBuildNameMap = record
       For Vista and Win 7 we have to add service pack number to these values to
       get actual build number. For Win 8 onwards we just use the build numbers
       as is.
+
+    References:
+      [^1] MS community blog post https://tinyurl.com/3c8e3hsc
+      [^2] https://en.wikipedia.org/wiki/Windows_11_version_history
   }
 
   {
@@ -1267,24 +1276,30 @@   TBuildNameMap = record
 
   // Windows 10 ----------------------------------------------------------------
 
-  // Version 1507 previews
-  // Preview builds with major/minor version number 6.4
-  Win10_6point4Builds: array[0..2] of Integer = (9841, 9860, 9879);
-  // Preview builds with major/minor version number 10.0
-  Win10_1507_Preview_Builds: array[0..10] of Integer = (
-    9926, 10041, 10049, 10061, 10074, 10122, 10130, 10158, 10159, 10162, 10166
-  );
+  // Version 1507 preview builds
+  //   Preview builds with major/minor version number 6.4
+  //     Expired by 2015-04-30 [^1]:
+  //       9841, 9860, 9879
+  //   Preview builds with major/minor version number 10.0
+  //     Expired by 2015-10-15 [^1]:
+  //       9926, 10041, 10049, 10061, 10074, 10122, 10130, 10158, 10159, 10162,
+  //       10166
 
-  // Version 1511 previews
-  Win10_1511_Preview_Builds: array[0..4] of Integer = (
-    10525, 10532, 10547, 10565, 10576
-  );
+  // Version 1511 preview builds
+  //   Expired by 2016-07-30 [^1]:
+  //     10525, 10532, 10547, 10565, 10576
 
   // Version 1607 previews
-  Win10_1607_Preview_Builds: array[0..24] of Integer = (
-    11082, 11099, 11102, 14251, 14257, 14271, 14279, 14291, 14295, 14316,
-    14328, 14332, 14342, 14352, 14361, 14366, 14367, 14371, 14372, 14376,
-    14379, 14383, 14385, 14388, 14390
+  Win10_1607_Preview_Builds: array[0..5] of Integer = (
+    // Expired 2016-07-30 [^1]:
+    //   11082, 11099
+    // Expired 2016-08-01 [^1]:
+    //   11102, 14251, 14257, 14267, 14271, 14279, 14291, 14295, 14316, 14328,
+    //   14332, 14342, 14352, 14361
+    // Expired 2016-10-15 [^1]:
+    //   14366, 14367, 14371, 14372,
+    14376, 14379, 14383, 14385, // unknown expiry date [^1]
+    14388, 14390                // permanently activated [^1]
   );
 
   // Version 1703 previews
@@ -1349,7 +1364,7 @@   TBuildNameMap = record
   );
 
   {
-    End of support information for Windows 10 versions (as of 2022-12-31).
+    End of support information for Windows 10 versions (as of 2023-05-01).
       GAC = General Availablity Channel.
       LTSC = Long Term Support Channel.
 
@@ -1365,10 +1380,10 @@   TBuildNameMap = record
     1903    | ended      | N/a
     1909    | ended      | N/a
     2004    | ended      | N/a
-    20H2    | 2023-09-05 | N/a
+    20H2    | ended      | N/a
     21H1    | ended      | N/a
     21H2    | 2024-06-11 | 2032-01-13
-    22H2    | 2025-05-13 | N/a
+    22H2    | 2025-10-14 | N/a
   }
 
   // Map of Win 10 builds from 1st release (version 1507) to version 20H2
@@ -1397,7 +1412,7 @@   TBuildNameMap = record
       Name: 'Version 1909: November 2019 Update'),
     (Build: 19041; LoRev: 264; HiRev: 1415;
       Name: 'Version 2004: May 2020 Update'),
-    (Build: 19042; LoRev: 572; HiRev: MaxInt;
+    (Build: 19042; LoRev: 572; HiRev: 2965;
       Name: 'Version 20H2: October 2020 Update')
   );
 
@@ -1430,6 +1445,7 @@   TBuildNameMap = record
     --------|------------|------------
     21H2    | 2023-10-10 | 2024-10-08
     22H2    | 2024-10-08 | 2025-10-14
+    23H2    | 2025-11-11 | 2026-11-10
   }
 
   // 1st build released branded as Windows 11
@@ -1445,50 +1461,93 @@   TBuildNameMap = record
   // various other channels.
   // See **REF1** in implementation
   Win11v22H2Build = 22621;
-  // Build 22632 was added as an alternative Beta channel build as of rev 290.
+
+  // Windows 11 version 22H3
+  // See **REF10** in implementation
+  Win11v23H2Build = 22631;
+
+  // "Preview Builds of October 2022 component update in Beta Channel"
   // See **REF2** in implementation
-  Win11v22H2BuildAlt = 22622;
-
-  // Windows 11 Dev channel releases (with version string "Dev").
-  // For details see https://en.wikipedia.org/wiki/Windows_11_version_history
-  Win11DevChannelDevBuilds: array[0..25] of Integer = (
-    // pre Win 11 release (expired 2021/10/31):
-    //   22449, 22454, 22458, 22463,
-    // pre Win 11 release (expired 2022/09/15):
-    //   22468,
-    // post Win 11 release, pre Win 11 22H2 beta release (expired 2022/09/15):
-    //   22471, 22478, 22483, 22489, 22494, 22499, 22504, 22509, 22518, 22523,
-    //   22526, 22533, 22538, 22543, 22557, 22563,
-    // post Win 11 22H2 beta release (expired 2022/09/15):
+  Win11Oct22ComponentBetaChannelBuild = 22622;
+
+  // "Preview Builds of February 2023 component update in Beta Channel"
+  // See **REF7** in implementation
+  Win11Feb23ComponentBetaChannelBuild = 22623;
+
+  // "Preview builds of May 2023 component update in Beta Channel"
+  // See **REF8** in implementation
+  Win11May23ComponentBetaChannelBuild = 22624;
+
+  // "Preview builds of future component update in Beta Channel"
+  // See **REF9** in implementation
+  Win11FutureComponentBetaChannelBuild = 22635;
+
+  // Windows 11 Dev channel releases with version string "Dev" [^2]
+  // pre Win 11 release (expired 2021/10/31):
+  //   22449, 22454, 22458, 22463,
+  // pre Win 11 release (expired 2022/09/15):
+  //   22468,
+  // post Win 11 release, pre Win 11 22H2 beta release (expired 2022/09/15):
+  //   22471, 22478, 22483, 22489, 22494, 22499, 22504, 22509, 22518, 22523,
+  //   22526, 22533, 22538, 22543, 22557, 22563,
+
+  // Windows 11 Dev channel releases with version string "22H2" [^2]
+  Win1122H2DevChannelDevBuilds: array[0..20] of Integer = (
+    // expired 2022/09/15 (pre Win 11 22H2 beta release):
+    //   22567, 22572, 22579
+    // expired 2022/09/15 (post Win 11 22H2 beta release):
     //   25115, 25120, 25126, 25131, 25136, 25140, 25145, 25151, 25158, 25163,
     //   25169, 25174, 25179,
-    // post Win 11 22H2 beta release (expiring 2023/09/15):
-    25182, 25188, 25193, 25197, 25201, 25206, 25211,
-    // post Win 11 22H2 release (expiring 2023/09/15):
-    25217, 25227, 25231, 25236, 25247, 25252, 25262, 25267, 25272, 25276, 25281,
-    25284, 25290, 25295, 25300, 25309, 23403, 23419, 23424
+    // expired 2023/09/15 (post Win 11 22H2 beta release):
+    //    25182, 25188, 25193, 25197, 25201, 25206, 25211,
+    // expired 2023/09/15 (post Win 11 22H2 release):
+    //    25217, 25227, 25231, 25236, 25247, 25252, 25262, 25267, 25272, 25276,
+    //    25281, 25284, 25290, 25295, 25300, 25309, 23403, 23419, 23424, 23430,
+    //    23435, 23440, 23451, 23466, 23471, 23475, 23481, 23486, 23493, 23506,
+    //    23511, 23516, 23521,
+    // expiring 2024-09-15:
+    23526, 23531, 23536, 23541, 23545, 23550, 23555, 23560, 23565, 23570, 23575,
+    23580, 23585, 23590, 23595, 23601, 23606, 23612, 23615, 23619, 23620
+  );
+
+  // Win 11 Dev channel releases with version string "24H2" [^2]
+  Win1124H2DevChannelDevBuilds: array[0..4] of Integer = (
+    // expiring 2024-09-15:
+    26052, 26058, 26080, 26085, 26090
   );
 
-  // Preview builds of Windows 11 in the Canary Channel
-  // For details see https://en.wikipedia.org/wiki/Windows_11_version_history
-  Win11CanaryPreviewBuilds: array[0..2] of Integer = (
-    // expiring 2023/09/15:
-    25314, 25324, 25330
+  // Preview builds of Windows 11 in the Canary Channel with version string
+  // "22H2" [^2]
+  // (expired 2023-09-15):
+  //    25314, 25324, 25330, 25336, 25346, 25352, 25357, 25370,
+
+  // Preview builds of Windows 11 in the Canary Channel with version string
+  // "23H2" [^2]
+  Win11Canary23H2PreviewBuilds: array[0..15] of Integer = (
+    // expired 2023-09-15:
+    //    25375, 25381, 25387, 25393, 25905, 25915, 25921, 25926,
+    // expires 2024-09-15:
+    25931, 25936, 25941, 25947, 25951, 25967, 25977, 25982, 25987, 25992, 25997,
+    26002, 26010, 26016, 26020, 26040
   );
 
-  // Windows 11 Dev channel builds with version string "22H2"
-  // expired 2022/09/15):
-  //   22567, 22572, 22579
+  // Preview builds of Windows 11 in the Canary Channel with version string
+  // "24H2" [^2]
+  Win11Canary24H2PreviewBuilds: array[0..5] of Integer = (
+    // expires 2024-09-15:
+    26052, 26058, 26063, 26080, 26085,
+    // expiry date unknown
+    26090
+  );
 
-  // Windows 11 Dev & Beta channel builds with version string "22H2"
+  // Windows 11 Dev & Beta channel builds with version string "22H2" [^2]
   Win11DevBetaChannels22H2Builds: array[0..1] of Integer = (
-    // expired 2022/09/15: 22581, 22593, 22598,
+    // Expired 2022/09/15:
+    //   22581, 22593, 22598
+    // Unknown expiry date:
     22610, 22616
   );
 
-  Win11Feb23ComponentBetaChannelBuild = 22623;
-  Win11FutureComponentBetaChannelBuild = 22624;
-
   Win11FirstBuild = Win11DevBuild;  // First build number of Windows 11
 
   // Windows server v10.0 version ----------------------------------------------
@@ -2006,6 +2065,13 @@ procedure InitPlatformIdEx;
     );
   end;
 
+  // Append "Moment N" to InternalExtraUpdateInfo
+  procedure AppendMomentToInternalExtraUpdateInfo(N: Cardinal);
+  begin
+    InternalExtraUpdateInfo := InternalExtraUpdateInfo
+      + ' Moment ' + IntToStr(N);
+  end;
+
 begin
   // Load version query functions used externally to this routine
   VerSetConditionMask := LoadKernelFunc('VerSetConditionMask');
@@ -2073,17 +2139,6 @@ procedure InitPlatformIdEx;
               // Windows 2016 Server tech preview 1
               InternalBuildNumber := Win2016TP1Build;
               InternalExtraUpdateInfo := 'Technical Preview 6';
-            end
-            else
-            begin
-              if FindBuildNumberFrom(
-                Win10_6point4Builds, InternalBuildNumber
-              ) then
-                // Early Win 10 preview builds report v6.4, not v10.0
-                InternalExtraUpdateInfo := Format(
-                  'Version 1507 Preview v6.4.%d.%d',
-                  [InternalBuildNumber, InternalRevisionNumber]
-                )
             end;
         end;
         if Win32ServicePackMajor > 0 then
@@ -2150,11 +2205,13 @@ procedure InitPlatformIdEx;
                 1288, 1348, 1387, 1415, 1466, 1469, 1503, 1526, 1566, 1586,
                 1620, 1645, 1682, 1706, 1708, 1741, 1766, 1767, 1806, 1826,
                 1865, 1889, 1949, 2006, 2075, 2130, 2132, 2193, 2194, 2251,
-                2311, 2364, 2486, 2546, 2604, 2673, 2728, 2788 .. MaxInt:
+                2311, 2364, 2486, 2546, 2604, 2673, 2728, 2788, 2846, 2965,
+                3086, 3208, 3324, 3448, 3570, 3693, 3803, 3930, 4046,
+                4170 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 21H2';
                 1147, 1149, 1151, 1165, 1200, 1202, 1237, 1263, 1266, 1319,
-                1320, 1379, 1381, 1499, 1618, 1679, 1737, 1739, 1862, 1947,
-                2192, 2545:
+                1320, 1379, 1381, 1499, 1618, 1679, 1737, 1739, 1862,
+                1947, 2192, 2545:
                   InternalExtraUpdateInfo := Format(
                     'Version 21H2 [Release Preview Channel v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2172,16 +2229,19 @@ procedure InitPlatformIdEx;
               InternalBuildNumber := Win1022H2Build;
               case InternalBuildNumber of
                 2006, 2130, 2132, 2193, 2194, 2251, 2311, 2364, 2486, 2546,
-                2604, 2673, 2728, 2788 .. MaxInt:
+                2604, 2673, 2728, 2788, 2846, 2913, 2965, 3031, 3086, 3208,
+                3271, 3324, 3393, 3448, 3516, 3570, 3636, 3693, 3758, 3803,
+                3930, 3996, 4046, 4123, 4170, 4239 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 22H2';
-                1865, 1889, 1949, 2075, 2301, 2670, 2787:
+                1865, 1889, 1949, 2075, 2301, 2670, 2787, 2908, 3030, 3154,
+                3155, 3269, 3391, 3513, 3754, 3757, 3992, 4116, 4233, 4235:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview Channel v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 else
                   InternalExtraUpdateInfo := Format(
-                    'Version 22H1 [Unknown release v10.0.%d.%d]',
+                    'Version 22H2 [Unknown release v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
               end;
@@ -2209,7 +2269,9 @@ procedure InitPlatformIdEx;
                 194, 258, 282, 348, 376, 434, 438, 469, 493, 527, 556, 593, 613,
                 652, 675, 708, 739, 740, 778, 795, 832, 856, 918, 978, 1042,
                 1098, 1100, 1165, 1219, 1281, 1335, 1455, 1516, 1574, 1641,
-                1696, 1761 .. MaxInt:
+                1696, 1761, 1817, 1880, 1936, 2003, 2057, 2124, 2176, 2245,
+                2295, 2360, 2416, 2482, 2538, 2600, 2652, 2713, 2777,
+                2836 .. MaxInt:
                   // Public releases of Windows 11
                   InternalExtraUpdateInfo := 'Version 21H2';
                 51, 65, 71:
@@ -2228,9 +2290,10 @@ procedure InitPlatformIdEx;
                       + '[Beta & Release Preview Channels v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                651, 706, 776, 829, 917, 1041, 1163, 1279, 1515, 1639, 1757:
+                651, 706, 776, 829, 917, 1041, 1163, 1279, 1515, 1639, 1757,
+                1879, 2001, 2121, 2243, 2359, 2479:
                   InternalExtraUpdateInfo := Format(
-                    'Version 21H1 Release Preview Channel v10.0.%d.%d]',
+                    'Version 21H2 Release Preview Channel v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 else
@@ -2246,21 +2309,35 @@ procedure InitPlatformIdEx;
               InternalBuildNumber := Win11v22H2Build;
               case InternalRevisionNumber of
                 382, 521, 525, 608, 674, 675, 755, 819, 900, 963, 1105, 1194,
-                1265, 1344, 1413, 1485, {placeholder->}1538 .. MaxInt:
+                1265, 1344, 1413, 1485, 1555, 1635, 1702, 1778, 1848, 1926,
+                1928, 1992, 2070, 2134, 2215, 2283, 2361, 2428, 2506, 2715,
+                2792, 2861, 3007, 3085, 3155, 3235, 3296, 3374 .. MaxInt:
+                begin
                   InternalExtraUpdateInfo := 'Version 22H2';
+                  case InternalRevisionNumber of
+                    675:  AppendMomentToInternalExtraUpdateInfo(1);
+                    1344: AppendMomentToInternalExtraUpdateInfo(2);
+                    1778: AppendMomentToInternalExtraUpdateInfo(3);
+                    2361: AppendMomentToInternalExtraUpdateInfo(4);
+                    3235: AppendMomentToInternalExtraUpdateInfo(5);
+                  end;
+                end;
                 1:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta & Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                105, 169, 232, 317, 457, 607, 754, 898, 1192, 1343, 1483:
+                105, 169, 232, 317, 457, 607, 754, 898, 1192, 1343, 1483, 1631,
+                1776, 2066, 2213, 2359, 2500, 2787, 3078, 3227, 3371:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 160, 290, 436, 440, 450, 575, 586, 590, 598, 601, 730, 741, 746,
                 870, 875, 885, 891, 1020, 1028, 1037, 1095, 1180, 1245, 1250,
-                1255, 1325, 1391, 1465, 1470, 1537:
+                1255, 1325, 1391, 1465, 1470, 1537, 1546, 1616, 1680, 1690,
+                1755, 1825, 1830, 1835, 1900, 1906, 1972, 2048, 2050, 2115,
+                2129, 2191, 2199, 2262, 2265, 2271, 2338:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2272,11 +2349,40 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
-            else if IsBuildNumber(Win11v22H2BuildAlt) then
+            else if IsBuildNumber(Win11v23H2Build) then
+            begin
+              // **REF10**
+              InternalBuildNumber := Win11v23H2Build;
+              case InternalRevisionNumber of
+                2428, 2506, 2715, 2792, 2861, 3007, 3085, 3155, 3235 {Moment 5}, 3296, 3374 .. MaxInt:
+                  InternalExtraUpdateInfo := 'Version 23H2';
+                1825, 1830, 1835, 1900, 1906, 1972:
+                  // revisions 1825..1972 had version string "22H2"
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [Beta v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                2048, 2050, 2115, 2129, 2191, 2199, 2262, 2265, 2271, 2338:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 23H2 [Beta v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                2361, 2787, 3078, 3227, 3371:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 23H2 [Release Preview v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'Version 23H2 [Unknown release v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
+            end
+            else if IsBuildNumber(Win11Oct22ComponentBetaChannelBuild) then
             begin
               // **REF2**
-              InternalBuildNumber := Win11v22H2BuildAlt;
-              // Set fallback update info for unknown revisions
+              InternalBuildNumber := Win11Oct22ComponentBetaChannelBuild;
               case InternalRevisionNumber of
                 290, 436, 440, 450, 575, 586, 590, 598, 601:
                   InternalExtraUpdateInfo := Format(
@@ -2291,22 +2397,42 @@ procedure InitPlatformIdEx;
               end;
             end
             else if FindBuildNumberFrom(
-              Win11DevChannelDevBuilds, InternalBuildNumber
+              Win1122H2DevChannelDevBuilds, InternalBuildNumber
+            ) then
+            begin
+              // Win11 Dev Channel builds with version string "22H2"
+              InternalExtraUpdateInfo := Format(
+                'Dev Channel Version 22H2 v10.0.%d.%d',
+                [InternalBuildNumber, InternalRevisionNumber]
+              );
+            end
+            else if FindBuildNumberFrom(
+              Win1124H2DevChannelDevBuilds, InternalBuildNumber
+            ) then
+            begin
+              // Win11 Dev Channel builds with version string "22H2"
+              InternalExtraUpdateInfo := Format(
+                'Dev Channel Version 24H2 v10.0.%d.%d',
+                [InternalBuildNumber, InternalRevisionNumber]
+              );
+            end
+            else if FindBuildNumberFrom(
+              Win11Canary23H2PreviewBuilds, InternalBuildNumber
             ) then
             begin
-              // Win11 Dev Channel builds with version string "Dev"
+              // Win11 Canary Channel builds with version string "23H2"
               InternalExtraUpdateInfo := Format(
-                'Dev Channel v10.0.%d.%d (Dev)',
+                'Canary Channel Version 23H2 v10.0.%d.%d',
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
             else if FindBuildNumberFrom(
-              Win11CanaryPreviewBuilds, InternalBuildNumber
+              Win11Canary24H2PreviewBuilds, InternalBuildNumber
             ) then
             begin
-              // Win11 Canary Channel builds
+              // Win11 Canary Channel builds with version string "24H2"
               InternalExtraUpdateInfo := Format(
-                'Canary Channel v10.0.%d.%d (Dev)',
+                'Canary Channel Version 24H2 v10.0.%d.%d',
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
@@ -2314,7 +2440,7 @@ procedure InitPlatformIdEx;
               Win11DevBetaChannels22H2Builds, InternalBuildNumber
             ) then
             begin
-              // Win 11 Dev & Beta channel builds with verison string "22H2"
+              // Win 11 Dev & Beta channel builds with version string "22H2"
               InternalExtraUpdateInfo := Format(
                 'Dev & Beta Channels v10.0.%d.%d (22H2)',
                 [InternalBuildNumber, InternalRevisionNumber]
@@ -2322,6 +2448,7 @@ procedure InitPlatformIdEx;
             end
             else if IsBuildNumber(Win11Feb23ComponentBetaChannelBuild) then
             begin
+              // **REF7**
               InternalBuildNumber := Win11Feb23ComponentBetaChannelBuild;
               case InternalRevisionNumber of
                 730, 741, 746, 870, 875, 885, 891, 1020, 1028, 1037, 1095,
@@ -2337,11 +2464,32 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
+            else if IsBuildNumber(Win11May23ComponentBetaChannelBuild) then
+            begin
+              // **REF8**
+              InternalBuildNumber := Win11May23ComponentBetaChannelBuild;
+              case InternalRevisionNumber of
+                1391, 1465, 1470, 1537, 1546, 1610, 1616, 1680, 1690, 1755 ..
+                MaxInt:
+                  InternalExtraUpdateInfo := Format(
+                    'May 2023 Component Update Beta v10.0.%d.%d',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'May 2023 Component Update [Unknown Beta v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
+            end
             else if IsBuildNumber(Win11FutureComponentBetaChannelBuild) then
             begin
+              // **REF9**
               InternalBuildNumber := Win11FutureComponentBetaChannelBuild;
               case InternalRevisionNumber of
-                1391, 1465, 1470, 1537 .. MaxInt:
+                2419, 2483, 2486, 2552, 2700, 2771, 2776, 2841, 2850, 2915,
+                2921, 3061, 3066, 3130, 3139, 3140, 3209, 3212, 3276, 3286,
+                3350, 3420 .. MaxInt:
                   InternalExtraUpdateInfo := Format(
                     'Future Component Update Beta v10.0.%d.%d',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2431,20 +2579,6 @@ procedure InitPlatformIdEx;
             begin
               // Nothing to do: required internal variables set in function call
             end
-            else if FindWin10PreviewBuildNameAndExtraFrom(
-              Win10_1511_Preview_Builds, '1511',
-              InternalBuildNumber, InternalExtraUpdateInfo
-            ) then
-            begin
-              // Nothing to do: required internal variables set in function call
-            end
-            else if FindWin10PreviewBuildNameAndExtraFrom(
-              Win10_1507_Preview_Builds, '1507',
-              InternalBuildNumber, InternalExtraUpdateInfo
-            ) then
-            begin
-              // Nothing to do: required internal variables set in function call
-            end
           end
           else // Win32ProductType in [VER_NT_DOMAIN_CONTROLLER, VER_NT_SERVER]
           begin
@@ -3059,8 +3193,6 @@ class function TPJOSInfo.Platform: TPJOSPlatform;
 end;
 
 class function TPJOSInfo.Product: TPJOSProduct;
-var
-  DummyBN: Integer;   // dummy build number
 begin
   Result := osUnknown;
   case Platform of
@@ -3150,8 +3282,10 @@ class function TPJOSInfo.Product: TPJOSProduct;
                 // application is "manifested" for the correct Windows version.
                 // See https://bit.ly/MJSO8Q.
                 Result := osWin10Svr
-              else if FindBuildNumberFrom(Win10_6point4Builds, DummyBN) then
-                Result := osWin10;
+                // Version 6.4 was also used for some early Windows 10 preview
+                // builds, but they have all expired so detection has been
+                // removed.
+                // See https://tinyurl.com/3c8e3hsc
             else
               // Higher minor version: must be an unknown later OS
               Result := osWinLater

From df62229ccefa0349445c08049261dd5233a19207 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 4 Apr 2024 01:19:30 +0100
Subject: [PATCH 169/264] Fix copyright date in About box

Fixes #129
---
 Src/Res/HTML/dlg-about-program-tplt.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/Res/HTML/dlg-about-program-tplt.html b/Src/Res/HTML/dlg-about-program-tplt.html
index 63a3a2cd4..be93a30c3 100644
--- a/Src/Res/HTML/dlg-about-program-tplt.html
+++ b/Src/Res/HTML/dlg-about-program-tplt.html
@@ -9,7 +9,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Template for content displayed in program tab of about dialog box.
 -->
@@ -47,7 +47,7 @@
   <body>
 
     <p>
-      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2023 by <a
+      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2024 by <a
         class="external-link"
         href="https://en.gravatar.com/delphidabbler"
       >Peter D Johnson</a>.

From 6d33c8df7b5d3b97b7f3f55e61303a2b94fbcdca Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 4 Apr 2024 01:46:59 +0100
Subject: [PATCH 170/264] Add version number to program caption

Program release version number now displayed in the main form caption.

Fixes #122
---
 Src/UAppInfo.pas | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Src/UAppInfo.pas b/Src/UAppInfo.pas
index eacc0d65d..37958f245 100644
--- a/Src/UAppInfo.pas
+++ b/Src/UAppInfo.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that provides information about the application.
 }
@@ -36,12 +36,6 @@   TAppInfo = class(TNoConstructObject)
     const ProgramName = 'CodeSnip-p';
     {$ENDIF}
       {Name of program}
-    {$IFNDEF PORTABLE}
-    const ProgramCaption = 'CodeSnip 4';
-    {$ELSE}
-    const ProgramCaption = 'CodeSnip 4 (Portable Edition)';
-    {$ENDIF}
-      {Name of program displayed in main window and task bar caption}
     const FullProgramName = CompanyName + ' ' + ProgramName;
       {Full name of program, including company name}
     const ProgramID = 'codesnip';
@@ -107,6 +101,10 @@   TAppInfo = class(TNoConstructObject)
       {Gets version number of program's executable file.
         @return Version number as dotted quad.
       }
+    class function ProgramCaption: string;
+      {Gets the program caption to be displayed in main window,
+        @return Required caption,
+      }
   end;
 
 
@@ -214,6 +212,19 @@ class function TAppInfo.HelpFileName: string;
   Result := AppExeDir + '\CodeSnip.chm';
 end;
 
+class function TAppInfo.ProgramCaption: string;
+var
+  ProductVer: TVersionNumber;
+begin
+  ProductVer := TVersionInfo.ProductVerNum;
+  Result := Format(
+    'CodeSnip v%d.%d.%d', [ProductVer.V1, ProductVer.V2, ProductVer.V3]
+  );
+  {$IFDEF PORTABLE}
+  Result := Result + ' (Portable Edition)'
+  {$ENDIF}
+end;
+
 class function TAppInfo.ProgramFileVersion: string;
   {Gets version number of program's executable file.
     @return Version number as dotted quad.

From b0d0726d6ae953adc42253a81d0be7f94f57b4a9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 4 Apr 2024 01:57:02 +0100
Subject: [PATCH 171/264] Fix full program name used by portable edition

The full program name is now always "DelphiDabbler CodeSnip", regardless
of the edition. Previously the name was "DelphiDabbler CodeSnip-p" on
the portable edition.

Fixes #130
---
 Src/UAppInfo.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/UAppInfo.pas b/Src/UAppInfo.pas
index 37958f245..7bc91fd6e 100644
--- a/Src/UAppInfo.pas
+++ b/Src/UAppInfo.pas
@@ -36,7 +36,7 @@   TAppInfo = class(TNoConstructObject)
     const ProgramName = 'CodeSnip-p';
     {$ENDIF}
       {Name of program}
-    const FullProgramName = CompanyName + ' ' + ProgramName;
+    const FullProgramName = CompanyName + ' CodeSnip';
       {Full name of program, including company name}
     const ProgramID = 'codesnip';
       {Machine readable identifier of program}

From 6d7a9925160333c8f2d50cec412696c74b9bcf77 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 4 Apr 2024 02:23:33 +0100
Subject: [PATCH 172/264] Fix REML documentation and help topic

* REML docs in Docs/Design/reml.html has duplicate &cent; character
entity entry.
* REML help topic was never updated for the new &apos; character entity.

Fixes #131
---
 Docs/Design/reml.html  | 4 ----
 Src/Help/HTML/reml.htm | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Docs/Design/reml.html b/Docs/Design/reml.html
index b945f4332..43adc650f 100644
--- a/Docs/Design/reml.html
+++ b/Docs/Design/reml.html
@@ -524,10 +524,6 @@ <h1>
         <td><code>&amp;deg;</code></td>
         <td>°</td>
       </tr>
-      <tr>
-        <td><code>&amp;cent;</code></td>
-        <td>¢</td>
-      </tr>
       <tr>
         <td><code>&amp;laquo;</code></td>
         <td>«</td>
diff --git a/Src/Help/HTML/reml.htm b/Src/Help/HTML/reml.htm
index f66afea9d..3b6753a59 100644
--- a/Src/Help/HTML/reml.htm
+++ b/Src/Help/HTML/reml.htm
@@ -353,6 +353,10 @@ <h3 id="entities">
           <td><code>&amp;iquest;</code></td>
           <td class="centre">&iquest;</td>
         </tr>
+        <tr>
+          <td><code>&amp;apos;</code></td>
+          <td class="centre">&apos;</td>
+        </tr>
       </tbody>
     </table>
     <p>

From 0fb7ce6de170769f3f7aa102375ce8d533fda714 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 8 Apr 2024 08:04:27 +0100
Subject: [PATCH 173/264] Rewrite Docs/Design/reml.html

Docs/Design/reml.html now contains a brief overview of REML and links to
documentation in the new delphidabbler/reml repository for a full
language definition.
---
 Docs/Design/reml.html | 537 ++----------------------------------------
 1 file changed, 20 insertions(+), 517 deletions(-)

diff --git a/Docs/Design/reml.html b/Docs/Design/reml.html
index 43adc650f..fb8b0ce15 100644
--- a/Docs/Design/reml.html
+++ b/Docs/Design/reml.html
@@ -19,7 +19,7 @@
 <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 <![endif]-->
 <meta name="author" content="Peter Johnson - https://en.gravatar.com/delphidabbler">
-<meta name="description" content="DelphiDabbler Code Snippets collection documentation - REML markup language">
+<meta name="description" content="DelphiDabbler Code Snippets documentation - REML markup language">
 <style>
 body {
   font-family: "Segoe UI", Tahoma, Geneva, Helvetica, Arial, sans-serif;
@@ -44,28 +44,6 @@
   text-align: center;
   margin: 0.5em;
 }
-header nav {
-  display: block;
-  margin: 1em;
-  font-weight: normal;
-  font-size: 90%;
-}
-header nav ul {
-  list-style: none;
-  margin: 0;
-  text-align: center;
-}
-header nav li {
-  display: inline;
-}
-header nav a {
-  text-decoration: none;
-  white-space: nowrap;
-  padding: 0.5em;
-}
-header nav a:hover {
-  background-color: #eeeeee;
-}
 h1 {
   font-weight: bold;
   font-size: 200%;
@@ -79,47 +57,11 @@
   padding: 0;
   margin: 0.75em 0;
 }
-aside {
-  display: block;
-  xfont-size: 100%;
-  font-style: italic;
-  padding: 0.25em 0.5em;
-  margin: 0.75em 2em;
-  border-left: 2px solid silver;
-  border-right: 1px solid silver;
-  border-top: 1px solid silver;
-  border-bottom: 2px solid silver;
-  border-radius: 6px;
-  background-color: #f5f5f5;
-}
-aside code.value {
-  background-color: #ddd;
-}
 p {
   font-size: 100%;
   padding: 0;
   margin: 0.75em 0;
 }
-pre, code {
-  font-family: "Lucida Console", "Courier New", Courier, monospace;
-  font-size: 90%;
-}
-pre.sample {
-  margin: 0.75em 2em;
-  background-color: #f5f5f5;
-  padding: 0.5em;
-}
-code.key, code.value {
-  background-color: #f5f5f5;
-  padding: 1px 4px;
-}
-code.key {
-  font-weight: bold;
-  font-style: none;
-}
-code.value {
-  font-style: normal;
-}
 ul {
   font-size: 100%;
   padding: 0;
@@ -141,21 +83,6 @@
 ul.unspaced li {
   margin: 0;
 }
-.very-strong {
-   xtext-transform: uppercase;
-   font-variant: small-caps;
-   font-weight: bold;
-}
-dt {
-  margin: 0;
-  padding: 0;
-  font-weight: bold;
-}
-dd {
-  margin: 0 0 0 2em;
-  padding: 0;
-  font-weight: normal;
-}
 a {
   color: rgb(46, 46, 192);
 }
@@ -171,36 +98,6 @@
   margin-top: 0;
   margin-bottom: 0.5em;
 }
-table {
-  border-collapse: collapse;
-}
-tr {
-  border-bottom: 1px silver solid;
-}
-th {
-  text-align: center;
-  font-weight: bold;
-  margin: 0;
-  padding: 0;
-  border-bottom: 2px silver solid;
-}
-td {
-  border-bottom: 1px silver solid;
-  margin: 0;
-  padding: 0;
-}
-td, th {
-  padding: 0.5em;
-}
-td:first-child, th:first-child {
-  border-right: 1px silver solid;
-}
-td:last-child {
-  text-align: center;
-}
-tr:nth-child(even), th {
-  background-color: #eee;
-}
 </style>
 
 <title>
@@ -219,450 +116,56 @@
     </p>
   </div>
 
-  <nav id="contents">
-    <ul>
-      <li>
-        <a href="#intro">Introduction</a>
-      </li>
-      <li>
-        <a href="#tags">Tags</a>
-      </li>
-      <li>
-        <a href="#entities">Character Entities</a>
-      </li>
-      <li>
-        <a href="#changes">Change Log</a>
-      </li>
-    </ul>
-  </nav>
-
 </header>
 
-<section id="intro">
-
-  <h1>
-    Introduction
-  </h1>
-
-  <p>
-    REML is a little markup language that can be used to style text. It is used in Code Snippets collection meta data for certain properties of a snippet.
-  </p>
-  <p>
-    The REML language is a SGML language similar to a greatly simplified XHTML. The are a small number of tags and character entities that can be used.
-  </p>
-  <aside>
-    <strong>Note:</strong> The language described here is REML v6. v4 is still in regular use in CodeSnip up to v4.20.x. Earlier versions are obsolete.
-  </aside>
-
-</section>
+<main>
 
-<section id="tags">
+<section id="intro">
 
   <h1>
-    Tags
+    About REML
   </h1>
 
   <p>
-    There are two types of tags: block level and in-line.
-  </p>
-
-  <p>
-    If an unrecognised tag is encountered an REML code the interpreter <em>should</em> report an error. However, providing start and end tags are matched, the interpreter <em>may</em> choose to simply ignore the tags.
-  </p>
-
-  <h2>
-    Block Level Tags
-  </h2>
-
-  <p>
-    Block level tags separate the enclosed text into paragraphs of some description. The supported tags are:
-  </p>
-  <ul class="half-spaced">
-    <li>
-      <code class="value">&lt;p&gt;...&lt;/p&gt;</code> &ndash; Renders the enclosed markup as a simple paragraph. 
-    </li>
-    <li>
-      <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> &ndash; Renders the enclosed markup as a heading.
-    </li>
-    <li>
-      <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> &ndash; Renders the enclosed markup as an ordered list.
-    </li>
-    <li>
-      <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> &ndash; Renders the enclosed markup as an unordered list.
-    </li>
-    <li>
-      <code class="value">&lt;li&gt;...&lt;/li&gt;</code> &ndash; Renders the enclosed markup as a list item.
-    </li>
-  </ul>
-  <p>
-    The following rules apply to the use of block level tags:
-  </p>
-  <ul class="unspaced">
-    <li>
-      <span class="very-strong">Must</span> be matched, e.g. <code class="value">&lt;p&gt;</code> <span class="very-strong">must</span> have a matching <code class="value">&lt;/p&gt;</code>.
-    </li>
-    <li>
-      <code class="value">&lt;p&gt;...&lt;/p&gt;</code> and <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> blocks <span class="very-strong">must not</span> contain other block level tags.
-    </li>
-    <li>
-      <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks <span class="very-strong">must only</span> contain one or more <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks.
-    </li>
-    <li>
-      <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks <span class="very-strong">must</span> only be used within <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks. <em>May</em> contain <code class="value">&lt;p&gt;...&lt;/p&gt;</code> and <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> blocks, but it is permitted to include text and inline tags directly without enclosing them one of the permitted blocks. Nested lists are permitted by including further <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> and <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> blocks.
-    </li>
-    <li>
-      All text <em>should</em> be embedded within <code class="value">&lt;p&gt;...&lt;/p&gt;</code>, <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> or <code class="value">&lt;li&gt;...&lt;/li&gt;</code> block level tags, e.g. <code class="value">&lt;heading&gt;heading&lt;/heading&gt;&lt;p&gt;text&lt;/p&gt;</code> or simply <code class="value">&lt;p&gt;text&lt;/p&gt;</code>.
-    </li>
-    <li>
-      White space between blocks <span class="very-strong">must</span> be ignored.
-    </li>
-  </ul>
-  <p>
-    Here is a valid example:
-  </p>
-  <pre class="sample">&lt;heading&gt;Hello&lt;/heading&gt;
-&lt;p&gt;Hello World&lt;/p&gt;
-&lt;ol&gt;
-  &lt;li&gt;one&lt;/li&gt;
-  &lt;li&gt;&lt;p&gt;two&lt;/p&gt;&lt;/li&gt;
-  &lt;ul&gt;
-    &lt;li&gt;two A&lt;/li&gt;
-    &lt;li&gt;two B&lt;/li&gt;
-  &lt;ul&gt;
-  &lt;li&gt;three&lt;/li&gt;
-&lt;/ol&gt;</pre>
-  <p>
-    Strictly speaking, the following example is invalid code &ndash; all occurrences of <code class="value">wrong</code> are in error because they are not contained within block tags.
-  </p>
-  <pre class="sample">wrong &lt;heading&gt;blah&lt;/heading&gt; wrong &lt;p&gt;blah&lt;/p&gt; wrong</pre>
-  <p>
-    However interpreting code <em>may</em> interpret this permissively. If this is done the text outside blocks <em>should</em> be interpreted as if it was enclosed in <code class="value">&lt;p&gt;</code> and <code class="value">&lt;/p&gt;</code> tags. Therefore the above code would be interpreted as:
+    REML is a little markup language that can be used to style text. It is a SGML language similar to HTML, albeit much smaller. A small number of tags and character entities are supported.
   </p>
-  <pre class="sample">&lt;p&gt;wrong &lt;/p&gt;&lt;heading&gt;blah&lt;/heading&gt;&lt;p&gt;wrong &lt;/p&gt;&lt;p&gt;blah&lt;/p&gt;&lt;p&gt;wrong&lt;/p&gt;</pre>
-  <aside>
-    <strong>Note:</strong> Code Snippets Database collections <em>may</em> contain such non-conforming REML. Therefore interpreters of REML that need to accept such collections <span class="very-strong">must</span> be able to handle text without enclosing block tags.
-  </aside>
 
-  <h2>
-    Inline Tags
-  </h2>
-
-  <p>
-    In-line tags format the text enclosed between the start and end tags.
-  </p>
   <p>
-    Here are the available in-line tags:
+    See the <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v6.html">REML v6 language definition</a> for full details.
   </p>
-  <ul class="half-spaced">
-    <li>
-      <code class="value">&lt;strong&gt;...&lt;/strong&gt;</code> &ndash; Renders the enclosed markup with strong emphasis.
-    </li>
-    <li>
-      <code class="value">&lt;em&gt;...&lt;/em&gt;</code> &ndash; Emphasises the enclosed markup.
-    </li>
-    <li>
-      <code class="value">&lt;var&gt;...&lt;/var&gt;</code> &ndash; Used to indicate the enclosed markup is a variable.
-    </li>
-    <li>
-      <code class="value">&lt;warning&gt;...&lt;/warning&gt;</code> &ndash; Used for warning text.
-    </li>
-    <li>
-      <code class="value">&lt;mono&gt;...&lt;/mono&gt;</code> &ndash; Renders markup in a mono-spaced font.
-    </li>
-    <li>
-      <code class="value">&lt;a href="url"&gt;...&lt;/a&gt;</code> &ndash; Creates a hyper-link. The <code class="value">href</code> attribute <span class="very-strong">must</span> specify the required URL, which <span class="very-strong">must</span> use one of the <code class="value">http</code>, <code class="value">https</code> or <code class="value">file</code> protocols; others are not permitted. If you use the <code class="value">file</code> protocol it <span class="very-strong">must</span> reference a valid local or network file.
-    </li>
-  </ul>
-  <p>
-    The following rules apply to the use of in-line tags:
-  </p>
-  <ul class="unspaced">
-    <li>
-      In-line tags <span class="very-strong">must</span> be embedded inside a valid block level tag. E.g. <code class="value">&lt;p&gt;one&lt;strong&gt;two&lt;/strong&gt;three&lt;/p&gt;</code>.
-    </li>
-    <li>
-      Tags <span class="very-strong">must</span> match. E.g. <code class="value">&lt;em&gt;</code> must be matched with <code class="value">&lt;/em&gt;</code>.
-    </li>
-    <li>
-      Tags may be nested, providing the tags are balanced. E.g. <code class="value">&lt;em&gt;blah &lt;var&gt;blah&lt;/var&gt;&lt;/em&gt;</code> is valid but <code class="value">&lt;em&gt;blah &lt;var&gt;blah&lt;/em&gt;&lt;/var&gt;</code> is not.
-    </li>
-  </ul>
-  <p>
-    Examples:
-  </p>
-  <pre class="sample">&lt;p&gt;Make stuff &lt;strong&gt;stand out&lt;/strong&gt;.&lt;/p&gt;
-&lt;p&gt;&lt;em&gt;Emphasised &lt;warning&gt;warning!&lt;/warning&gt;&lt;/em&gt;&lt;/p&gt;
-&lt;p&gt;Refer to a function &lt;var&gt;parameter&lt;/var&gt;.&lt;/p&gt;
-&lt;p&gt;Use the: &lt;mono&gt;Windows&lt;/mono&gt; unit.&lt;/p&gt;
-&lt;p&gt;See this &lt;a href="https://example.com"&gt;example&lt;/a&gt;.&lt;/p&gt;</pre>
 
 </section>
 
-<section id="entities">
+<section id="reml-in-codesnip">
 
   <h1>
-    Character Entities
+    REML in CodeSnip
   </h1>
 
   <p>
-    Some symbolic character entities are supported in REML. Many symbols, but not all, have analogues in the list of supported character entities in XHTML or HTML 5. Some entities have alternate symbols. Here is the complete list.
+    Code snippets include REML to format snippets' description and extra fields. CodeSnip interprets and renders the REML when displaying snippets in its UI and when printing them.
   </p>
 
-  <table>
-    <thead>
-      <tr>
-        <th>Character Entity</th>
-        <th>Actual Character</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td><code>&amp;amp;</code></td>
-        <td>&amp;</td>
-      </tr>
-      <tr>
-        <td><code>&amp;quot;</code></td>
-        <td>&quot;</td>
-      </tr>
-      <tr>
-        <td><code>&amp;gt;</code></td>
-        <td>&gt;</td>
-      </tr>
-      <tr>
-        <td><code>&amp;lt;</code></td>
-        <td>&lt;</td>
-      </tr>
-      <tr>
-        <td><code>&amp;copy;</code></td>
-        <td>©</td>
-      </tr>
-      <tr>
-        <td><code>&amp;times;</code></td>
-        <td>×</td>
-      </tr>
-      <tr>
-        <td><code>&amp;divide;</code> or <code>&amp;div;</code></td>
-        <td>÷</td>
-      </tr>
-      <tr>
-        <td><code>&amp;plusmn;</code></td>
-        <td>±</td>
-      </tr>
-      <tr>
-        <td><code>&amp;ne;</code> or <code>&amp;neq;</code></td>
-        <td>≠</td>
-      </tr>
-      <tr>
-        <td><code>&amp;sum;</code></td>
-        <td>∑</td>
-      </tr>
-      <tr>
-        <td><code>&amp;infin;</code></td>
-        <td>∞</td>
-      </tr>
-      <tr>
-        <td><code>&amp;pound;</code></td>
-        <td>£</td>
-      </tr>
-      <tr>
-        <td><code>&amp;curren;</code></td>
-        <td>¤</td>
-      </tr>
-      <tr>
-        <td><code>&amp;yen;</code></td>
-        <td>¥</td>
-      </tr>
-      <tr>
-        <td><code>&amp;euro;</code></td>
-        <td>€</td>
-      </tr>
-      <tr>
-        <td><code>&amp;cent;</code></td>
-        <td>¢</td>
-      </tr>
-      <tr>
-        <td><code>&amp;dagger;</code></td>
-        <td>†</td>
-      </tr>
-      <tr>
-        <td><code>&amp;ddagger;</code> or <code>&amp;Dagger;</code></td>
-        <td>‡</td>
-      </tr>
-      <tr>
-        <td><code>&amp;hellip;</code></td>
-        <td>…</td>
-      </tr>
-      <tr>
-        <td><code>&amp;para;</code></td>
-        <td>¶</td>
-      </tr>
-      <tr>
-        <td><code>&amp;sect;</code></td>
-        <td>§</td>
-      </tr>
-      <tr>
-        <td><code>&amp;reg;</code></td>
-        <td>®</td>
-      </tr>
-      <tr>
-        <td><code>&amp;frac14;</code></td>
-        <td>¼</td>
-      </tr>
-      <tr>
-        <td><code>&amp;frac12;</code> or <code>&amp;half;</code></td>
-        <td>½</td>
-      </tr>
-      <tr>
-        <td><code>&amp;frac34;</code></td>
-        <td>¾</td>
-      </tr>
-      <tr>
-        <td><code>&amp;micro;</code></td>
-        <td>µ</td>
-      </tr>
-      <tr>
-        <td><code>&amp;deg;</code></td>
-        <td>°</td>
-      </tr>
-      <tr>
-        <td><code>&amp;laquo;</code></td>
-        <td>«</td>
-      </tr>
-      <tr>
-        <td><code>&amp;raquo;</code></td>
-        <td>»</td>
-      </tr>
-      <tr>
-        <td><code>&amp;iquest;</code></td>
-        <td>¿</td>
-      </tr>
-      <tr>
-        <td><code>&amp;apos;</code></td>
-        <td>'</td>
-      </tr>
-    </tbody>
-  </table>
-
-  <aside>
-    <strong>Note:</strong> the '&lt;' and '&amp;' characters are special within the markup and cannot be used literally, even when you are just entering plain text. You <span class="very-strong">must</span> use the <code class="value">&amp;lt;</code> character entity in place of <code class="value">&lt;</code> and <code class="value">&amp;amp;</code> instead of <code class="value">&amp;</code>. For example to write <code class="value">x&lt;y</code> in REML use <code class="value">x&amp;lt;y</code> and to write <code class="value">you &amp; me</code> use <code class="value">you &amp;amp; me</code>.
-  </aside>
-
   <p>
-    To express other special symbols for which there is no symbolic character entity, numeric character entities can be used. For example to display the 'Ω' character (Unicode <em>Greek capital letter Omega</em>) use <code class="value">&amp;#937;</code>.
+    CodeSnip currently supports REML v6. Earlier versions of CodeSnip supported different versions of REML:
   </p>
-
-  <aside>
-    <strong>Note:</strong> Numeric entities should be used with caution because the characters they represent may vary across different text encodings, whereas symbolic entities are safe across encodings.
-  </aside>
-
-</section>
-
-
-<section id="changes">
-
-  <h1>Change Log</h1>
-
-  <p>
-    This section notes the changes in the various versions of REML.
-  </p>
-
-  <p>
-    <strong>v1 of 2008-12-31</strong>
-  </p>
-
-  <p>
-    Introduced in CodeSnip v2.2.5
-  </p>
-
-  <ul>
-    <li>
-      Supported tags: <code class="value">&lt;strong&gt;</code> and <code class="value">&lt;a&gt;</code>.
-    </li>
-    <li>
-      Supported entities: <code class="value">&amp;gt;</code>, <code class="value">&amp;lt;</code>, <code class="value">&amp;quot;</code> and <code class="value">&amp;amp;</code>.
-    </li>
-    <li>
-      Supported protocols for use in <code class="value">&lt;a&gt;</code> tags: <code class="value">http</code>.
-    </li>
-  </ul>
-
-  <p>
-    <strong>v2 of 2009-06-29</strong>
-  </p>
-
-  <p>
-    Introduced in CodeSnip v3.0
-  </p>
-
-  <ul>
-    <li>
-      Added tags: <code class="value">&lt;em&gt;</code>, <code class="value">&lt;var&gt;</code>, <code class="value">&lt;warning&gt;</code>, <code class="value">&lt;mono&gt;</code>, <code class="value">&lt;p&gt;</code> and <code class="value">&lt;heading&gt;</code>.
-    </li>
-    <li>
-      Added entity: <code class="value">&amp;copy;</code>.
-    </li>
-  </ul>
-
-  <p>
-    <strong>v3 of 2009-07-06</strong>
-  </p>
-
-  <p>
-    Introduced in CodeSnip v3.0.1
-  </p>
-
-  <ul>
-    <li>
-      Added protocol for use in <code class="value">&lt;a&gt;</code> tags: <code class="value">file</code>.
-    </li>
-  </ul>
-
-  <p>
-    <strong>v4 of 2011-12-31</strong>
-  </p>
-
-  <p>
-    Introduced in CodeSnip v4.0 alpha 1 (preview)
-  </p>
-
-  <ul>
-    <li>
-      Added protocol for use in <code class="value">&lt;a&gt;</code> tags: <code class="value">https</code>.
-    </li>
-  </ul>
-
-  <p>
-    <strong>v5 of 2022-12-16</strong>
-  </p>
-
-  <p>
-    Introduced in CodeSnip v4.21.0
-  </p>
-
+  
   <ul>
-    <li>
-      Added support for lists with the <code class="value">&lt;ol&gt;</code>, <code class="value">&lt;ul&gt;</code> &amp; <code class="value">&lt;li&gt;</code> block tags.
-    </li>
-    <li>
-      Added entities: <code class="value">&amp;times;</code>, <code class="value">&amp;divide;</code>, <code class="value">&amp;div;</code> <code class="value">&amp;plusmn;</code>, <code class="value">&amp;ne;</code>, <code class="value">&amp;neq;</code>, <code class="value">&amp;sum;</code>, <code class="value">&amp;infin;</code>, <code class="value">&amp;pound;</code>, <code class="value">&amp;curren;</code>, <code class="value">&amp;yen;</code>, <code class="value">&amp;euro;</code>, <code class="value">&amp;cent;</code>, <code class="value">&amp;dagger;</code>, <code class="value">&amp;ddagger;</code>, <code class="value">&amp;Dagger;</code>, <code class="value">&amp;hellip;</code>, <code class="value">&amp;para;</code>, <code class="value">&amp;sect;</code>, <code class="value">&amp;reg;</code>, <code class="value">&amp;frac14;</code>, <code class="value">frac12</code>, <code class="value">&amp;half;</code>, <code class="value">&amp;frac34;</code>, <code class="value">&amp;micro;</code>, <code class="value">&amp;deg;</code>, <code class="value">&amp;laquo;</code>, <code class="value">&amp;raquo;</code> &amp; <code class="value">&amp;iquest;</code>.
-    </li>
+    <li>REML v1 was first supported by CodeSnip v2.2.5</li>
+    <li>REML v2 was first supported by CodeSnip v3.0</li>
+    <li>REML v3 was first supported by CodeSnip v3.0.1</li>
+    <li>REML v4 was first supported by CodeSnip v4.0 alpha 1 (preview)</li>
+    <li>REML v5 was first supported by CodeSnip v4.21.0</li>
+    <li>REML v6 was first supported by CodeSnip v4.23.0</li>
   </ul>
 
   <p>
-    <strong>v6 of 2024-04-02</strong>
+    All CodeSnip versions are backward compatible with earlier versions of REML.
   </p>
 
-  <p>
-    Introduced in CodeSnip v4.23.0
-  </p>
+</section>
 
-  <ul>
-    <li>
-      Added entity: <code class="value">&amp;apos;</code>.
-    </li>
-  </ul>
-  
-  </section>
+</main>
 
 </body>
 

From fca862c6d28a2b3fed1fa43a2e3852293791d6e0 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 8 Apr 2024 08:46:15 +0100
Subject: [PATCH 174/264] Rewite REML help topic

REML language definition was replaced with a link to the definition on
the delphidabbler/reml project.

Added a brief preamble and an example that uses all supported tags.
Added screens shot image to illustrate example.
---
 Src/Help/HTML/reml.htm          | 387 ++++----------------------------
 Src/Help/Images/REMLExample.png | Bin 0 -> 47280 bytes
 2 files changed, 47 insertions(+), 340 deletions(-)
 create mode 100644 Src/Help/Images/REMLExample.png

diff --git a/Src/Help/HTML/reml.htm b/Src/Help/HTML/reml.htm
index 3b6753a59..0783817a5 100644
--- a/Src/Help/HTML/reml.htm
+++ b/Src/Help/HTML/reml.htm
@@ -15,20 +15,6 @@
       About REML
     </title>
     <link rel="stylesheet" href="../css/codesnip.css" type="text/css">
-    <style type="text/css">
-      dl {
-        margin: 6px 0 0 0;
-      }
-      dl dt {
-        margin: 3px 0 0 0;
-      }
-      dl dd {
-        margin-left: 24px;
-      }
-      .hilite {
-        background-color: #ff9;
-      }
-    </style>
   </head>
   <body>
     <object
@@ -41,341 +27,62 @@ <h1>
       <a name="reml"></a>About the REML markup language
     </h1>
     <p>
-      <em>REML</em> is <em>CodeSnip</em>'s own little markup language that can
-      be used to style the text of a snippet's description and / or extra
-      information. The latest version is v6, which is backwards compatible with
-	    all other versions.
+      REML is a little markup language that can be used to style text. It is a SGML language similar to HTML, albeit much smaller. A small number of tags and character entities are supported.
     </p>
-    <h2>
-      Language Details
-    </h2>
     <p>
-      The <em>REML</em> language is a SGML language similar to a greatly
-      simplified XHTML. The are a small number of tags you can use. Firstly
-      there are two block-level tags that render text in paragraphs, while the
-      other tags format text inline or embed hyplerlinks.
+      CodeSnip currently supports REML v6. See the <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v6.html">REML v6 language definition</a> for full details.
     </p>
-    <h3>
-      Block level tags
-    </h3>
-    <dl>
-      <dt><code class="reml">&lt;p&gt;...&lt/p&gt;</code></dt>
-      <dd>
-        Renders the enclosed markup as a simple paragraph.
-      </dd>
-      <dt><code class="reml">&lt;heading&gt;...&lt;/heading&gt;</code></dt>
-      <dd>
-        Renders the enclosed markup as a heading.
-      </dd>
-      <dt><code class="reml">&lt;ol&gt;...&lt;/ol&gt;</code></dt>
-      <dd>
-        Renders the enclosed HTML as an ordered list. Must contain
-        <code class="value">&lt;li&gt;...&lt;/li&gt</code> blocks and nothing
-        else.
-      </dd>
-      <dt><code class="reml">&lt;ul&gt;...&lt;/ul&gt;</code></dt>
-      <dd>
-        Renders the enclosed HTML as an unordered list. Must contain
-        <code class="value">&lt;li&gt;...&lt;/li&gt</code> blocks and nothing
-        else.
-      </dd>
-      <dt><code class="reml">&lt;l1&gt;...&lt;/li&gt;</code></dt>
-      <dd>
-        Renders the enclosed HTML as a list item. May only be used within
-        <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and
-        <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks.
-      </dd>
-    </dl>
     <p>
-      The following rules apply to the use of block level tags:
-    </p>
-    <ol>
-      <li>
-        Must be matched, e.g.
-        <code class="value">&lt;p&gt;</code> must have a matching
-        <code class="value">&lt;/p&gt;</code>.
-      </li>
-      <li>
-        <code class="value">&lt;p&gt;...&lt;/p&gt;</code> and
-        <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> blocks
-        must not contain other block level tags.
-      </li>
-      <li>
-        <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> and
-        <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code> blocks must only
-        contain one or more
-        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks.
-      </li>
-      <li>
-        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> blocks may contain
-        <code class="value">&lt;p&gt;...&lt;/p&gt;</code> and
-        <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> blocks,
-        but it is permitted to include text and inline tags directly without
-        enclosing them one of the permitted blocks. Nested lists are permitted
-        by including further <code class="value">&lt;ul&gt;...&lt;/ul&gt;</code>
-        and <code class="value">&lt;ol&gt;...&lt;/ol&gt;</code> blocks.
-      </li>
-      <li>
-        All text should be embedded within
-        <code class="value">&lt;p&gt;...&lt;/p&gt;</code>,
-        <code class="value">&lt;heading&gt;...&lt;/heading&gt;</code> or
-        <code class="value">&lt;li&gt;...&lt;/li&gt;</code> block level tags,
-        e.g. <code class="value"
-        >&lt;heading&gt;heading&lt;/heading&gt;&lt;p&gt;text&lt;/p&gt;</code>
-        or simply <code class="value">&lt;p&gt;text&lt;/p&gt;</code>.
-      </li>
-      <li>
-        White space between blocks must be ignored.
-      </li>
-    </ol>
-    <p>
-      Here is a valid example:
-    </p>
-    <pre class="sample">&lt;heading&gt;Hello&lt;/heading&gt;
-&lt;p&gt;Hello World&lt;/p&gt;
+      The following whimsical example demonstrates every supported REML tag along with a couple of character entities:
+<pre class="reml">&lt;heading&gt;
+  Wombat converter
+&lt;/heading&gt;
+&lt;p&gt;
+ Transforms &lt;strong&gt;wombats&lt;/strong&gt; into &lt;em&gt;dongles&lt;/em&gt;.
+ &lt;warning&gt;&lt;em&gt;W&lt;/em&gt;arning:&lt;/warning&gt; The &lt;var&gt;Foo&lt;/var&gt;
+ variable stores &amp;lt;=&lt;mono&gt;12&lt;/mono&gt; accumulated &lt;mono&gt;dongles&lt;/mono&gt;.
+&lt;/p&gt;
+&lt;p&gt;
+ All 3 species of wombat are supported:
+&lt;/p&gt;
 &lt;ol&gt;
-  &lt;li&gt;one&lt;/li&gt;
-  &lt;li&gt;&lt;p&gt;two&lt;/p&gt;&lt;/li&gt;
-  &lt;ul&gt;
-    &lt;li&gt;two A&lt;/li&gt;
-    &lt;li&gt;two B&lt;/li&gt;
-  &lt;ul&gt;
-  &lt;li&gt;three&lt;/li&gt;
-&lt;/ol&gt;</pre>
-          <p>
-      Srictly speaking, the following example is invalid code &ndash; the
-      highlighted sections are in error, because they are not contained within
-      block tags.
-    </p>
-    <pre class="reml indent"><span class="hilite">blah</span>&lt;heading&gt;blah&lt;/heading&gt;<span class="hilite">blah</span>&lt;p&gt;blah&lt;/p&gt;<span class="hilite">blah</span></pre>
-    <p>
-      However, <em>CodeSnip</em> is quite permissive and, in many cases,
-      automatically adds block level tags for text that is not enclosed in block
-      level tags. The above code is interpreted similar ro:
-    </p>
-    <pre class="reml indent">&lt;p&gt;<span class="hilite">blah</span> &lt;/p&gt;
-&lt;heading&gt;blah&lt;/heading&gt;
-&lt;p&gt;<span class="hilite">blah</span> &lt;/p&gt;
-&lt;p&gt;blah&lt;/p&gt;
-&lt;p&gt;<span class="hilite">blah</span>&lt;/p&gt;</pre>
-    <h3>
-      Inline tags
-    </h3>
-    <p>
-      Here are the available inline tags:
-    </p>
-    <dl>
-      <dt><code class="reml">&lt;strong&gt;...&lt/strong&gt;</code></dt>
-      <dd>
-        Renders the enclosed markup with strong emphasis.<br>
-        <em>Example:</em> <code class="reml">&lt;p&gt;Make stuff
-        &lt;strong&gt;stand out&lt;/strong&gt;.&lt;/p&gt;</code>
-      </dd>
-      <dt><code class="reml">&lt;em&gt;...&lt;/em&gt;</code></dt>
-      <dd>
-        Emphasises the enclosed markup.<br>
-        <em>Example:</em> <code class="reml">&lt;p&gt;Draw
-        &lt;em&gt;attention&lt;/em&gt; to something.&lt;/p&gt;</code>
-      </dd>
-      <dt><code class="reml">&lt;var&gt;...&lt;/var&gt;</code></dt>
-      <dd>
-        Used to indicate the enclosed markup is a variable.<br>
-        <em>Example:</em> <code class="reml">&lt;p&gt;Refer to a function
-        &lt;var&gt;parameter&lt;/var&gt;.&lt;/p&gt;</code>
-      </dd>
-      <dt><code class="reml">&lt;warning&gt;...&lt;/warning&gt;</code></dt>
-      <dd>
-        Used for warning text.<br>
-        <em>Example:</em>
-        <code class="reml">&lt;p&gt;&lt;warning&gt;Warning:&lt;/warning&gt;
-        Don't do it!&lt;/p&gt;</code>
-      </dd>
-      <dt><code class="reml">&lt;mono&gt;...&lt;/mono&gt;</code></dt>
-      <dd>
-        Renders markup in a mono-spaced font.<br>
-        <em>Example:</em> <code class="reml">&lt;p&gt;Use the:
-        &lt;mono&gt;Windows&lt;/mono&gt; unit.&lt;/p&gt;</code>
-      </dd>
-      <dt><code class="reml">&lt;a href=&quot;url&quot;&gt;...&lt;/a&gt;</code></dt>
-      <dd>
-        Creates a hyperlink. The <code class="reml">href</code> attribute must
-        specify the required URL, which must use one of the <em>http:</em>,
-        <em>https:</em> or <em>file:</em> protocols; others are not permitted.
-        If you use the <em>file:</em> protocol it must reference a valid local
-        or network file. Be aware that if you export a snippet
-        containing a hyperlink that uses the <em>file:</em> protocol it will
-        only work on the recipient's system if the specified file exists in the
-        same location.<br>
-        <em>Example:</em> <code class="reml">&lt;p&gt;&lt;a
-        href=&quot;https://example.com&quot;&gt;Visit
-        example.com&lt;/a&gt;&lt/p&gt;.</code>.
-      </dd>
-    </dl>
-    <h3 id="entities">
-      Character Entities
-    </h3>
-    <p>
-      The &quot;&lt;&quot; and &quot;&amp;&quot; characters are special within
-      the markup and must not be used directly, even when you are just entering
-      plain text. You must use the <code class="reml">&amp;lt;</code> character
-      entity in place of &quot;&lt;&quot; and
-      <code class="reml">&amp;amp;</code> instead of &quot;&amp;&quot;.
-    </p>
-    <p>
-      A few other character entities are supported for convenience. Here is the
-      complete list:
-    </p>
-    <table class="bordered" cellspacing="1" cellpadding="0">
-      <thead>
-        <tr>
-          <th>Character Entity</th>
-          <th>Actual Character</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td><code>&amp;amp;</code></td>
-          <td class="centre">&amp;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;quot;</code></td>
-          <td class="centre">&quot;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;gt;</code></td>
-          <td class="centre">&gt;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;lt;</code></td>
-          <td class="centre">&lt;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;copy;</code></td>
-          <td class="centre">&copy;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;times;</code></td>
-          <td class="centre">&times;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;divide;</code> or <code>&amp;div;</code></td>
-          <td class="centre">&divide;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;plusmn;</code></td>
-          <td class="centre">&plusmn;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;ne;</code> or <code>&amp;neq;</code></td>
-          <td class="centre">&ne;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;sum;</code></td>
-          <td class="centre">&sum;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;infin;</code></td>
-          <td class="centre">&infin;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;pound;</code></td>
-          <td class="centre">&pound;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;curren;</code></td>
-          <td class="centre">&curren;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;yen;</code></td>
-          <td class="centre">&yen;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;euro;</code></td>
-          <td class="centre">&euro;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;cent;</code></td>
-          <td class="centre">&cent;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;dagger;</code></td>
-          <td class="centre">&dagger;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;ddagger;</code> or <code>&amp;Dagger;</code></td>
-          <td class="centre">&ddagger;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;hellip;</code></td>
-          <td class="centre">&hellip;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;para;</code></td>
-          <td class="centre">&para;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;sect;</code></td>
-          <td class="centre">&sect;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;reg;</code></td>
-          <td class="centre">&reg;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;frac14;</code></td>
-          <td class="centre">&frac14;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;frac12;</code> or <code>&amp;half;</code></td>
-          <td class="centre">&frac12;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;frac34;</code></td>
-          <td class="centre">&frac34;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;micro;</code></td>
-          <td class="centre">&micro;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;deg;</code></td>
-          <td class="centre">&deg;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;laquo;</code></td>
-          <td class="centre">&laquo;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;raquo;</code></td>
-          <td class="centre">&raquo;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;iquest;</code></td>
-          <td class="centre">&iquest;</td>
-        </tr>
-        <tr>
-          <td><code>&amp;apos;</code></td>
-          <td class="centre">&apos;</td>
-        </tr>
-      </tbody>
-    </table>
-    <p>
-      By way of an example, if you want to display <code>x &ne; y</code>, use:
-    </p>
-    <p class="indent">
-      <code class="reml">x &amp;ne; y</code>
+ &lt;li&gt;
+   &lt;p&gt;
+     &lt;a href="https://en.wikipedia.org/wiki/Common_wombat"&gt;Common
+     wombat&lt;/a&gt;. The following sub-species are supported:
+   &lt;/p&gt;
+   &lt;ul&gt;
+     &lt;li&gt;
+       Bass Strait wombat
+     &lt;/li&gt;
+     &lt;li&gt;
+       Hirsute wombat
+     &lt;/li&gt;
+     &lt;li&gt;
+       Tasmanian wombat
+     &lt;/li&gt;
+   &lt;/ul&gt;
+ &lt;/li&gt;
+ &lt;li&gt;
+   Northen hairy-nosed wombat
+ &lt;/li&gt;
+ &lt;li&gt;
+   Southern hairy-nosed wombat
+ &lt;/li&gt;
+&lt;/ol&gt;
+&lt;p&gt;
+ Copyright &amp;copy; wombaterama, 2024.
+&lt;/p&gt;</pre>
     </p>
     <p>
-      No other symbolic character entities are supported.
-      However, numeric character entities can be used to insert other characters
-      by specifying its code. For example <code class="reml">&amp;#64;</code> is
-      equivalent to &quot;&#64;&quot;.
+      All this silliness renders something like this:
     </p>
     <p>
-      Numeric entities should be used with caution. Using a code that is
-      specific to an ANSI character set may cause unexpected results because
-      <em>CodeSnip</em> uses Unicode internally and the specified character code
-      may not represent the same character in ANSI and Unicode.
+      <img
+        src="..\Images\REMLExample.png"
+        width="379"
+        height="198"
+      >
     </p>
   </body>
 </html>
diff --git a/Src/Help/Images/REMLExample.png b/Src/Help/Images/REMLExample.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e7a49f5bee6ce5ebb8a6c54f70e776991471493
GIT binary patch

From bbdbdcaa87d613eaa18272d68516fbc2894c9c43 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 23 Oct 2024 05:56:37 +0100
Subject: [PATCH 175/264] Reverse order of compilers in Snippets Editor

Order of compilers on the Compile Results tab was reversed.

Fixes #135
---
 Src/UCompileResultsLBMgr.pas | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Src/UCompileResultsLBMgr.pas b/Src/UCompileResultsLBMgr.pas
index 6d8fd29bd..c94b7fcab 100644
--- a/Src/UCompileResultsLBMgr.pas
+++ b/Src/UCompileResultsLBMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines classes that manages display and interaction with a list box that
  * displays compiler results.
@@ -600,13 +600,18 @@ procedure TCompileResultsLBMgr.PopulateListBox;
   'unknown'.
   }
 var
-  Compiler: ICompiler;  // each supported compiler
+  Compiler: ICompiler;
+  CompilerId: TCompilerID;
 begin
-  for Compiler in fCompilers do
+  // Populate list box in reverse order of compiler ID
+  for CompilerId := High(TCompilerID) downto Low(TCompilerID) do
+  begin
+    Compiler := fCompilers[CompilerId];
     fLB.Items.AddObject(
       Compiler.GetName,
       TCompilerInfo.Create(Compiler.GetID, crQuery)
     );
+  end;
 end;
 
 procedure TCompileResultsLBMgr.SetCompileResult(const Index: Integer;

From 1ab44ec348e90be5dbf8a5360677263240279333 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 23 Oct 2024 06:10:09 +0100
Subject: [PATCH 176/264] Fix bug in TFileIO.CheckBOM (TStream overload)

Method was returning True for encodings with zero length BOMs instead of
the False result per documentation.

Fixes #139
---
 Src/UIOUtils.pas | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Src/UIOUtils.pas b/Src/UIOUtils.pas
index 88beb3afa..09b02879d 100644
--- a/Src/UIOUtils.pas
+++ b/Src/UIOUtils.pas
@@ -206,6 +206,8 @@ class function TFileIO.CheckBOM(const Stream: TStream;
   Assert(Assigned(Stream), 'TFileIO.CheckBOM: Stream is nil');
   Assert(Assigned(Encoding), 'TFileIO.CheckBOM: Encoding is nil');
   Preamble := Encoding.GetPreamble;
+  if Length(Preamble) = 0 then
+    Exit(False);
   if Stream.Size < Length(Preamble) then
     Exit(False);
   OldPos := Stream.Position;

From 2a323b6c524ca1ac106b65d3a2f5a22cfb7a6d83 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 23 Oct 2024 12:40:24 +0100
Subject: [PATCH 177/264] Update Build.html with alternate zip download link

The old link to InfoZip zip.exe is http only. Added an alternative
https link that gets the file from delphidabbler.com.

Fixes #137
---
 Build.html | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Build.html b/Build.html
index ba8a9086f..5dde59363 100644
--- a/Build.html
+++ b/Build.html
@@ -284,11 +284,19 @@ <h3>
 </h3>
 
 <p>
-  This program is used to create <em>CodeSnip</em>'s release file.
-  You can get a Windows command line version at
+  This program is used to create <em>CodeSnip</em>'s release file. The InfoZip
+  version of zip is required. You can get a Windows command line version at
   <a
     href="http://stahlforce.com/dev/index.php?tool=zipunzip"
-  >http://stahlforce.com/dev/index.php?tool=zipunzip</a>.
+  >http://stahlforce.com/dev/index.php?tool=zipunzip</a>. 
+</p>
+
+<p class="note">
+  <strong>Warning:</strong> The above link is <code>http</code> only. If you or
+  your browser object to the insecure link you can download an identical version
+  from delphidabbler.com, using the <code>https</code> protocol. See <a
+    href="https://delphidabbler.com/extras/info-zip"
+  >https://delphidabbler.com/extras/info-zip</a>.
 </p>
 
 <p>

From 5217e273f4a81760a3b1ccd80bd63ab3e037a23a Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 23 Oct 2024 13:06:47 +0100
Subject: [PATCH 178/264] Update user-db.html with links to REML documentation

Fixes #134
---
 Docs/Design/FileFormats/user-db.html | 50 ++++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/Docs/Design/FileFormats/user-db.html b/Docs/Design/FileFormats/user-db.html
index bc761983e..d8d7773f0 100644
--- a/Docs/Design/FileFormats/user-db.html
+++ b/Docs/Design/FileFormats/user-db.html
@@ -322,15 +322,15 @@ <h3 id="xml-file">
       </li>
       <li>
         <span class="highlight">version 6.0 to 6.10:</span> Content is formatted text
-        encoded in REML markup. REML v4 is supported.
+        encoded in <a href="../reml.html">REML</a> markup. <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v4.html">REML v4</a> is supported.
       </li>
       <li>
         <span class="highlight">version 6.11 &amp; 6.12:</span> Content is formatted text
-        encoded in REML markup. REML v5 is supported.
+        encoded in <a href="../reml.html">REML</a> markup. <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v5.html">REML v5</a> is supported.
       </li>
       <li>
         <span class="highlight">version 6.13 &amp; later:</span> Content is formatted text
-        encoded in REML markup. REML v6 is supported.
+        encoded in <a href="../reml.html">REML</a> markup. <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v6.html">REML v6</a> is supported.
       </li>
     </ul>
   </dd>
@@ -460,26 +460,26 @@ <h3 id="xml-file">
           <div class="unspaced">
             <span class="highlight">version 2 and later:</span> Additional
             information about a snippet. Content is formatted text encoded in
-            REML markup.
+            <a href="../reml.html">REML</a> markup.
           </div>
           <ul class="squashed">
             <li>
-              <span class="highlight">version 2:</span> supports REML v1.
+              <span class="highlight">version 2:</span> supports <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v1.html">REML v1</a>.
             </li>
             <li>
-              <span class="highlight">version 3:</span> supports REML v2.
+              <span class="highlight">version 3:</span> supports <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v2.html">REML v2</a>.
             </li>
             <li>
-              <span class="highlight">version 4:</span> supports REML v3.
+              <span class="highlight">version 4:</span> supports <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v3.html">REML v3</a>.
             </li>
             <li>
-              <span class="highlight">versions 5 &amp; 6.10:</span> supports REML v4.
+              <span class="highlight">versions 5 &amp; 6.10:</span> supports <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v4.html">REML v4</a>.
             </li>
             <li>
-              <span class="highlight">version 6.11 &amp; 6.12:</span> supports REML v5.
+              <span class="highlight">version 6.11 &amp; 6.12:</span> supports <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v5.html">REML v5</a>.
             </li>
             <li>
-              <span class="highlight">version 6.13 &amp; later:</span> supports REML v6.
+              <span class="highlight">version 6.13 &amp; later:</span> supports <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v6.html">REML v6</a>.
             </li>
           </ul>
         </li>
@@ -788,7 +788,7 @@ <h2>
       Supported Delphi compilers from Delphi 2 to Delphi 2007 plus Free Pascal.
     </p>
     <p>
-      REML not supported.
+      <a href="../reml.html">REML</a> not supported.
     </p>
     <p>
       Data files were ANSI text using code page 1252. The XML file was in UTF-8 format with no BOM and no XML encoding attribute.
@@ -833,8 +833,8 @@ <h2>
       </li>
     </ul>
     <p>
-      The version of REML supported by the
-      <em>codesnip-data/routines/routine/extra</em> tag was v1.
+      The version of <a href="../reml.html">REML</a> supported by the
+      <em>codesnip-data/routines/routine/extra</em> tag was <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v1.html">v1</a>.
     </p>
   </dd>
 
@@ -862,8 +862,8 @@ <h2>
       </li>
     </ul>
     <p>
-      The version of REML supported by the
-      <em>codesnip-data/routines/routine/extra</em> tag was updated to v2.
+      The version of <a href="../reml.html">REML</a> supported by the
+      <em>codesnip-data/routines/routine/extra</em> tag was updated to <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v2.html">v2</a>.
     </p>
   </dd>
 
@@ -875,8 +875,8 @@ <h2>
       Introduced with CodeSnip v3.0.1.
     </p>
     <p>
-      The version of REML supported by the
-      <em>codesnip-data/routines/routine/extra</em> tag was updated to v3.
+      The version of <a href="../reml.html">REML</a> supported by the
+      <em>codesnip-data/routines/routine/extra</em> tag was updated to <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v3.html">v3</a>.
     </p>
     <dl>
       <dt>
@@ -937,8 +937,8 @@ <h2>
       New &quot;class&quot and &quot;unit&quot; snippet kinds supported.
     </p>
     <p>
-      The version of REML supported by the
-      <em>codesnip-data/routines/routine/extra</em> tag was updated to v4.
+      The version of <a href="../reml.html">REML</a> supported by the
+      <em>codesnip-data/routines/routine/extra</em> tag was updated to <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v4.html">v4</a>.
     </p>
   </dd>
 
@@ -950,7 +950,7 @@ <h2>
       Introduced with CodeSnip v4.0 beta 1.
     </p>
     <p>
-      A snippet's description is now stored as formatted text using REML v4 markup. Previously the description was plain text.
+      A snippet's description is now stored as formatted text using <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v4.html">REML v4</a> markup. Previously the description was plain text.
     </p>
     <p>
       The following tags were introduced:
@@ -1028,7 +1028,7 @@ <h2>
         <em>Version 6.11 - 16 December 2022</em>
       </dt>
       <dd>
-        Updated with CodeSnip v4.21.0 to add support for REML v5, which is backwards compatible with REML v4.
+        Updated with CodeSnip v4.21.0 to add support for <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v5.html">REML v5</a>, which is backwards compatible with <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v4.html">REML v4</a>.
       </dd>
       <dt>
         <em>Version 6.12 - 7 November 2023</em>
@@ -1040,7 +1040,7 @@ <h2>
         <em>Version 6.13 - 2 April 2024</em>
       </dt>
       <dd>
-        Updated with CodeSnip v4.23.0 to add support for REML v6, which is backwards compatible with REML v4.
+        Updated with CodeSnip v4.23.0 to add support for <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v6.html">REML v6</a>, which is backwards compatible with <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v4.html">REML v4</a>.
       </dd>
     </dl>
   </dd>
@@ -1073,7 +1073,7 @@ <h3>
 </ul>
 
 <p>
-  into valid REML code that simulates the parsed content of the <em>codesnip-data/routines/routine/extra</em> tag.
+  into valid <a href="../reml.html">REML</a> code that simulates the parsed content of the <em>codesnip-data/routines/routine/extra</em> tag.
 </p>
 
 <p>
@@ -1090,7 +1090,7 @@ <h3>
 <ul>
   <li>
     Convert the plain text snippet description read from
-    <em>codesnip-data/routines/routine/description</em> into the REML
+    <em>codesnip-data/routines/routine/description</em> into the <a href="../reml.html">REML</a>
     equivalent of a single paragraph containing the description.
   </li>
   <li>
@@ -1100,7 +1100,7 @@ <h3>
 </ul>
 
 <p>
-  Readers of v2 and later files may parse REML from any file version as if it were REML v6, since all versions of REML up to v6 are compatible.
+  Readers of v2 and later files may parse <a href="../reml.html">REML</a> from any file version as if it were <a href="https://htmlpreview.github.io/?https://raw.githubusercontent.com/delphidabbler/reml/main/docs/reml-v6.html">REML v6</a>, since all versions of REML up to v6 are compatible.
 </p>
 
 <h3>

From 45b06d76452947e9ff3d193f9ed857f823faec4d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 23 Oct 2024 17:02:40 +0100
Subject: [PATCH 179/264] Omit untested compilers from generated snippet info

Modified TSnippetDoc base class to filter out compilers without any test
information and to use a special no tests message where no test
compilations have been recorded.

Modified both TTextSnippetDoc & TRTFSnippetDoc to render new "no tests"
message.

Also modified TRTFSnippetDoc to widen spacing between Compiler name and
result in compile results table.

Fixes #143
---
 Src/URTFSnippetDoc.pas  | 28 ++++++++++++++++++++++---
 Src/USnippetDoc.pas     | 45 ++++++++++++++++++++++++++++++-----------
 Src/UTextSnippetDoc.pas | 15 +++++++++++++-
 3 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/Src/URTFSnippetDoc.pas b/Src/URTFSnippetDoc.pas
index b4f41d63a..0fe04c353 100644
--- a/Src/URTFSnippetDoc.pas
+++ b/Src/URTFSnippetDoc.pas
@@ -93,10 +93,14 @@   TRTFSnippetDoc = class(TSnippetDoc)
     ///  to document.</summary>
     procedure RenderTitledList(const Title: string; List: IStringList);
       override;
-    ///  <summary>Adds given compiler info, preceeded by given heading, to
-    ///  document.</summary>
+    ///  <summary>Output given compiler test info, preceded by given heading.
+    ///  </summary>
     procedure RenderCompilerInfo(const Heading: string;
       const Info: TCompileDocInfoArray); override;
+    ///  <summary>Output message stating that there is no compiler test info,
+    ///  preceded by given heading.</summary>
+    procedure RenderNoCompilerInfo(const Heading, NoCompileTests: string);
+      override;
     ///  <summary>Interprets and adds given extra information to document.
     ///  </summary>
     ///  <remarks>Active text formatting is observed and styled to suit
@@ -341,7 +345,8 @@ procedure TRTFSnippetDoc.RenderCompilerInfo(const Heading: string;
   TabStop: SmallInt;              // tab stop where compile result displayed
 begin
   // Calculate tab stop where compile results are displayed
-  TabStop := (MaxCompilerNameLenInTwips div IndentDelta) * IndentDelta + IndentDelta;
+  TabStop := (MaxCompilerNameLenInTwips div IndentDelta) * IndentDelta
+    + 2 * IndentDelta;
   // Display heading
   fBuilder.SetFontStyle([fsBold]);
   fBuilder.SetParaSpacing(
@@ -423,6 +428,23 @@ procedure TRTFSnippetDoc.RenderHeading(const Heading: string;
   fBuilder.EndPara;
 end;
 
+procedure TRTFSnippetDoc.RenderNoCompilerInfo(const Heading,
+  NoCompileTests: string);
+begin
+  // Display heading
+  fBuilder.SetFontStyle([fsBold]);
+  fBuilder.SetParaSpacing(
+    TRTFParaSpacing.Create(ParaSpacing, ParaSpacing / 3)
+  );
+  fBuilder.AddText(Heading);
+  fBuilder.ResetCharStyle;
+  fBuilder.EndPara;
+  fBuilder.ClearParaFormatting;
+  fBuilder.SetFontSize(ParaFontSize);
+  fBuilder.AddText(NoCompileTests);
+  fBuilder.EndPara;
+end;
+
 procedure TRTFSnippetDoc.RenderSourceCode(const SourceCode: string);
 var
   Renderer: IHiliteRenderer;  // renders highlighted source as RTF
diff --git a/Src/USnippetDoc.pas b/Src/USnippetDoc.pas
index 17fbe309b..35cd8e94a 100644
--- a/Src/USnippetDoc.pas
+++ b/Src/USnippetDoc.pas
@@ -39,7 +39,7 @@   TCompileDocInfo = record
 
 type
   ///  <summary>Array of textual compiler result information.</summary>
-  TCompileDocInfoArray = array of TCompileDocInfo;
+  TCompileDocInfoArray = TArray<TCompileDocInfo>;
 
 type
   ///  <summary>Abstract base class for classes that render documents that
@@ -76,10 +76,14 @@   TSnippetDoc = class(TObject)
     ///  title.</summary>
     procedure RenderTitledList(const Title: string; List: IStringList);
       virtual; abstract;
-    ///  <summary>Output given compiler info, preceeded by given heading.
+    ///  <summary>Output given compiler test info, preceded by given heading.
     ///  </summary>
     procedure RenderCompilerInfo(const Heading: string;
       const Info: TCompileDocInfoArray); virtual; abstract;
+    ///  <summary>Output message stating that there is no compiler test info,
+    ///  preceded by given heading.</summary>
+    procedure RenderNoCompilerInfo(const Heading, NoCompileTests: string);
+      virtual; abstract;
     ///  <summary>Output given extra information to document.</summary>
     ///  <remarks>Active text must be interpreted in a manner that makes sense
     ///  for document format.</remarks>
@@ -109,6 +113,7 @@ implementation
 uses
   // Delphi
   SysUtils,
+  Generics.Collections,
   // Project
   Compilers.UCompilers,
   DB.UMain,
@@ -136,17 +141,24 @@ function TSnippetDoc.CompilerInfo(const Snippet: TSnippet):
 var
   Compilers: ICompilers;  // provided info about compilers
   Compiler: ICompiler;    // each supported compiler
-  InfoIdx: Integer;       // index into output array
+  ResList: TList<TCompileDocInfo>;
 begin
   Compilers := TCompilersFactory.CreateAndLoadCompilers;
   SetLength(Result, Compilers.Count);
-  InfoIdx := 0;
-  for Compiler in Compilers do
-  begin
-    Result[InfoIdx] := TCompileDocInfo.Create(
-      Compiler.GetName, Snippet.Compatibility[Compiler.GetID]
-    );
-    Inc(InfoIdx);
+  ResList := TList<TCompileDocInfo>.Create;
+  try
+    for Compiler in Compilers do
+    begin
+      if Snippet.Compatibility[Compiler.GetID] <> crQuery then
+      ResList.Add(
+        TCompileDocInfo.Create(
+          Compiler.GetName, Snippet.Compatibility[Compiler.GetID]
+        )
+      );
+    end;
+    Result := ResList.ToArray;
+  finally
+    ResList.Free;
   end;
 end;
 
@@ -158,7 +170,10 @@ function TSnippetDoc.Generate(const Snippet: TSnippet): TEncodedData;
   sUnitListTitle = 'Required units:';
   sDependListTitle = 'Required snippets:';
   sXRefListTitle = 'See also:';
-  sCompilers = 'Supported compilers:';
+  sCompilers = 'Compiler test results:';
+  sNoCompilerTests = 'No compiler tests were carried out.';
+var
+  CompileResults: TCompileDocInfoArray;
 begin
   Assert(Assigned(Snippet), ClassName + '.Create: Snippet is nil');
   // generate document
@@ -176,7 +191,13 @@ function TSnippetDoc.Generate(const Snippet: TSnippet): TEncodedData;
   RenderTitledList(sDependListTitle, SnippetsToStrings(Snippet.Depends));
   RenderTitledList(sXRefListTitle, SnippetsToStrings(Snippet.XRef));
   if Snippet.Kind <> skFreeform then
-    RenderCompilerInfo(sCompilers, CompilerInfo(Snippet));
+  begin
+    CompileResults := CompilerInfo(Snippet);
+    if Length(CompileResults) > 0 then
+      RenderCompilerInfo(sCompilers, CompilerInfo(Snippet))
+    else
+      RenderNoCompilerInfo(sCompilers, sNoCompilerTests);
+  end;
   if Snippet.Extra.HasContent then
     RenderExtra(Snippet.Extra);
   if not Snippet.UserDefined then
diff --git a/Src/UTextSnippetDoc.pas b/Src/UTextSnippetDoc.pas
index 5b80fd32b..4ea009d9d 100644
--- a/Src/UTextSnippetDoc.pas
+++ b/Src/UTextSnippetDoc.pas
@@ -63,10 +63,14 @@   TTextSnippetDoc = class(TSnippetDoc)
     ///  to document.</summary>
     procedure RenderTitledList(const Title: string; List: IStringList);
       override;
-    ///  <summary>Adds given compiler info, preceeded by given heading, to
+    ///  <summary>Adds given compiler info, preceded by given heading, to
     ///  document.</summary>
     procedure RenderCompilerInfo(const Heading: string;
       const Info: TCompileDocInfoArray); override;
+    ///  <summary>Output message stating that there is no compiler test info,
+    ///  preceded by given heading.</summary>
+    procedure RenderNoCompilerInfo(const Heading, NoCompileTests: string);
+      override;
     ///  <summary>Interprets and adds given extra information to document.
     ///  </summary>
     ///  <remarks>Active text is converted to word-wrapped plain text
@@ -166,6 +170,15 @@ procedure TTextSnippetDoc.RenderHeading(const Heading: string;
   fWriter.WriteLine(Heading);
 end;
 
+procedure TTextSnippetDoc.RenderNoCompilerInfo(const Heading,
+  NoCompileTests: string);
+begin
+  // Write out compilers with results
+  fWriter.WriteLine;
+  fWriter.WriteLine(Heading);
+  fWriter.WriteLine(NoCompileTests);
+end;
+
 procedure TTextSnippetDoc.RenderSourceCode(const SourceCode: string);
 begin
   fWriter.WriteLine;

From fa71b941198b8cf1048dbc533adc9d1ecd1b81c6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:07:53 +0100
Subject: [PATCH 180/264] Update pjsysinfo library unit to v5.30.0

Fixes #144
---
 Src/3rdParty/PJSysInfo.pas | 1048 +++++++++++++++++++++++++-----------
 1 file changed, 726 insertions(+), 322 deletions(-)

diff --git a/Src/3rdParty/PJSysInfo.pas b/Src/3rdParty/PJSysInfo.pas
index 88f726505..342fd7750 100644
--- a/Src/3rdParty/PJSysInfo.pas
+++ b/Src/3rdParty/PJSysInfo.pas
@@ -59,6 +59,7 @@
 {$UNDEF RTLNAMESPACES}        // No support for RTL namespaces in unit names
 {$UNDEF HASUNIT64}            // UInt64 type not defined
 {$UNDEF INLINEMETHODS}        // No support for inline methods
+{$UNDEF HASTBYTES}            // TBytes not defined
 
 // Undefine facilities not available in earlier compilers
 // Note: Delphi 1 to 3 is not included since the code will not compile on these
@@ -80,6 +81,9 @@
   {$IF CompilerVersion >= 24.0} // Delphi XE3 and later
     {$LEGACYIFEND ON}  // NOTE: this must come before all $IFEND directives
   {$IFEND}
+  {$IF CompilerVersion >= 18.5} // Delphi 2007 Win32 and later
+    {$DEFINE HASTBYTES}
+  {$IFEND}
   {$IF CompilerVersion >= 23.0} // Delphi XE2 and later
     {$DEFINE RTLNAMESPACES}
   {$IFEND}
@@ -115,6 +119,11 @@ interface
   System.SysUtils, System.Classes, Winapi.Windows;
   {$ENDIF}
 
+{$IFNDEF HASTBYTES}
+// Compiler doesn't have TBytes: define it
+type
+  TBytes = array of Byte;
+{$ENDIF}
 
 type
   // Windows types not defined in all supported Delphi VCLs
@@ -234,107 +243,190 @@ interface
 
   // These Windows-defined constants are required for use with the
   // GetProductInfo API call used with Windows Vista and later
+  // NOTE: PRODUCT_xxx constants marked with an asterisk comment have no
+  //       associated description hard wired into this unit.
   // ** Thanks to Laurent Pierre for providing these definitions originally.
   // ** Subsequent additions were obtained from https://tinyurl.com/3rhhbs2z
-  PRODUCT_BUSINESS                            = $00000006;
-  PRODUCT_BUSINESS_N                          = $00000010;
-  PRODUCT_CLUSTER_SERVER                      = $00000012;
-  PRODUCT_CLUSTER_SERVER_V                    = $00000040;
-  PRODUCT_CORE                                = $00000065;
-  PRODUCT_CORE_COUNTRYSPECIFIC                = $00000063;
-  PRODUCT_CORE_N                              = $00000062;
-  PRODUCT_CORE_SINGLELANGUAGE                 = $00000064;
-  PRODUCT_DATACENTER_EVALUATION_SERVER        = $00000050;
-  PRODUCT_DATACENTER_A_SERVER_CORE            = $00000091;
-  PRODUCT_STANDARD_A_SERVER_CORE              = $00000092;
-  PRODUCT_DATACENTER_SERVER                   = $00000008;
-  PRODUCT_DATACENTER_SERVER_CORE              = $0000000C;
-  PRODUCT_DATACENTER_SERVER_CORE_V            = $00000027;
-  PRODUCT_DATACENTER_SERVER_V                 = $00000025;
-  PRODUCT_EDUCATION                           = $00000079;
-  PRODUCT_EDUCATION_N                         = $0000007A;
-  PRODUCT_ENTERPRISE                          = $00000004;
-  PRODUCT_ENTERPRISE_E                        = $00000046;
-  PRODUCT_ENTERPRISE_EVALUATION               = $00000048;
-  PRODUCT_ENTERPRISE_N                        = $0000001B;
-  PRODUCT_ENTERPRISE_N_EVALUATION             = $00000054;
-  PRODUCT_ENTERPRISE_S                        = $0000007D;
-  PRODUCT_ENTERPRISE_S_EVALUATION             = $00000081;
-  PRODUCT_ENTERPRISE_S_N                      = $0000007E;
-  PRODUCT_ENTERPRISE_S_N_EVALUATION           = $00000082;
-  PRODUCT_ENTERPRISE_SERVER                   = $0000000A;
-  PRODUCT_ENTERPRISE_SERVER_CORE              = $0000000E;
-  PRODUCT_ENTERPRISE_SERVER_CORE_V            = $00000029;
-  PRODUCT_ENTERPRISE_SERVER_IA64              = $0000000F;
-  PRODUCT_ENTERPRISE_SERVER_V                 = $00000026;
-  PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL       = $0000003C;
-  PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC    = $0000003E;
-  PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT       = $0000003B;
-  PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC    = $0000003D;
-  PRODUCT_HOME_BASIC                          = $00000002;
-  PRODUCT_HOME_BASIC_E                        = $00000043;
-  PRODUCT_HOME_BASIC_N                        = $00000005;
-  PRODUCT_HOME_PREMIUM                        = $00000003;
-  PRODUCT_HOME_PREMIUM_E                      = $00000044;
-  PRODUCT_HOME_PREMIUM_N                      = $0000001A;
-  PRODUCT_HOME_PREMIUM_SERVER                 = $00000022;
-  PRODUCT_HOME_SERVER                         = $00000013;
-  PRODUCT_HYPERV                              = $0000002A;
-  PRODUCT_IOTENTERPRISE                       = $000000BC;
-  PRODUCT_IOTENTERPRISE_S                     = $000000BF;
-  PRODUCT_IOTUAP                              = $0000007B;
-  PRODUCT_IOTUAPCOMMERCIAL                    = $00000083;
-  PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT    = $0000001E;
-  PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING     = $00000020;
-  PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY      = $0000001F;
-  PRODUCT_MOBILE_CORE                         = $00000068;
-  PRODUCT_MOBILE_ENTERPRISE                   = $00000085;
-  PRODUCT_MULTIPOINT_PREMIUM_SERVER           = $0000004D;
-  PRODUCT_MULTIPOINT_STANDARD_SERVER          = $0000004C;
-  PRODUCT_PRO_WORKSTATION                     = $000000A1;
-  PRODUCT_PRO_WORKSTATION_N                   = $000000A2;
-  PRODUCT_PROFESSIONAL                        = $00000030;
-  PRODUCT_PROFESSIONAL_E                      = $00000045;
-  PRODUCT_PROFESSIONAL_N                      = $00000031;
-  PRODUCT_PROFESSIONAL_WMC                    = $00000067;
-  PRODUCT_SB_SOLUTION_SERVER                  = $00000032;
-  PRODUCT_SB_SOLUTION_SERVER_EM               = $00000036;
-  PRODUCT_SERVER_FOR_SB_SOLUTIONS             = $00000033;
-  PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM          = $00000037;
-  PRODUCT_SERVER_FOR_SMALLBUSINESS            = $00000018;
-  PRODUCT_SERVER_FOR_SMALLBUSINESS_V          = $00000023;
-  PRODUCT_SERVER_FOUNDATION                   = $00000021;
-  PRODUCT_SMALLBUSINESS_SERVER                = $00000009;
-  PRODUCT_SMALLBUSINESS_SERVER_PREMIUM        = $00000019;
-  PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE   = $0000003F;
-  PRODUCT_SOLUTION_EMBEDDEDSERVER             = $00000038;
-  PRODUCT_STANDARD_EVALUATION_SERVER          = $0000004F;
-  PRODUCT_STANDARD_SERVER                     = $00000007;
-  PRODUCT_STANDARD_SERVER_CORE                = $0000000D;
-  PRODUCT_STANDARD_SERVER_CORE_V              = $00000028;
-  PRODUCT_STANDARD_SERVER_V                   = $00000024;
-  PRODUCT_STANDARD_SERVER_SOLUTIONS           = $00000034;
-  PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE      = $00000035;
-  PRODUCT_STARTER                             = $0000000B;
-  PRODUCT_STARTER_E                           = $00000042;
-  PRODUCT_STARTER_N                           = $0000002F;
-  PRODUCT_STORAGE_ENTERPRISE_SERVER           = $00000017;
-  PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE      = $0000002E;
-  PRODUCT_STORAGE_EXPRESS_SERVER              = $00000014;
-  PRODUCT_STORAGE_EXPRESS_SERVER_CORE         = $0000002B;
-  PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER  = $00000060;
-  PRODUCT_STORAGE_STANDARD_SERVER             = $00000015;
-  PRODUCT_STORAGE_STANDARD_SERVER_CORE        = $0000002C;
-  PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER = $0000005F;
-  PRODUCT_STORAGE_WORKGROUP_SERVER            = $00000016;
-  PRODUCT_STORAGE_WORKGROUP_SERVER_CORE       = $0000002D;
-  PRODUCT_ULTIMATE                            = $00000001;
-  PRODUCT_ULTIMATE_E                          = $00000047;
-  PRODUCT_ULTIMATE_N                          = $0000001C;
-  PRODUCT_UNDEFINED                           = $00000000;
-  PRODUCT_WEB_SERVER                          = $00000011;
-  PRODUCT_WEB_SERVER_CORE                     = $0000001D;
-  PRODUCT_UNLICENSED                          = $ABCDABCD;
+  // ** and the Windows 11 24H2 SDK
+  PRODUCT_UNDEFINED                             = $00000000;
+  PRODUCT_ULTIMATE                              = $00000001;
+  PRODUCT_HOME_BASIC                            = $00000002;
+  PRODUCT_HOME_PREMIUM                          = $00000003;
+  PRODUCT_ENTERPRISE                            = $00000004;
+  PRODUCT_HOME_BASIC_N                          = $00000005;
+  PRODUCT_BUSINESS                              = $00000006;
+  PRODUCT_STANDARD_SERVER                       = $00000007;
+  PRODUCT_DATACENTER_SERVER                     = $00000008;
+  PRODUCT_SMALLBUSINESS_SERVER                  = $00000009;
+  PRODUCT_ENTERPRISE_SERVER                     = $0000000A;
+  PRODUCT_STARTER                               = $0000000B;
+  PRODUCT_DATACENTER_SERVER_CORE                = $0000000C;
+  PRODUCT_STANDARD_SERVER_CORE                  = $0000000D;
+  PRODUCT_ENTERPRISE_SERVER_CORE                = $0000000E;
+  PRODUCT_ENTERPRISE_SERVER_IA64                = $0000000F;
+  PRODUCT_BUSINESS_N                            = $00000010;
+  PRODUCT_WEB_SERVER                            = $00000011;
+  PRODUCT_CLUSTER_SERVER                        = $00000012;
+  PRODUCT_HOME_SERVER                           = $00000013;
+  PRODUCT_STORAGE_EXPRESS_SERVER                = $00000014;
+  PRODUCT_STORAGE_STANDARD_SERVER               = $00000015;
+  PRODUCT_STORAGE_WORKGROUP_SERVER              = $00000016;
+  PRODUCT_STORAGE_ENTERPRISE_SERVER             = $00000017;
+  PRODUCT_SERVER_FOR_SMALLBUSINESS              = $00000018;
+  PRODUCT_SMALLBUSINESS_SERVER_PREMIUM          = $00000019;
+  PRODUCT_HOME_PREMIUM_N                        = $0000001A;
+  PRODUCT_ENTERPRISE_N                          = $0000001B;
+  PRODUCT_ULTIMATE_N                            = $0000001C;
+  PRODUCT_WEB_SERVER_CORE                       = $0000001D;
+  PRODUCT_MEDIUMBUSINESS_SERVER_MANAGEMENT      = $0000001E;
+  PRODUCT_MEDIUMBUSINESS_SERVER_SECURITY        = $0000001F;
+  PRODUCT_MEDIUMBUSINESS_SERVER_MESSAGING       = $00000020;
+  PRODUCT_SERVER_FOUNDATION                     = $00000021;
+  PRODUCT_HOME_PREMIUM_SERVER                   = $00000022;
+  PRODUCT_SERVER_FOR_SMALLBUSINESS_V            = $00000023;
+  PRODUCT_STANDARD_SERVER_V                     = $00000024;
+  PRODUCT_DATACENTER_SERVER_V                   = $00000025;
+  PRODUCT_ENTERPRISE_SERVER_V                   = $00000026;
+  PRODUCT_DATACENTER_SERVER_CORE_V              = $00000027;
+  PRODUCT_STANDARD_SERVER_CORE_V                = $00000028;
+  PRODUCT_ENTERPRISE_SERVER_CORE_V              = $00000029;
+  PRODUCT_HYPERV                                = $0000002A;
+  PRODUCT_STORAGE_EXPRESS_SERVER_CORE           = $0000002B;
+  PRODUCT_STORAGE_STANDARD_SERVER_CORE          = $0000002C;
+  PRODUCT_STORAGE_WORKGROUP_SERVER_CORE         = $0000002D;
+  PRODUCT_STORAGE_ENTERPRISE_SERVER_CORE        = $0000002E;
+  PRODUCT_STARTER_N                             = $0000002F;
+  PRODUCT_PROFESSIONAL                          = $00000030;
+  PRODUCT_PROFESSIONAL_N                        = $00000031;
+  PRODUCT_SB_SOLUTION_SERVER                    = $00000032;
+  PRODUCT_SERVER_FOR_SB_SOLUTIONS               = $00000033;
+  PRODUCT_STANDARD_SERVER_SOLUTIONS             = $00000034;
+  PRODUCT_STANDARD_SERVER_SOLUTIONS_CORE        = $00000035;
+  PRODUCT_SB_SOLUTION_SERVER_EM                 = $00000036;
+  PRODUCT_SERVER_FOR_SB_SOLUTIONS_EM            = $00000037;
+  PRODUCT_SOLUTION_EMBEDDEDSERVER               = $00000038;
+  PRODUCT_SOLUTION_EMBEDDEDSERVER_CORE          = $00000039; // *
+  PRODUCT_PROFESSIONAL_EMBEDDED                 = $0000003A; // *
+  PRODUCT_ESSENTIALBUSINESS_SERVER_MGMT         = $0000003B;
+  PRODUCT_ESSENTIALBUSINESS_SERVER_ADDL         = $0000003C;
+  PRODUCT_ESSENTIALBUSINESS_SERVER_MGMTSVC      = $0000003D;
+  PRODUCT_ESSENTIALBUSINESS_SERVER_ADDLSVC      = $0000003E;
+  PRODUCT_SMALLBUSINESS_SERVER_PREMIUM_CORE     = $0000003F;
+  PRODUCT_CLUSTER_SERVER_V                      = $00000040;
+  PRODUCT_EMBEDDED                              = $00000041; // *
+  PRODUCT_STARTER_E                             = $00000042;
+  PRODUCT_HOME_BASIC_E                          = $00000043;
+  PRODUCT_HOME_PREMIUM_E                        = $00000044;
+  PRODUCT_PROFESSIONAL_E                        = $00000045;
+  PRODUCT_ENTERPRISE_E                          = $00000046;
+  PRODUCT_ULTIMATE_E                            = $00000047;
+  PRODUCT_ENTERPRISE_EVALUATION                 = $00000048;
+  PRODUCT_MULTIPOINT_STANDARD_SERVER            = $0000004C;
+  PRODUCT_MULTIPOINT_PREMIUM_SERVER             = $0000004D;
+  PRODUCT_STANDARD_EVALUATION_SERVER            = $0000004F;
+  PRODUCT_DATACENTER_EVALUATION_SERVER          = $00000050;
+  PRODUCT_ENTERPRISE_N_EVALUATION               = $00000054;
+  PRODUCT_EMBEDDED_AUTOMOTIVE                   = $00000055; // *
+  PRODUCT_EMBEDDED_INDUSTRY_A                   = $00000056; // *
+  PRODUCT_THINPC                                = $00000057; // *
+  PRODUCT_EMBEDDED_A                            = $00000058; // *
+  PRODUCT_EMBEDDED_INDUSTRY                     = $00000059; // *
+  PRODUCT_EMBEDDED_E                            = $0000005A; // *
+  PRODUCT_EMBEDDED_INDUSTRY_E                   = $0000005B; // *
+  PRODUCT_EMBEDDED_INDUSTRY_A_E                 = $0000005C; // *
+  PRODUCT_STORAGE_WORKGROUP_EVALUATION_SERVER   = $0000005F;
+  PRODUCT_STORAGE_STANDARD_EVALUATION_SERVER    = $00000060;
+  PRODUCT_CORE_ARM                              = $00000061;
+  PRODUCT_CORE_N                                = $00000062;
+  PRODUCT_CORE_COUNTRYSPECIFIC                  = $00000063;
+  PRODUCT_CORE_SINGLELANGUAGE                   = $00000064;
+  PRODUCT_CORE                                  = $00000065;
+  PRODUCT_PROFESSIONAL_WMC                      = $00000067;
+  PRODUCT_MOBILE_CORE                           = $00000068;
+  PRODUCT_EMBEDDED_INDUSTRY_EVAL                = $00000069; // *
+  PRODUCT_EMBEDDED_INDUSTRY_E_EVAL              = $0000006A; // *
+  PRODUCT_EMBEDDED_EVAL                         = $0000006B; // *
+  PRODUCT_EMBEDDED_E_EVAL                       = $0000006C; // *
+  PRODUCT_NANO_SERVER                           = $0000006D; // *
+  PRODUCT_CLOUD_STORAGE_SERVER                  = $0000006E; // *
+  PRODUCT_CORE_CONNECTED                        = $0000006F; // *
+  PRODUCT_PROFESSIONAL_STUDENT                  = $00000070; // *
+  PRODUCT_CORE_CONNECTED_N                      = $00000071; // *
+  PRODUCT_PROFESSIONAL_STUDENT_N                = $00000072; // *
+  PRODUCT_CORE_CONNECTED_SINGLELANGUAGE         = $00000073; // *
+  PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC        = $00000074; // *
+  PRODUCT_CONNECTED_CAR                         = $00000075; // *
+  PRODUCT_INDUSTRY_HANDHELD                     = $00000076; // *
+  PRODUCT_PPI_PRO                               = $00000077; // *
+  PRODUCT_ARM64_SERVER                          = $00000078; // *
+  PRODUCT_EDUCATION                             = $00000079;
+  PRODUCT_EDUCATION_N                           = $0000007A;
+  PRODUCT_IOTUAP                                = $0000007B;
+  PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER      = $0000007C; // *
+  PRODUCT_ENTERPRISE_S                          = $0000007D;
+  PRODUCT_ENTERPRISE_S_N                        = $0000007E;
+  PRODUCT_PROFESSIONAL_S                        = $0000007F; // *
+  PRODUCT_PROFESSIONAL_S_N                      = $00000080; // *
+  PRODUCT_ENTERPRISE_S_EVALUATION               = $00000081;
+  PRODUCT_ENTERPRISE_S_N_EVALUATION             = $00000082;
+  PRODUCT_IOTUAPCOMMERCIAL                      = $00000083;
+  PRODUCT_MOBILE_ENTERPRISE                     = $00000085;
+  PRODUCT_HOLOGRAPHIC                           = $00000087; // *
+  PRODUCT_HOLOGRAPHIC_BUSINESS                  = $00000088; // *
+  PRODUCT_PRO_SINGLE_LANGUAGE                   = $0000008A; // *
+  PRODUCT_PRO_CHINA                             = $0000008B; // *
+  PRODUCT_ENTERPRISE_SUBSCRIPTION               = $0000008C; // *
+  PRODUCT_ENTERPRISE_SUBSCRIPTION_N             = $0000008D; // *
+  PRODUCT_DATACENTER_NANO_SERVER                = $0000008F;
+  PRODUCT_STANDARD_NANO_SERVER                  = $00000090;
+  PRODUCT_DATACENTER_A_SERVER_CORE              = $00000091;
+  PRODUCT_STANDARD_A_SERVER_CORE                = $00000092;
+  PRODUCT_DATACENTER_WS_SERVER_CORE             = $00000093;
+  PRODUCT_STANDARD_WS_SERVER_CORE               = $00000094;
+  PRODUCT_UTILITY_VM                            = $00000095; // *
+  PRODUCT_DATACENTER_EVALUATION_SERVER_CORE     = $0000009F; // *
+  PRODUCT_STANDARD_EVALUATION_SERVER_CORE       = $000000A0; // *
+  PRODUCT_PRO_WORKSTATION                       = $000000A1;
+  PRODUCT_PRO_WORKSTATION_N                     = $000000A2;
+  PRODUCT_PRO_FOR_EDUCATION                     = $000000A4;
+  PRODUCT_PRO_FOR_EDUCATION_N                   = $000000A5; // *
+  PRODUCT_AZURE_SERVER_CORE                     = $000000A8; // *
+  PRODUCT_AZURE_NANO_SERVER                     = $000000A9; // *
+  PRODUCT_ENTERPRISEG                           = $000000AB; // *
+  PRODUCT_ENTERPRISEGN                          = $000000AC; // *
+  PRODUCT_SERVERRDSH                            = $000000AF;
+  PRODUCT_CLOUD                                 = $000000B2; // *
+  PRODUCT_CLOUDN                                = $000000B3; // *
+  PRODUCT_HUBOS                                 = $000000B4; // *
+  PRODUCT_ONECOREUPDATEOS                       = $000000B6; // *
+  PRODUCT_CLOUDE                                = $000000B7; // *
+  PRODUCT_IOTOS                                 = $000000B9; // *
+  PRODUCT_CLOUDEN                               = $000000BA; // *
+  PRODUCT_IOTEDGEOS                             = $000000BB; // *
+  PRODUCT_IOTENTERPRISE                         = $000000BC;
+  PRODUCT_LITE                                  = $000000BD; // *
+  PRODUCT_IOTENTERPRISE_S                       = $000000BF;
+  PRODUCT_XBOX_SYSTEMOS                         = $000000C0; // *
+  PRODUCT_XBOX_GAMEOS                           = $000000C2; // *
+  PRODUCT_XBOX_ERAOS                            = $000000C3; // *
+  PRODUCT_XBOX_DURANGOHOSTOS                    = $000000C4; // *
+  PRODUCT_XBOX_SCARLETTHOSTOS                   = $000000C5; // *
+  PRODUCT_XBOX_KEYSTONE                         = $000000C6; // *
+  PRODUCT_AZURE_SERVER_CLOUDHOST                = $000000C7; // *
+  PRODUCT_AZURE_SERVER_CLOUDMOS                 = $000000C8; // *
+  PRODUCT_CLOUDEDITIONN                         = $000000CA; // *
+  PRODUCT_CLOUDEDITION                          = $000000CB; // *
+  PRODUCT_VALIDATION                            = $000000CC; // *
+  PRODUCT_IOTENTERPRISESK                       = $000000CD; // *
+  PRODUCT_IOTENTERPRISEK                        = $000000CE; // *
+  PRODUCT_IOTENTERPRISESEVAL                    = $000000CF; // *
+  PRODUCT_AZURE_SERVER_AGENTBRIDGE              = $000000D0; // *
+  PRODUCT_AZURE_SERVER_NANOHOST                 = $000000D1; // *
+  PRODUCT_WNC                                   = $000000D2; // *
+  PRODUCT_AZURESTACKHCI_SERVER_CORE             = $00000196; // *
+  PRODUCT_DATACENTER_SERVER_AZURE_EDITION       = $00000197;
+  PRODUCT_DATACENTER_SERVER_CORE_AZURE_EDITION  = $00000198; // *
+  PRODUCT_UNLICENSED                            = $ABCDABCD;
 
   // These constants are required for use with GetSystemMetrics to detect
   // certain editions. GetSystemMetrics returns non-zero when passed these flags
@@ -454,6 +546,17 @@ interface
     bmSafeModeNetwork       // Booted in safe node with networking
   );
 
+type
+  // Various Windows 10 & 11 release versions
+  TPJWin10PlusVersion = (
+    win10plusNA,
+    win10plusUnknown,
+    win10v1507, win10v1511, win10v1607, win10v1703, win10v1709, win10v1803,
+    win10v1809, win10v1903, win10v1909, win10v2004, win10v20H2, win10v21H1,
+    win10v21H2, win10v22H2,
+    win11v21H2, win11v22H2, win11v23H2, win11v24H2
+  );
+
 type
   ///  <summary>Class of exception raised by code in this unit.</summary>
   EPJSysInfo = class(Exception);
@@ -473,10 +576,13 @@   TPJOSInfo = class(TObject)
     ///  <returns>True if suite is installed, False if not installed or not an
     ///  NT platform OS.</returns>
     class function CheckSuite(const Suite: Integer): Boolean;
+      {$IFDEF INLINEMETHODS}inline;{$ENDIF}
+
+    ///  <summary>Gets product edition from registry for NT4 pre SP6.</remarks>
+    class function NTEditionFromReg: string;
 
-    ///  <summary>Gets product edition from registry.</summary>
-    ///  <remarks>Needed to get edition for NT4 pre SP6.</remarks>
-    class function EditionFromReg: string;
+    ///  <summary>Gets edition ID from registry.</summary>
+    class function EditionIDFromReg: string;
 
     ///  <summary>Checks registry to see if NT4 Service Pack 6a is installed.
     ///  </summary>
@@ -498,6 +604,18 @@   TPJOSInfo = class(TObject)
     class function IsReallyWindowsVersionOrGreater(MajorVersion, MinorVersion,
       ServicePackMajor: Word): Boolean;
 
+    ///  <summary>Checks if the operating system is Windows 10 or later, with a
+    ///  version identifier the same or later than the given version identifier.
+    ///  </summary>
+    ///  <remarks>
+    ///  <para>WARNING: Windows 11 versions are always considered to be later
+    ///  Windows 10 versions, even if the Windows 10 version was released after
+    ///  the Windows 11 version.</para>
+    ///  <para><c>AVersion</c> must not be one of <c>win10plusNA</c> or
+    ///  <c>win10plusUnknown</c>.</para>
+    class function IsWindows10PlusVersionOrLater(
+      const AVersion: TPJWin10PlusVersion): Boolean;
+
   public
 
     ///  <summary>Checks if the OS can be "spoofed" by specifying a
@@ -534,17 +652,21 @@   TPJOSInfo = class(TObject)
 
     ///  <summary>Checks if Windows Media Center is installed.</summary>
     class function IsMediaCenter: Boolean;
+      {$IFDEF INLINEMETHODS}inline;{$ENDIF}
 
     ///  <summary>Checks if the program is running on a tablet PC OS.</summary>
     class function IsTabletPC: Boolean;
+      {$IFDEF INLINEMETHODS}inline;{$ENDIF}
 
     ///  <summary>Checks if the program is running under Windows Terminal Server
     ///  as a client session.</summary>
     class function IsRemoteSession: Boolean;
+      {$IFDEF INLINEMETHODS}inline;{$ENDIF}
 
     ///  <summary>Checks of the host operating system has pen extensions
     ///  installed.</summary>
     class function HasPenExtensions: Boolean;
+      {$IFDEF INLINEMETHODS}inline;{$ENDIF}
 
     ///  <summary>Returns the host OS platform identifier.</summary>
     class function Platform: TPJOSPlatform;
@@ -605,6 +727,9 @@   TPJOSInfo = class(TObject)
     ///  <summary>Returns the Windows product ID of the host OS.</summary>
     class function ProductID: string;
 
+    ///  <summary>Returns the digital product ID of the host OS.</summary>
+    class function DigitalProductID: TBytes;
+
     ///  <summary>Organisation to which Windows is registered, if any.</summary>
     class function RegisteredOrganisation: string;
 
@@ -740,6 +865,46 @@   TPJOSInfo = class(TObject)
     class function IsReallyWindows10OrGreater: Boolean;
       {$IFDEF INLINEMETHODS}inline;{$ENDIF}
 
+    ///  <summary>Returns an identifier representing a Windows 10 or 11
+    ///  version.</summary>
+    ///  <remarks>If the OS is earlier than Windows 10 then <c>win10plusNA</c>
+    ///  is returned. If the OS is Windows 10 or later but is a dev, beta etc.
+    ///  build whose version can't be detected then <c>win10plusUnknown</c> is
+    ///  returned.</remarks>
+    class function Windows10PlusVersion: TPJWin10PlusVersion;
+
+    ///  <summary>Returns the version name of a the current operating system, if
+    ///  it is Windows 10 or later.</summary>
+    ///  <remarks>
+    ///  <para>NOTE: some Windows 10 and 11 versions have the same string.
+    ///  </para>
+    ///  <para>If the OS is earlier than Windows 10 then an empty string is
+    ///  returned. If the OS is Windows 10 or later but is a dev, beta etc.
+    ///  build whose version can't be detected then 'Unknown' is returned.
+    ///  </para>
+    ///  </remarks>
+    class function Windows10PlusVersionName: string;
+
+    ///  <summary>Checks if the operating system is Windows 10 or later, with a
+    ///  version identifier the same or later than <c>AVersion</c>.
+    ///  </summary>
+    ///  <remarks><c>AVersion</c> must be a valid Windows 10 version
+    ///  identifier, with a name that begins with <c>win10v</c>.</remarks>
+    ///  <exception><c>EPJSysInfo</c> raised if <c>AVersion</c> is not a valid
+    ///  Windows 10 version identifier.</exception>
+    class function IsWindows10VersionOrLater(
+      const AVersion: TPJWin10PlusVersion): Boolean;
+
+    ///  <summary>Checks if the operating system is Windows 11 or later, with a
+    ///  version identifier the same or later than <c>AVersion</c>.
+    ///  </summary>
+    ///  <remarks><c>AVersion</c> must be a valid Windows 11 version
+    ///  identifier, with a name that begins with <c>win11v</c>.</remarks>
+    ///  <exception><c>EPJSysInfo</c> raised if <c>AVersion</c> is not a valid
+    ///  Windows 11 version identifier.</exception>
+    class function IsWindows11VersionOrLater(
+      const AVersion: TPJWin10PlusVersion): Boolean;
+
     ///  <summary>Checks if the OS is a server version.</summary>
     ///  <remarks>
     ///  <para>For Windows 2000 and later the result always relates to the
@@ -758,6 +923,12 @@   TPJOSInfo = class(TObject)
     ///  that this value could be spoofed.</para>
     ///  </remarks>
     class function RevisionNumber: Integer;
+
+    ///  <summary>Returns the repository branch from which the OS release was]
+    ///  built.</summary>
+    ///  <remarks>Returns the empty string if no build branch information is
+    ///  available.</remarks>
+    class function BuildBranch: string;
   end;
 
 type
@@ -810,6 +981,7 @@   TPJComputerInfo = class(TObject)
 
     ///  <summary>Checks if a network is present on host computer.</summary>
     class function IsNetworkPresent: Boolean;
+      {$IFDEF INLINEMETHODS}inline;{$ENDIF}
 
     ///  <summary>Returns the OS mode used when host computer was last booted.
     ///  </summary>
@@ -984,6 +1156,7 @@ implementation
   sUnknownProduct = 'Unrecognised operating system product';
   sBadRegType =  'Unsupported registry type';
   sBadRegIntType = 'Integer value expected in registry';
+  sBadRegBinType = 'Binary value expected in registry';
   sBadProcHandle = 'Bad process handle';
 
 
@@ -994,13 +1167,14 @@ implementation
   UInt64 = Int64;
 {$ENDIF}
 
-
 const
   // Map of product codes per GetProductInfo API to product names
+  // Names are not available for all PRODUCT_xxx values.
   // ** Laurent Pierre supplied original code on which this map is based
   //    It has been modified and extended using MSDN documentation at
-  //    https://msdn.microsoft.com/en-us/library/ms724358
-  cProductMap: array[1..99] of record
+  //    https://msdn.microsoft.com/en-us/library/ms724358 and
+  //    https://tinyurl.com/5684558v (learn.microsoft.com)
+  cProductMap: array[1..107] of record
     Id: Cardinal; // product ID
     Name: string; // product name
   end = (
@@ -1200,6 +1374,22 @@ implementation
       Name: 'Web Server (full installation)';),
     (Id: PRODUCT_WEB_SERVER_CORE;
       Name: 'Web Server (core installation)';),
+    (Id: PRODUCT_CORE_ARM;
+      Name: 'Windows RT';),
+    (Id: PRODUCT_DATACENTER_NANO_SERVER;
+      Name: 'Windows Server Datacenter Edition (Nano Server installation)';),
+    (Id: PRODUCT_STANDARD_NANO_SERVER;
+      Name: 'Windows Server Standard Edition (Nano Server installation)';),
+    (Id: PRODUCT_DATACENTER_WS_SERVER_CORE;
+      Name: 'Windows Server Datacenter Edition (Server Core installation)';),
+    (Id: PRODUCT_STANDARD_WS_SERVER_CORE;
+      Name: 'Windows Server Standard Edition (Server Core installation)';),
+    (Id: PRODUCT_PRO_FOR_EDUCATION;
+      Name: 'Windows 10 Pro Education';),
+    (Id: PRODUCT_SERVERRDSH;
+      Name: 'Windows 10 Enterprise for Virtual Desktops';),
+    (Id: PRODUCT_DATACENTER_SERVER_AZURE_EDITION;
+      Name: 'Windows Server Datacenter: Azure Edition';),
     (Id: Cardinal(PRODUCT_UNLICENSED);
       Name: 'Unlicensed product';)
   );
@@ -1220,8 +1410,11 @@   TBuildNameMap = record
     LoRev: Integer;
     HiRev: Integer;
     Name: string;
+    Version: Word;
   end;
 
+  TWin10PlusVersionSet = set of TPJWin10PlusVersion;
+
 const
   {
     Known windows build numbers.
@@ -1265,14 +1458,14 @@   TBuildNameMap = record
 
 
   // Windows Vista -------------------------------------------------------------
-  WinVistaBaseBuild = 6000;
+  WinVista_Base_Build = 6000;
 
   // Windows 7 -----------------------------------------------------------------
-  Win7BaseBuild = 7600;
+  Win7_Base_Build = 7600;
 
   // Windows 8 -----------------------------------------------------------------
-  Win8Build = 9200;             // Build number used for all Win 8/Svr 2012
-  Win8Point1Build = 9600;       // Build number used for all Win 8.1/Svr 2012 R2
+  Win8_Build = 9200;        // Build number used for all Win 8/Svr 2012
+  Win8Point1_Build = 9600;  // Build number used for all Win 8.1/Svr 2012 R2
 
   // Windows 10 ----------------------------------------------------------------
 
@@ -1364,7 +1557,7 @@   TBuildNameMap = record
   );
 
   {
-    End of support information for Windows 10 versions (as of 2023-05-01).
+    End of support information for Windows 10 versions (as of 2024-10-01).
       GAC = General Availablity Channel.
       LTSC = Long Term Support Channel.
 
@@ -1382,51 +1575,63 @@   TBuildNameMap = record
     2004    | ended      | N/a
     20H2    | ended      | N/a
     21H1    | ended      | N/a
-    21H2    | 2024-06-11 | 2032-01-13
+    21H2    | ended      | 2032-01-13
     22H2    | 2025-10-14 | N/a
   }
 
+  // Win 10 release build numbers
+  Win10_1507_Build = 10240;
+  Win10_1511_Build = 10586;
+  Win10_1607_Build = 14393;
+  Win10_1703_Build = 15063;
+  Win10_1709_Build = 16299;
+  Win10_1803_Build = 17134;
+  Win10_1809_Build = 17763;
+  Win10_1903_Build = Win10_19XX_Shared_Build;
+  Win10_1909_Build = 18363;
+  Win10_2004_Build = 19041;
+  Win10_20H2_Build = 19042;
+  Win10_21H1_Build = 19043; // See **REF3** End of service @ rev 2364
+  Win10_21H2_Build = 19044; // See **REF4**
+  Win10_22H2_Build = 19045; // See **REF5**
+
   // Map of Win 10 builds from 1st release (version 1507) to version 20H2
+  // Later Win 10 releases have special handling and aren't in the build map
   //
   // NOTE: The following versions that are still being maintained per the above
   // table have HiRev = MaxInt while the unsupported versions have HiRev set to
   // the final build number.
-  Win10BuildMap: array[0..10] of TBuildNameMap = (
-    (Build: 10240; LoRev: 16484; HiRev: MaxInt;
-      Name: 'Version 1507'),
-    (Build: 10586; LoRev: 0; HiRev: 1540;
-      Name: 'Version 1511: November Update'),
-    (Build: 14393; LoRev: 0; HiRev: MaxInt;
-      Name: 'Version 1607: Anniversary Update'),
-    (Build: 15063; LoRev: 0; HiRev: 2679;
-      Name: 'Version 1703: Creators Update'),
-    (Build: 16299; LoRev: 15; HiRev: 2166;
-      Name: 'Version 1709: Fall Creators Update'),
-    (Build: 17134; LoRev: 1; HiRev: 2208;
-      Name: 'Version 1803: April 2018 Update'),
-    (Build: 17763; LoRev: 1; HiRev: MaxInt;
-      Name: 'Version 1809: October 2018 Update'),
-    (Build: Win10_19XX_Shared_Build; LoRev: 116; HiRev: 1256;
-      Name: 'Version 1903: May 2019 Update'),
-    (Build: 18363; LoRev: 327; HiRev: 2274;
-      Name: 'Version 1909: November 2019 Update'),
-    (Build: 19041; LoRev: 264; HiRev: 1415;
-      Name: 'Version 2004: May 2020 Update'),
-    (Build: 19042; LoRev: 572; HiRev: 2965;
-      Name: 'Version 20H2: October 2020 Update')
+  Win10_BuildMap: array[0..10] of TBuildNameMap = (
+    (Build: Win10_1507_Build; LoRev: 16484; HiRev: MaxInt;
+      Name: 'Version 1507'; Version: Ord(win10v1507)),
+    (Build: Win10_1511_Build; LoRev: 0; HiRev: 1540;
+      Name: 'Version 1511: November Update'; Version: Ord(win10v1511)),
+    (Build: Win10_1607_Build; LoRev: 0; HiRev: MaxInt;
+      Name: 'Version 1607: Anniversary Update'; Version: Ord(win10v1607)),
+    (Build: Win10_1703_Build; LoRev: 0; HiRev: 2679;
+      Name: 'Version 1703: Creators Update'; Version: Ord(win10v1703)),
+    (Build: Win10_1709_Build; LoRev: 15; HiRev: 2166;
+      Name: 'Version 1709: Fall Creators Update'; Version: Ord(win10v1709)),
+    (Build: Win10_1803_Build; LoRev: 1; HiRev: 2208;
+      Name: 'Version 1803: April 2018 Update'; Version: Ord(win10v1803)),
+    (Build: Win10_1809_Build; LoRev: 1; HiRev: MaxInt;
+      Name: 'Version 1809: October 2018 Update'; Version: Ord(win10v1809)),
+    (Build: Win10_1903_Build; LoRev: 116; HiRev: 1256;
+      Name: 'Version 1903: May 2019 Update'; Version: Ord(win10v1903)),
+    (Build: Win10_1909_Build; LoRev: 327; HiRev: 2274;
+      Name: 'Version 1909: November 2019 Update'; Version: Ord(win10v1909)),
+    (Build: Win10_2004_Build; LoRev: 264; HiRev: 1415;
+      Name: 'Version 2004: May 2020 Update'; Version: Ord(win10v2004)),
+    (Build: Win10_20H2_Build; LoRev: 572; HiRev: 2965;
+      Name: 'Version 20H2: October 2020 Update'; Version: Ord(win10v20H2))
   );
 
-  // Additional information is available for Win 10 builds from version 21H1,
-  // as follows:
-
-  // Windows 10 version 21H1 - see **REF3** in implementation for details
-  Win1021H1Build = 19043; // ** End of service 2022-12-13, rev 2364
-
-  // Windows 10 version 21H2 - see **REF4** in implementation for details
-  Win1021H2Build = 19044;
-
-  // Windows 10 version 22H2 - see **REF5** in implementation for details
-  Win1022H2Build = 19045;
+  // Set of Windows 10 version identifiers
+  Win10_Versions: TWin10PlusVersionSet = [
+    win10v1507, win10v1511, win10v1607, win10v1703, win10v1709, win10v1803,
+    win10v1809, win10v1903, win10v1909, win10v2004, win10v20H2, win10v21H1,
+    win10v21H2, win10v22H2
+  ];
 
   // Windows 10 slow ring, fast ring and skip-ahead channels were all expired
   // well before 2022-12-31 and are not detected. (In fact there was never any
@@ -1437,50 +1642,59 @@   TBuildNameMap = record
   // NOTE: All releases of Windows 11 report version 10.0
 
   {
-    End of support (EOS) information for Windows 11 versions (as of 2022-12-31).
+    End of support (EOS) information for Windows 11 versions (as of 2024-10-01).
 
     Version | Home, Pro  | Education,
             | etc EOS    | Enterprise
             |            | etc EOS
     --------|------------|------------
-    21H2    | 2023-10-10 | 2024-10-08
+    21H2    | ENDED      | 2024-10-08
     22H2    | 2024-10-08 | 2025-10-14
     23H2    | 2025-11-11 | 2026-11-10
+    24H2    | 2026-10-13 | 2027-10-12
   }
 
   // 1st build released branded as Windows 11
   // Insider version, Dev channel, v10.0.21996.1
-  Win11DevBuild = 21996;
+  Win11_Dev_Build = 21996;
 
   // Windows 11 version 21H2  - see **REF6** in implementation for details
-  Win11v21H2Build = 22000;
+  Win11_21H2_Build = 22000;
 
   // Windows 11 version 22H2
   //
   // Build 22621 was the original beta build. Same build used for releases and
   // various other channels.
   // See **REF1** in implementation
-  Win11v22H2Build = 22621;
+  Win11_22H2_Build = 22621;
 
   // Windows 11 version 22H3
   // See **REF10** in implementation
-  Win11v23H2Build = 22631;
+  Win11_23H2_Build = 22631;
+
+  // Windows 11 version 22H4
+  // See **REF11** in implementation
+  Win11_24H2_Build = 26100;
 
   // "Preview Builds of October 2022 component update in Beta Channel"
   // See **REF2** in implementation
-  Win11Oct22ComponentBetaChannelBuild = 22622;
+  Win11_Oct22Component_BetaChannel_Build = 22622;
 
   // "Preview Builds of February 2023 component update in Beta Channel"
   // See **REF7** in implementation
-  Win11Feb23ComponentBetaChannelBuild = 22623;
+  Win11_Feb23Component_BetaChannel_Build = 22623;
 
   // "Preview builds of May 2023 component update in Beta Channel"
   // See **REF8** in implementation
-  Win11May23ComponentBetaChannelBuild = 22624;
+  Win11_May23Component_BetaChannel_Build = 22624;
 
   // "Preview builds of future component update in Beta Channel"
   // See **REF9** in implementation
-  Win11FutureComponentBetaChannelBuild = 22635;
+  Win11_FutureComponent_BetaChannel_Build = 22635;
+
+  // "Preview builds of future component update in Dev Channel"
+  // See **REF12** in implementation
+  Win11_FutureComponent_DevChannel_Build = 26120;
 
   // Windows 11 Dev channel releases with version string "Dev" [^2]
   // pre Win 11 release (expired 2021/10/31):
@@ -1492,63 +1706,61 @@   TBuildNameMap = record
   //   22526, 22533, 22538, 22543, 22557, 22563,
 
   // Windows 11 Dev channel releases with version string "22H2" [^2]
-  Win1122H2DevChannelDevBuilds: array[0..20] of Integer = (
-    // expired 2022/09/15 (pre Win 11 22H2 beta release):
-    //   22567, 22572, 22579
-    // expired 2022/09/15 (post Win 11 22H2 beta release):
-    //   25115, 25120, 25126, 25131, 25136, 25140, 25145, 25151, 25158, 25163,
-    //   25169, 25174, 25179,
-    // expired 2023/09/15 (post Win 11 22H2 beta release):
-    //    25182, 25188, 25193, 25197, 25201, 25206, 25211,
-    // expired 2023/09/15 (post Win 11 22H2 release):
-    //    25217, 25227, 25231, 25236, 25247, 25252, 25262, 25267, 25272, 25276,
-    //    25281, 25284, 25290, 25295, 25300, 25309, 23403, 23419, 23424, 23430,
-    //    23435, 23440, 23451, 23466, 23471, 23475, 23481, 23486, 23493, 23506,
-    //    23511, 23516, 23521,
-    // expiring 2024-09-15:
-    23526, 23531, 23536, 23541, 23545, 23550, 23555, 23560, 23565, 23570, 23575,
-    23580, 23585, 23590, 23595, 23601, 23606, 23612, 23615, 23619, 23620
-  );
-
-  // Win 11 Dev channel releases with version string "24H2" [^2]
-  Win1124H2DevChannelDevBuilds: array[0..4] of Integer = (
-    // expiring 2024-09-15:
-    26052, 26058, 26080, 26085, 26090
-  );
+  // pre Win 11 22H2 beta release (expired 2022/09/15):
+  //   22567, 22572, 22579
+  // post Win 11 22H2 beta release (expired 2022/09/15):
+  //   25115, 25120, 25126, 25131, 25136, 25140, 25145, 25151, 25158, 25163,
+  //   25169, 25174, 25179,
+  // post Win 11 22H2 beta release (expired 2023/09/15):
+  //    25182, 25188, 25193, 25197, 25201, 25206, 25211,
+  // post Win 11 22H2 release, ni_release string (expired 2023/09/15):
+  //    25217, 25227, 25231, 25236, 25247, 25252, 25262, 25267, 25272, 25276,
+  //    25281, 25284, 25290, 25295, 25300, 25309,
+  // post Win 11 22H2 release, ni_prerelease string (expired 2023/09/15):
+  //    23403, 23419, 23424, 23430, 23435, 23440, 23451, 23466, 23471, 23475,
+  //    23481, 23486, 23493, 23506, 23511, 23516, 23521,
+  // post Win 11 22H2 release, ni_prerelease string (expired 2024-09-15):
+  //    23526, 23531, 23536, 23541, 23545, 23550, 23555, 23560, 23565, 23570,
+  //    23575, 23580, 23585, 23590, 23595, 23601, 23606, 23612, 23615, 23619,
+  //    23620
 
   // Preview builds of Windows 11 in the Canary Channel with version string
   // "22H2" [^2]
-  // (expired 2023-09-15):
+  // expired 2023-09-15:
   //    25314, 25324, 25330, 25336, 25346, 25352, 25357, 25370,
 
   // Preview builds of Windows 11 in the Canary Channel with version string
   // "23H2" [^2]
-  Win11Canary23H2PreviewBuilds: array[0..15] of Integer = (
-    // expired 2023-09-15:
-    //    25375, 25381, 25387, 25393, 25905, 25915, 25921, 25926,
-    // expires 2024-09-15:
-    25931, 25936, 25941, 25947, 25951, 25967, 25977, 25982, 25987, 25992, 25997,
-    26002, 26010, 26016, 26020, 26040
-  );
-
-  // Preview builds of Windows 11 in the Canary Channel with version string
-  // "24H2" [^2]
-  Win11Canary24H2PreviewBuilds: array[0..5] of Integer = (
-    // expires 2024-09-15:
-    26052, 26058, 26063, 26080, 26085,
-    // expiry date unknown
-    26090
-  );
+  // Expired 2023-09-15:
+  //    25375, 25381, 25387, 25393, 25905, 25915, 25921, 25926,
+  // Expired 2024-09-15:
+  //    25931, 25936, 25941, 25947, 25951, 25967, 25977, 25982, 25987, 25992,
+  //    25997, 26002, 26010, 26016, 26020, 26040, 26063, 26200, 26212, 26217,
+  //    26227, 26231, 26236, 26241, 26244, 26252, 26257, 27686.
 
   // Windows 11 Dev & Beta channel builds with version string "22H2" [^2]
-  Win11DevBetaChannels22H2Builds: array[0..1] of Integer = (
+  Win11_22H2_DevAndBetaChannel_Builds: array[0..1] of Integer = (
     // Expired 2022/09/15:
     //   22581, 22593, 22598
     // Unknown expiry date:
     22610, 22616
   );
 
-  Win11FirstBuild = Win11DevBuild;  // First build number of Windows 11
+  // Windows 11 Preview, Dev & Canary channel builds with version "24H2" [^2]
+  Win11_24H2_DevAndCanaryChannel_Builds: array[0..1] of Integer = (
+    // Expired 2024-09-15:
+    //   26052, 26058, 26080, 26085,
+    // Unknown expiry date:
+    26090 {Dev revs:1,112; Canary revs: 1},
+    26100 {Dev revs:1,268; Canary revs: 1}
+  );
+
+  Win11_24H2_CanaryChannel_Builds: array[0..0] of Integer = (
+    // expiring 2025-09-15:
+    27695
+  );
+
+  Win11_First_Build = Win11_Dev_Build;  // First build number of Windows 11
 
   // Windows server v10.0 version ----------------------------------------------
 
@@ -1556,9 +1768,14 @@   TBuildNameMap = record
   // version 10.0. There's always an exception with Windows versioning!
 
   // Last build numbers of each "major" release before moving on to the next
-  Win2016LastBuild = 17134;
-  Win2019LastBuild = 18363;
-  WinServerLastBuild = 19042;
+  Win2016_Last_Build = 17134;
+  Win2019_Last_Build = 18363;
+  WinServer_Last_Build = 19042;
+
+  // Set of Windows 10 version identifiers
+  Win11_Versions: TWin10PlusVersionSet = [
+    win11v21H2, win11v22H2, win11v23H2, win11v24H2
+  ];
 
   {
     End of support information for all Windows Server versions.
@@ -1590,31 +1807,38 @@   TBuildNameMap = record
   // Map of Windows server releases that are named straightforwardly
   WinServerSimpleBuildMap: array[0..12] of TBuildNameMap = (
     // Windows Server 2016
-    (Build: 10074; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 2'),
-    (Build: 10514; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 3'),
-    (Build: 10586; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 4'),
-    (Build: 14300; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 5'),
-    (Build: 14393; LoRev: 0; HiRev: MaxInt; Name: 'Version 1607'),
-    (Build: 16299; LoRev: 0; HiRev: MaxInt; Name: 'Version 1709'),
-    (Build: Win2016LastBuild; LoRev: 0; HiRev: MaxInt; Name: 'Version 1803'),
+    (Build: 10074; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 2';
+      Version: 0),
+    (Build: 10514; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 3';
+      Version: 0),
+    (Build: 10586; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 4';
+      Version: 0),
+    (Build: 14300; LoRev: 0; HiRev: MaxInt; Name: 'Technical Preview 5';
+      Version: 0),
+    (Build: 14393; LoRev: 0; HiRev: MaxInt; Name: 'Version 1607'; Version: 0),
+    (Build: 16299; LoRev: 0; HiRev: MaxInt; Name: 'Version 1709'; Version: 0),
+    (Build: Win2016_Last_Build; LoRev: 0; HiRev: MaxInt; Name: 'Version 1803';
+      Version: 0),
     // Windows Server 2019
-    (Build: 17763; LoRev: 0; HiRev: MaxInt; Name: 'Version 1809'),
-    (Build: 18362; LoRev: 0; HiRev: MaxInt; Name: 'Version 1903'),
-    (Build: Win2019LastBuild; LoRev: 0; HiRev: MaxInt; Name: 'Version 1909'),
+    (Build: 17763; LoRev: 0; HiRev: MaxInt; Name: 'Version 1809'; Version: 0),
+    (Build: 18362; LoRev: 0; HiRev: MaxInt; Name: 'Version 1903'; Version: 0),
+    (Build: Win2019_Last_Build; LoRev: 0; HiRev: MaxInt; Name: 'Version 1909';
+      Version: 0),
     // Windows Server (no year number)
-    (Build: 19041; LoRev: 0; HiRev: MaxInt; Name: 'Version 2004'),
-    (Build: WinServerLastBuild; LoRev: 0; HiRev: MaxInt; Name: 'Version 20H2'),
+    (Build: 19041; LoRev: 0; HiRev: MaxInt; Name: 'Version 2004'; Version: 0),
+    (Build: WinServer_Last_Build; LoRev: 0; HiRev: MaxInt;
+      Name: 'Version 20H2'; Version: 0),
     // Windows Server 2022
-    (Build: 20348; LoRev: 0; HiRev: MaxInt; Name: 'Version 21H2')
+    (Build: 20348; LoRev: 0; HiRev: MaxInt; Name: 'Version 21H2'; Version: 0)
   );
 
   // Windows server releases needing special handling
 
   // Server 2016 Technical Preview 1: reports version 6.4 instead of 10.0!
-  Win2016TP1Build = 9841;
+  Win2016_TP1_Build = 9841;
 
   // Server 2019 Insider Preview builds: require format strings in names
-  Win2019IPBuilds: array[0..9] of Integer = (
+  Win2019_IP_Builds: array[0..9] of Integer = (
     17623, 17627, 17666, 17692, 17709, 17713, 17723, 17733, 17738, 17744
   );
 
@@ -1663,6 +1887,8 @@   TBuildNameMap = record
   // ** At present this variable is only used for Windows 10.
   InternalExtraUpdateInfo: string = '';
 
+  InternalWin1011Version: TPJWin10PlusVersion = win10plusNA;
+
 // Flag required when opening registry with specified access flags
 {$IFDEF REGACCESSFLAGS}
 const
@@ -1781,7 +2007,8 @@ function FindBuildNumberFrom(const BNs: array of Integer; var FoundBN: Integer):
 // parameters respectively. Otherwise False is returned, FoundBN is set to 0 and
 // FoundExtra is set to ''.
 function FindBuildNameAndExtraFrom(const Infos: array of TBuildNameMap;
-  var FoundBN: Integer; var FoundExtra: string): Boolean;
+  var FoundBN: Integer; var FoundExtra: string; var FoundVersion: Word):
+  Boolean;
 var
   I: Integer;
 begin
@@ -1795,6 +2022,7 @@ function FindBuildNameAndExtraFrom(const Infos: array of TBuildNameMap;
     begin
       FoundBN := Infos[I].Build;
       FoundExtra := Infos[I].Name;
+      FoundVersion := Infos[I].Version;
       Result := True;
       Break;
     end;
@@ -2031,6 +2259,33 @@ function GetRegistryInt(const RootKey: HKEY; const SubKey, Name: string):
   end;
 end;
 
+function GetRegistryBytes(const RootKey: HKEY; const SubKey, Name: string):
+  TBytes;
+var
+  Reg: TRegistry;          // registry access object
+  ValueInfo: TRegDataInfo; // info about registry value
+begin
+  SetLength(Result, 0);
+  // Open registry at required root key
+  Reg := RegCreate;
+  try
+    Reg.RootKey := RootKey;
+    if RegOpenKeyReadOnly(Reg, SubKey) and Reg.ValueExists(Name) then
+    begin
+      // Check if registry value is integer
+      Reg.GetDataInfo(Name, ValueInfo);
+      if ValueInfo.RegData <> rdBinary then
+        raise EPJSysInfo.Create(sBadRegBinType);
+      SetLength(Result, ValueInfo.DataSize);
+      Reg.ReadBinaryData(Name, Result[0], Length(Result));
+    end;
+  finally
+    // Close registry
+    Reg.CloseKey;
+    Reg.Free;
+  end;
+end;
+
 // Gets string info for given value from Windows current version key in
 // registry.
 function GetCurrentVersionRegStr(ValName: string): string;
@@ -2056,6 +2311,7 @@ procedure InitPlatformIdEx;
   GetVersionEx: TGetVersionEx;      // pointer to GetVersionEx API function
   GetProductInfo: TGetProductInfo;  // pointer to GetProductInfo API function
   SI: TSystemInfo;                  // structure from GetSystemInfo API call
+  VersionEx: Word;                  // gets extra version info (Win 10/11)
 
   // Get OS's revision number from registry.
   function GetOSRevisionNumber(const IsNT: Boolean): Integer;
@@ -2120,24 +2376,24 @@ procedure InitPlatformIdEx;
         case InternalMinorVersion of
           0:
             // Vista
-            InternalBuildNumber := WinVistaBaseBuild + Win32ServicePackMajor;
+            InternalBuildNumber := WinVista_Base_Build + Win32ServicePackMajor;
           1:
             // Windows 7
-            InternalBuildNumber := Win7BaseBuild + Win32ServicePackMajor;
+            InternalBuildNumber := Win7_Base_Build + Win32ServicePackMajor;
           2:
             // Windows 8 (no known SPs)
             if Win32ServicePackMajor = 0 then
-              InternalBuildNumber := Win8Build;
+              InternalBuildNumber := Win8_Build;
           3:
             // Windows 8.1 (no known SPs)
             if Win32ServicePackMajor = 0 then
-              InternalBuildNumber := Win8Point1Build;
+              InternalBuildNumber := Win8Point1_Build;
           4:
             if (Win32ProductType = VER_NT_DOMAIN_CONTROLLER)
               or (Win32ProductType = VER_NT_SERVER) then
             begin
               // Windows 2016 Server tech preview 1
-              InternalBuildNumber := Win2016TP1Build;
+              InternalBuildNumber := Win2016_TP1_Build;
               InternalExtraUpdateInfo := 'Technical Preview 6';
             end;
         end;
@@ -2162,15 +2418,18 @@ procedure InitPlatformIdEx;
             and (Win32ProductType <> VER_NT_SERVER) then
           begin
             if FindBuildNameAndExtraFrom(
-              Win10BuildMap, InternalBuildNumber, InternalExtraUpdateInfo
+              Win10_BuildMap, InternalBuildNumber, InternalExtraUpdateInfo,
+              VersionEx
             ) then
             begin
-              // Nothing to do: required internal variables set in function call
+              InternalWin1011Version :=
+              TPJWin10PlusVersion(VersionEx);
             end
-            else if IsBuildNumber(Win1021H1Build) then
+            else if IsBuildNumber(Win10_21H1_Build) then
             begin
               // **REF3**
-              InternalBuildNumber := Win1021H1Build;
+              InternalBuildNumber := Win10_21H1_Build;
+              InternalWin1011Version := win10v21H1;
               case InternalRevisionNumber of
                 985, 1023, 1052, 1055, 1081, 1082, 1083, 1110, 1151, 1165, 1202,
                 1237, 1266, 1288, 1320, 1348, 1387, 1415, 1466, 1469, 1503,
@@ -2195,19 +2454,20 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
-            else if IsBuildNumber(Win1021H2Build) then
+            else if IsBuildNumber(Win10_21H2_Build) then
             begin
               // **REF4**
               // From 21H2 Windows 10 moves from a 6 monthly update cycle to a
               // yearly cycle
-              InternalBuildNumber := Win1021H2Build;
+              InternalBuildNumber := Win10_21H2_Build;
+              InternalWin1011Version := win10v21H2;
               case InternalRevisionNumber of
                 1288, 1348, 1387, 1415, 1466, 1469, 1503, 1526, 1566, 1586,
                 1620, 1645, 1682, 1706, 1708, 1741, 1766, 1767, 1806, 1826,
                 1865, 1889, 1949, 2006, 2075, 2130, 2132, 2193, 2194, 2251,
                 2311, 2364, 2486, 2546, 2604, 2673, 2728, 2788, 2846, 2965,
                 3086, 3208, 3324, 3448, 3570, 3693, 3803, 3930, 4046,
-                4170 .. MaxInt:
+                4170, 4291, 4412, 4529, 4651, 4780, 4894 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 21H2';
                 1147, 1149, 1151, 1165, 1200, 1202, 1237, 1263, 1266, 1319,
                 1320, 1379, 1381, 1499, 1618, 1679, 1737, 1739, 1862,
@@ -2223,22 +2483,31 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
-            else if IsBuildNumber(Win1022H2Build) then
+            else if IsBuildNumber(Win10_22H2_Build) then
             begin
               // **REF5**
-              InternalBuildNumber := Win1022H2Build;
+              InternalBuildNumber := Win10_22H2_Build;
+              InternalWin1011Version := win10v22H2;
               case InternalBuildNumber of
                 2006, 2130, 2132, 2193, 2194, 2251, 2311, 2364, 2486, 2546,
                 2604, 2673, 2728, 2788, 2846, 2913, 2965, 3031, 3086, 3208,
                 3271, 3324, 3393, 3448, 3516, 3570, 3636, 3693, 3758, 3803,
-                3930, 3996, 4046, 4123, 4170, 4239 .. MaxInt:
+                3930, 3996, 4046, 4123, 4170, 4239, 4291, 4355, 4412, 4474,
+                4529, 4598, 4651, 4717, 4780, 4842, 4894, 4957 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 22H2';
                 1865, 1889, 1949, 2075, 2301, 2670, 2787, 2908, 3030, 3154,
-                3155, 3269, 3391, 3513, 3754, 3757, 3992, 4116, 4233, 4235:
+                3155, 3269, 3391, 3513, 3754, 3757, 3992, 4116, 4233, 4235,
+                4353, 4472:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview Channel v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
+                4593, 4713, 4955:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 '
+                    + '[Beta and Release Preview Channels v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
                 else
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Unknown release v10.0.%d.%d]',
@@ -2248,15 +2517,16 @@ procedure InitPlatformIdEx;
             end
             // Win 11 releases are reporting v10.0
             // Details taken from: https://tinyurl.com/usupsz4a
-            else if IsBuildNumber(Win11DevBuild) then
+            else if IsBuildNumber(Win11_Dev_Build) then
             begin
-              InternalBuildNumber := Win11DevBuild;
+              InternalBuildNumber := Win11_Dev_Build;
+              InternalWin1011Version := win10plusUnknown;
               InternalExtraUpdateInfo := Format(
                 'Dev [Insider v10.0.%d.%d]',
                 [InternalBuildNumber, InternalRevisionNumber]
               )
             end
-            else if IsBuildNumber(Win11v21H2Build) then
+            else if IsBuildNumber(Win11_21H2_Build) then
             begin
               // **REF6**
               // There are several Win 11 releases with this build number
@@ -2264,14 +2534,15 @@ procedure InitPlatformIdEx;
               // number.
               // *** Amazingly one of them, revision 194, is the 1st public
               //     release of Win 11 -- well hidden eh?!
-              InternalBuildNumber := Win11v21H2Build;
+              InternalBuildNumber := Win11_21H2_Build;
+              InternalWin1011Version := win11v21H2;
               case InternalRevisionNumber of
                 194, 258, 282, 348, 376, 434, 438, 469, 493, 527, 556, 593, 613,
                 652, 675, 708, 739, 740, 778, 795, 832, 856, 918, 978, 1042,
                 1098, 1100, 1165, 1219, 1281, 1335, 1455, 1516, 1574, 1641,
                 1696, 1761, 1817, 1880, 1936, 2003, 2057, 2124, 2176, 2245,
                 2295, 2360, 2416, 2482, 2538, 2600, 2652, 2713, 2777,
-                2836 .. MaxInt:
+                2836, 2899, 2960, 3019, 3079, 3147, 3197 .. MaxInt:
                   // Public releases of Windows 11
                   InternalExtraUpdateInfo := 'Version 21H2';
                 51, 65, 71:
@@ -2303,15 +2574,18 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
-            else if IsBuildNumber(Win11v22H2Build) then
+            else if IsBuildNumber(Win11_22H2_Build) then
             begin
               // **REF1**
-              InternalBuildNumber := Win11v22H2Build;
+              InternalBuildNumber := Win11_22H2_Build;
+              InternalWin1011Version := win11v22H2;
               case InternalRevisionNumber of
                 382, 521, 525, 608, 674, 675, 755, 819, 900, 963, 1105, 1194,
                 1265, 1344, 1413, 1485, 1555, 1635, 1702, 1778, 1848, 1926,
                 1928, 1992, 2070, 2134, 2215, 2283, 2361, 2428, 2506, 2715,
-                2792, 2861, 3007, 3085, 3155, 3235, 3296, 3374 .. MaxInt:
+                2792, 2861, 3007, 3085, 3155, 3235, 3296, 3374, 3447, 3527,
+                3593, 3672, 3737, 3810, 3880, 3958, 4037, 4112, 4169, 4249
+                .. MaxInt:
                 begin
                   InternalExtraUpdateInfo := 'Version 22H2';
                   case InternalRevisionNumber of
@@ -2328,7 +2602,8 @@ procedure InitPlatformIdEx;
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 105, 169, 232, 317, 457, 607, 754, 898, 1192, 1343, 1483, 1631,
-                1776, 2066, 2213, 2359, 2500, 2787, 3078, 3227, 3371:
+                1776, 2066, 2213, 2359, 2500, 2787, 3078, 3227, 3371, 3520,
+                3668, 3807, 3951, 4108, 4247:
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2349,25 +2624,32 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
-            else if IsBuildNumber(Win11v23H2Build) then
+            else if IsBuildNumber(Win11_23H2_Build) then
             begin
               // **REF10**
-              InternalBuildNumber := Win11v23H2Build;
+              InternalBuildNumber := Win11_23H2_Build;
+              InternalWin1011Version := win11v23H2;
               case InternalRevisionNumber of
-                2428, 2506, 2715, 2792, 2861, 3007, 3085, 3155, 3235 {Moment 5}, 3296, 3374 .. MaxInt:
+                2428, 2506, 2715, 2792, 2861, 3007, 3085, 3155, 3235 {Moment 5},
+                3296, 3374, 3447, 3527, 3593, 3672, 3737, 3810, 3880, 3958,
+                4037, 4112, 4169, 4249 .. MaxInt:
                   InternalExtraUpdateInfo := 'Version 23H2';
                 1825, 1830, 1835, 1900, 1906, 1972:
+                begin
                   // revisions 1825..1972 had version string "22H2"
+                  InternalWin1011Version := win11v22H2;
                   InternalExtraUpdateInfo := Format(
                     'Version 22H2 [Beta v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
+                end;
                 2048, 2050, 2115, 2129, 2191, 2199, 2262, 2265, 2271, 2338:
                   InternalExtraUpdateInfo := Format(
                     'Version 23H2 [Beta v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
-                2361, 2787, 3078, 3227, 3371:
+                2361, 2787, 3078, 3227, 3371, 3520, 3668, 3807, 3951, 4108,
+                4247:
                   InternalExtraUpdateInfo := Format(
                     'Version 23H2 [Release Preview v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2379,77 +2661,93 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
-            else if IsBuildNumber(Win11Oct22ComponentBetaChannelBuild) then
+            else if IsBuildNumber(Win11_24H2_Build) then
             begin
-              // **REF2**
-              InternalBuildNumber := Win11Oct22ComponentBetaChannelBuild;
+              // **REF11**
+              InternalBuildNumber := Win11_24H2_Build;
+              InternalWin1011Version := win11v24H2;
               case InternalRevisionNumber of
-                290, 436, 440, 450, 575, 586, 590, 598, 601:
+                1742, 1882 .. MaxInt:
+                  InternalExtraUpdateInfo := 'Version 24H2';
+                560, 712, 863, 994, 1000, 1150, 1297, 1301, 1457, 1586, 1591:
                   InternalExtraUpdateInfo := Format(
-                    'Version 22H2 [October Component Update v10.0.%d.%d]',
+                    'Version 24H2 [Release Preview v10.0.%d.%d',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                1:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 24H2 [Dev & Canary Channel v10.0.%d.%d',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                268:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 24H2 [Dev Channel v10.0.%d.%d',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
                 else
                   InternalExtraUpdateInfo := Format(
-                    'Version 22H2 [Unknown release v10.0.%d.%d]',
+                    'Version 24H2 [Unknown release v10.0.%d.%d]',
                     [InternalBuildNumber, InternalRevisionNumber]
                   );
               end;
             end
             else if FindBuildNumberFrom(
-              Win1122H2DevChannelDevBuilds, InternalBuildNumber
+              Win11_24H2_DevAndCanaryChannel_Builds, InternalBuildNumber
             ) then
             begin
-              // Win11 Dev Channel builds with version string "22H2"
+              // Win11 builds in Canary, Dev & Preview channels with version
+              // string "24H2"
+              InternalWin1011Version := win10plusUnknown;
               InternalExtraUpdateInfo := Format(
-                'Dev Channel Version 22H2 v10.0.%d.%d',
+                'Dev or Canary Channel Version 24H2 v10.0.%d.%d',
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
             else if FindBuildNumberFrom(
-              Win1124H2DevChannelDevBuilds, InternalBuildNumber
+              Win11_24H2_CanaryChannel_Builds, InternalBuildNumber
             ) then
             begin
-              // Win11 Dev Channel builds with version string "22H2"
+              // Win11 builds in Canary channel with version string "24H2"
+              InternalWin1011Version := win10plusUnknown;
               InternalExtraUpdateInfo := Format(
-                'Dev Channel Version 24H2 v10.0.%d.%d',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
-            end
-            else if FindBuildNumberFrom(
-              Win11Canary23H2PreviewBuilds, InternalBuildNumber
-            ) then
-            begin
-              // Win11 Canary Channel builds with version string "23H2"
-              InternalExtraUpdateInfo := Format(
-                'Canary Channel Version 23H2 v10.0.%d.%d',
+                'Canary Channel Version 24H2 v10.0.%d.%d',
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
-            else if FindBuildNumberFrom(
-              Win11Canary24H2PreviewBuilds, InternalBuildNumber
-            ) then
+            else if IsBuildNumber(Win11_Oct22Component_BetaChannel_Build) then
             begin
-              // Win11 Canary Channel builds with version string "24H2"
-              InternalExtraUpdateInfo := Format(
-                'Canary Channel Version 24H2 v10.0.%d.%d',
-                [InternalBuildNumber, InternalRevisionNumber]
-              );
+              // **REF2**
+              InternalBuildNumber := Win11_Oct22Component_BetaChannel_Build;
+              InternalWin1011Version := win10plusUnknown;
+              case InternalRevisionNumber of
+                290, 436, 440, 450, 575, 586, 590, 598, 601:
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [October Component Update v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'Version 22H2 [Unknown release v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
             end
             else if FindBuildNumberFrom(
-              Win11DevBetaChannels22H2Builds, InternalBuildNumber
+              Win11_22H2_DevAndBetaChannel_Builds, InternalBuildNumber
             ) then
             begin
               // Win 11 Dev & Beta channel builds with version string "22H2"
+              InternalWin1011Version := win10plusUnknown;
               InternalExtraUpdateInfo := Format(
                 'Dev & Beta Channels v10.0.%d.%d (22H2)',
                 [InternalBuildNumber, InternalRevisionNumber]
               );
             end
-            else if IsBuildNumber(Win11Feb23ComponentBetaChannelBuild) then
+            else if IsBuildNumber(Win11_Feb23Component_BetaChannel_Build) then
             begin
               // **REF7**
-              InternalBuildNumber := Win11Feb23ComponentBetaChannelBuild;
+              InternalBuildNumber := Win11_Feb23Component_BetaChannel_Build;
+              InternalWin1011Version := win10plusUnknown;
               case InternalRevisionNumber of
                 730, 741, 746, 870, 875, 885, 891, 1020, 1028, 1037, 1095,
                 1180, 1245, 1250, 1255, 1325 .. MaxInt:
@@ -2464,10 +2762,11 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
-            else if IsBuildNumber(Win11May23ComponentBetaChannelBuild) then
+            else if IsBuildNumber(Win11_May23Component_BetaChannel_Build) then
             begin
               // **REF8**
-              InternalBuildNumber := Win11May23ComponentBetaChannelBuild;
+              InternalBuildNumber := Win11_May23Component_BetaChannel_Build;
+              InternalWin1011Version := win10plusUnknown;
               case InternalRevisionNumber of
                 1391, 1465, 1470, 1537, 1546, 1610, 1616, 1680, 1690, 1755 ..
                 MaxInt:
@@ -2482,14 +2781,17 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
-            else if IsBuildNumber(Win11FutureComponentBetaChannelBuild) then
+            else if IsBuildNumber(Win11_FutureComponent_BetaChannel_Build) then
             begin
               // **REF9**
-              InternalBuildNumber := Win11FutureComponentBetaChannelBuild;
+              InternalBuildNumber := Win11_FutureComponent_BetaChannel_Build;
+              InternalWin1011Version := win10plusUnknown;
               case InternalRevisionNumber of
                 2419, 2483, 2486, 2552, 2700, 2771, 2776, 2841, 2850, 2915,
                 2921, 3061, 3066, 3130, 3139, 3140, 3209, 3212, 3276, 3286,
-                3350, 3420 .. MaxInt:
+                3350, 3420, 3430, 3495, 3500, 3566, 3570, 3575, 3640, 3646,
+                3720, 3785, 3790, 3858, 3930, 3936, 4000, 4005, 4010, 4076,
+                4082, 4145, 4225, 4291 .. MaxInt:
                   InternalExtraUpdateInfo := Format(
                     'Future Component Update Beta v10.0.%d.%d',
                     [InternalBuildNumber, InternalRevisionNumber]
@@ -2501,6 +2803,25 @@ procedure InitPlatformIdEx;
                   );
               end;
             end
+            else if IsBuildNumber(Win11_FutureComponent_DevChannel_Build) then
+            begin
+              // **REF12**
+              InternalBuildNumber := Win11_FutureComponent_DevChannel_Build;
+              InternalWin1011Version := win10plusUnknown;
+              case InternalRevisionNumber of
+                 461, 470, 670, 751, 770, 961, 1252, 1330, 1340, 1350, 1542,
+                 1843, 1912  .. MaxInt:
+                  InternalExtraUpdateInfo := Format(
+                    'Future Component Update Dev Channel v10.0.%d.%d',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+                else
+                  InternalExtraUpdateInfo := Format(
+                    'Future Component Update [Unknown Beta v10.0.%d.%d]',
+                    [InternalBuildNumber, InternalRevisionNumber]
+                  );
+              end;
+            end
             // End with some much less likely cases
             // NOTE: All the following tests MUST come after the last call to
             //       FindBuildNameAndExtraFrom() for non-server OSs because some
@@ -2512,14 +2833,14 @@ procedure InitPlatformIdEx;
               InternalBuildNumber, InternalExtraUpdateInfo
             ) then
             begin
-              // Nothing to do: required internal variables set in function call
+              InternalWin1011Version := win10v20H2;
             end
             else if FindWin10PreviewBuildNameAndExtraFrom(
               Win10_2004_Preview_Builds, '2004',
               InternalBuildNumber, InternalExtraUpdateInfo
             ) then
             begin
-              // Nothing to do: required internal variables set in function call
+              InternalWin1011Version := win10v2004;
             end
             else if IsBuildNumber(Win10_19XX_Shared_Build) then
             begin
@@ -2527,57 +2848,63 @@ procedure InitPlatformIdEx;
               // preview of Version 1903 or 1909
               InternalBuildNumber := Win10_19XX_Shared_Build;
               if IsInRange(InternalRevisionNumber, 0, 113) then
+              begin
+                InternalWin1011Version := win10v1903;
                 InternalExtraUpdateInfo := Format(
                   'Version 1903 Preview Build %d.%d',
                   [InternalBuildNumber, InternalRevisionNumber]
                 )
+              end
               else if IsInRange(InternalRevisionNumber, 10000, 10024) then
+              begin
+                InternalWin1011Version := win10v1909;
                 InternalExtraUpdateInfo := Format(
                   'Version 1909 Preview Build %d.%d',
                   [InternalBuildNumber, InternalRevisionNumber]
                 );
+              end;
             end
             else if FindWin10PreviewBuildNameAndExtraFrom(
               Win10_1903_Preview_Builds, '1903',
               InternalBuildNumber, InternalExtraUpdateInfo
             ) then
             begin
-              // Nothing to do: required internal variables set in function call
+              InternalWin1011Version := win10v1903;
             end
             else if FindWin10PreviewBuildNameAndExtraFrom(
               Win10_1809_Preview_Builds, '1809',
               InternalBuildNumber, InternalExtraUpdateInfo
             ) then
             begin
-              // Nothing to do: required internal variables set in function call
+              InternalWin1011Version := win10v1809;
             end
             else if FindWin10PreviewBuildNameAndExtraFrom(
               Win10_1803_Preview_Builds, '1803',
               InternalBuildNumber, InternalExtraUpdateInfo
             ) then
             begin
-              // Nothing to do: required internal variables set in function call
+              InternalWin1011Version := win10v1803;
             end
             else if FindWin10PreviewBuildNameAndExtraFrom(
               Win10_1709_Preview_Builds, '1709',
               InternalBuildNumber, InternalExtraUpdateInfo
             ) then
             begin
-              // Nothing to do: required internal variables set in function call
+              InternalWin1011Version := win10v1709;
             end
             else if FindWin10PreviewBuildNameAndExtraFrom(
               Win10_1703_Preview_Builds, '1703',
               InternalBuildNumber, InternalExtraUpdateInfo
             ) then
             begin
-              // Nothing to do: required internal variables set in function call
+              InternalWin1011Version := win10v1703;
             end
             else if FindWin10PreviewBuildNameAndExtraFrom(
               Win10_1607_Preview_Builds, '1607',
               InternalBuildNumber, InternalExtraUpdateInfo
             ) then
             begin
-              // Nothing to do: required internal variables set in function call
+              InternalWin1011Version := win10v1607;
             end
           end
           else // Win32ProductType in [VER_NT_DOMAIN_CONTROLLER, VER_NT_SERVER]
@@ -2587,13 +2914,14 @@ procedure InitPlatformIdEx;
             if FindBuildNameAndExtraFrom(
               WinServerSimpleBuildMap,
               InternalBuildNumber,
-              InternalExtraUpdateInfo
+              InternalExtraUpdateInfo,
+              VersionEx // unused
             ) then
             begin
               // Nothing to do: required internal variables set in function call
             end
             else if FindBuildNumberFrom(
-              Win2019IPBuilds, InternalBuildNumber
+              Win2019_IP_Builds, InternalBuildNumber
             ) then
             begin
               // Windows 2019 Insider preview builds require build number in
@@ -2687,6 +3015,13 @@ procedure InitPlatformIdEx;
 
 { TPJOSInfo }
 
+class function TPJOSInfo.BuildBranch: string;
+begin
+  Result := GetRegistryString(
+    HKEY_LOCAL_MACHINE, CurrentVersionRegKeys[IsWinNT], 'BuildBranch'
+  );
+end;
+
 class function TPJOSInfo.BuildNumber: Integer;
 begin
   Result := InternalBuildNumber;
@@ -2752,6 +3087,13 @@ class function TPJOSInfo.Description: string;
   end;
 end;
 
+class function TPJOSInfo.DigitalProductID: TBytes;
+begin
+  Result := GetRegistryBytes(
+    HKEY_LOCAL_MACHINE, CurrentVersionRegKeys[IsWinNT], 'DigitalProductId'
+  );
+end;
+
 class function TPJOSInfo.Edition: string;
 begin
   // This method is based on sample C++ code from MSDN
@@ -2766,7 +3108,11 @@ class function TPJOSInfo.Edition: string;
       // For v6.0 and later we ignore the suite mask and use the new
       // PRODUCT_ flags from the GetProductInfo() function to determine the
       // edition
+      // 1st try to find edition name from lookup table
       Result := EditionFromProductInfo;
+      if Result = '' then
+        // no matching entry in lookup: get from registry
+        Result := EditionIDFromReg;
       // append 64-bit if 64 bit system
       if InternalProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64 then
         Result := Result + ' (64-bit)';
@@ -2870,7 +3216,7 @@ class function TPJOSInfo.Edition: string;
       end
       else
         // NT before SP6: we read required info from registry
-        Result := EditionFromReg;
+        Result := NTEditionFromReg;
     end;
   end;
 end;
@@ -2890,19 +3236,10 @@ class function TPJOSInfo.EditionFromProductInfo: string;
   end;
 end;
 
-class function TPJOSInfo.EditionFromReg: string;
-var
-  EditionCode: string;  // OS product edition code stored in registry
+class function TPJOSInfo.EditionIDFromReg: string;
 begin
-  EditionCode := ProductTypeFromReg;
-  if CompareText(EditionCode, 'WINNT') = 0 then
-    Result := 'WorkStation'
-  else if CompareText(EditionCode, 'LANMANNT') = 0 then
-    Result := 'Server'
-  else if CompareText(EditionCode, 'SERVERNT') = 0 then
-    Result := 'Advanced Server';
-  Result := Result + Format(
-    ' %d.%d', [InternalMajorVersion, InternalMinorVersion]
+  Result := GetRegistryString(
+    HKEY_LOCAL_MACHINE, CurrentVersionRegKeys[IsWinNT], 'EditionID'
   );
 end;
 
@@ -3125,6 +3462,29 @@ class function TPJOSInfo.IsWin9x: Boolean;
   Result := Platform = ospWin9x;
 end;
 
+class function TPJOSInfo.IsWindows10PlusVersionOrLater(
+  const AVersion: TPJWin10PlusVersion): Boolean;
+begin
+  Assert(not (AVersion in [win10plusNA, win10plusUnknown]));
+  Result := IsReallyWindows10OrGreater and (Windows10PlusVersion >= AVersion);
+end;
+
+class function TPJOSInfo.IsWindows10VersionOrLater(
+  const AVersion: TPJWin10PlusVersion): Boolean;
+begin
+  if not (AVersion in Win10_Versions) then
+    raise EPJSysInfo.Create('Invalid Windows 10 version: can''t compare');
+  Result := IsWindows10PlusVersionOrLater(AVersion);
+end;
+
+class function TPJOSInfo.IsWindows11VersionOrLater(
+  const AVersion: TPJWin10PlusVersion): Boolean;
+begin
+  if not (AVersion in Win11_Versions) then
+    raise EPJSysInfo.Create('Invalid Windows 11 version: can''t compare');
+  Result := IsWindows10PlusVersionOrLater(AVersion);
+end;
+
 class function TPJOSInfo.IsWindowsServer: Boolean;
 var
   OSVI: TOSVersionInfoEx;
@@ -3182,6 +3542,22 @@ class function TPJOSInfo.MinorVersion: Integer;
   Result := InternalMinorVersion;
 end;
 
+class function TPJOSInfo.NTEditionFromReg: string;
+var
+  EditionCode: string;  // OS product edition code stored in registry
+begin
+  EditionCode := ProductTypeFromReg;
+  if CompareText(EditionCode, 'WINNT') = 0 then
+    Result := 'WorkStation'
+  else if CompareText(EditionCode, 'LANMANNT') = 0 then
+    Result := 'Server'
+  else if CompareText(EditionCode, 'SERVERNT') = 0 then
+    Result := 'Advanced Server';
+  Result := Result + Format(
+    ' %d.%d', [InternalMajorVersion, InternalMinorVersion]
+  );
+end;
+
 class function TPJOSInfo.Platform: TPJOSPlatform;
 begin
   case InternalPlatform of
@@ -3303,7 +3679,7 @@ class function TPJOSInfo.Product: TPJOSProduct;
             0:
               if not IsServer then
               begin
-                if TestBuildNumber(VER_LESS, Win11FirstBuild) then
+                if TestBuildNumber(VER_LESS, Win11_First_Build) then
                   Result := osWin10
                 else
                   // ** As of 2021-10-05 Win 11 is reporting version 10.0!
@@ -3311,11 +3687,17 @@ class function TPJOSInfo.Product: TPJOSProduct;
               end
               else
               begin
-                if TestBuildNumber(VER_LESS_EQUAL, Win2016LastBuild) then
+                if TestBuildNumber(
+                  VER_LESS_EQUAL, Win2016_Last_Build
+                ) then
                   Result := osWin10Svr
-                else if TestBuildNumber(VER_LESS_EQUAL, Win2019LastBuild) then
+                else if TestBuildNumber(
+                  VER_LESS_EQUAL, Win2019_Last_Build
+                ) then
                   Result := osWinSvr2019
-                else if TestBuildNumber(VER_LESS_EQUAL, WinServerLastBuild) then
+                else if TestBuildNumber(
+                  VER_LESS_EQUAL, WinServer_Last_Build
+                ) then
                   Result := osWinServer
                 else
                   Result := osWinSvr2022;
@@ -3457,6 +3839,29 @@ class function TPJOSInfo.ServicePackMinor: Integer;
   Result := Win32ServicePackMinor;
 end;
 
+class function TPJOSInfo.Windows10PlusVersion: TPJWin10PlusVersion;
+begin
+  Result := InternalWin1011Version;
+end;
+
+class function TPJOSInfo.Windows10PlusVersionName: string;
+const
+  cVersions: array[TPJWin10PlusVersion] of string = (
+    // Not windows 10+
+    '',
+    // Windows 10+ with unknown version string
+    'Unknown',
+    // Windows 10
+    '1507', '1511', '1607', '1703', '1709',
+    '1803', '1809', '1903', '1909', '2004',
+    '20H2', '21H1', '21H2', '22H2',
+    // Windows 11
+    '21H2', '22H2', '23H2', '24H2'
+  );
+begin
+  Result := cVersions[Windows10PlusVersion];
+end;
+
 { TPJComputerInfo }
 
 class function TPJComputerInfo.BiosVendor: string;
@@ -3642,18 +4047,17 @@ class function TPJComputerInfo.MACAddress: string;
     if NetBiosSucceeded(Netbios(@Ncb)) then
     begin
       // we have a MAC address: return it
-      with Adapter.Adapt do
-        Result := Format(
-          '%.2x-%.2x-%.2x-%.2x-%.2x-%.2x',
-          [
-            Ord(adapter_address[0]),
-            Ord(adapter_address[1]),
-            Ord(adapter_address[2]),
-            Ord(adapter_address[3]),
-            Ord(adapter_address[4]),
-            Ord(adapter_address[5])
-          ]
-        );
+      Result := Format(
+        '%.2x-%.2x-%.2x-%.2x-%.2x-%.2x',
+        [
+          Ord(Adapter.Adapt.adapter_address[0]),
+          Ord(Adapter.Adapt.adapter_address[1]),
+          Ord(Adapter.Adapt.adapter_address[2]),
+          Ord(Adapter.Adapt.adapter_address[3]),
+          Ord(Adapter.Adapt.adapter_address[4]),
+          Ord(Adapter.Adapt.adapter_address[5])
+        ]
+      );
       Exit;
     end;
   end;

From 82b16ca6917f6e84d4bedd879d6f1d3b31d1a90d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:37:29 +0100
Subject: [PATCH 181/264] Bump version number to v4.24.0 build 272

---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index c9ae9dae3..70615f76f 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.23.0
-build=271
+version=4.24.0
+build=272
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From 7572fdad75cd510d5229ecd9c7b3971d34337e2b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 23 Oct 2024 20:32:52 +0100
Subject: [PATCH 182/264] Update change log with details of release v4.24.0

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5aeb246be..456f8baa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,21 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
+## Release v4.24.0 of 23 October 2024
+
+* Compilers with which a snippet has not been tested are now omitted from snippet information that is copied to the clipboard and included in print outs [issue #143].
+* Reversed order of compilers in the snippets editor's _Compile Results_ tab so that later compilers are display first. This change was accidentally left out of release v4.22.0 when similar changes were made in other parts of the UI [issue #135].
+* Release version number is now displayed in the program title bar [issue #122].
+* Fixed incorrect copyright date displayed in About Box [issue #129].
+* Fixed bug when checking for correct preamble bytes (BOMs) in UTF-8 and UTF-16 format text files [issue #139].
+* Portable and Standard edition now use the same program names. Portable edition was previously declaring itself as _DelphiDabbler CodeSnip-p_ instead of _DelphiDabbler CodeSnip_ [issue #130].
+* Updated operating system detection code [issues #126 and #144].
+* Added `Deploy.bat` script to create and package both the CodeSnip standard and portable releases [issue #128].
+* Documentation changes:
+  * CodeSnip standard and portable releases now each have their own release read-me files instead of both releases being shipped with the same read-me [issue #127]. Updated `Build.html` and `README.md` re this change.
+  * Updated and corrected REML documentation and REML help topic. Those documents and others that discuss REML were also changed to link to authoritative REML definitions in the `delphidabbler/reml` repository. [issues #131, #133 & #134].
+  * Updated `Build.html` with alternative, more secure, download link for `zip.exe` program that is required to package releases [issue #137].
+
 ## Release v4.23.0 of 02 April 2024
 
 * Removed marketing names (e.g. "Athens" or "Rio") from Delphi compiler names to save space when the compiler names are displayed in the UI [issue #125].

From 7a6ef7fb397c186b021759e3e56cebbcba7a7aa9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:51:15 +0100
Subject: [PATCH 183/264] Update copyright date in header comments to 2024

---
 Src/UIOUtils.pas        | 2 +-
 Src/URTFSnippetDoc.pas  | 2 +-
 Src/USnippetDoc.pas     | 2 +-
 Src/UTextSnippetDoc.pas | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Src/UIOUtils.pas b/Src/UIOUtils.pas
index 09b02879d..8c6ab2154 100644
--- a/Src/UIOUtils.pas
+++ b/Src/UIOUtils.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides a container for assisting with common file operations.
 }
diff --git a/Src/URTFSnippetDoc.pas b/Src/URTFSnippetDoc.pas
index 0fe04c353..4bb6399c1 100644
--- a/Src/URTFSnippetDoc.pas
+++ b/Src/URTFSnippetDoc.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that renders a document that describes a snippet as rich
  * text.
diff --git a/Src/USnippetDoc.pas b/Src/USnippetDoc.pas
index 35cd8e94a..e11245322 100644
--- a/Src/USnippetDoc.pas
+++ b/Src/USnippetDoc.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements an abstract base class that renders a text document that describes
  * a snippet. Should be overridden by classes that generate actual documents in
diff --git a/Src/UTextSnippetDoc.pas b/Src/UTextSnippetDoc.pas
index 4ea009d9d..923637950 100644
--- a/Src/UTextSnippetDoc.pas
+++ b/Src/UTextSnippetDoc.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2024, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that renders a document that describes a snippet as plain
  * text.

From 58be37c7a9a31be5abab1ec2ae323552259f44d9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 13 Apr 2025 17:43:18 +0100
Subject: [PATCH 184/264] Fix CodeSnip crash after resume from hiberanation.

It seems that the problem is that, sometimes (not always) Windows recreates the tree view displayed in the overview pane and all its nodes. The tree view nodes are custom classes that have a property that reference an `IView` instance relating to the displayed items. Unfortunately when Windows recreates the nodes the `IView` property is set to `nil`.

This explains the nil `IView` references that have been causing the access violation.

The solution used in the fix is to handle the Windows messages sent when the computer hibernates and resumes. On hibernation the state of the tree view is recorded. On restoration we assume that the tree view is corrupted and so forcibly rebuild it and restore the saved state.

There is a problem thought. The message we handle is issued twice after resuming from hibernation. There is no easy way to tell which message has been issued. Therefore the tree view is rebuilt twice. There is not much performance penalty to this, so we can let it go. The potential problem is that if the tree view is recreated it happens after the 1st message and before the 2nd. Should, for example, the message only be triggered once then the bug will be back!

Even after all this it is possible that the program will redraw the tree view before the `IView` instances are restored. I've added code to the tree node custom drawing code to test if a node's `IView` instance is nil. This leads to some nodes not being drawn correctly. However, this doesn't matter because the tree view is forcibly redrawn again after the `IView` instances are restored.

All in all, I've not totally happy with this solution, which is more of a work around than a fix, but it's the best I can come up with without completely revising the overview frame code.

Fixes #70
---
 Src/FmMain.pas          | 23 ++++++++++++++++++++++-
 Src/FrOverview.pas      | 16 +++++++++++++---
 Src/UMainDisplayMgr.pas | 29 +++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 725d241aa..2bce3465e 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -522,6 +522,11 @@   TMainForm = class(THelpAwareForm)
       ///  <summary>Object that manages favourites.</summary>
       fFavouritesMgr: TFavouritesManager;
 
+    ///  <summary>Handles the <c>WM_POWERBROADCAST</c> messages to detect and
+    ///  respond to hibernation messages.</summary>
+    ///  <remarks>This is necessary as part of the fix for an obscure bug. See
+    ///  https://github.com/delphidabbler/codesnip/issues/70</remarks>
+    procedure WMPowerBroadcast(var Msg: TMessage); message WM_POWERBROADCAST;
     ///  <summary>Displays view item given by TViewItemAction instance
     ///  referenced by Sender and adds to history list.</summary>
     procedure ActViewItemExecute(Sender: TObject);
@@ -1324,7 +1329,6 @@ procedure TMainForm.FormDestroy(Sender: TObject);
   // fStatusBarMgr MUST be nilled: otherwise it can be called after status bar
   // control has been freed and so cause AV when trying to use the control
   FreeAndNil(fStatusBarMgr);
-
 end;
 
 procedure TMainForm.FormResize(Sender: TObject);
@@ -1582,5 +1586,22 @@ procedure TMainForm.splitVertCanResize(Sender: TObject;
     Accept := False;
 end;
 
+procedure TMainForm.WMPowerBroadcast(var Msg: TMessage);
+begin
+  // Sometimes when the computer is resumed from hibernation the tree view in
+  // the overview frame is destroyed and recreated by Windows. Unfortunately the
+  // IView instances associated with the recreated tree nodes are lost.
+  // Attempting to read those (now nil) IView instances was resulting in an
+  // access violation.
+  case Msg.WParam of
+    PBT_APMSUSPEND:
+      // Get ready for isolation
+      fMainDisplayMgr.PrepareForHibernate;
+    PBT_APMPOWERSTATUSCHANGE:
+      // Restore from hibernation: ensure the IView instances are recreeated
+      fMainDisplayMgr.RestoreFromHibernation;
+  end;
+end;
+
 end.
 
diff --git a/Src/FrOverview.pas b/Src/FrOverview.pas
index e668c3007..b96e4b63f 100644
--- a/Src/FrOverview.pas
+++ b/Src/FrOverview.pas
@@ -86,6 +86,7 @@       TTVDraw = class(TSnippetsTVDraw)
             @return True if node is a section header, False if not.
           }
       end;
+
     var
       fTVDraw: TTVDraw;             // Object that renders tree view nodes
       fNotifier: INotifier;         // Notifies app of user initiated events
@@ -966,7 +967,12 @@ function TOverviewFrame.TTVDraw.IsSectionHeadNode(
   ViewItem: IView;  // view item represented by node
 begin
   ViewItem := (Node as TViewItemTreeNode).ViewItem;
-  Result := ViewItem.IsGrouping;
+  // Workaround for possibility that ViewItem might be nil when restarting after
+  // hibernation.
+  if Assigned(ViewItem) then
+    Result := ViewItem.IsGrouping
+  else
+    Result := False;
 end;
 
 function TOverviewFrame.TTVDraw.IsUserDefinedNode(
@@ -979,8 +985,12 @@ function TOverviewFrame.TTVDraw.IsUserDefinedNode(
   ViewItem: IView;  // view item represented by node
 begin
   ViewItem := (Node as TViewItemTreeNode).ViewItem;
-  // TODO -cBug: Exception reported as issue #70 seems to be triggered here
-  Result := ViewItem.IsUserDefined;
+  // Workaround for possibility that ViewItem might be nil when restarting after
+  // hibernation.
+  if Assigned(ViewItem) then
+    Result := ViewItem.IsUserDefined
+  else
+    Result := False;
 end;
 
 end.
diff --git a/Src/UMainDisplayMgr.pas b/Src/UMainDisplayMgr.pas
index e9c1f5459..3df9a37fe 100644
--- a/Src/UMainDisplayMgr.pas
+++ b/Src/UMainDisplayMgr.pas
@@ -291,6 +291,23 @@   TMainDisplayMgr = class(TObject)
 
     /// <summary>Prepares display ready for database to be reloaded.</summary>
     procedure PrepareForDBReload;
+
+    ///  <summary>Gets the overview frame prepared for program hibernation.
+    ///  </summary>
+    ///  <remarks>Saves the overview tree view state ready for restoring after
+    ///  hibernation.</remarks>
+    procedure PrepareForHibernate;
+
+    ///  <summary>Restores the overview's tree view to have the correct IView
+    ///  instances after hibernation restores the previously saved state.
+    ///  </summary>
+    ///  <remarks>Sometimes, Windows quietly recreates the node of the tree view
+    ///  after resuming from hibernation, without restoring the associated IView
+    ///  instances, leading to access violations. This method should be called
+    ///  after resuming from hibernation to recreate the tree view with the
+    ///  correct IView instances.</remarks>
+    procedure RestoreFromHibernation;
+
   end;
 
 
@@ -566,6 +583,12 @@ procedure TMainDisplayMgr.PrepareForDBViewChange(View: IView);
   fPendingViewChange := True;
 end;
 
+procedure TMainDisplayMgr.PrepareForHibernate;
+begin
+  // simply save the state of the overview tree view ready for later restoration
+  (fOverviewMgr as IOverviewDisplayMgr).SaveTreeState;
+end;
+
 procedure TMainDisplayMgr.RedisplayOverview;
 begin
   (fOverviewMgr as IOverviewDisplayMgr).Display(Query.Selection, True);
@@ -593,6 +616,12 @@ procedure TMainDisplayMgr.ReStart;
   (fOverviewMgr as IOverviewDisplayMgr).Display(Query.Selection, True);
 end;
 
+procedure TMainDisplayMgr.RestoreFromHibernation;
+begin
+  (fOverviewMgr as IOverviewDisplayMgr).Display(Query.Selection, True);
+  (fOverviewMgr as IOverviewDisplayMgr).RestoreTreeState;
+end;
+
 procedure TMainDisplayMgr.SelectAll;
 begin
   // Only details pane supports text selection

From 689c4be2014bc2b3a54206bf9559a34e0c8a1bab Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 13 Apr 2025 18:07:41 +0100
Subject: [PATCH 185/264] Bump copyright dates for 2025

---
 Docs/License.html              | 6 +++---
 Src/FmMain.pas                 | 3 +--
 Src/FrOverview.pas             | 2 +-
 Src/Help/HTML/license.htm      | 4 ++--
 Src/Install/Assets/License.rtf | 2 +-
 Src/UMainDisplayMgr.pas        | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Docs/License.html b/Docs/License.html
index 458ab8f79..c47a44323 100644
--- a/Docs/License.html
+++ b/Docs/License.html
@@ -1,7 +1,7 @@
 ﻿<!DOCTYPE HTML>
 
 <!--
- * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip license.
  *
@@ -231,7 +231,7 @@ <h2>
     Executable Program
   </h2>
   <p>
-    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2024 by <a
+    DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2025 by <a
       href="https://gravatar.com/delphidabbler"
     >Peter D Johnson</a>.
   </p>
@@ -1801,7 +1801,7 @@ <h2 id="ddab-exclusive">
   </h2>
 
   <p>
-    Files covered by this license are original work, copyright &copy; 2012-2024, <a href="https://gravatar.com/delphidabbler">Peter D Johnson</a>.
+    Files covered by this license are original work, copyright &copy; 2012-2025, <a href="https://gravatar.com/delphidabbler">Peter D Johnson</a>.
   </p>
 
   <p>
diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 2bce3465e..adfd77419 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2024, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Application's main form. Handles the program's main window display and user
  * interaction.
@@ -1518,7 +1518,6 @@ procedure TMainForm.InitForm;
     // Create object to handle compilation and assoicated UI and dialogues
     fCompileMgr := TMainCompileMgr.Create(Self);  // auto-freed
 
-
     // Set event handler for snippets database
     Database.AddChangeEventHandler(DBChangeHandler);
 
diff --git a/Src/FrOverview.pas b/Src/FrOverview.pas
index b96e4b63f..e608e6d4a 100644
--- a/Src/FrOverview.pas
+++ b/Src/FrOverview.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a titled frame that displays lists of snippets, arranged in
  * different ways, and manages user interaction with the displayed items.
diff --git a/Src/Help/HTML/license.htm b/Src/Help/HTML/license.htm
index fc310ae74..5f57a6c32 100644
--- a/Src/Help/HTML/license.htm
+++ b/Src/Help/HTML/license.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic containing summary of CodeSnip license.
 -->
@@ -27,7 +27,7 @@ <h1>
       <a name="license"></a>Summary of End User License Agreement
     </h1>
     <p>
-      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2024 by Peter D
+      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2025 by Peter D
       Johnson, <a
         href="https://gravatar.com/delphidabbler"
         class="weblink"
diff --git a/Src/Install/Assets/License.rtf b/Src/Install/Assets/License.rtf
index 5ef3433ff..74ec0e7d1 100644
--- a/Src/Install/Assets/License.rtf
+++ b/Src/Install/Assets/License.rtf
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deftab709{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}}
 {\colortbl ;\red0\green0\blue255;}
 {\*\generator Riched20 10.0.18362}\viewkind4\uc1 
-\pard\sa113\f0\fs18\lang1033 DelphiDabbler CodeSnip is copyright \'a9 2005-2024 by Peter D Johnson, {{\field{\*\fldinst{HYPERLINK https://en.gravatar.com/delphidabbler }}{\fldrslt{https://en.gravatar.com/delphidabbler\ul0\cf0}}}}\f0\fs18 . \par
+\pard\sa113\f0\fs18\lang1033 DelphiDabbler CodeSnip is copyright \'a9 2005-2025 by Peter D Johnson, {{\field{\*\fldinst{HYPERLINK https://en.gravatar.com/delphidabbler }}{\fldrslt{https://en.gravatar.com/delphidabbler\ul0\cf0}}}}\f0\fs18 . \par
 The executable version of CodeSnip is made available under the terms of the Mozilla Public License 2.0 ({{\field{\*\fldinst{HYPERLINK https://www.mozilla.org/MPL/2.0/ }}{\fldrslt{https://www.mozilla.org/MPL/2.0/\ul0\cf0}}}}\f0\fs18 ). This means you can use, copy and distribute CodeSnip as you wish.\par
 You may also modify CodeSnip as you wish and you may distribute copies of your modified version under the terms of the Mozilla Public License. The only exception is that you may not use the CodeSnip name or branding (e.g. the program icon) in any modification you distribute unless you have the explicit permission of the copyright holder. \par
 For full information see the file \i License.html\i0  installed with this program.\fs24\lang2057\par
diff --git a/Src/UMainDisplayMgr.pas b/Src/UMainDisplayMgr.pas
index 3df9a37fe..65e98e2fb 100644
--- a/Src/UMainDisplayMgr.pas
+++ b/Src/UMainDisplayMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that manages and co-ordinates the display of the program's main UI.
  * Calls into subsidiary manager objects to perform display operations.

From 2069c04b53c9c64b1d8f91b65cd688e1f2148ee8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 13 Apr 2025 18:51:06 +0100
Subject: [PATCH 186/264] Bump version number to v4.24.1 build 273

---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index 70615f76f..513eae126 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.24.0
-build=272
+version=4.24.1
+build=273
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From c6274e0b06a74e5bbc728b4e3e0cd99829d4f669 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 13 Apr 2025 19:11:28 +0100
Subject: [PATCH 187/264] Update change log with details of release v4.24.1

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 456f8baa6..bafd5addf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
+## Release v4.24.1 of 13 April 2005
+
+* Fixed bug where CodeSnip occasionally crashes after a computer resumes from hibernation [issue #70].
+* Bumped some copyright dates for 2025.
+
 ## Release v4.24.0 of 23 October 2024
 
 * Compilers with which a snippet has not been tested are now omitted from snippet information that is copied to the clipboard and included in print outs [issue #143].

From ca42523866c90e8bbeff5f5ce4490a311b076cc0 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 14 Apr 2025 14:13:33 +0100
Subject: [PATCH 188/264] Revise hibernate bug fix (issue #70)

Following a discussion in the comments the DelphiDabbler Blog post at
https://tinyurl.com/mrp76mdy it seems that was not a good idea to rely
upon handling WM_POWERBROADCAST's PBT_APMPOWERSTATUSCHANGE event to
restore the overview pane's tree view nodes to the expected state after
Windows has recreated the tree view in an invalid state.

So I've modified the code to only rely on the PBT_APMSUSPEND event of
WM_POWERBROADCAST and not PBT_APMPOWERSTATUSCHANGE. PBT_APMSUSPEND is
handled to prepare for hibernation by not only saving the tree view's
state (as per the previous fix) but also setting an event handler that
gets called only when the tree view's window gets recreated by Windows
AND the treeview contains nodes with nil IView pointers. When called,
the event handler rebuilds the tree view with nodes containing valid
IView references.

The problem is that the event needs to be triggered from the
TTreeView.CreateWnd method that gets called when Windows recreates the
tree view. Since TTreeView exposes no suitable events, the only way is
to inject a suitable event using a nasty hack. Not good practise.

Note that all the methods that depend on the hack have been given names
beginning with "_HACK_" to make it obvious where the naughtiness lies.
---
 Src/FmMain.pas          | 10 ++++----
 Src/FrOverview.pas      | 52 +++++++++++++++++++++++++++++++++++++++++
 Src/IntfFrameMgrs.pas   |  6 ++++-
 Src/UMainDisplayMgr.pas | 52 ++++++++++++++++++++---------------------
 4 files changed, 87 insertions(+), 33 deletions(-)

diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index adfd77419..8bffbe2b8 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -524,9 +524,10 @@   TMainForm = class(THelpAwareForm)
 
     ///  <summary>Handles the <c>WM_POWERBROADCAST</c> messages to detect and
     ///  respond to hibernation messages.</summary>
-    ///  <remarks>This is necessary as part of the fix for an obscure bug. See
+    ///  <remarks>!! HACK necessary as part of the fix for an obscure bug. See
     ///  https://github.com/delphidabbler/codesnip/issues/70</remarks>
     procedure WMPowerBroadcast(var Msg: TMessage); message WM_POWERBROADCAST;
+
     ///  <summary>Displays view item given by TViewItemAction instance
     ///  referenced by Sender and adds to history list.</summary>
     procedure ActViewItemExecute(Sender: TObject);
@@ -1587,6 +1588,7 @@ procedure TMainForm.splitVertCanResize(Sender: TObject;
 
 procedure TMainForm.WMPowerBroadcast(var Msg: TMessage);
 begin
+  // !! HACK
   // Sometimes when the computer is resumed from hibernation the tree view in
   // the overview frame is destroyed and recreated by Windows. Unfortunately the
   // IView instances associated with the recreated tree nodes are lost.
@@ -1594,11 +1596,7 @@ procedure TMainForm.WMPowerBroadcast(var Msg: TMessage);
   // access violation.
   case Msg.WParam of
     PBT_APMSUSPEND:
-      // Get ready for isolation
-      fMainDisplayMgr.PrepareForHibernate;
-    PBT_APMPOWERSTATUSCHANGE:
-      // Restore from hibernation: ensure the IView instances are recreeated
-      fMainDisplayMgr.RestoreFromHibernation;
+      fMainDisplayMgr._HACK_PrepareForHibernate;
   end;
 end;
 
diff --git a/Src/FrOverview.pas b/Src/FrOverview.pas
index e608e6d4a..9cf76a2a8 100644
--- a/Src/FrOverview.pas
+++ b/Src/FrOverview.pas
@@ -26,6 +26,29 @@ interface
 
 type
 
+  // !! HACK
+  // Horrible hack to expose CreateWnd for overiding TTreeView.CreateWnd for the
+  // existing TTreeView component of TOverviewFrame. The hack avoids having to
+  // remove the component and replacing it with a descendant class that is
+  // manually constructed at run time.
+  // This is here to enable the tree view to be recreated with correctly
+  // instantiated TViewItemTreeNode nodes after Windows recreates the tree
+  // behind the scenes after resuming from hibernation.
+  // I am deeply ashamed of this hack.
+  TTreeView = class(ComCtrls.TTreeView)
+  strict private
+    var
+      _HACK_fOnAfterCreateNilViews: TNotifyEvent;
+  protected
+    procedure CreateWnd; override;
+  public
+    ///  <summary>!! HACK. Event triggered after the inherited CreateWnd is
+    ///  called. Only called if the tree view has nil references to IView
+    ///  objects.</summary>
+    property _HACK_OnAfterCreateNilViews: TNotifyEvent
+      read _HACK_fOnAfterCreateNilViews write _HACK_fOnAfterCreateNilViews;
+  end;
+
   {
   TOverviewFrame:
     Titled frame that displays lists of snippets grouped in various ways and
@@ -214,6 +237,10 @@       TTVDraw = class(TSnippetsTVDraw)
     procedure RestoreTreeState;
       {Restores last saved treeview expansion state from memory.
       }
+    ///  <summary>!! HACK: Sets an event handler on the tree view to work
+    ///  around a bug that can occur after resuming from hibernation.</summary>
+    ///  <remarks>Method of IOverviewDisplayMgr.</remarks>
+    procedure _HACK_SetHibernateHandler(const AHandler: TNotifyEvent);
     { IPaneInfo }
     function IsInteractive: Boolean;
       {Checks if the pane is currently interactive with user.
@@ -955,6 +982,12 @@ procedure TOverviewFrame.UpdateTreeState(const State: TTreeNodeAction);
   end;
 end;
 
+procedure TOverviewFrame._HACK_SetHibernateHandler(
+  const AHandler: TNotifyEvent);
+begin
+  tvSnippets._HACK_OnAfterCreateNilViews := AHandler;
+end;
+
 { TOverviewFrame.TTVDraw }
 
 function TOverviewFrame.TTVDraw.IsSectionHeadNode(
@@ -993,5 +1026,24 @@ function TOverviewFrame.TTVDraw.IsUserDefinedNode(
     Result := False;
 end;
 
+{ TTreeView }
+
+procedure TTreeView.CreateWnd;
+var
+  HasNilViews: Boolean;
+  Node: TTreeNode;
+begin
+  inherited;
+  HasNilViews := False;
+  for Node in Items do
+  begin
+    HasNilViews := not Assigned((Node as TViewItemTreeNode).ViewItem);
+    if HasNilViews then
+      Break;
+  end;
+  if HasNilViews and Assigned(_HACK_fOnAfterCreateNilViews) then
+    _HACK_fOnAfterCreateNilViews(Self);
+end;
+
 end.
 
diff --git a/Src/IntfFrameMgrs.pas b/Src/IntfFrameMgrs.pas
index 0f409800c..b3cb76101 100644
--- a/Src/IntfFrameMgrs.pas
+++ b/Src/IntfFrameMgrs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Declares interfaces, constants and enumerations required to manage various
  * parts of CodeSnip's UI.
@@ -19,6 +19,7 @@ interface
 uses
   // Delphi
   SHDocVw, ActiveX,
+  Classes, // !! For HACK
   // Project
   Browser.IntfDocHostUI, DB.USnippet, Compilers.UGlobals, UCommandBars, UView;
 
@@ -145,6 +146,9 @@ interface
     ///  <summary>Restore expand / collapse state of treeview to last save
     ///  state.</summary>
     procedure RestoreTreeState;
+    ///  <summary>!! HACK: Sets an event handler on the tree view to work
+    ///  around a bug that can occur after resuming from hibernation.</summary>
+    procedure _HACK_SetHibernateHandler(const AHandler: TNotifyEvent);
   end;
 
 type
diff --git a/Src/UMainDisplayMgr.pas b/Src/UMainDisplayMgr.pas
index 65e98e2fb..0c64a17d5 100644
--- a/Src/UMainDisplayMgr.pas
+++ b/Src/UMainDisplayMgr.pas
@@ -165,6 +165,11 @@   TMainDisplayMgr = class(TObject)
     procedure DisplayViewItem(ViewItem: IView; Mode: TDetailPageDisplayMode);
       overload;
 
+    ///  <summary>!! HACK event handle to redisplay the overview pane treeview.
+    ///  Called only if Windows has mysteriously recreated the treeview and lost
+    ///  necessary object references.</summary>
+    procedure _HACK_HibernateHandler(Sender: TObject);
+
   public
     ///  <summary>Object contructor. Sets up object to work with given frame
     ///  manager objects.</summary>
@@ -292,21 +297,12 @@   TMainDisplayMgr = class(TObject)
     /// <summary>Prepares display ready for database to be reloaded.</summary>
     procedure PrepareForDBReload;
 
-    ///  <summary>Gets the overview frame prepared for program hibernation.
-    ///  </summary>
+    ///  <summary>!!HACK: gets the overview frame prepared for program
+    ///  hibernation.</summary>
     ///  <remarks>Saves the overview tree view state ready for restoring after
-    ///  hibernation.</remarks>
-    procedure PrepareForHibernate;
-
-    ///  <summary>Restores the overview's tree view to have the correct IView
-    ///  instances after hibernation restores the previously saved state.
-    ///  </summary>
-    ///  <remarks>Sometimes, Windows quietly recreates the node of the tree view
-    ///  after resuming from hibernation, without restoring the associated IView
-    ///  instances, leading to access violations. This method should be called
-    ///  after resuming from hibernation to recreate the tree view with the
-    ///  correct IView instances.</remarks>
-    procedure RestoreFromHibernation;
+    ///  hibernation if Windows has recreated the overview pane's treeview,
+    ///  losing necessary IView object references..</remarks>
+    procedure _HACK_PrepareForHibernate;
 
   end;
 
@@ -583,12 +579,6 @@ procedure TMainDisplayMgr.PrepareForDBViewChange(View: IView);
   fPendingViewChange := True;
 end;
 
-procedure TMainDisplayMgr.PrepareForHibernate;
-begin
-  // simply save the state of the overview tree view ready for later restoration
-  (fOverviewMgr as IOverviewDisplayMgr).SaveTreeState;
-end;
-
 procedure TMainDisplayMgr.RedisplayOverview;
 begin
   (fOverviewMgr as IOverviewDisplayMgr).Display(Query.Selection, True);
@@ -616,12 +606,6 @@ procedure TMainDisplayMgr.ReStart;
   (fOverviewMgr as IOverviewDisplayMgr).Display(Query.Selection, True);
 end;
 
-procedure TMainDisplayMgr.RestoreFromHibernation;
-begin
-  (fOverviewMgr as IOverviewDisplayMgr).Display(Query.Selection, True);
-  (fOverviewMgr as IOverviewDisplayMgr).RestoreTreeState;
-end;
-
 procedure TMainDisplayMgr.SelectAll;
 begin
   // Only details pane supports text selection
@@ -720,5 +704,21 @@ procedure TMainDisplayMgr.UpdateOverviewTreeState(const State: TTreeNodeAction);
   (fOverviewMgr as IOverviewDisplayMgr).UpdateTreeState(State);
 end;
 
+procedure TMainDisplayMgr._HACK_HibernateHandler(Sender: TObject);
+begin
+  (fOverviewMgr as IOverviewDisplayMgr).Display(Query.Selection, True);
+  (fOverviewMgr as IOverviewDisplayMgr).RestoreTreeState;
+  // disable this handler until next resume from hibernation
+  (fOverviewMgr as IOverviewDisplayMgr)._HACK_SetHibernateHandler(nil);
+end;
+
+procedure TMainDisplayMgr._HACK_PrepareForHibernate;
+begin
+  (fOverviewMgr as IOverviewDisplayMgr).SaveTreeState;
+  (fOverviewMgr as IOverviewDisplayMgr)._HACK_SetHibernateHandler(
+    _HACK_HibernateHandler
+  );
+end;
+
 end.
 

From ef80e27bbdbb30e895f2b73fbac5519ab2512119 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 14 Apr 2025 19:19:29 +0100
Subject: [PATCH 189/264] Bump version number to v4.24.2 build 274

---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index 513eae126..fbd558db1 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.24.1
-build=273
+version=4.24.2
+build=274
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From 0ad4fbe75b4cb4bbdb6b27844057107c39bcaedb Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 14 Apr 2025 19:37:10 +0100
Subject: [PATCH 190/264] Update change log with details of release v4.24.2

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bafd5addf..16846323a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,14 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
-## Release v4.24.1 of 13 April 2005
+## Release v4.24.2 of 14 April 2025
+
+Hotfix release.
+
+* Updated bug fix implemented in v4.24.1 to avoid relying on a potentially problematic windows event [issue #70 (2nd attempt)].
+* Corrected release date error for v4.24.1 in `CHANGELOG.md`.
+
+## Release v4.24.1 of 13 April 2025
 
 * Fixed bug where CodeSnip occasionally crashes after a computer resumes from hibernation [issue #70].
 * Bumped some copyright dates for 2025.

From efcef0f2453ff43d525bddabd78d88f2dbb780d6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 15 Apr 2025 08:22:24 +0100
Subject: [PATCH 191/264] Fix malformed bullet char in snippet import wizard

The last page of the Import Wizard dialogue box lists imported snippets
as bullet points. The bullet point string literal had become corrupted.

Replaced the string literal with a constant containing the Unicode
character code point.

Fixes #147
---
 Src/FmCodeImportDlg.pas | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Src/FmCodeImportDlg.pas b/Src/FmCodeImportDlg.pas
index 7315b29e8..86f0fbef2 100644
--- a/Src/FmCodeImportDlg.pas
+++ b/Src/FmCodeImportDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a wizard dialogue box that handles the import of user defined
  * snippets into the database. Permits snippets from the import file to be
@@ -419,6 +419,8 @@ procedure TCodeImportDlg.PresentResults;
   ///  Creates a label containing name of an imported snippet and adds it to
   ///  scroll box with top at given position.
   procedure AddLabel(var Top: Integer; const SnippetName: string);
+  const
+    Bullet = #$2022;
   var
     Lbl: TLabel;
   begin
@@ -426,7 +428,7 @@ procedure TCodeImportDlg.PresentResults;
     Lbl.Parent := sbFinish;
     Lbl.Left := 0;
     Lbl.Top := Top;
-    Lbl.Caption := '� ' + SnippetName;
+    Lbl.Caption := Bullet + ' ' + SnippetName;
     Top := TCtrlArranger.BottomOf(Lbl, 2);
   end;
   // ---------------------------------------------------------------------------

From 0a0681841be323fdf1001794777fae820b8a790e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 15 Apr 2025 08:29:22 +0100
Subject: [PATCH 192/264] Correct program copyright date in about box

Updated copyright date to 2025.

Fixes #149
---
 Src/Res/HTML/dlg-about-program-tplt.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/Res/HTML/dlg-about-program-tplt.html b/Src/Res/HTML/dlg-about-program-tplt.html
index be93a30c3..a337e8b80 100644
--- a/Src/Res/HTML/dlg-about-program-tplt.html
+++ b/Src/Res/HTML/dlg-about-program-tplt.html
@@ -9,7 +9,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2024, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Template for content displayed in program tab of about dialog box.
 -->
@@ -47,7 +47,7 @@
   <body>
 
     <p>
-      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2024 by <a
+      DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2025 by <a
         class="external-link"
         href="https://en.gravatar.com/delphidabbler"
       >Peter D Johnson</a>.

From 46ae69be45e9904cf04f31f5f43fa01464bccdeb Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 15 Apr 2025 09:42:42 +0100
Subject: [PATCH 193/264] Fix error in export file format documentation

Documentation of XML tags relating to storing snippet xrefs in export
files was removed as erroneous. The error was noted and the file format
bumped to v8 following this change.

Updated the current file version number in the UCodeImportExport unit to
v8.

Fixes #151
Updated the export help topic to note that snippet categories and xrefs
are not exported.
---
 Docs/Design/FileFormats/export.html | 75 ++++++++++++++++-------------
 Src/Help/HTML/dlg_export.htm        |  6 ++-
 Src/UCodeImportExport.pas           |  4 +-
 3 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/Docs/Design/FileFormats/export.html b/Docs/Design/FileFormats/export.html
index 29ca8a849..7f6e80653 100644
--- a/Docs/Design/FileFormats/export.html
+++ b/Docs/Design/FileFormats/export.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2024, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Export
 -->
@@ -57,6 +57,9 @@ <h2>
   <li>
     <a href="#file-format">File Format</a>
   </li>
+  <li>
+    <a href="#erratum">Erratum</a>
+  </li>
   <li>
     <a href="#changelog">Change Log</a>
   </li>
@@ -114,8 +117,8 @@ <h2>
 </h2>
 
 <p>
-  There have been seven different versions of the XML export file format &ndash; v1 to
-  v7. Tags used by all versions are explained below, with notes describing
+  There have been eight different versions of the XML export file format &ndash; v1 to
+  v8. Tags used by all versions are explained below, with notes describing
   which versions a tag applies to. Where there is no note the tag is valid in
   all versions.
 </p>
@@ -176,7 +179,7 @@ <h2>
       </dt>
       <dd>
         Identifies major version of file. Determines which tags are valid and
-        establishes rules concerning content. Valid versions are 1 to 7.
+        establishes rules concerning content. Valid versions are 1 to 8.
       </dd>
     </dl>
   </dd>
@@ -198,7 +201,7 @@ <h2>
         <span class="highlight">versions 1 to 6:</span> Contains information about user who created the file &nbsp; used for submissions to the online database, omitted for other exports.
       </li>
       <li>
-        <span class="highlight">version 7:</span> Not supported. Ignored if present.
+        <span class="highlight">version 7 and later:</span> Not supported. Ignored if present.
       </li>
     </ul>
   </dd>
@@ -212,7 +215,7 @@ <h2>
         <span class="highlight">versions 1 to 6:</span> User's name or nickname.
       </li>
       <li>
-        <span class="highlight">version 7:</span> Not supported. Ignored if present.
+        <span class="highlight">version 7 and later:</span> Not supported. Ignored if present.
       </li>
     </ul>
   </dd>
@@ -226,7 +229,7 @@ <h2>
         <span class="highlight">versions 1 to 6:</span> User's email address.
       </li>
       <li>
-        <span class="highlight">version 7:</span> Not supported. Ignored if present.
+        <span class="highlight">version 7 and later:</span> Not supported. Ignored if present.
       </li>
     </ul>
   </dd>
@@ -240,7 +243,7 @@ <h2>
         <span class="highlight">versions 1 to 6:</span> Any comments provided by user.
       </li>
       <li>
-        <span class="highlight">version 7:</span> Not supported. Ignored if present.
+        <span class="highlight">version 7 and later:</span> Not supported. Ignored if present.
       </li>
     </ul>
   </dd>
@@ -687,33 +690,21 @@ <h2>
     </ul>
   </dd>
 
-  <dt>
-    <strong>codesnip-export/routines/routine/xref</strong>
-  </dt>
-  <dd>
-    List of cross-referenced snippets.
-  </dd>
+</section>
 
-  <dt>
-    <strong>codesnip-export/routines/routine/xref/pascal-name</strong>
-  </dt>
-  <dd>
-    <div class="half-spaced">
-      Name of a snippet within cross-reference list.
-    </div>
-    <ul class="squashed">
-      <li>
-        <span class="highlight">versions 1 to 4:</span> Name must begin with an
-        English language letter or the underscore.
-      </li>
-      <li>
-        <span class="highlight">version 5 and later:</span> Name can begin with
-        any character that is valid as the first character of a Unicode Pascal
-        identifier.
-      </li>
-    </ul>
-  </dd>
-</dl>
+<section id="erratum">
+
+<h2>
+  Erratum
+</h2>
+
+<p>
+  The <em>codesnip-export/routines/routine/xref</em> and <em>codesnip-export/routines/routine/xref/pascal-name</em> tags were included in versions 1 to 7 of this specification in error. XRefs were never intended to be written to export files by any version of CodeSnip, as source code comments make clear.
+</p>
+
+<p>
+  These tags have been removed from this document entirely of specification version 8.
+</p>
 
 </section>
 
@@ -1008,6 +999,18 @@ <h2>
       </dd>
     </dl>
   </dd>
+
+  <dt>
+    <strong>Version 8 - 15 April 2025</strong>
+  </dt>
+  <dd>
+    <p>
+      Introduced with CodeSnip v4.24.3.
+    </p>
+    <p>
+      The <em>codesnip-export/routines/routine/xref</em> and <em>codesnip-export/routines/routine/xref/pascal-name</em> tags were removed from the specification. See <a href="#erratum">Erratum</a> above for details.
+    </p>
+  </dd>
 </dl>
 
 </section>
@@ -1058,6 +1061,10 @@ <h2>
   Readers of v2 files and later can parse REML as v6, since all versions of REML up to v6 are backwards compatible.
 </p>
 
+<p>
+  Readers of v1 to v7 files must ignore any <em>codesnip-export/routines/routine/xref</em> tags and sub tags in the unlikely event that they are found. For an explanation see <a href="#erratum">Erratum</a> above.
+</p>
+
 </section>
 
 </body>
diff --git a/Src/Help/HTML/dlg_export.htm b/Src/Help/HTML/dlg_export.htm
index a17b626a4..b8e1db3ff 100644
--- a/Src/Help/HTML/dlg_export.htm
+++ b/Src/Help/HTML/dlg_export.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic for Export Snippets dialogue box.
 -->
@@ -57,6 +57,10 @@ <h1>
       and the dialogue box remains open. The export can be aborted by clicking
       the <em>Cancel</em> button.
     </p>
+    <p>
+      <strong>Note:</strong> Snippet categories and cross references are not
+      included in the export file.
+    </p>
   </body>
 </html>
 
diff --git a/Src/UCodeImportExport.pas b/Src/UCodeImportExport.pas
index e43346daa..b4dfffd29 100644
--- a/Src/UCodeImportExport.pas
+++ b/Src/UCodeImportExport.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2025. Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements classes that can import and export user defined snippets from and
  * to XML.
@@ -181,7 +181,7 @@ implementation
   cWatermark        = 'B46969D4-D367-4F5F-833E-F165FBA78631';
   // file version numbers
   cEarliestVersion  = 1;  // earliest file version supported by importer
-  cLatestVersion    = 7;  // current file version written by exporter
+  cLatestVersion    = 8;  // current file version written by exporter
 
 { TCodeExporter }
 

From 9998f4e22fb02339d4b4080535364d93a13b5087 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:03:43 +0100
Subject: [PATCH 194/264] Corrected comments for some methods of TREMLEntities

The comments for both TREMLEntities.MapToEntity and the private
TREMLEntities.CharToMnemonicEntity methods were changed to reflect their
actual functions.

Fixes #84
---
 Src/UREMLDataIO.pas | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/Src/UREMLDataIO.pas b/Src/UREMLDataIO.pas
index 76974afc8..249990248 100644
--- a/Src/UREMLDataIO.pas
+++ b/Src/UREMLDataIO.pas
@@ -281,12 +281,15 @@       TREMLEntity = record
           }
       end;
     class var fEntityMap: array of TREMLEntity; // Entity <=> character map
+
+    ///  <summary>Attempts to map a character to an associated mnemonic
+    ///  character entity, without the surrounding <c>&amp;</c> and <c>;</c>
+    ///  characters.</summary>
+    ///  <param name="Ch"><c>Char</c> [in] Character to be mapped.</param>
+    ///  <returns><c>string</c>. The associated mnemonic entity or an empty
+    ///  string if not such entity exists.</returns>
     class function CharToMnemonicEntity(const Ch: Char): string;
-      {Gets the mnemonic character entity that represents a character.
-        @param Entity [in] Character for which equivalent entity is required.
-        @return Required entity or '' if character has no matching mnemonic
-          entity.
-      }
+
     class function GetCount: Integer; static;
       {Read accessor for Count property.
         @return Number of supported tags.
@@ -309,13 +312,16 @@       TREMLEntity = record
     class destructor Destroy;
       {Class destructor. Clears entity map
       }
+
+    ///  <summary>Attempts to map a character to a character enitity, without
+    ///  the surrounding <c>&amp;</c> and <c>;</c> characters.</summary>
+    ///  <param name="Ch"><c>Char</c> [in] Character to be mapped.</param>
+    ///  <returns><c>string</c>. A mnemonic entity if one exists for <c>Ch</c>.
+    ///  Otherwise if <c>Ch</c> is not a printable ASCII character a numeric
+    ///  entity is returned. If <c>Ch</c> is a printable ASCII character an
+    ///  empty string is returned.</returns>
     class function MapToEntity(const Ch: Char): string;
-      {Maps a character to a character entity if appropriate.
-        @param Ch [in] Character to be mapped.
-        @return Mnemonic entity if one exists, character itself if it is
-          printable and has ascii value less than 127, or a numeric character
-          otherwise.
-      }
+
     class property Count: Integer read GetCount;
       {Number of supported tags}
     class property Entities[Idx: Integer]: string read GetEntity;
@@ -1013,10 +1019,6 @@ constructor TREMLTags.TREMLTag.Create(const AId: TActiveTextActionElemKind;
 { TREMLEntities }
 
 class function TREMLEntities.CharToMnemonicEntity(const Ch: Char): string;
-  {Gets the mnemonic character entity that represents a character.
-    @param Entity [in] Character for which equivalent entity is required.
-    @return Required entity or '' if character has no matching mnemonic entity.
-  }
 var
   Idx: Integer; // loops thru table of entity / characters
 begin
@@ -1112,11 +1114,6 @@ class function TREMLEntities.GetEntity(Idx: Integer): string;
 end;
 
 class function TREMLEntities.MapToEntity(const Ch: Char): string;
-  {Maps a character to a character entity if appropriate.
-    @param Ch [in] Character to be mapped.
-    @return Mnemonic entity if one exists, character itself if it is printable
-      and has ascii value less than 127, or a numeric character otherwise.
-  }
 begin
   Result := CharToMnemonicEntity(Ch);
   if (Result = '') and ( (Ord(Ch) <= 31) or (Ord(Ch) >= 127) ) then

From 0265ec083e05e49f533e17db50e9a0ee30a09ddf Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 16 Apr 2025 07:52:47 +0100
Subject: [PATCH 195/264] Add feature to save snippet info to RTF file

Added new USaveInfoMgr unit to handle getting file name from user,
generating the RTF from a given snippet's information and saving to
file.

Added new File | Save Snippet Information menu option and associated
action to the main form.
---
 Src/CodeSnip.dpr     |   3 +-
 Src/CodeSnip.dproj   |   1 +
 Src/FmMain.dfm       |  13 +++++
 Src/FmMain.pas       |  21 ++++++-
 Src/USaveInfoMgr.pas | 132 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 166 insertions(+), 4 deletions(-)
 create mode 100644 Src/USaveInfoMgr.pas

diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index 1fe24aca3..babbd49e2 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -374,7 +374,8 @@ uses
   Compilers.USettings in 'Compilers.USettings.pas',
   FmRegisterCompilersDlg in 'FmRegisterCompilersDlg.pas' {RegisterCompilersDlg},
   ClassHelpers.UGraphics in 'ClassHelpers.UGraphics.pas',
-  ClassHelpers.UActions in 'ClassHelpers.UActions.pas';
+  ClassHelpers.UActions in 'ClassHelpers.UActions.pas',
+  USaveInfoMgr in 'USaveInfoMgr.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index dc6c27915..41e93eb81 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -581,6 +581,7 @@
 			</DCCReference>
 			<DCCReference Include="ClassHelpers.UGraphics.pas"/>
 			<DCCReference Include="ClassHelpers.UActions.pas"/>
+			<DCCReference Include="USaveInfoMgr.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
diff --git a/Src/FmMain.dfm b/Src/FmMain.dfm
index 902e71720..6f460ff96 100644
--- a/Src/FmMain.dfm
+++ b/Src/FmMain.dfm
@@ -877,6 +877,16 @@ inherited MainForm: TMainForm
       OnExecute = actDeleteUserDatabaseExecute
       OnUpdate = ActNonEmptyUserDBUpdate
     end
+    object actSaveInfo: TAction
+      Category = 'File'
+      Caption = 'Save Snippet Information...'
+      Hint = 
+        'Save snippet information|Save information about the selected sni' +
+        'ppet to file'
+      ShortCut = 24649
+      OnExecute = actSaveInfoExecute
+      OnUpdate = actSaveInfoUpdate
+    end
   end
   object mnuMain: TMainMenu
     Images = ilMain
@@ -887,6 +897,9 @@ inherited MainForm: TMainForm
       object miSaveSnippet: TMenuItem
         Action = actSaveSnippet
       end
+      object miSaveInfo: TMenuItem
+        Action = actSaveInfo
+      end
       object miSaveUnit: TMenuItem
         Action = actSaveUnit
       end
diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 8bffbe2b8..60556605c 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -241,6 +241,8 @@   TMainForm = class(THelpAwareForm)
     tbSpacer7: TToolButton;
     tbSpacer8: TToolButton;
     tbTestCompile: TToolButton;
+    miSaveInfo: TMenuItem;
+    actSaveInfo: TAction;
     ///  <summary>Displays About Box.</summary>
     procedure actAboutExecute(Sender: TObject);
     ///  <summary>Gets a new category from user and adds to database.</summary>
@@ -501,6 +503,8 @@   TMainForm = class(THelpAwareForm)
     procedure splitVertCanResize(Sender: TObject; var NewSize: Integer;
       var Accept: Boolean);
     procedure ActNonEmptyUserDBUpdate(Sender: TObject);
+    procedure actSaveInfoUpdate(Sender: TObject);
+    procedure actSaveInfoExecute(Sender: TObject);
   strict private
     var
       ///  <summary>Object that notifies user-initiated events by triggering
@@ -596,9 +600,9 @@ implementation
   UCodeShareMgr, UCommandBars, UConsts, UCopyInfoMgr,
   UCopySourceMgr, UDatabaseLoader, UDatabaseLoaderUI, UDetailTabAction,
   UEditSnippetAction, UExceptions, UHelpMgr, UHistoryMenus, UKeysHelper,
-  UMessageBox, UNotifier, UNulDropTarget, UPrintMgr, UQuery, USaveSnippetMgr,
-  USaveUnitMgr, USelectionIOMgr, UUrl, UUserDBMgr, UView, UViewItemAction,
-  UWBExternal;
+  UMessageBox, UNotifier, UNulDropTarget, UPrintMgr, UQuery, USaveInfoMgr,
+  USaveSnippetMgr, USaveUnitMgr, USelectionIOMgr, UUrl, UUserDBMgr, UView,
+  UViewItemAction, UWBExternal;
 
 
 {$R *.dfm}
@@ -1025,6 +1029,17 @@ procedure TMainForm.actSaveDatabaseUpdate(Sender: TObject);
   (Sender as TAction).Enabled := TUserDBMgr.CanSave;
 end;
 
+procedure TMainForm.actSaveInfoExecute(Sender: TObject);
+begin
+  TSaveInfoMgr.Execute(fMainDisplayMgr.CurrentView);
+end;
+
+procedure TMainForm.actSaveInfoUpdate(Sender: TObject);
+begin
+  (Sender as TAction).Enabled :=
+    TSaveInfoMgr.CanHandleView(fMainDisplayMgr.CurrentView);
+end;
+
 procedure TMainForm.actSaveSelectionExecute(Sender: TObject);
 begin
   TSelectionIOMgr.SaveCurrentSelection;
diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
new file mode 100644
index 000000000..123f04a99
--- /dev/null
+++ b/Src/USaveInfoMgr.pas
@@ -0,0 +1,132 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2025, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Saves information about a snippet to disk in rich text format. Only routine
+ * snippet kinds are supported.
+}
+
+
+unit USaveInfoMgr;
+
+interface
+
+uses
+  // Project
+  UEncodings,
+  UView;
+
+
+type
+  ///  <summary>Method-only record that saves information about a snippet to
+  ///  file in rich text format. The snippet is obtained from a view. Only
+  ///  snippet views are supported.</summary>
+  TSaveInfoMgr = record
+  strict private
+    ///  <summary>Attempts to name of the file to be written from the user.
+    ///  </summary>
+    ///  <param name="AFileName"><c>string</c> [out] Set to the name of the file
+    ///  entered by the user. Undefined if the user cancelled.</param>
+    ///  <returns><c>Boolean</c>. <c>True</c> if the user entered and accepted a
+    ///  file name of <c>False</c> if the user cancelled.</returns>
+    class function TryGetFileNameFromUser(out AFileName: string): Boolean;
+      static;
+    ///  <summary>Returns encoded data containing a RTF representation of
+    ///  information about the snippet represented by the given view.</summary>
+    class function GenerateRichText(View: IView): TEncodedData; static;
+  public
+    ///  <summary>Saves information about the snippet referenced by the a given
+    ///  view to file.</summary>
+    ///  <remarks>The view must be a snippet view.</remarks>
+    class procedure Execute(View: IView); static;
+    ///  <summary>Checks if a given view can be saved to the clipboard. Returns
+    ///  True only if the view represents a snippet.</summary>
+    class function CanHandleView(View: IView): Boolean; static;
+
+  end;
+
+implementation
+
+uses
+  // Delphi
+  SysUtils,
+  Dialogs,
+  // Project
+  Hiliter.UAttrs,
+  Hiliter.UGlobals,
+  UIOUtils,
+  UOpenDialogHelper,
+  URTFSnippetDoc,
+  URTFUtils,
+  USaveDialogEx;
+
+{ TSaveInfoMgr }
+
+class function TSaveInfoMgr.CanHandleView(View: IView): Boolean;
+begin
+  Result := Supports(View, ISnippetView);
+end;
+
+class procedure TSaveInfoMgr.Execute(View: IView);
+var
+  FileName: string;
+  RTF: TRTF;
+begin
+  Assert(Assigned(View), 'TSaveInfoMgr.Execute: View is nil');
+  Assert(CanHandleView(View), 'TSaveInfoMgr.Execute: View not supported');
+  if not TryGetFileNameFromUser(FileName) then
+    Exit;
+  RTF := TRTF.Create(GenerateRichText(View));
+  TFileIO.WriteAllBytes(FileName, RTF.ToBytes);
+end;
+
+class function TSaveInfoMgr.GenerateRichText(View: IView): TEncodedData;
+var
+  Doc: TRTFSnippetDoc;        // object that generates RTF document
+  HiliteAttrs: IHiliteAttrs;  // syntax highlighter formatting attributes
+begin
+  Assert(Supports(View, ISnippetView),
+    'TSaveInfoMgr.GenerateRichText: View is not a snippet view');
+  if (View as ISnippetView).Snippet.HiliteSource then
+    HiliteAttrs := THiliteAttrsFactory.CreateUserAttrs
+  else
+    HiliteAttrs := THiliteAttrsFactory.CreateNulAttrs;
+  Doc := TRTFSnippetDoc.Create(HiliteAttrs);
+  try
+    // TRTFSnippetDoc generates stream of ASCII bytes
+    Result := Doc.Generate((View as ISnippetView).Snippet);
+    Assert(Result.EncodingType = etASCII,
+      'TSaveInfoMgr.GenerateRichText: ASCII encoded data expected');
+  finally
+    Doc.Free;
+  end;
+end;
+
+class function TSaveInfoMgr.TryGetFileNameFromUser(
+  out AFileName: string): Boolean;
+var
+  Dlg: TSaveDialogEx;
+resourcestring
+  sCaption = 'Save Snippet Information';     // dialogue box caption
+  sFilter = 'Rich Text File (*.rtf)|*.rtf|'  // file filter
+    + 'All files (*.*)|*.*';
+begin
+  Dlg := TSaveDialogEx.Create(nil);
+  try
+    Dlg.Title := sCaption;
+    Dlg.Options := [ofShowHelp, ofNoTestFileCreate, ofEnableSizing];
+    Dlg.Filter := sFilter;
+    Dlg.FilterIndex := 1;
+    Dlg.HelpKeyword := 'SnippetInfoFileDlg';
+    Result := Dlg.Execute;
+    if Result then
+      AFileName := FileOpenFileNameWithExt(Dlg)
+  finally
+    Dlg.Free;
+  end;
+end;
+
+end.

From afa37e47a5be5907bd5cd2a3e6e14fe27679df09 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 16 Apr 2025 08:19:33 +0100
Subject: [PATCH 196/264] Update help file re save snippet information feature

Added new help topic for the Save Snippet Information file save dialogue
box.

Updated help project file and help index file re the new topic.

Updated File menu help topic to add the new Save Snippet Information
menu option.
---
 Src/Help/CodeSnip.hhp          |  1 +
 Src/Help/HTML/dlg_saveinfo.htm | 48 ++++++++++++++++++++++++++++++++++
 Src/Help/HTML/menu_file.htm    | 16 ++++++++++++
 Src/Help/Index.hhk             |  4 +++
 4 files changed, 69 insertions(+)
 create mode 100644 Src/Help/HTML/dlg_saveinfo.htm

diff --git a/Src/Help/CodeSnip.hhp b/Src/Help/CodeSnip.hhp
index 48d4ec0f2..73163ca7e 100644
--- a/Src/Help/CodeSnip.hhp
+++ b/Src/Help/CodeSnip.hhp
@@ -57,6 +57,7 @@ HTML\dlg_registercompilers.htm
 HTML\dlg_renamecategory.htm
 HTML\dlg_restore.htm
 HTML\dlg_savehiliter.htm
+HTML\dlg_saveinfo.htm
 HTML\dlg_saveselection.htm
 HTML\dlg_savesnippet.htm
 HTML\dlg_selectcompiler.htm
diff --git a/Src/Help/HTML/dlg_saveinfo.htm b/Src/Help/HTML/dlg_saveinfo.htm
new file mode 100644
index 000000000..53abcca9d
--- /dev/null
+++ b/Src/Help/HTML/dlg_saveinfo.htm
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!--
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2025, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Help topic for Save Snippet Information dialogue box.
+-->
+<html>
+
+<head>
+    <meta name="generator" content="HTML Tidy, see www.w3.org">
+    <meta http-equiv="Content-Type" content="text-html; charset=Windows-1252">
+    <title>
+        Save Snippet Information Dialogue Box
+    </title>
+    <link rel="stylesheet" href="../css/codesnip.css" type="text/css">
+</head>
+
+<body>
+    <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e">
+        <param name="ALink Name" value="SnippetInfoFileDlg">
+    </object>
+    <h1>
+        <a name="dlg_saveinfo"></a>Save Snippet Information Dialogue Box
+    </h1>
+    <p>
+        This dialogue box is displayed when the <em>File | Save Snippet
+        Information</em> menu option is clicked. It is used to specify the
+        name of the file into which information about the currently selected
+        snippet is to be saved.
+    </p>
+    <p>
+        The saved snippet information is written in rich text format.
+    </p>
+    <p>
+        This dialogue is a standard Windows save dialogue box. You specify the
+         name and folder for the file in the usual way.
+    </p>
+    <p>
+        Use the <em>Save</em> button to write the file to disk or press
+        <em>Cancel</em> to abort.
+    </p>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Src/Help/HTML/menu_file.htm b/Src/Help/HTML/menu_file.htm
index 706315a9c..dfb1a4963 100644
--- a/Src/Help/HTML/menu_file.htm
+++ b/Src/Help/HTML/menu_file.htm
@@ -44,6 +44,22 @@ <h1>
           not routines are ignored.
         </td>
       </tr>
+      <tr>
+        <td class="img">
+          &nbsp;
+        </td>
+        <td class="item">
+          Save Snippet Information<br>
+          [<span class="smallcaps">Shift+Ctrl+I</span>]
+        </td>
+        <td class="desc">
+          Saves information about the currently selected snippet to file, in
+          rich text format. The information saved is that displayed in the
+          <a href="detail_pane.htm">Detail Pane</a>.
+          The <a href="dlg_saveinfo.htm">Save Snippet Information</a> dialogue
+          box is displayed where the required file name is entered.
+        </td>
+      </tr>
       <tr>
         <td class="img">
           <img
diff --git a/Src/Help/Index.hhk b/Src/Help/Index.hhk
index 0b17203b6..5a74ad8ed 100644
--- a/Src/Help/Index.hhk
+++ b/Src/Help/Index.hhk
@@ -316,6 +316,10 @@
     <param name="Name" value="rename category dialogue">
     <param name="Local" value="HTML\dlg_renamecategory.htm">
     </OBJECT>
+  <LI> <OBJECT type="text/sitemap">
+    <param name="Name" value="save snippet information dialogue">
+    <param name="Local" value="HTML\dlg_saveinfo.htm">
+    </OBJECT>
   <LI> <OBJECT type="text/sitemap">
     <param name="Name" value="save annotated source dialogue">
     <param name="Local" value="HTML\dlg_savesnippet.htm">

From b5511d95409116936e73eb2d1f4cef2825d2495c Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 16 Apr 2025 08:32:54 +0100
Subject: [PATCH 197/264] Update Saved Files documentation page

Updated with details of the file format used for the
new Save Snippet Information feature.
---
 Docs/Design/FileFormats/saved.html | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Docs/Design/FileFormats/saved.html b/Docs/Design/FileFormats/saved.html
index 8e68c073d..69dbbefd4 100644
--- a/Docs/Design/FileFormats/saved.html
+++ b/Docs/Design/FileFormats/saved.html
@@ -5,7 +5,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip File Format Documentation: Saved Files
 -->
@@ -46,20 +46,27 @@ <h2>
 </h2>
 
 <p>
-  CodeSnip saves external files in two different ways:
+  CodeSnip saves external files in three different ways:
 </p>
 
 <ol>
   <li>
-    By saving snippets to file from the <em>File | Save Snippet</em> menu.
+    By saving snippet information to file from the <em>File | Save Snippet Information</em> menu option.
   </li>
   <li>
-    By saving units to file from the <em>File | Save Unit</em> menu.
+    By saving snippets to file from the <em>File | Save Snippet</em> menu option.
+  </li>
+  <li>
+    By saving units to file from the <em>File | Save Unit</em> menu option.
   </li>
 </ol>
 
 <p>
-  In each case the following file types can be chosen by the user:
+  In the first case the snippet is always saved in rich text format.
+</p>
+
+<p>
+  In the second two cases the following file types can be chosen by the user:
 </p>
 
 <ul>
@@ -87,7 +94,11 @@ <h2>
 </h2>
 
 <p>
-  The encodings used depend on the file type and user choice. Different file
+  In the first case the RTF is always saved in ASCII format.
+</p>
+
+<p>
+  In the 2nd and 3rd cases the encodings used depend on the file type and user choice. Different file
   types have different encoding choices, as follows:
 </p>
 
@@ -140,7 +151,7 @@ <h2>
   <dd>
     <ul class="squashed">
       <li>
-        ANSI (system default code page)
+        ANSI (system default code page). ASCII format is actually used.
       </li>
     </ul>
   </dd>

From fc1b87aee77056ccea36154477856f0e6cf539a6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 17 Apr 2025 17:16:25 +0100
Subject: [PATCH 198/264] Add new THML5 & TXHTML classes & reimplement THTML

THTML was re-implemented as a static abstract class instead of a record.
It now acts as an abstract base template class for two new static
classes - TXHTML and THML5.

TXHTML was added as drop-in replacement for the original implementation
of THTML. Since the original THTML generated XML compliant tags, this
new name is more accurate.

All code that called THML was changed to call TXHTML instead. TXHTML was
implemented without any change of interface to THTML, despite the fact
that the original THML was a record and TXHTML is a class.

THTML5 was added as another static class that descends from THTML. This
class generates HTML 5 compliant tags.

A new class reference to THTML derived types was added, named
THTMLClass.
---
 Src/ActiveText.UHTMLRenderer.pas |  6 ++--
 Src/Browser.UHighlighter.pas     |  2 +-
 Src/FmAboutDlg.pas               | 12 +++----
 Src/FmCompErrorDlg.pas           |  2 +-
 Src/UCompResHTML.pas             | 34 +++++++++---------
 Src/UDetailPageHTML.pas          | 18 +++++-----
 Src/UHTMLBuilder.pas             | 20 +++++------
 Src/UHTMLTemplate.pas            |  2 +-
 Src/UHTMLUtils.pas               | 61 ++++++++++++++++++++++++--------
 Src/USnippetHTML.pas             | 14 ++++----
 Src/USnippetPageHTML.pas         | 16 ++++-----
 11 files changed, 109 insertions(+), 78 deletions(-)

diff --git a/Src/ActiveText.UHTMLRenderer.pas b/Src/ActiveText.UHTMLRenderer.pas
index bf4dfc7c1..ec9c19d23 100644
--- a/Src/ActiveText.UHTMLRenderer.pas
+++ b/Src/ActiveText.UHTMLRenderer.pas
@@ -145,7 +145,7 @@ procedure TActiveTextHTML.InitialiseTagInfoMap;
 function TActiveTextHTML.MakeClosingTag(const Elem: IActiveTextActionElem):
   string;
 begin
-  Result := THTML.ClosingTag(fTagInfoMap[Elem.Kind].Name);
+  Result := TXHTML.ClosingTag(fTagInfoMap[Elem.Kind].Name);
 end;
 
 function TActiveTextHTML.MakeOpeningTag(const Elem: IActiveTextActionElem):
@@ -160,7 +160,7 @@ function TActiveTextHTML.MakeOpeningTag(const Elem: IActiveTextActionElem):
       Attrs := THTMLAttributes.Create;
     Attrs.Add('class', fCSSStyles.ElemClasses[Elem.Kind])
   end;
-  Result := THTML.OpeningTag(fTagInfoMap[Elem.Kind].Name, Attrs);
+  Result := TXHTML.OpeningTag(fTagInfoMap[Elem.Kind].Name, Attrs);
 end;
 
 function TActiveTextHTML.Render(ActiveText: IActiveText): string;
@@ -242,7 +242,7 @@ function TActiveTextHTML.RenderText(const TextElem: IActiveTextTextElem):
   end
   else
     Result := '';
-  Result := Result + THTML.Entities(TextElem.Text);
+  Result := Result + TXHTML.Entities(TextElem.Text);
 end;
 
 { TActiveTextHTML.TCSSStyles }
diff --git a/Src/Browser.UHighlighter.pas b/Src/Browser.UHighlighter.pas
index 9231502b4..5405008cd 100644
--- a/Src/Browser.UHighlighter.pas
+++ b/Src/Browser.UHighlighter.pas
@@ -194,7 +194,7 @@ function TWBHighlighter.HighlightWord(const Word: string;
     begin
       // Apply highlight to found text by spanning it with highlight style
       SpanAttrs := THTMLAttributes.Create('style', fHighLightStyle);
-      Range.pasteHTML(THTML.CompoundTag('span', SpanAttrs, Range.htmlText));
+      Range.pasteHTML(TXHTML.CompoundTag('span', SpanAttrs, Range.htmlText));
       Inc(Result);
     end
     else
diff --git a/Src/FmAboutDlg.pas b/Src/FmAboutDlg.pas
index 6584a4ffd..dafdfb627 100644
--- a/Src/FmAboutDlg.pas
+++ b/Src/FmAboutDlg.pas
@@ -312,15 +312,15 @@ function TAboutDlg.ContribListHTML(ContribList: IStringList):
   begin
     for Contributor in ContribList do
       Result := Result
-        + THTML.CompoundTag('div', THTML.Entities(Contributor))
+        + TXHTML.CompoundTag('div', TXHTML.Entities(Contributor))
         + EOL;
   end
   else
   begin
     // List couldn't be found: display warning message
     DivAttrs := THTMLAttributes.Create('class', 'warning');
-    Result := THTML.CompoundTag(
-      'div', DivAttrs, THTML.Entities(sNoContributors)
+    Result := TXHTML.CompoundTag(
+      'div', DivAttrs, TXHTML.Entities(sNoContributors)
     );
   end;
 end;
@@ -484,15 +484,15 @@ procedure TAboutDlg.InitHTMLFrames;
           'DBLicense',
           StrIf(
             fMetaData.GetLicenseInfo.URL <> '',
-            THTML.CompoundTag(
+            TXHTML.CompoundTag(
               'a',
               THTMLAttributes.Create([
                 THTMLAttribute.Create('href', fMetaData.GetLicenseInfo.URL),
                 THTMLAttribute.Create('class', 'external-link')
               ]),
-              THTML.Entities(fMetaData.GetLicenseInfo.Name)
+              TXHTML.Entities(fMetaData.GetLicenseInfo.Name)
             ),
-            THTML.Entities(fMetaData.GetLicenseInfo.Name)
+            TXHTML.Entities(fMetaData.GetLicenseInfo.Name)
           )
         );
         Tplt.ResolvePlaceholderHTML(
diff --git a/Src/FmCompErrorDlg.pas b/Src/FmCompErrorDlg.pas
index ed1285957..b9cdf0a3e 100644
--- a/Src/FmCompErrorDlg.pas
+++ b/Src/FmCompErrorDlg.pas
@@ -341,7 +341,7 @@ function TCompErrorDlg.TCompilerLog.LogListHTML: string;
 begin
   Result := '';
   for Line in fLog do
-    Result := Result + THTML.CompoundTag('li', THTML.Entities(Line)) + EOL;
+    Result := Result + TXHTML.CompoundTag('li', TXHTML.Entities(Line)) + EOL;
 end;
 
 end.
diff --git a/Src/UCompResHTML.pas b/Src/UCompResHTML.pas
index a3248e55c..7ed706983 100644
--- a/Src/UCompResHTML.pas
+++ b/Src/UCompResHTML.pas
@@ -99,8 +99,8 @@ class function TCompResHTML.CompileResultsTableRows(Compilers: ICompilers;
   Compiler: ICompiler;  // each supported compiler
 begin
   // Initialise HTML for two rows of table and resulting table HTML
-  Row1 := THTML.OpeningTag('tr');
-  Row2 := THTML.OpeningTag('tr');
+  Row1 := TXHTML.OpeningTag('tr');
+  Row2 := TXHTML.OpeningTag('tr');
   // Add to each table row for each compiler: compiler name in row 1 and LED
   // image representing compile result in row 2
   for Compiler in Compilers do
@@ -111,8 +111,8 @@ class function TCompResHTML.CompileResultsTableRows(Compilers: ICompilers;
     Row2 := Row2 + ResultCell(CompileResults[Compiler.GetID]) + EOL;
   end;
   // Close the two rows
-  Row1 := Row1 + THTML.ClosingTag('tr');
-  Row2 := Row2 + THTML.ClosingTag('tr');
+  Row1 := Row1 + TXHTML.ClosingTag('tr');
+  Row2 := Row2 + TXHTML.ClosingTag('tr');
   // Return HTML of two rows
   Result := Row1 + Row2;
 end;
@@ -123,30 +123,30 @@ class function TCompResHTML.EmptyTableRows: string;
   sMessage = 'Results for all compilers have been hidden.';
   sHelpText = 'More information';
 begin
-  Result := THTML.CompoundTag(
+  Result := TXHTML.CompoundTag(
     'tr',
-    THTML.CompoundTag(
+    TXHTML.CompoundTag(
       'th',
-      THTML.CompoundTag(
+      TXHTML.CompoundTag(
         'span',
         THTMLAttributes.Create('class', 'warning'),
-        THTML.Entities(sHeading)
+        TXHTML.Entities(sHeading)
       )
     )
   ) +
-  THTML.CompoundTag(
+  TXHTML.CompoundTag(
     'tr',
-    THTML.CompoundTag(
+    TXHTML.CompoundTag(
       'td',
-      THTML.Entities(sMessage)
+      TXHTML.Entities(sMessage)
       + ' ' +
-      THTML.CompoundTag(
+      TXHTML.CompoundTag(
         'a',
         THTMLAttributes.Create([
           THTMLAttribute.Create('href', 'help:AllCompilersHidden'),
           THTMLAttribute.Create('class', 'help-link')
         ]),
-        THTML.Entities(sHelpText)
+        TXHTML.Entities(sHelpText)
       )
       + '.'
     )
@@ -172,7 +172,7 @@ class function TCompResHTML.ImageTag(const CompRes: TCompileResult): string;
   );
   Attrs.Add('title', CompResImgInfo[CompRes].Title);
   // Create tag
-  Result := THTML.SimpleTag('img', Attrs);
+  Result := TXHTML.SimpleTag('img', Attrs);
 end;
 
 class function TCompResHTML.NameCell(const Compiler: ICompiler): string;
@@ -181,14 +181,14 @@ class function TCompResHTML.NameCell(const Compiler: ICompiler): string;
 begin
   // Any spaces in compiler name replaced by <br /> tags
   CompilerNameHTML := StrReplace(
-    THTML.Entities(Compiler.GetName), ' ', THTML.SimpleTag('br')
+    TXHTML.Entities(Compiler.GetName), ' ', TXHTML.SimpleTag('br')
   );
-  Result := THTML.CompoundTag('th', CompilerNameHTML);
+  Result := TXHTML.CompoundTag('th', CompilerNameHTML);
 end;
 
 class function TCompResHTML.ResultCell(const CompRes: TCompileResult): string;
 begin
-  Result := THTML.CompoundTag('td', ImageTag(CompRes));
+  Result := TXHTML.CompoundTag('td', ImageTag(CompRes));
 end;
 
 class function TCompResHTML.TableRows(const CompileResults: TCompileResults):
diff --git a/Src/UDetailPageHTML.pas b/Src/UDetailPageHTML.pas
index 718aa7032..d278ab931 100644
--- a/Src/UDetailPageHTML.pas
+++ b/Src/UDetailPageHTML.pas
@@ -391,10 +391,10 @@ function TNulPageHTML.Generate: string;
 
 function TNewTabPageHTML.GetBodyHTML: string;
 begin
-  Result := THTML.CompoundTag(
+  Result := TXHTML.CompoundTag(
     'div',
     THTMLAttributes.Create('id', 'newtab'),
-    THTML.Entities(View.Description)
+    TXHTML.Entities(View.Description)
   );
 end;
 
@@ -452,9 +452,9 @@ procedure TWelcomePageHTML.ResolvePlaceholders(const Tplt: THTMLTemplate);
     for Compiler in Compilers do
       if Compiler.IsAvailable then
         CompilerList.AppendLine(
-          THTML.CompoundTag(
+          TXHTML.CompoundTag(
             'li',
-            THTML.Entities(Compiler.GetName)
+            TXHTML.Entities(Compiler.GetName)
           )
         );
     Tplt.ResolvePlaceholderHTML('CompilerList', CompilerList.ToString);
@@ -470,9 +470,9 @@ function TDBUpdatedPageHTML.GetBodyHTML: string;
   sBody = 'The database has been updated successfully.';
 begin
   Result :=
-    THTML.CompoundTag('h1', View.Description)
+    TXHTML.CompoundTag('h1', View.Description)
     +
-    THTML.CompoundTag('p', sBody);
+    TXHTML.CompoundTag('p', sBody);
 end;
 
 { TSnippetInfoPageHTML }
@@ -623,14 +623,14 @@ function TSnippetListPageHTML.SnippetTableRow(const Snippet: TSnippet): string;
   DescCellAttrs := THTMLAttributes.Create('class', 'desc');
   SnippetHTML := TSnippetHTML.Create(Snippet);
   try
-    Result := THTML.CompoundTag(
+    Result := TXHTML.CompoundTag(
       'tr',
-      THTML.CompoundTag(
+      TXHTML.CompoundTag(
         'td',
         NameCellAttrs,
         SnippetHTML.SnippetALink
       )
-      + THTML.CompoundTag('td', DescCellAttrs, SnippetHTML.Description)
+      + TXHTML.CompoundTag('td', DescCellAttrs, SnippetHTML.Description)
     );
   finally
     SnippetHTML.Free;
diff --git a/Src/UHTMLBuilder.pas b/Src/UHTMLBuilder.pas
index 8a5a2038a..87a11a00c 100644
--- a/Src/UHTMLBuilder.pas
+++ b/Src/UHTMLBuilder.pas
@@ -142,22 +142,22 @@ implementation
 
 procedure THTMLBuilder.AddText(const Text: string);
 begin
-  fBodyInner.Append(THTML.Entities(Text));
+  fBodyInner.Append(TXHTML.Entities(Text));
 end;
 
 function THTMLBuilder.BodyTag: string;
 begin
-  Result := THTML.CompoundTag(cBodyTag, EOL + HTMLFragment + EOL);
+  Result := TXHTML.CompoundTag(cBodyTag, EOL + HTMLFragment + EOL);
 end;
 
 procedure THTMLBuilder.ClosePre;
 begin
-  fBodyInner.Append(THTML.ClosingTag(cPreTag));
+  fBodyInner.Append(TXHTML.ClosingTag(cPreTag));
 end;
 
 procedure THTMLBuilder.CloseSpan;
 begin
-  fBodyInner.Append(THTML.ClosingTag(cSpanTag));
+  fBodyInner.Append(TXHTML.ClosingTag(cSpanTag));
 end;
 
 constructor THTMLBuilder.Create;
@@ -182,10 +182,10 @@ function THTMLBuilder.GetTitle: string;
 
 function THTMLBuilder.HeadTag: string;
 begin
-  Result := THTML.CompoundTag(
+  Result := TXHTML.CompoundTag(
     cHeadTag,
     EOL
-      + THTML.CompoundTag(cTitleTag, THTML.Entities(Title))
+      + TXHTML.CompoundTag(cTitleTag, TXHTML.Entities(Title))
       + EOL
       + InlineStyleSheet
   );
@@ -222,7 +222,7 @@ function THTMLBuilder.HTMLTag: string;
   // ---------------------------------------------------------------------------
 
 begin
-  Result := THTML.CompoundTag(
+  Result := TXHTML.CompoundTag(
     cHTMLTag,
     HTMLAttrs,
     EOL + HeadTag + EOL + BodyTag + EOL
@@ -237,7 +237,7 @@ function THTMLBuilder.InlineStyleSheet: string;
   begin
     Attrs := THTMLAttributes.Create('type', 'text/css');
     Result := EOL
-      + THTML.CompoundTag(cStyleTag, Attrs, EOL + fCSS + EOL)
+      + TXHTML.CompoundTag(cStyleTag, Attrs, EOL + fCSS + EOL)
       + EOL;
   end
   else
@@ -258,12 +258,12 @@ procedure THTMLBuilder.NewLine;
 
 procedure THTMLBuilder.OpenPre(const ClassName: string);
 begin
-  fBodyInner.Append(THTML.OpeningTag(cPreTag, MakeClassAttr(ClassName)));
+  fBodyInner.Append(TXHTML.OpeningTag(cPreTag, MakeClassAttr(ClassName)));
 end;
 
 procedure THTMLBuilder.OpenSpan(const ClassName: string);
 begin
-  fBodyInner.Append(THTML.OpeningTag(cSpanTag, MakeClassAttr(ClassName)));
+  fBodyInner.Append(TXHTML.OpeningTag(cSpanTag, MakeClassAttr(ClassName)));
 end;
 
 end.
diff --git a/Src/UHTMLTemplate.pas b/Src/UHTMLTemplate.pas
index 7a9088aef..54ae6a876 100644
--- a/Src/UHTMLTemplate.pas
+++ b/Src/UHTMLTemplate.pas
@@ -105,7 +105,7 @@ procedure THTMLTemplate.ResolvePlaceholderText(const Placeholder, Text: string);
     @param Text [in] Plain text to replace placeholder.
   }
 begin
-  ResolvePlaceholderHTML(Placeholder, THTML.Entities(Text));
+  ResolvePlaceholderHTML(Placeholder, TXHTML.Entities(Text));
 end;
 
 end.
diff --git a/Src/UHTMLUtils.pas b/Src/UHTMLUtils.pas
index 5ec7ccebb..ddc441e88 100644
--- a/Src/UHTMLUtils.pas
+++ b/Src/UHTMLUtils.pas
@@ -19,6 +19,7 @@ interface
   // Delphi
   Classes, Graphics, Generics.Collections,
   // Project
+  UBaseObjects,
   UIStringList;
 
 
@@ -123,10 +124,12 @@   THTMLAttributes = class(TInterfacedObject, IHTMLAttributes)
   end;
 
 type
-  ///  <summary>
-  ///  Container for static methods that generate HTML tags and entities.
-  ///  </summary>
-  THTML = record
+
+  THTMLClass = class of THTML;
+
+  ///  <summary>Abstract base classe for static classes that return valid tags
+  ///  for different flavours of HTML.</summary>
+  THTML = class abstract(TNoConstructObject)
   strict private
     ///  <summary>Generates either an HTML start tag or a simple tag with given
     ///  name and attributes.</summary>
@@ -137,8 +140,9 @@   THTML = record
     ///  be simple (True) or the start of a compound tag (False).</param>
     ///  <returns>string. Required tag.</returns>
     class function TagWithAttrs(const Name: string; Attrs: IHTMLAttributes;
-      const IsSimple: Boolean): string; static;
-
+      const IsSimple: Boolean): string;
+  strict protected
+    class function GetSimpleTagCloser: string; virtual; abstract;
   public
     ///  <summary>Generates an opening HTML tag.</summary>
     ///  <param name="Name">string [in] Name of tag.</param>
@@ -147,13 +151,13 @@   THTML = record
     ///  <returns>String. Required tag.</returns>
     ///  <remarks>Example tag: &lt;p class=&quot;ident&quot;&gt;</remarks>
     class function OpeningTag(const Name: string; Attrs: IHTMLAttributes = nil):
-      string; static;
+      string;
 
     ///  <summary>Generates a closing HTML tag.</summary>
     ///  <param name="Name">string [in] Name of tag.</param>
     ///  <returns>String. Required tag.</returns>
     ///  <remarks>Example tag: &lt;/p&gt;</remarks>
-    class function ClosingTag(const Name: string): string; static;
+    class function ClosingTag(const Name: string): string;
 
     ///  <summary>Generates a simple HTML tag.</summary>
     ///  <param name="Name">string [in] Name of tag.</param>
@@ -162,7 +166,7 @@   THTML = record
     ///  <returns>String. Required tag.</returns>
     ///  <remarks>Example tag: &lt;img class=&quot;glyph&quot; /&gt;</remarks>
     class function SimpleTag(const Name: string; Attrs: IHTMLAttributes = nil):
-      string; static;
+      string;
 
     ///  <summary>Surrounds the given HTML in a HTML tag pair.</summary>
     ///  <param name="Name">string [in] Name of tag.</param>
@@ -172,7 +176,7 @@   THTML = record
     ///  the tag pair.</param>
     ///  <returns>String. Required tag.</returns>
     class function CompoundTag(const Name: string; Attrs: IHTMLAttributes;
-      const InnerHTML: string): string; overload; static;
+      const InnerHTML: string): string; overload;
 
     ///  <summary>Surrounds the given HTML in a HTML tag pair. The opening tag
     ///  has no attributes.</summary>
@@ -181,14 +185,27 @@   THTML = record
     ///  the tag pair.</param>
     ///  <returns>String. Required tag.</returns>
     class function CompoundTag(const Name, InnerHTML: string): string; overload;
-      static;
 
     ///  <summary>Encodes the given string replacing any HTML-incompatible
     ///  characters with character entities.</summary>
-    class function Entities(const Text: string): string; static;
+    class function Entities(const Text: string): string;
   end;
 
 
+  ///  <summary>Contains static methods that generate XHTML tags and entities.
+  ///  </summary>
+  TXHTML = class sealed (THTML)
+  strict protected
+    class function GetSimpleTagCloser: string; override;
+  end;
+
+  ///  <summary>Contains static methods that generate HTML5 tags and entities.
+  ///  </summary>
+  THTML5 = class sealed (THTML)
+  strict protected
+    class function GetSimpleTagCloser: string; override;
+  end;
+
 implementation
 
 
@@ -260,11 +277,25 @@ class function THTML.TagWithAttrs(const Name: string; Attrs: IHTMLAttributes;
   if Assigned(Attrs) and (not Attrs.IsEmpty) then
     Result := Result + ' ' + Attrs.RenderSafe;
   if IsSimple then
-    Result := Result + ' />'
+    Result := Result + GetSimpleTagCloser
   else
     Result := Result + '>';
 end;
 
+{ TXHTML }
+
+class function TXHTML.GetSimpleTagCloser: string;
+begin
+  Result := ' />';
+end;
+
+{ THTML5 }
+
+class function THTML5.GetSimpleTagCloser: string;
+begin
+  Result := '>';
+end;
+
 { THTMLAttributes }
 
 procedure THTMLAttributes.Add(const Name, Value: string);
@@ -376,8 +407,8 @@ function THTMLAttributes.RenderSafe: string;
     Result := Result + Format(
       ' %0:s="%1:s"',
       [
-        THTML.Entities(fAttrs.Names[Idx]),
-        THTML.Entities(fAttrs.ValueFromIndex[Idx])
+        TXHTML.Entities(fAttrs.Names[Idx]),
+        TXHTML.Entities(fAttrs.ValueFromIndex[Idx])
       ]
     );
   Result := StrTrimLeft(Result);
diff --git a/Src/USnippetHTML.pas b/Src/USnippetHTML.pas
index a853e74f6..3703830dd 100644
--- a/Src/USnippetHTML.pas
+++ b/Src/USnippetHTML.pas
@@ -143,7 +143,7 @@ function TSnippetHTML.EmptyListSentence: string;
 resourcestring
   sEmpty = 'None';
 begin
-  Result := THTML.Entities(StrMakeSentence(sEmpty));
+  Result := TXHTML.Entities(StrMakeSentence(sEmpty));
 end;
 
 function TSnippetHTML.Extra: string;
@@ -161,7 +161,7 @@ class function TSnippetHTML.JSALink(const JSFn, CSSClass, Text: string):
     THTMLAttribute.Create('onclick', JSFn + '; return false;'),
     THTMLAttribute.Create('class', CSSClass)
   ]);
-  Result := THTML.CompoundTag('a', Attrs, THTML.Entities(Text));
+  Result := TXHTML.CompoundTag('a', Attrs, TXHTML.Entities(Text));
 end;
 
 function TSnippetHTML.RenderActiveText(ActiveText: IActiveText): string;
@@ -199,7 +199,7 @@ function TSnippetHTML.SnippetList(const Snippets: TSnippetList): string;
 
 function TSnippetHTML.SnippetName: string;
 begin
-  Result := THTML.Entities(fSnippet.DisplayName);
+  Result := TXHTML.Entities(fSnippet.DisplayName);
 end;
 
 class function TSnippetHTML.SnippetALink(const Snippet: TSnippet): string;
@@ -221,7 +221,7 @@ function TSnippetHTML.SnippetALink: string;
 
 function TSnippetHTML.SnippetKind: string;
 begin
-  Result := THTML.Entities(
+  Result := TXHTML.Entities(
     StrMakeSentence(TSnippetKindInfoList.Items[fSnippet.Kind].DisplayName)
   );
 end;
@@ -267,9 +267,9 @@ function TSnippetHTML.TestingImage: string;
 begin
   Attrs := THTMLAttributes.Create;
   Attrs.Add('src', MakeResourceURL(ImgSrcs[fSnippet.TestInfo].ResName));
-  Attrs.Add('title', THTML.Entities(ImgSrcs[fSnippet.TestInfo].Title));
+  Attrs.Add('title', TXHTML.Entities(ImgSrcs[fSnippet.TestInfo].Title));
   Attrs.Add('class', 'testing-img');
-  Result := THTML.SimpleTag('img', Attrs);
+  Result := TXHTML.SimpleTag('img', Attrs);
 end;
 
 function TSnippetHTML.Units: string;
@@ -277,7 +277,7 @@ function TSnippetHTML.Units: string;
   if fSnippet.Units.Count = 0 then
     Result := EmptyListSentence
   else
-    Result := THTML.Entities(StrJoin(fSnippet.Units, ', ', False) + '.');
+    Result := TXHTML.Entities(StrJoin(fSnippet.Units, ', ', False) + '.');
 end;
 
 function TSnippetHTML.XRefs: string;
diff --git a/Src/USnippetPageHTML.pas b/Src/USnippetPageHTML.pas
index a4871cc06..9ad1f082a 100644
--- a/Src/USnippetPageHTML.pas
+++ b/Src/USnippetPageHTML.pas
@@ -205,10 +205,10 @@ destructor TSnippetHTMLFragment.Destroy;
 class function TPrefixedSnippetHTMLFragment.Render(const Prefix, Id,
   Content: string): string;
 begin
-  Result := THTML.CompoundTag(
+  Result := TXHTML.CompoundTag(
     'p',
-    THTML.CompoundTag('strong', Prefix) + ' ' +
-      THTML.CompoundTag('span', THTMLAttributes.Create('id', Id), Content)
+    TXHTML.CompoundTag('strong', Prefix) + ' ' +
+      TXHTML.CompoundTag('span', THTMLAttributes.Create('id', Id), Content)
   );
 end;
 
@@ -216,7 +216,7 @@ class function TPrefixedSnippetHTMLFragment.Render(const Prefix, Id,
 
 function TSnippetDescHTMLFragment.ToString: string;
 begin
-  Result := THTML.CompoundTag(
+  Result := TXHTML.CompoundTag(
     'div', THTMLAttributes.Create('id', 'description'), SnippetHTML.Description
   );
 end;
@@ -225,7 +225,7 @@ function TSnippetDescHTMLFragment.ToString: string;
 
 function TSnippetSourceCodeHTMLFragment.ToString: string;
 begin
-  Result := THTML.CompoundTag(
+  Result := TXHTML.CompoundTag(
     'div', THTMLAttributes.Create('id', 'sourcecode'), SnippetHTML.SourceCode
   );
 end;
@@ -279,10 +279,10 @@ function TSnippetXRefsHTMLFragment.ToString: string;
 
 function TSnippetCompileResultsHTMLFragment.ToString: string;
 begin
-  Result := THTML.CompoundTag(
+  Result := TXHTML.CompoundTag(
     'div',
     THTMLAttributes.Create('id', 'compile-results'),
-    THTML.CompoundTag(
+    TXHTML.CompoundTag(
       'table',
       THTMLAttributes.Create(
         [
@@ -300,7 +300,7 @@ function TSnippetCompileResultsHTMLFragment.ToString: string;
 
 function TSnippetExtraHTMLFragment.ToString: string;
 begin
-  Result := THTML.CompoundTag(
+  Result := TXHTML.CompoundTag(
     'div', THTMLAttributes.Create('id', 'extra'), SnippetHTML.Extra
   );
 end;

From 050bc587dc4cbc93ccb65e588222e8f4c9c886d4 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 17 Apr 2025 09:41:00 +0100
Subject: [PATCH 199/264] Rename TSourceFileType.sfHTML as sfXHTML

This was done to better decribe the file type.
---
 Src/Hiliter.UFileHiliter.pas | 4 ++--
 Src/USaveSourceMgr.pas       | 4 ++--
 Src/USourceFileInfo.pas      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Src/Hiliter.UFileHiliter.pas b/Src/Hiliter.UFileHiliter.pas
index 0c60d9372..18d1bf4d3 100644
--- a/Src/Hiliter.UFileHiliter.pas
+++ b/Src/Hiliter.UFileHiliter.pas
@@ -99,7 +99,7 @@ function TFileHiliter.Hilite(const SourceCode, DocTitle: string): TEncodedData;
 begin
   case fFileType of
     sfRTF: HilitedDocCls := TRTFDocumentHiliter;
-    sfHTML: HilitedDocCls := TXHTMLDocumentHiliter;
+    sfXHTML: HilitedDocCls := TXHTMLDocumentHiliter;
     else HilitedDocCls := TNulDocumentHiliter;
   end;
   if fWantHiliting and IsHilitingSupported(fFileType) then
@@ -116,7 +116,7 @@ class function TFileHiliter.IsHilitingSupported(
     @return True if file type supports highlighting, false if not.
   }
 begin
-  Result := FileType in [sfHTML, sfRTF];
+  Result := FileType in [sfXHTML, sfRTF];
 end;
 
 end.
diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index 9c7c8efca..69eb4e763 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -262,9 +262,9 @@ constructor TSaveSourceMgr.InternalCreate;
       TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
     ]
   );
-  fSourceFileInfo.FileTypeInfo[sfHTML] := TSourceFileTypeInfo.Create(
+  fSourceFileInfo.FileTypeInfo[sfXHTML] := TSourceFileTypeInfo.Create(
     '.html',
-    GetFileTypeDesc(sfHTML),
+    GetFileTypeDesc(sfXHTML),
     [
       TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
     ]
diff --git a/Src/USourceFileInfo.pas b/Src/USourceFileInfo.pas
index 4c641622e..67c7e3fff 100644
--- a/Src/USourceFileInfo.pas
+++ b/Src/USourceFileInfo.pas
@@ -28,7 +28,7 @@ interface
   TSourceFileType = (
     sfText,     // plain text files
     sfPascal,   // pascal files (either .pas for units or .inc for include files
-    sfHTML,     // HTML files
+    sfXHTML,    // XHTML files
     sfRTF       // rich text files
   );
 

From 78cf622bd4606142656310f0df451cde3bea2d01 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 17 Apr 2025 09:45:49 +0100
Subject: [PATCH 200/264] Change name of XHTML files in save dialogue boxes

Name is dialogue box drop down lists change from HTML to XHTML
---
 Src/USaveSnippetMgr.pas | 4 ++--
 Src/USaveUnitMgr.pas    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Src/USaveSnippetMgr.pas b/Src/USaveSnippetMgr.pas
index 63dcb9b0e..1182fed92 100644
--- a/Src/USaveSnippetMgr.pas
+++ b/Src/USaveSnippetMgr.pas
@@ -99,7 +99,7 @@ implementation
   sCategory = 'category';
   sSnippet = 'routine';
   // File filter strings
-  sHtmExtDesc = 'HTML file';
+  sXHtmExtDesc = 'XHTML file';
   sRtfExtDesc = 'Rich text file';
   sIncExtDesc = 'Pascal include file';
   sTxtExtDesc = 'Plain text file';
@@ -170,7 +170,7 @@ function TSaveSnippetMgr.GetFileTypeDesc(
   const FileType: TSourceFileType): string;
 const
   Descriptions: array[TSourceFileType] of string = (
-    sTxtExtDesc, sIncExtDesc, sHtmExtDesc, sRtfExtDesc
+    sTxtExtDesc, sIncExtDesc, sXHtmExtDesc, sRtfExtDesc
   );
 begin
   Result := Descriptions[FileType];
diff --git a/Src/USaveUnitMgr.pas b/Src/USaveUnitMgr.pas
index 1cd7841d3..3a9c446af 100644
--- a/Src/USaveUnitMgr.pas
+++ b/Src/USaveUnitMgr.pas
@@ -107,7 +107,7 @@ implementation
   // Dialog box title
   sSaveDlgTitle = 'Save Unit';
   // File filter strings
-  sHTMLDesc = 'HTML file';
+  sXHTMLDesc = 'XHTML file';
   sRTFDesc = 'Rich text file';
   sPascalDesc = 'Pascal unit';
   sTextDesc = 'Plain text file';
@@ -241,7 +241,7 @@ function TSaveUnitMgr.GetDocTitle: string;
 function TSaveUnitMgr.GetFileTypeDesc(const FileType: TSourceFileType): string;
 const
   Descriptions: array[TSourceFileType] of string = (
-    sTextDesc, sPascalDesc, sHTMLDesc, sRTFDesc
+    sTextDesc, sPascalDesc, sXHTMLDesc, sRTFDesc
   );
 begin
   Result := Descriptions[FileType];

From 182d9c82daddf8dd54a90ebcc4b92d24c28da254 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 17 Apr 2025 11:57:05 +0100
Subject: [PATCH 201/264] Revise handling of file extensions in save dialogues

This commit applies to the custom file save dialogues used when saving
units or annotated source code files.

The code to detect file types and to look up filter indexes depended on
file extensions being different for each file type, which cannot be
guaranteed.

Relevant code was updated to remove this dependency.

NOTE: This change was made because HTML 5 documents, when added, will
use the same .html file extension and XTHML documents.
---
 Src/UOpenDialogHelper.pas | 71 +++++++++++++++++++--------------------
 Src/USaveSourceDlg.pas    |  8 ++---
 Src/USaveSourceMgr.pas    | 47 ++++++++++++++++++++------
 Src/USourceFileInfo.pas   | 19 -----------
 4 files changed, 74 insertions(+), 71 deletions(-)

diff --git a/Src/UOpenDialogHelper.pas b/Src/UOpenDialogHelper.pas
index 084b2b284..68382f1af 100644
--- a/Src/UOpenDialogHelper.pas
+++ b/Src/UOpenDialogHelper.pas
@@ -44,18 +44,20 @@ function FilterIndexToExt(const Dlg: TOpenDialog): string;
       prepended '.'.
   }
 
-function ExtToFilterIndex(const FilterStr, Ext: string;
-  const DefValue: Integer): Integer;
-  {Calculates index of a file extension in a "|" delimited file filter string as
-  used in standard file dialog boxes.
-    @param FilterStr [in] List of file types and extensions. Has format
-      "file desc 1|ext 1|file desc 2|ext 2 etc...".
-    @param Ext [in] Extension to be found.
-    @param DefValue [in] Default 1 based index to use if Ext is not in
-      FilterStr.
-    @return 1 based index of extension in filter string or -1 if extension not
-      in list.
-  }
+///  <summary>Calculates the index of a file type description in a &quot;|&quot;
+///  delimited string, as used in Windows standard file dialogue boxes.
+///  </summary>
+///  <param name="FilterStr"><c>string</c> [in] List of file types and
+///  extensions. Must have format
+///  <c>file desc 1|(*.ext1)|file desc 2|(*.ext2)</c> etc...</param>
+///  <param name="Desc"><c>string</c> [in] File type description to be found.
+///  </param>
+///  <param name="DefIdx"><c>Integer</c> [in] Default 1 based index to use if
+///  <c>Desc</c> is not in <c>FilterStr</c>.</param>
+///  <returns><c>Integer</c>. 1 based index of the file type description in the
+///  filter string, or <c>DefIdx</c> if the description is not found.</returns>
+function FilterDescToIndex(const FilterStr, Desc: string;
+  const DefIdx: Integer): Integer;
 
 function FileOpenEditedFileNameWithExt(const Dlg: TOpenDialog): string;
   {Gets full path to the file that is currently entered in a file open dialog
@@ -96,47 +98,42 @@ function FilterIndexToExt(const Dlg: TOpenDialog): string;
   end;
 end;
 
-function ExtToFilterIndex(const FilterStr, Ext: string;
-  const DefValue: Integer): Integer;
-  {Calculates index of a file extension in a "|" delimited file filter string as
-  used in standard file dialog boxes.
-    @param FilterStr [in] List of file types and extensions. Has format
-      "file desc 1|ext 1|file desc 2|ext 2 etc...".
-    @param Ext [in] Extension to be found.
-    @param DefValue [in] Default 1 based index to use if Ext is not in
-      FilterStr.
-    @return 1 based index of extension in filter string or -1 if extension not
-      in list.
-  }
+function FilterDescToIndex(const FilterStr, Desc: string;
+  const DefIdx: Integer): Integer;
 var
   FilterParts: TStringList; // stores filter split into component parts
-  Extensions: TStringList;  // list of extensions in filter string
-  Idx: Integer;             // loops thru extensions in filter string
+  Descs: TStringList;       // list of file type descriptions in filter string
+  Idx: Integer;             // loops thru Descs in filter string
+  DescStr: string;
+  DescEnd: Integer;
 begin
-  Extensions := nil;
+  Descs := nil;
   FilterParts := TStringList.Create;
   try
     // Split filter string into parts (divided by | chars):
-    // even number indexes are descriptions and odd indexes are extensions
+    // even number indexes are descriptions and odd indexes are Descs
     StrExplode(FilterStr, '|', FilterParts);
-    // Record only extensions (every 2nd entry starting at index 1)
-    Extensions := TStringList.Create;
-    Idx := 1;
+    // Record only Descs (every 2nd entry starting at index 1)
+    Descs := TStringList.Create;
+    Idx := 0;
     while Idx < FilterParts.Count do
     begin
-      Extensions.Add(ExtractFileExt(FilterParts[Idx]));
+      DescStr := FilterParts[Idx];
+      DescEnd := StrPos('(', DescStr) - 2;
+      DescStr := Copy(DescStr, 1, DescEnd);
+      Descs.Add(DescStr);
       Inc(Idx, 2);
     end;
     // Check if required extension in list
-    Result := Extensions.IndexOf(Ext);
+    Result := Descs.IndexOf(Desc);
     if Result >= 0 then
-      // extension in list, increment by 1 since filter indexes are 1 based
+      // description in list, increment by 1 since filter indexes are 1 based
       Inc(Result)
     else
-      Result := DefValue;
+      Result := DefIdx;
   finally
-    FreeAndNil(Extensions);
-    FreeAndNil(FilterParts);
+    Descs.Free;
+    FilterParts.Free;
   end;
 end;
 
diff --git a/Src/USaveSourceDlg.pas b/Src/USaveSourceDlg.pas
index fad8094d2..8a5aeaa5b 100644
--- a/Src/USaveSourceDlg.pas
+++ b/Src/USaveSourceDlg.pas
@@ -38,11 +38,11 @@ interface
   ///  <summary>Type of handler for event triggered by TSaveSourceDlg to get
   ///  list of encodings supported for a file type.</summary>
   ///  <param name="Sender">TObject [in] Object triggering event.</param>
-  ///  <param name="Ext">string [in] Extension that defines type of file being
-  ///  queried.</param>
+  ///  <param name="FilterIdx">string [in] Filter index that specifies the type
+  ///  of file being queried.</param>
   ///  <param name="Encodings">TSourceFileEncodings [in/out] Assigned an array
   ///  of records that specify supported encodings.</param>
-  TEncodingQuery = procedure(Sender: TObject; const Ext: string;
+  TEncodingQuery = procedure(Sender: TObject; const FilterIdx: Integer;
     var Encodings: TSourceFileEncodings) of object;
 
 type
@@ -475,7 +475,7 @@ procedure TSaveSourceDlg.DoTypeChange;
   // handle OnEncodingQuery)
   SetLength(Encodings, 0);
   if Assigned(fOnEncodingQuery) then
-    fOnEncodingQuery(Self, SelectedExt, Encodings);
+    fOnEncodingQuery(Self, FilterIndex, Encodings);
   if Length(Encodings) = 0 then
     Encodings := TSourceFileEncodings.Create(
       TSourceFileEncoding.Create(etSysDefault, sANSIEncoding)
diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index 69eb4e763..dd5305682 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -49,10 +49,11 @@   TSaveSourceMgr = class abstract(TNoPublicConstructObject)
     ///  Provides array of encodings supported for a file extension.</summary>
     ///  <param name="Sender">TObject [in] Reference to object that triggered
     ///  event.</param>
-    ///  <param name="Ext">string [in] Name of extension to check.</param>
+    ///  <param name="FilterIdx">string [in] Index of file type withing dialog's
+    ///  filter string to check.</param>
     ///  <param name="Encodings">TSourceFileEncodings [in/out] Receives array of
     ///  supported encodings.</param>
-    procedure EncodingQueryHandler(Sender: TObject; const Ext: string;
+    procedure EncodingQueryHandler(Sender: TObject; const FilterIdx: Integer;
       var Encodings: TSourceFileEncodings);
     ///  <summary>Handles custom save dialog's OnPreview event. Displays source
     ///  code appropriately formatted in preview dialog box.</summary>
@@ -81,6 +82,12 @@   TSaveSourceMgr = class abstract(TNoPublicConstructObject)
     ///  <returns>TEncodedData - Formatted source code, syntax highlighted if
     ///  required.</returns>
     function GenerateOutput(const FileType: TSourceFileType): TEncodedData;
+    ///  <summary>Returns the source file type associated with the selected
+    ///  index in the save dialogue box.</summary>
+    ///  <remarks>This method assumes that the filter string entries are in the
+    ///  same order as elements of the <c>TSourceFileType</c> enumeration.
+    ///  </remarks>
+    function FileTypeFromFilterIdx: TSourceFileType;
   strict protected
     ///  <summary>Internal constructor. Initialises managed save source dialog
     ///  box and records information about supported file types.</summary>
@@ -178,18 +185,16 @@ procedure TSaveSourceMgr.DoExecute;
 begin
   // Set up dialog box
   fSaveDlg.Filter := fSourceFileInfo.FilterString;
-  fSaveDlg.FilterIndex := ExtToFilterIndex(
+  fSaveDlg.FilterIndex := FilterDescToIndex(
     fSaveDlg.Filter,
-    fSourceFileInfo.FileTypeInfo[Preferences.SourceDefaultFileType].Extension,
+    fSourceFileInfo.FileTypeInfo[Preferences.SourceDefaultFileType].DisplayName,
     1
   );
   fSaveDlg.FileName := fSourceFileInfo.DefaultFileName;
   // Display dialog box and save file if user OKs
   if fSaveDlg.Execute then
   begin
-    FileType := fSourceFileInfo.FileTypeFromExt(
-      ExtractFileExt(fSaveDlg.FileName)
-    );
+    FileType := FileTypeFromFilterIdx;
     FileContent := GenerateOutput(FileType).ToString;
     Encoding := TEncodingHelper.GetEncoding(fSaveDlg.SelectedEncoding);
     try
@@ -201,14 +206,27 @@ procedure TSaveSourceMgr.DoExecute;
 end;
 
 procedure TSaveSourceMgr.EncodingQueryHandler(Sender: TObject;
-  const Ext: string; var Encodings: TSourceFileEncodings);
+  const FilterIdx: Integer; var Encodings: TSourceFileEncodings);
 var
   FileType: TSourceFileType;  // type of file that has given extension
 begin
-  FileType := fSourceFileInfo.FileTypeFromExt(Ext);
+  FileType := FileTypeFromFilterIdx;
   Encodings := fSourceFileInfo.FileTypeInfo[FileType].Encodings;
 end;
 
+function TSaveSourceMgr.FileTypeFromFilterIdx: TSourceFileType;
+var
+  FilterIdx: Integer; // dlg FilterIndex adjusted to be 0 based
+begin
+  FilterIdx := fSaveDlg.FilterIndex - 1;
+  Assert(
+    (FilterIdx >= Ord(Low(TSourceFileType)))
+      and (FilterIdx <= Ord(High(TSourceFileType))),
+    ClassName + '.FileTypeFromFilterIdx: FilerIdx out of range'
+  );
+  Result := TSourceFileType(FilterIdx)
+end;
+
 function TSaveSourceMgr.GenerateOutput(const FileType: TSourceFileType):
   TEncodedData;
 var
@@ -231,7 +249,7 @@ function TSaveSourceMgr.GenerateOutput(const FileType: TSourceFileType):
 procedure TSaveSourceMgr.HiliteQueryHandler(Sender: TObject; const Ext: string;
   var CanHilite: Boolean);
 begin
-  CanHilite := IsHilitingSupported(fSourceFileInfo.FileTypeFromExt(Ext));
+  CanHilite := IsHilitingSupported(FileTypeFromFilterIdx);
 end;
 
 constructor TSaveSourceMgr.InternalCreate;
@@ -262,6 +280,13 @@ constructor TSaveSourceMgr.InternalCreate;
       TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
     ]
   );
+  fSourceFileInfo.FileTypeInfo[sfHTML5] := TSourceFileTypeInfo.Create(
+    '.html',
+    GetFileTypeDesc(sfHTML5),
+    [
+      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
+    ]
+  );
   fSourceFileInfo.FileTypeInfo[sfXHTML] := TSourceFileTypeInfo.Create(
     '.html',
     GetFileTypeDesc(sfXHTML),
@@ -305,7 +330,7 @@ procedure TSaveSourceMgr.PreviewHandler(Sender: TObject);
 var
   FileType: TSourceFileType;  // type of source file to preview
 begin
-  FileType := fSourceFileInfo.FileTypeFromExt(fSaveDlg.SelectedExt);
+  FileType := FileTypeFromFilterIdx;
   // Display preview dialog box. We use save dialog as owner to ensure preview
   // dialog box is aligned over save dialog box
   TPreviewDlg.Execute(
diff --git a/Src/USourceFileInfo.pas b/Src/USourceFileInfo.pas
index 67c7e3fff..d2a4a2b39 100644
--- a/Src/USourceFileInfo.pas
+++ b/Src/USourceFileInfo.pas
@@ -105,9 +105,6 @@   TSourceFileInfo = class(TObject)
     ///  <summary>Builds filter string for use in open / save dialog boxes from
     ///  descriptions and file extensions of each supported file type.</summary>
     function FilterString: string;
-    ///  <summary>Finds source file type associated with a file extension.
-    ///  </summary>
-    function FileTypeFromExt(const Ext: string): TSourceFileType;
     ///  <summary>Array of information about each supported file type that is
     ///  of use to save source dialog boxes.</summary>
     property FileTypeInfo[const FileType: TSourceFileType]: TSourceFileTypeInfo
@@ -132,22 +129,6 @@ implementation
 
 { TSourceFileInfo }
 
-function TSourceFileInfo.FileTypeFromExt(const Ext: string): TSourceFileType;
-var
-  FT: TSourceFileType;  // loops thru all source file types
-begin
-  // Assume text file type if extension not recognised
-  Result := sfText;
-  for FT := Low(TSourceFileType) to High(TSourceFileType) do
-  begin
-    if StrSameText(Ext, fFileTypeInfo[FT].Extension) then
-    begin
-      Result := FT;
-      Break;
-    end;
-  end;
-end;
-
 function TSourceFileInfo.FilterString: string;
 const
   cFilterFmt = '%0:s (*%1:s)|*%1:s';  // format string for creating file filter

From b2f2bfc921488ccefbc10c3225744244d08155da Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 17 Apr 2025 11:57:47 +0100
Subject: [PATCH 202/264] Add support for HTML 5 as save dialogue file type

Added support for listing HTML 5 as a file type option, and detecting
its selection in the custom save file dialogue boxes used when saving
units and annotated source code.

NOTE: this commit does not implement the correct rendering of HTML 5
files: at present selecting HTML 5 has the same effect as selecting
plain text.
---
 Src/FrSourcePrefs.pas        | 5 +++--
 Src/Hiliter.UFileHiliter.pas | 2 +-
 Src/USaveSnippetMgr.pas      | 3 ++-
 Src/USaveSourceMgr.pas       | 6 +++++-
 Src/USaveUnitMgr.pas         | 3 ++-
 Src/USourceFileInfo.pas      | 1 +
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Src/FrSourcePrefs.pas b/Src/FrSourcePrefs.pas
index 297cac1f4..2fbe5c77f 100644
--- a/Src/FrSourcePrefs.pas
+++ b/Src/FrSourcePrefs.pas
@@ -121,7 +121,8 @@ implementation
 
 resourcestring
   // File type descriptions
-  sHTMLFileDesc = 'HTML';
+  sHTML5FileDesc = 'HTML 5';
+  sXHTMLFileDesc = 'XHTML';
   sRTFFileDesc = 'Rich text';
   sPascalFileDesc = 'Pascal';
   sTextFileDesc = 'Plain text';
@@ -130,7 +131,7 @@ implementation
 const
   // Maps source code file types to descriptions
   cFileDescs: array[TSourceFileType] of string = (
-    sTextFileDesc, sPascalFileDesc, sHTMLFileDesc, sRTFFileDesc
+    sTextFileDesc, sPascalFileDesc, sHTML5FileDesc, sXHTMLFileDesc, sRTFFileDesc
   );
 
 
diff --git a/Src/Hiliter.UFileHiliter.pas b/Src/Hiliter.UFileHiliter.pas
index 18d1bf4d3..3bb87cf8b 100644
--- a/Src/Hiliter.UFileHiliter.pas
+++ b/Src/Hiliter.UFileHiliter.pas
@@ -116,7 +116,7 @@ class function TFileHiliter.IsHilitingSupported(
     @return True if file type supports highlighting, false if not.
   }
 begin
-  Result := FileType in [sfXHTML, sfRTF];
+  Result := FileType in [sfHTML5, sfXHTML, sfRTF];
 end;
 
 end.
diff --git a/Src/USaveSnippetMgr.pas b/Src/USaveSnippetMgr.pas
index 1182fed92..61f37bef6 100644
--- a/Src/USaveSnippetMgr.pas
+++ b/Src/USaveSnippetMgr.pas
@@ -99,6 +99,7 @@ implementation
   sCategory = 'category';
   sSnippet = 'routine';
   // File filter strings
+  sHtml5ExtDesc = 'HTML 5 file';
   sXHtmExtDesc = 'XHTML file';
   sRtfExtDesc = 'Rich text file';
   sIncExtDesc = 'Pascal include file';
@@ -170,7 +171,7 @@ function TSaveSnippetMgr.GetFileTypeDesc(
   const FileType: TSourceFileType): string;
 const
   Descriptions: array[TSourceFileType] of string = (
-    sTxtExtDesc, sIncExtDesc, sXHtmExtDesc, sRtfExtDesc
+    sTxtExtDesc, sIncExtDesc, sHtml5ExtDesc, sXHtmExtDesc, sRtfExtDesc
   );
 begin
   Result := Descriptions[FileType];
diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index dd5305682..29058b105 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -325,7 +325,11 @@ procedure TSaveSourceMgr.PreviewHandler(Sender: TObject);
 const
   // Map of source file type to preview document types
   PreviewDocTypeMap: array[TSourceFileType] of TPreviewDocType = (
-    dtPlainText, dtPlainText, dtHTML, dtRTF
+    dtPlainText,  // sfText
+    dtPlainText,  // sfPascal
+    dtHTML,       // sfHTML5
+    dtHTML,       // sfXHTML
+    dtRTF         // sfRTF
   );
 var
   FileType: TSourceFileType;  // type of source file to preview
diff --git a/Src/USaveUnitMgr.pas b/Src/USaveUnitMgr.pas
index 3a9c446af..45d2b4529 100644
--- a/Src/USaveUnitMgr.pas
+++ b/Src/USaveUnitMgr.pas
@@ -107,6 +107,7 @@ implementation
   // Dialog box title
   sSaveDlgTitle = 'Save Unit';
   // File filter strings
+  sHTML5Desc = 'HTML 5 file';
   sXHTMLDesc = 'XHTML file';
   sRTFDesc = 'Rich text file';
   sPascalDesc = 'Pascal unit';
@@ -241,7 +242,7 @@ function TSaveUnitMgr.GetDocTitle: string;
 function TSaveUnitMgr.GetFileTypeDesc(const FileType: TSourceFileType): string;
 const
   Descriptions: array[TSourceFileType] of string = (
-    sTextDesc, sPascalDesc, sXHTMLDesc, sRTFDesc
+    sTextDesc, sPascalDesc, sHTML5Desc, sXHTMLDesc, sRTFDesc
   );
 begin
   Result := Descriptions[FileType];
diff --git a/Src/USourceFileInfo.pas b/Src/USourceFileInfo.pas
index d2a4a2b39..a4b4f49a5 100644
--- a/Src/USourceFileInfo.pas
+++ b/Src/USourceFileInfo.pas
@@ -28,6 +28,7 @@ interface
   TSourceFileType = (
     sfText,     // plain text files
     sfPascal,   // pascal files (either .pas for units or .inc for include files
+    sfHTML5,    // HTML 5 files
     sfXHTML,    // XHTML files
     sfRTF       // rich text files
   );

From 28ac886326bffd8fa4f132a255543b38e800b14d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 17 Apr 2025 12:57:02 +0100
Subject: [PATCH 203/264] Fix TSaveSourceMgr to preview HTML5 files correctly

HTML 5 files are actually previewed as XHTML because support for HTML5
might not be properly implemented by the IE based MS web browser
control.

TSaveSourceMgr was also changed to explicitly render pascal file as
plain text for previewing. Although this change is not strictly
necessary since pascal and plain text file types render the same, it
was done for consitency and clarity.
---
 Src/USaveSourceMgr.pas | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index 29058b105..bf35fc824 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -331,16 +331,23 @@ procedure TSaveSourceMgr.PreviewHandler(Sender: TObject);
     dtHTML,       // sfXHTML
     dtRTF         // sfRTF
   );
+  PreviewFileTypeMap: array[TPreviewDocType] of TSourceFileType = (
+    sfText,       // dtPlainText
+    sfXHTML,      // dtHTML
+    sfRTF         // dtRTF
+  );
 var
-  FileType: TSourceFileType;  // type of source file to preview
+  PreviewFileType: TSourceFileType;  // type of source file to preview
+  PreviewDocType: TPreviewDocType;   // type of file to be generated for preview
 begin
-  FileType := FileTypeFromFilterIdx;
+  PreviewDocType := PreviewDocTypeMap[FileTypeFromFilterIdx];
+  PreviewFileType := PreviewFileTypeMap[PreviewDocType];
   // Display preview dialog box. We use save dialog as owner to ensure preview
   // dialog box is aligned over save dialog box
   TPreviewDlg.Execute(
     fSaveDlg,
-    GenerateOutput(FileType),
-    PreviewDocTypeMap[FileType],
+    GenerateOutput(PreviewFileType),
+    PreviewDocType,
     GetDocTitle
   );
 end;

From b165f85300fbe5d7b76037dc7c09ff70f7103658 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 17 Apr 2025 15:49:09 +0100
Subject: [PATCH 204/264] Add support for hiliting source code as HTML 5

Selecting the HTML 5 file type in custom save dialogue boxes now
renders highlighted source code in correctly formatted HTML 5 documents.

Revised the UHTMLBuilder unit so that the original THTMLBuilder class
was refactored into an abstract template class containing HTML
flavour-agnostic code. Added new TXHTMLBuilder and THTML5Builder
concrete classes that can build XHTML and HTML 5 documents,
respectively. XHTML output was modified to emit the correct <meta> data
tag to describe the document content type.

Similarly revised TXHTMLDocumentHiliter as a concrete sub class of a
new THTMLDocumentHiliter abstract template class. The functionality of
TXHTMLDocumentHiliter is unchanged. Added THTML5DocumentHiliter as
another concrete subclass of THTMLDocumentHiliter that outputs HTML 5.

Revised code in USnippetHTML that constructed a THTMLBuilder object to
construct a TXHTMLBuilder object instead.

Changed TFileHiliter.Hilite to highlight HTML 5 documents when the
source file type is sfHTML5.
---
 Src/Hiliter.UFileHiliter.pas |   1 +
 Src/Hiliter.UHiliters.pas    | 101 ++++++++++------
 Src/UHTMLBuilder.pas         | 220 +++++++++++++++++++++++++----------
 Src/USnippetHTML.pas         |   2 +-
 4 files changed, 229 insertions(+), 95 deletions(-)

diff --git a/Src/Hiliter.UFileHiliter.pas b/Src/Hiliter.UFileHiliter.pas
index 3bb87cf8b..43838cb87 100644
--- a/Src/Hiliter.UFileHiliter.pas
+++ b/Src/Hiliter.UFileHiliter.pas
@@ -100,6 +100,7 @@ function TFileHiliter.Hilite(const SourceCode, DocTitle: string): TEncodedData;
   case fFileType of
     sfRTF: HilitedDocCls := TRTFDocumentHiliter;
     sfXHTML: HilitedDocCls := TXHTMLDocumentHiliter;
+    sfHTML5: HilitedDocCls := THTML5DocumentHiliter;
     else HilitedDocCls := TNulDocumentHiliter;
   end;
   if fWantHiliting and IsHilitingSupported(fFileType) then
diff --git a/Src/Hiliter.UHiliters.pas b/Src/Hiliter.UHiliters.pas
index f0a998300..8433ab199 100644
--- a/Src/Hiliter.UHiliters.pas
+++ b/Src/Hiliter.UHiliters.pas
@@ -132,7 +132,7 @@   TNulDocumentHiliter = class sealed(TDocumentHiliter)
   ///  <summary>
   ///  Creates a highlighted source code document in XHTML format.
   ///  </summary>
-  TXHTMLDocumentHiliter = class sealed(TDocumentHiliter)
+  THTMLDocumentHiliter = class abstract(TDocumentHiliter)
   strict private
     ///  <summary>Generates the CSS rules to be used in the document.</summary>
     ///  <param name="Attrs">IHiliteAttrs [in] Highlighting styles used in
@@ -140,6 +140,8 @@   TXHTMLDocumentHiliter = class sealed(TDocumentHiliter)
     ///  <returns>string. CSS rules that apply styles specified in Attrs.
     ///  </returns>
     class function GenerateCSSRules(Attrs: IHiliteAttrs): string;
+  strict protected
+    class function BuilderClass: THTMLBuilderClass; virtual; abstract;
   public
     ///  <summary>Creates XHTML document containing highlighted source code.
     ///  </summary>
@@ -154,6 +156,20 @@   TXHTMLDocumentHiliter = class sealed(TDocumentHiliter)
       override;
   end;
 
+  ///  <summary>Creates a highlighted source code document in XHTML format.
+  ///  </summary>
+  TXHTMLDocumentHiliter = class sealed(THTMLDocumentHiliter)
+  strict protected
+    class function BuilderClass: THTMLBuilderClass; override;
+  end;
+
+  ///  <summary>Creates a highlighted source code document in HTML5 format.
+  ///  </summary>
+  THTML5DocumentHiliter = class sealed(THTMLDocumentHiliter)
+  strict protected
+    class function BuilderClass: THTMLBuilderClass; override;
+  end;
+
 type
   ///  <summary>
   ///  Creates a highlighted source code document in rich text format.
@@ -242,55 +258,56 @@   TRTFHiliteRenderer = class(THiliteRenderer, IHiliteRenderer)
   end;
 
 type
-  ///  <summary>
-  ///  Renders highlighted source code in XHTML format. Generated code is
-  ///  recorded in a given HTML code builder object.
+  ///  <summary>Renders highlighted source code in any supported HTML format.
   ///  </summary>
-  ///  <remarks>
-  ///  Designed for use with TSyntaxHiliter objects.
-  ///  </remarks>
+  ///  <remarks>Designed for use with <c>TSyntaxHiliter</c> objects.</remarks>
   THTMLHiliteRenderer = class(THiliteRenderer, IHiliteRenderer)
   strict private
     var
-      ///  <summary>Object used to record generated XHTML code.</summary>
+      ///  <summary>Object used to build up the generated HTML.</summary>
       fBuilder: THTMLBuilder;
-      ///  <summary>Flag indicating if writing first line of output.</summary>
+      ///  <summary>Flag indicating if writing the first line of output.
+      ///  </summary>
       fIsFirstLine: Boolean;
   public
-    ///  <summary>Object constructor. Sets up object to render documents.
-    ///  </summary>
-    ///  <param name="Builder">THTMLBuilder [in] Object that receives generated
-    ///  XHTML code.</param>
-    ///  <param name="Attrs">IHiliteAttrs [in] Specifies required highlighting
-    ///  style. If nil document is not highlighted.</param>
+    ///  <summary>Object constructor. Sets up the object to render HTML
+    ///  documents.</summary>
+    ///  <param name="Builder"><c>THTMLBuilder</c> [in] Object used to build the
+    ///  required HTML. <c>Builder</c> must be an instance of a concreate
+    ///  descendant class of <c>THTMLBuilder</c>, which is abstract. The type of
+    ///  <c>Builder</c> determines the type of HTML that is generated.</param>
+    ///  <param name="Attrs"><c>IHiliteAttrs</c> [in] Specifies required
+    ///  highlighting style. If <c>nil</c> the document is not highlighted.
+    ///  </param>
     constructor Create(const Builder: THTMLBuilder;
       const Attrs: IHiliteAttrs = nil);
-    ///  <summary>Initialises XHTML ready to receive highlighted code.</summary>
-    ///  <remarks>Method of IHiliteRenderer.</remarks>
+    ///  <summary>Initialises the HTML ready to receive highlighted code.
+    ///  </summary>
+    ///  <remarks>Method of <c>IHiliteRenderer</c>.</remarks>
     procedure Initialise;
-    ///  <summary>Tidies up XHTML after all highlighted code processed.
+    ///  <summary>Tidies up the HTML after all highlighted code is processed.
     ///  </summary>
-    ///  <remarks>Method of IHiliteRenderer.</remarks>
+    ///  <remarks>Method of <c>IHiliteRenderer</c>.</remarks>
     procedure Finalise;
-    ///  <summary>Emits new line if necessary.</summary>
-    ///  <remarks>Method of IHiliteRenderer.</remarks>
+    ///  <summary>Emits a new line if necessary.</summary>
+    ///  <remarks>Method of <c>IHiliteRenderer</c>.</remarks>
     procedure BeginLine;
     ///  <summary>Does nothing.</summary>
     ///  <remarks>
-    ///  <para>Handling of new lines is all done by BeginLine.</para>
-    ///  <para>Method of IHiliteRenderer.</para>
+    ///  <para>Handling of new lines is all done by <c>BeginLine</c>.</para>
+    ///  <remarks>Method of <c>IHiliteRenderer</c>.</remarks>
     ///  </remarks>
     procedure EndLine;
-    ///  <summary>Emits any span tag required to style following source code
-    ///  element as specified by Elem.</summary>
-    ///  <remarks>Method of IHiliteRenderer.</remarks>
+    ///  <summary>Emits any &lt;span&gt; tag required to style the following
+    ///  source code element, specified by <c>Elem</c>.</summary>
+    ///  <remarks>Method of <c>IHiliteRenderer</c>.</remarks>
     procedure BeforeElem(Elem: THiliteElement);
-    ///  <summary>Writes given source code element text.</summary>
-    ///  <remarks>Method of IHiliteRenderer.</remarks>
+    ///  <summary>Writes the given source code element text.</summary>
+    ///  <remarks>Method of <c>IHiliteRenderer</c>.</remarks>
     procedure WriteElemText(const Text: string);
-    ///  <summary>Closes any span tag used to style source code element
-    ///  specified by Elem.</summary>
-    ///  <remarks>Method of IHiliteRenderer.</remarks>
+    ///  <summary>Closes any &lt;span&gt; tag used to style the source code
+    ///  element specified by <c>Elem</c>.</summary>
+    ///  <remarks>Method of <c>IHiliteRenderer</c>.</remarks>
     procedure AfterElem(Elem: THiliteElement);
   end;
 
@@ -372,9 +389,9 @@ class function TNulDocumentHiliter.Hilite(const RawCode: string;
   Result := TEncodedData.Create(RawCode, etUnicode);
 end;
 
-{ TXHTMLDocumentHiliter }
+{ THTMLDocumentHiliter }
 
-class function TXHTMLDocumentHiliter.GenerateCSSRules(Attrs: IHiliteAttrs):
+class function THTMLDocumentHiliter.GenerateCSSRules(Attrs: IHiliteAttrs):
   string;
 var
   CSSBuilder: TCSSBuilder;  // builds CSS code
@@ -396,7 +413,7 @@ class function TXHTMLDocumentHiliter.GenerateCSSRules(Attrs: IHiliteAttrs):
   end;
 end;
 
-class function TXHTMLDocumentHiliter.Hilite(const RawCode: string;
+class function THTMLDocumentHiliter.Hilite(const RawCode: string;
   Attrs: IHiliteAttrs; const Title: string): TEncodedData;
 resourcestring
   // Default document title
@@ -405,7 +422,7 @@ class function TXHTMLDocumentHiliter.Hilite(const RawCode: string;
   Renderer: IHiliteRenderer;    // XHTML renderer object
   Builder: THTMLBuilder;        // object used to construct XHTML document
 begin
-  Builder := THTMLBuilder.Create;
+  Builder := BuilderClass.Create;
   try
     if Title <> '' then
       Builder.Title := Title
@@ -420,6 +437,20 @@ class function TXHTMLDocumentHiliter.Hilite(const RawCode: string;
   end;
 end;
 
+{ TXHTMLDocumentHiliter }
+
+class function TXHTMLDocumentHiliter.BuilderClass: THTMLBuilderClass;
+begin
+  Result := TXHTMLBuilder;
+end;
+
+{ THTML5DocumentHiliter }
+
+class function THTML5DocumentHiliter.BuilderClass: THTMLBuilderClass;
+begin
+  Result := THTML5Builder;
+end;
+
 { TRTFDocumentHiliter }
 
 class function TRTFDocumentHiliter.Hilite(const RawCode: string;
diff --git a/Src/UHTMLBuilder.pas b/Src/UHTMLBuilder.pas
index 87a11a00c..1c9afdab0 100644
--- a/Src/UHTMLBuilder.pas
+++ b/Src/UHTMLBuilder.pas
@@ -23,10 +23,12 @@ interface
 
 
 type
-  ///  <summary>
-  ///  Class used to create content of a XHTML strict document.
-  ///  </summary>
-  THTMLBuilder = class(TObject)
+
+  THTMLBuilderClass = class of THTMLBuilder;
+
+  ///  <summary>Abstract base class for classes that create the content of
+  ///  different types of HTML documents.</summary>
+  THTMLBuilder = class abstract (TObject)
   strict private
     var
       ///  <summary>Value of CSS property.</summary>
@@ -48,6 +50,9 @@   THTMLBuilder = class(TObject)
     ///  </summary>
     function HeadTag: string;
 
+    ///  <summary>Build document's &lt;title&gt; tag and its content.</summary>
+    function TitleTag: string;
+
     ///  <summary>Builds document's compound &lt;body&gt; tag and its content.
     ///  </summary>
     function BodyTag: string;
@@ -60,6 +65,30 @@   THTMLBuilder = class(TObject)
     ///  <remarks>Returns default title if title is empty string.</remarks>
     function GetTitle: string;
 
+  strict protected
+    const
+      // Various HTML tag names
+      HTMLTagName = 'html';
+      HeadTagName = 'head';
+      TitleTagName = 'title';
+      MetaTagName = 'meta';
+      StyleTagName = 'style';
+      BodyTagName = 'body';
+      PreTagName = 'pre';
+      SpanTagName = 'span';
+  strict protected
+    ///  <summary>Returns the class used to generate tags for the appropriate
+    ///  type of HTML.</summary>
+    function TagGenerator: THTMLClass; virtual; abstract;
+    ///  <summary>Returns any preamble to be written to the HTML before the
+    ///  opening &lt;html&gt; tag.</summary>
+    function Preamble: string; virtual; abstract;
+    ///  <summary>Returns the attributes of the document's &lt;html&gt; tag.
+    ///  </summary>
+    function HTMLTagAttrs: IHTMLAttributes; virtual; abstract;
+    ///  <summary>Returns any &lt;meta&gt; tags to be included within the
+    ///  document's &lt;head&gt; tag.</summary>
+    function MetaTags: string; virtual; abstract;
   public
     ///  <summary>Object constructor. Initialises object with empty body.
     ///  </summary>
@@ -107,6 +136,51 @@   THTMLBuilder = class(TObject)
     property CSS: string read fCSS write fCSS;
   end;
 
+  ///  <summary>Class used to create the content of a XHTML strict document.
+  ///  </summary>
+  TXHTMLBuilder = class sealed(THTMLBuilder)
+  strict private
+    const
+      // XML processor instruction
+      XMLProcInstruction = '<?xml version="1.0"?>';
+      // XML document type
+      XHTMLDocType = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" '
+        + '"https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+  strict protected
+    ///  <summary>Returns the class used to generate XHTML compliant tags.
+    ///  </summary>
+    function TagGenerator: THTMLClass; override;
+    ///  <summary>Returns the XML processing instruction followed by the XHTML
+    ///  doctype.</summary>
+    function Preamble: string; override;
+    ///  <summary>Returns the attributes required for an XHTML &lt;html&gt; tag.
+    ///  </summary>
+    function HTMLTagAttrs: IHTMLAttributes; override;
+    ///  <summary>Returns a &lt;meta&gt; tag that specifies the text/html
+    ///  content type and UTF-8 encodiing.</summary>
+    function MetaTags: string; override;
+  end;
+
+  ///  <summary>Class used to create the content of a HTML 5 document.</summary>
+  THTML5Builder = class sealed(THTMLBuilder)
+  strict private
+    const
+      // HTML 5 document type
+      HTML5DocType = '<!DOCTYPE HTML>';
+  strict protected
+    ///  <summary>Returns the class used to generate HTML 5 compliant tags.
+    ///  </summary>
+    function TagGenerator: THTMLClass; override;
+    ///  <summary>Returns the HTML 5 doctype.</summary>
+    function Preamble: string; override;
+    ///  <summary>Returns the attributes required for an HTML 5 &lt;html&gt;
+    ///  tag.</summary>
+    function HTMLTagAttrs: IHTMLAttributes; override;
+    ///  <summary>Returns a &lt;meta&gt; tag that specifies that the document
+    ///  uses UTF-8 encoding.</summary>
+    function MetaTags: string; override;
+  end;
+
 
 implementation
 
@@ -116,23 +190,6 @@ implementation
   UConsts;
 
 
-const
-  // XHTML document elements
-  // XML processor instruction
-  cXMLProcInstruction = '<?xml version="1.0"?>';
-  // XML document type
-  cDocType = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" '
-    + '"https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-  // Various tag names
-  cHTMLTag = 'html';
-  cHeadTag = 'head';
-  cTitleTag = 'title';
-  cStyleTag = 'style';
-  cBodyTag = 'body';
-  cPreTag = 'pre';
-  cSpanTag = 'span';
-
-
 resourcestring
   // Default document title used if none provided
   sUntitled = 'Untitled';
@@ -142,22 +199,22 @@ implementation
 
 procedure THTMLBuilder.AddText(const Text: string);
 begin
-  fBodyInner.Append(TXHTML.Entities(Text));
+  fBodyInner.Append(TagGenerator.Entities(Text));
 end;
 
 function THTMLBuilder.BodyTag: string;
 begin
-  Result := TXHTML.CompoundTag(cBodyTag, EOL + HTMLFragment + EOL);
+  Result := TagGenerator.CompoundTag(BodyTagName, EOL + HTMLFragment + EOL);
 end;
 
 procedure THTMLBuilder.ClosePre;
 begin
-  fBodyInner.Append(TXHTML.ClosingTag(cPreTag));
+  fBodyInner.Append(TagGenerator.ClosingTag(PreTagName));
 end;
 
 procedure THTMLBuilder.CloseSpan;
 begin
-  fBodyInner.Append(TXHTML.ClosingTag(cSpanTag));
+  fBodyInner.Append(TagGenerator.ClosingTag(SpanTagName));
 end;
 
 constructor THTMLBuilder.Create;
@@ -182,23 +239,15 @@ function THTMLBuilder.GetTitle: string;
 
 function THTMLBuilder.HeadTag: string;
 begin
-  Result := TXHTML.CompoundTag(
-    cHeadTag,
-    EOL
-      + TXHTML.CompoundTag(cTitleTag, TXHTML.Entities(Title))
-      + EOL
-      + InlineStyleSheet
+  Result := TagGenerator.CompoundTag(
+    HeadTagName,
+    EOL + MetaTags + EOL + TitleTag + EOL + InlineStyleSheet
   );
 end;
 
 function THTMLBuilder.HTMLDocument: string;
 begin
-  Result := cXMLProcInstruction
-    + EOL
-    + cDocType
-    + EOL
-    + HTMLTag
-    + EOL;
+  Result := Preamble + EOL + HTMLTag + EOL;
 end;
 
 function THTMLBuilder.HTMLFragment: string;
@@ -207,24 +256,10 @@ function THTMLBuilder.HTMLFragment: string;
 end;
 
 function THTMLBuilder.HTMLTag: string;
-
-  // ---------------------------------------------------------------------------
-  ///  <summary>Builds object describing attributes of &lt;html&gt; tag.
-  ///  </summary>
-  function HTMLAttrs: IHTMLAttributes;
-  begin
-    Result := THTMLAttributes.Create(
-      [THTMLAttribute.Create('xmlns', 'https://www.w3.org/1999/xhtml'),
-      THTMLAttribute.Create('xml:lang', 'en'),
-      THTMLAttribute.Create('lang', 'en')]
-    );
-  end;
-  // ---------------------------------------------------------------------------
-
 begin
-  Result := TXHTML.CompoundTag(
-    cHTMLTag,
-    HTMLAttrs,
+  Result := TagGenerator.CompoundTag(
+    HTMLTagName,
+    HTMLTagAttrs,
     EOL + HeadTag + EOL + BodyTag + EOL
   );
 end;
@@ -236,9 +271,7 @@ function THTMLBuilder.InlineStyleSheet: string;
   if fCSS <> '' then
   begin
     Attrs := THTMLAttributes.Create('type', 'text/css');
-    Result := EOL
-      + TXHTML.CompoundTag(cStyleTag, Attrs, EOL + fCSS + EOL)
-      + EOL;
+    Result := TagGenerator.CompoundTag(StyleTagName, Attrs, EOL + fCSS) + EOL;
   end
   else
     Result := '';
@@ -258,12 +291,81 @@ procedure THTMLBuilder.NewLine;
 
 procedure THTMLBuilder.OpenPre(const ClassName: string);
 begin
-  fBodyInner.Append(TXHTML.OpeningTag(cPreTag, MakeClassAttr(ClassName)));
+  fBodyInner.Append(
+    TagGenerator.OpeningTag(PreTagName, MakeClassAttr(ClassName))
+  );
 end;
 
 procedure THTMLBuilder.OpenSpan(const ClassName: string);
 begin
-  fBodyInner.Append(TXHTML.OpeningTag(cSpanTag, MakeClassAttr(ClassName)));
+  fBodyInner.Append(
+    TagGenerator.OpeningTag(SpanTagName, MakeClassAttr(ClassName))
+  );
+end;
+
+function THTMLBuilder.TitleTag: string;
+begin
+  Result := TagGenerator.CompoundTag(
+    TitleTagName, TagGenerator.Entities(Title)
+  );
+end;
+
+{ TXHTMLBuilder }
+
+function TXHTMLBuilder.HTMLTagAttrs: IHTMLAttributes;
+begin
+  Result := THTMLAttributes.Create(
+    [THTMLAttribute.Create('xmlns', 'https://www.w3.org/1999/xhtml'),
+    THTMLAttribute.Create('xml:lang', 'en'),
+    THTMLAttribute.Create('lang', 'en')]
+  );
+end;
+
+function TXHTMLBuilder.MetaTags: string;
+begin
+  Result := TagGenerator.SimpleTag(
+    MetaTagName,
+    THTMLAttributes.Create([
+      THTMLAttribute.Create('http-equiv', 'content-type'),
+      THTMLAttribute.Create('content', 'text/html; UTF-8')
+    ])
+  );
+end;
+
+function TXHTMLBuilder.Preamble: string;
+begin
+  Result := XMLProcInstruction + EOL + XHTMLDocType;
+end;
+
+function TXHTMLBuilder.TagGenerator: THTMLClass;
+begin
+  Result := TXHTML;
+end;
+
+{ THTML5Builder }
+
+function THTML5Builder.HTMLTagAttrs: IHTMLAttributes;
+begin
+  Result := THTMLAttributes.Create('lang', 'en');
+end;
+
+function THTML5Builder.MetaTags: string;
+begin
+  // <meta charset="UTF-8">
+  Result := TagGenerator.SimpleTag(
+    MetaTagName,
+    THTMLAttributes.Create('charset', 'UTF-8')
+  );
+end;
+
+function THTML5Builder.Preamble: string;
+begin
+  Result := HTML5DocType;
+end;
+
+function THTML5Builder.TagGenerator: THTMLClass;
+begin
+  Result := THTML5;
 end;
 
 end.
diff --git a/Src/USnippetHTML.pas b/Src/USnippetHTML.pas
index 3703830dd..8035a7474 100644
--- a/Src/USnippetHTML.pas
+++ b/Src/USnippetHTML.pas
@@ -236,7 +236,7 @@ function TSnippetHTML.SourceCode: string;
     Attrs := THiliteAttrsFactory.CreateUserAttrs
   else
     Attrs := THiliteAttrsFactory.CreateNulAttrs;
-  Builder := THTMLBuilder.Create;
+  Builder := TXHTMLBuilder.Create;
   try
     Renderer := THTMLHiliteRenderer.Create(Builder, Attrs);
     TSyntaxHiliter.Hilite(fSnippet.SourceCode, Renderer);

From bd3b3ee14e2c245e431aed49c6a3e6105215a9af Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 17 Apr 2025 17:35:18 +0100
Subject: [PATCH 205/264] Update docs re support for HTML 5 in save dialogues

Noted the HTML 5 output option in:

* the save snippet & save unit dialogue boxes and file menu help topics.

* the saved.html file format document

XX
---
 Docs/Design/FileFormats/saved.html | 15 ++++++++++++++-
 Src/Help/HTML/dlg_savesnippet.htm  |  8 +++++++-
 Src/Help/HTML/dlg_saveunit.htm     |  8 +++++++-
 Src/Help/HTML/menu_file.htm        |  6 +++---
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/Docs/Design/FileFormats/saved.html b/Docs/Design/FileFormats/saved.html
index 69dbbefd4..f464bd621 100644
--- a/Docs/Design/FileFormats/saved.html
+++ b/Docs/Design/FileFormats/saved.html
@@ -76,6 +76,9 @@ <h2>
   <li>
     Pascal source files (either .inc or .pas files).
   </li>
+  <li>
+    HTML 5 files.
+  </li>
   <li>
     XHTML files.
   </li>
@@ -85,7 +88,7 @@ <h2>
 </ul>
 
 <p>
-  There is no specific file format for these files, except that XHTML and RTF
+  There is no specific file format for these files, except that HTML 5, XHTML and RTF
   files conform to published specifications.
 </p>
 
@@ -135,6 +138,16 @@ <h2>
       </li>
     </ul>
   </dd>
+  <dt>
+    HTML 5 files
+  </dt>
+  <dd>
+    <ul class="squashed">
+      <li>
+        UTF-8
+      </li>
+    </ul>
+  </dd>
   <dt>
     XHTML files
   </dt>
diff --git a/Src/Help/HTML/dlg_savesnippet.htm b/Src/Help/HTML/dlg_savesnippet.htm
index 10e613980..bdddfe9b1 100644
--- a/Src/Help/HTML/dlg_savesnippet.htm
+++ b/Src/Help/HTML/dlg_savesnippet.htm
@@ -75,7 +75,13 @@ <h1>
         file except that the extension is .txt rather than .inc.
       </li>
       <li>
-        An HTML file (.html) &ndash; This option writes the source code out as a
+        A HTML 5 file (.html) &ndash; This option writes the source code out as a
+        valid HTML 5 document that uses embedded CSS to format the code. The
+        source code will be syntax highlighted if the <em>Use syntax
+        highlighting</em> check box is checked.
+      </li>
+      <li>
+        An XHTML file (.html) &ndash; This option writes the source code out as a
         valid XHTML document that uses embedded CSS to format the code. The
         source code will be syntax highlighted if the <em>Use syntax
         highlighting</em> check box is checked.
diff --git a/Src/Help/HTML/dlg_saveunit.htm b/Src/Help/HTML/dlg_saveunit.htm
index 928c4ebe6..9dfb25358 100644
--- a/Src/Help/HTML/dlg_saveunit.htm
+++ b/Src/Help/HTML/dlg_saveunit.htm
@@ -60,7 +60,13 @@ <h1>
         file except that the extension is .txt rather than .pas.
       </li>
       <li>
-        An HTML file (.html) &ndash; This option writes the source code out as a
+        A HTML 5 file (.html) &ndash; This option writes the source code out as a
+        valid HTML 5 document that uses embedded CSS to format the code. The
+        source code will be syntax highlighted if the <em>Use syntax
+        highlighting</em> check box is checked.
+      </li>
+      <li>
+        An XHTML file (.html) &ndash; This option writes the source code out as a
         valid XHTML document that uses embedded CSS to format the code. The
         source code will be syntax highlighted if the <em>Use syntax
         highlighting</em> check box is checked.
diff --git a/Src/Help/HTML/menu_file.htm b/Src/Help/HTML/menu_file.htm
index dfb1a4963..badf54294 100644
--- a/Src/Help/HTML/menu_file.htm
+++ b/Src/Help/HTML/menu_file.htm
@@ -37,8 +37,8 @@ <h1>
           to a file. The file contains an annotated fragment of Pascal code. The
           <a href="dlg_savesnippet.htm">Save Annotated Source</a> dialogue box
           is displayed and is used to determine the format of the file being
-          saved. This can be plain text, a Pascal include file, HTML or RTF. The
-          latter two options can be syntax highlighted. This option is available
+          saved. This can be plain text, a Pascal include file, HTML 5, XHTML or RTF. The
+          latter three options can be syntax highlighted. This option is available
           only for <a href="snippet_routine.htm">routine</a> snippets or
           categories containing routines. Any snippets in a category that are
           not routines are ignored.
@@ -74,7 +74,7 @@ <h1>
           snippets and saves it to file. The <a href="dlg_saveunit.htm">Save
           Unit</a> dialogue box is displayed and is used to determine the format
           of the file being saved. The format can be plain text, a Pascal unit
-          file, HTML or RTF. The latter two options can be syntax highlighted.
+          file, HTML 5, XHTML or RTF. The latter three options can be syntax highlighted.
           <a href="snippet_freeform.htm">Freeform</a> snippets are not included
           in the unit.
         </td>

From 426ec5502f236505b332c18cb15e912e6ae2b41e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 18 Apr 2025 07:27:14 +0100
Subject: [PATCH 206/264] Refactor TRichEditHelper as a class helper

Added new ClassHelpers.RichEdit unit to the project.

Converted TRichEditHelper into a "class helper for TRichEdit" and
moved it from URTFUtils into ClassHelpers.RichEdit.

Updated all affected code.
---
 Src/ClassHelpers.RichEdit.pas | 53 +++++++++++++++++++++++++++++++++++
 Src/CodeSnip.dpr              |  3 +-
 Src/CodeSnip.dproj            |  1 +
 Src/FrHiliterPrefs.pas        |  3 +-
 Src/FrPrintingPrefs.pas       |  5 ++--
 Src/FrRTFPreview.pas          |  3 +-
 Src/FrSourcePrefs.pas         |  4 +--
 Src/UPrintEngine.pas          |  3 +-
 Src/URTFUtils.pas             | 37 +-----------------------
 9 files changed, 68 insertions(+), 44 deletions(-)
 create mode 100644 Src/ClassHelpers.RichEdit.pas

diff --git a/Src/ClassHelpers.RichEdit.pas b/Src/ClassHelpers.RichEdit.pas
new file mode 100644
index 000000000..fc6f1f70b
--- /dev/null
+++ b/Src/ClassHelpers.RichEdit.pas
@@ -0,0 +1,53 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2025, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Class helper for TRichEdit.
+}
+
+unit ClassHelpers.RichEdit;
+
+interface
+
+uses
+  // Delphi
+  ComCtrls,
+  // Project
+  URTFUtils;
+
+type
+  TRichEditHelper = class helper for TRichEdit
+  public
+    procedure Load(const ARTF: TRTF);
+  end;
+
+implementation
+
+uses
+  // Delphi
+  SysUtils,
+  Classes;
+
+{ TRichEditHelper }
+
+procedure TRichEditHelper.Load(const ARTF: TRTF);
+var
+  Stream: TStream;
+begin
+  PlainText := False;
+  Stream := TMemoryStream.Create;
+  try
+    ARTF.ToStream(Stream);
+    Stream.Position := 0;
+    // must set MaxLength or long documents may not display
+    MaxLength := Stream.Size;
+    Lines.LoadFromStream(Stream, TEncoding.ASCII);
+  finally
+    Stream.Free;
+  end;
+end;
+
+end.
diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index babbd49e2..8e5662dfe 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -375,7 +375,8 @@ uses
   FmRegisterCompilersDlg in 'FmRegisterCompilersDlg.pas' {RegisterCompilersDlg},
   ClassHelpers.UGraphics in 'ClassHelpers.UGraphics.pas',
   ClassHelpers.UActions in 'ClassHelpers.UActions.pas',
-  USaveInfoMgr in 'USaveInfoMgr.pas';
+  USaveInfoMgr in 'USaveInfoMgr.pas',
+  ClassHelpers.RichEdit in 'ClassHelpers.RichEdit.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index 41e93eb81..e430334ce 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -582,6 +582,7 @@
 			<DCCReference Include="ClassHelpers.UGraphics.pas"/>
 			<DCCReference Include="ClassHelpers.UActions.pas"/>
 			<DCCReference Include="USaveInfoMgr.pas"/>
+			<DCCReference Include="ClassHelpers.RichEdit.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
diff --git a/Src/FrHiliterPrefs.pas b/Src/FrHiliterPrefs.pas
index e92e82fa1..a34bfff14 100644
--- a/Src/FrHiliterPrefs.pas
+++ b/Src/FrHiliterPrefs.pas
@@ -178,6 +178,7 @@ implementation
   // Delphi
   SysUtils, ExtCtrls, Windows, Graphics, Dialogs,
   // Project
+  ClassHelpers.RichEdit,
   FmPreferencesDlg, FmNewHiliterNameDlg, FmUserHiliterMgrDlg, Hiliter.UAttrs,
   IntfCommon, UCtrlArranger, UFontHelper, UIStringList, UMessageBox,
   URTFBuilder, URTFStyles, UUtils;
@@ -614,7 +615,7 @@ procedure THiliterPrefsFrame.UpdatePopupMenu;
 
 procedure THiliterPrefsFrame.UpdatePreview;
 begin
-  TRichEditHelper.Load(frmExample.RichEdit, GenerateRTF);
+  frmExample.RichEdit.Load(GenerateRTF);
 end;
 
 initialization
diff --git a/Src/FrPrintingPrefs.pas b/Src/FrPrintingPrefs.pas
index f0fbfc9eb..f825f511e 100644
--- a/Src/FrPrintingPrefs.pas
+++ b/Src/FrPrintingPrefs.pas
@@ -101,9 +101,10 @@ implementation
   // Delphi
   SysUtils, Windows, Graphics, Math, ComCtrls,
   // Project
+  ClassHelpers.RichEdit,
   FmPreferencesDlg, Hiliter.UAttrs, Hiliter.UHiliters, IntfCommon, UColours,
   UConsts, UEncodings, UFontHelper, UKeysHelper, UPrintInfo, URTFBuilder,
-  URTFStyles, URTFUtils, UStrUtils, UUtils;
+  URTFStyles, UStrUtils, UUtils;
 
 
 {$R *.dfm}
@@ -379,7 +380,7 @@ procedure TPrintingPrefsPreview.Generate(const UseColor, SyntaxPrint: Boolean);
     HiliteSource(UseColor, SyntaxPrint, Builder);
     Builder.EndPara;
     // Load document into rich edit
-    TRichEditHelper.Load(fRe, Builder.Render);
+    fRe.Load(Builder.Render);
   finally
     FreeAndNil(Builder);
   end;
diff --git a/Src/FrRTFPreview.pas b/Src/FrRTFPreview.pas
index 05edcd01e..a542a75a1 100644
--- a/Src/FrRTFPreview.pas
+++ b/Src/FrRTFPreview.pas
@@ -59,6 +59,7 @@ implementation
 
 uses
   // Project
+  ClassHelpers.RichEdit,
   URTFUtils;
 
 
@@ -80,7 +81,7 @@ procedure TRTFPreviewFrame.LoadContent(const DocContent: TEncodedData);
     @param DocContent [in] Valid RTF document to be displayed.
   }
 begin
-  TRichEditHelper.Load(reView, TRTF.Create(DocContent));
+  reView.Load(TRTF.Create(DocContent));
 end;
 
 procedure TRTFPreviewFrame.SetPopupMenu(const Menu: TPopupMenu);
diff --git a/Src/FrSourcePrefs.pas b/Src/FrSourcePrefs.pas
index 2fbe5c77f..48ccb606d 100644
--- a/Src/FrSourcePrefs.pas
+++ b/Src/FrSourcePrefs.pas
@@ -112,6 +112,7 @@ implementation
   // Delphi
   SysUtils, Math,
   // Project
+  ClassHelpers.RichEdit,
   FmPreferencesDlg, Hiliter.UAttrs, Hiliter.UFileHiliter, Hiliter.UHiliters,
   IntfCommon, UConsts, UCtrlArranger, URTFUtils;
 
@@ -358,8 +359,7 @@ procedure TSourcePrefsFrame.UpdatePreview;
   // Generate and display preview with required comment style
   Preview := TSourcePrefsPreview.Create(GetCommentStyle, fHiliteAttrs);
   try
-    // Display preview
-    TRichEditHelper.Load(frmPreview.RichEdit, Preview.Generate);
+    frmPreview.RichEdit.Load(Preview.Generate);
   finally
     Preview.Free;
   end;
diff --git a/Src/UPrintEngine.pas b/Src/UPrintEngine.pas
index 30e1a3983..7c5e60876 100644
--- a/Src/UPrintEngine.pas
+++ b/Src/UPrintEngine.pas
@@ -63,6 +63,7 @@ implementation
   // Delphi
   Printers,
   // Project
+  ClassHelpers.RichEdit,
   UMeasurement, UPrintInfo;
 
 
@@ -102,7 +103,7 @@ procedure TPrintEngine.Print(const Document: TRTF);
   sDefTitle = 'CodeSnip document';  // default document title
 begin
   // Load document into engine
-  TRichEditHelper.Load(RichEdit, Document);
+  RichEdit.Load(Document);
   // Set up page margins
   PrintMargins := GetPrintMargins;
   RichEdit.PageRect := Rect(
diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index e567184cc..6dffc5b76 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -17,7 +17,7 @@ interface
 
 uses
   // Delphi
-  SysUtils, Classes, ComCtrls,
+  SysUtils, Classes,
   // Project
   UEncodings;
 
@@ -130,20 +130,6 @@   TRTF = record
   ///  <summary>Class of exception raised by TRTF</summary>
   ERTF = class(Exception);
 
-type
-  ///  <summary>Static method record that assists in working with rich edit
-  ///  VCL controls.</summary>
-  TRichEditHelper = record
-  public
-    ///  <summary>Loads RTF code into a rich edit control, replacing existing
-    ///  content.</summary>
-    ///  <param name="RE">TRichEdit [in] Rich edit control.</param>
-    ///  <param name="RTF">TRTF [in] Contains rich text code to be loaded.
-    ///  </param>
-    class procedure Load(const RE: TRichEdit; const RTF: TRTF); static;
-  end;
-
-
 ///  <summary>Returns a parameterless RTF control word of given kind.</summary>
 function RTFControl(const Ctrl: TRTFControl): ASCIIString; overload;
 
@@ -184,8 +170,6 @@ implementation
 
 
 uses
-  // Delphi
-  Windows, RichEdit,
   // Project
   UExceptions;
 
@@ -372,24 +356,5 @@ function TRTF.ToString: UnicodeString;
   Result := TEncoding.ASCII.GetString(fData);
 end;
 
-{ TRichEditHelper }
-
-class procedure TRichEditHelper.Load(const RE: TRichEdit; const RTF: TRTF);
-var
-  Stream: TStream;
-begin
-  RE.PlainText := False;
-  Stream := TMemoryStream.Create;
-  try
-    RTF.ToStream(Stream);
-    Stream.Position := 0;
-    // must set MaxLength or long documents may not display
-    RE.MaxLength := Stream.Size;
-    RE.Lines.LoadFromStream(Stream, TEncoding.ASCII);
-  finally
-    Stream.Free;
-  end;
-end;
-
 end.
 

From 26a7b998a1dcf7b1ce1c5d479ab728650b671e6c Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 18 Apr 2025 08:18:46 +0100
Subject: [PATCH 207/264] Rename TRTF as TRTFMarkup

Also renamed some related variables etc.

Updated all affected code.
---
 Src/ClassHelpers.RichEdit.pas |  6 +++---
 Src/FrHiliterPrefs.pas        |  4 ++--
 Src/FrRTFPreview.pas          |  2 +-
 Src/FrSourcePrefs.pas         |  8 +++++---
 Src/UCopyViewMgr.pas          |  6 +++---
 Src/UPrintDocuments.pas       | 14 +++++++-------
 Src/UPrintEngine.pas          |  4 ++--
 Src/UPrintMgr.pas             |  2 +-
 Src/URTFBuilder.pas           |  6 +++---
 Src/URTFUtils.pas             | 32 ++++++++++++++++----------------
 Src/USaveInfoMgr.pas          |  6 +++---
 11 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/Src/ClassHelpers.RichEdit.pas b/Src/ClassHelpers.RichEdit.pas
index fc6f1f70b..f82600e6f 100644
--- a/Src/ClassHelpers.RichEdit.pas
+++ b/Src/ClassHelpers.RichEdit.pas
@@ -21,7 +21,7 @@ interface
 type
   TRichEditHelper = class helper for TRichEdit
   public
-    procedure Load(const ARTF: TRTF);
+    procedure Load(const ARTFMarkup: TRTFMarkup);
   end;
 
 implementation
@@ -33,14 +33,14 @@ implementation
 
 { TRichEditHelper }
 
-procedure TRichEditHelper.Load(const ARTF: TRTF);
+procedure TRichEditHelper.Load(const ARTFMarkup: TRTFMarkup);
 var
   Stream: TStream;
 begin
   PlainText := False;
   Stream := TMemoryStream.Create;
   try
-    ARTF.ToStream(Stream);
+    ARTFMarkup.ToStream(Stream);
     Stream.Position := 0;
     // must set MaxLength or long documents may not display
     MaxLength := Stream.Size;
diff --git a/Src/FrHiliterPrefs.pas b/Src/FrHiliterPrefs.pas
index a34bfff14..0910a505f 100644
--- a/Src/FrHiliterPrefs.pas
+++ b/Src/FrHiliterPrefs.pas
@@ -131,7 +131,7 @@   THiliterPrefsFrame = class(TPrefsBaseFrame)
     ///  <summary>Generates and returns RTF representation of currently selected
     ///  highlighter element.</summary>
     ///  <remarks>This RTF is used to display elememt in preview pane.</remarks>
-    function GenerateRTF: TRTF;
+    function GenerateRTF: TRTFMarkup;
   public
     ///  <summary>Constructs frame instance and initialises controls.</summary>
     ///  <param name="AOwner">TComponent [in] Component that owns the frame.
@@ -479,7 +479,7 @@ function THiliterPrefsFrame.DisplayName: string;
   Result := sDisplayName;
 end;
 
-function THiliterPrefsFrame.GenerateRTF: TRTF;
+function THiliterPrefsFrame.GenerateRTF: TRTFMarkup;
 var
   RTFBuilder: TRTFBuilder;  // object used to create and render RTFBuilder
   EgLines: IStringList;     // list of lines in the example
diff --git a/Src/FrRTFPreview.pas b/Src/FrRTFPreview.pas
index a542a75a1..16eb4f70b 100644
--- a/Src/FrRTFPreview.pas
+++ b/Src/FrRTFPreview.pas
@@ -81,7 +81,7 @@ procedure TRTFPreviewFrame.LoadContent(const DocContent: TEncodedData);
     @param DocContent [in] Valid RTF document to be displayed.
   }
 begin
-  reView.Load(TRTF.Create(DocContent));
+  reView.Load(TRTFMarkup.Create(DocContent));
 end;
 
 procedure TRTFPreviewFrame.SetPopupMenu(const Menu: TPopupMenu);
diff --git a/Src/FrSourcePrefs.pas b/Src/FrSourcePrefs.pas
index 48ccb606d..6b925973b 100644
--- a/Src/FrSourcePrefs.pas
+++ b/Src/FrSourcePrefs.pas
@@ -160,7 +160,7 @@   TSourcePrefsPreview = class(TObject)
         @param HiliteAttrs [in] Attributes of highlighter used to render
           preview.
       }
-    function Generate: TRTF;
+    function Generate: TRTFMarkup;
       {Generate RTF code used to render preview.
         @return Required RTF code.
       }
@@ -400,12 +400,14 @@ constructor TSourcePrefsPreview.Create(const CommentStyle: TCommentStyle;
   fHiliteAttrs := HiliteAttrs;
 end;
 
-function TSourcePrefsPreview.Generate: TRTF;
+function TSourcePrefsPreview.Generate: TRTFMarkup;
   {Generate RTF code used to render preview.
     @return Required RTF code.
   }
 begin
-  Result := TRTF.Create(TRTFDocumentHiliter.Hilite(SourceCode, fHiliteAttrs));
+  Result := TRTFMarkup.Create(
+    TRTFDocumentHiliter.Hilite(SourceCode, fHiliteAttrs)
+  );
 end;
 
 function TSourcePrefsPreview.SourceCode: string;
diff --git a/Src/UCopyViewMgr.pas b/Src/UCopyViewMgr.pas
index 4db32bd2c..27c329634 100644
--- a/Src/UCopyViewMgr.pas
+++ b/Src/UCopyViewMgr.pas
@@ -66,20 +66,20 @@ class procedure TCopyViewMgr.Execute(View: IView);
 var
   Clip: TClipboardHelper;     // object used to update clipboard
   UnicodeText: UnicodeString; // Unicode plain text representation of view
-  RTF: TRTF;                  // rich text representation of view
+  RTFMarkup: TRTFMarkup;      // rich text representation of view
 begin
   Assert(Assigned(View), ClassName + '.Execute: View is nil');
   Assert(CanHandleView(View), ClassName + '.Execute: View not supported');
   // Generate plain text and rich text representation of view
   UnicodeText := GeneratePlainText(View).ToString;
-  RTF := TRTF.Create(GenerateRichText(View));
+  RTFMarkup := TRTFMarkup.Create(GenerateRichText(View));
   // Open clipboard and add both plain and rich text representations of snippet
   Clip := TClipboardHelper.Create;
   try
     Clip.Open;
     try
       Clip.AddUnicodeText(UnicodeText);
-      Clip.AddRTF(RTF.ToRTFCode);
+      Clip.AddRTF(RTFMarkup.ToRTFCode);
     finally
       Clip.Close;
     end;
diff --git a/Src/UPrintDocuments.pas b/Src/UPrintDocuments.pas
index b98950def..402971a5c 100644
--- a/Src/UPrintDocuments.pas
+++ b/Src/UPrintDocuments.pas
@@ -31,7 +31,7 @@ interface
   IPrintDocument = interface(IInterface)
     ['{56E4CA97-7F04-427A-A95F-03CE55910DC0}']
     ///  <summary>Generates and returns print document.</summary>
-    function Generate: TRTF;
+    function Generate: TRTFMarkup;
   end;
 
 type
@@ -53,7 +53,7 @@   TSnippetPrintDocument = class(TInterfacedObject,
     constructor Create(const Snippet: TSnippet);
     ///  <summary>Generates and returns print document.</summary>
     ///  <remarks>Method of IPrintDocument.</remarks>
-    function Generate: TRTF;
+    function Generate: TRTFMarkup;
   end;
 
 type
@@ -72,7 +72,7 @@   TCategoryPrintDocument = class(TInterfacedObject,
     constructor Create(const Category: TCategory);
     ///  <summary>Generates and returns print document.</summary>
     ///  <remarks>Method of IPrintDocument.</remarks>
-    function Generate: TRTF;
+    function Generate: TRTFMarkup;
   end;
 
 implementation
@@ -91,7 +91,7 @@ constructor TSnippetPrintDocument.Create(const Snippet: TSnippet);
   fSnippet := Snippet;
 end;
 
-function TSnippetPrintDocument.Generate: TRTF;
+function TSnippetPrintDocument.Generate: TRTFMarkup;
 var
   Doc: TRTFSnippetDoc;  // object that renders snippet document in RTF
 begin
@@ -99,7 +99,7 @@ function TSnippetPrintDocument.Generate: TRTF;
     GetHiliteAttrs, poUseColor in PrintInfo.PrintOptions
   );
   try
-    Result := TRTF.Create(Doc.Generate(fSnippet));
+    Result := TRTFMarkup.Create(Doc.Generate(fSnippet));
   finally
     Doc.Free;
   end;
@@ -127,13 +127,13 @@ constructor TCategoryPrintDocument.Create(const Category: TCategory);
   fCategory := Category;
 end;
 
-function TCategoryPrintDocument.Generate: TRTF;
+function TCategoryPrintDocument.Generate: TRTFMarkup;
 var
   Doc: TRTFCategoryDoc; // object that renders category document in RTF
 begin
   Doc := TRTFCategoryDoc.Create(poUseColor in PrintInfo.PrintOptions);
   try
-    Result := TRTF.Create(Doc.Generate(fCategory));
+    Result := TRTFMarkup.Create(Doc.Generate(fCategory));
   finally
     Doc.Free;
   end;
diff --git a/Src/UPrintEngine.pas b/Src/UPrintEngine.pas
index 7c5e60876..318940e4c 100644
--- a/Src/UPrintEngine.pas
+++ b/Src/UPrintEngine.pas
@@ -48,7 +48,7 @@   TPrintEngine = class(THiddenRichEdit)
     function GetPrintMargins: TPrintMargins;
   public
     ///  <summary>Prints given RTF document.</summary>
-    procedure Print(const Document: TRTF);
+    procedure Print(const Document: TRTFMarkup);
     ///  <summary>Title of document that appears in print spooler.</summary>
     ///  <remarks>A default title is used if Title is not set or is set to
     ///  empty string.</remarks>
@@ -95,7 +95,7 @@ function TPrintEngine.GetPrintMargins: TPrintMargins;
   Result.Bottom := InchesToPixelsY(MMToInches(PrintInfo.PageMargins.Bottom));
 end;
 
-procedure TPrintEngine.Print(const Document: TRTF);
+procedure TPrintEngine.Print(const Document: TRTFMarkup);
 var
   PrintMargins: TPrintMargins;  // page margins
   DocTitle: string;             // document title for print spooler
diff --git a/Src/UPrintMgr.pas b/Src/UPrintMgr.pas
index 4c72fc589..c361d2ae8 100644
--- a/Src/UPrintMgr.pas
+++ b/Src/UPrintMgr.pas
@@ -85,7 +85,7 @@ class function TPrintMgr.CanPrint(ViewItem: IView): Boolean;
 procedure TPrintMgr.DoPrint;
 var
   PrintEngine: TPrintEngine;  // object that prints the print document
-  Document: TRTF;             // generated print document
+  Document: TRTFMarkup;       // generated print document
 begin
   PrintEngine := TPrintEngine.Create;
   try
diff --git a/Src/URTFBuilder.pas b/Src/URTFBuilder.pas
index c0be9ede7..200e80fa3 100644
--- a/Src/URTFBuilder.pas
+++ b/Src/URTFBuilder.pas
@@ -189,7 +189,7 @@   TRTFBuilder = class(TObject)
     ///  according to given RTF style.</summary>
     procedure ApplyStyle(const Style: TRTFStyle);
     ///  <summary>Generates RTF code for whole document.</summary>
-    function Render: TRTF;
+    function Render: TRTFMarkup;
     ///  <summary>Table of colours used in document.</summary>
     property ColourTable: TRTFColourTable
       read fColourTable write fColourTable;
@@ -320,9 +320,9 @@ procedure TRTFBuilder.EndPara;
   fInControls := False;
 end;
 
-function TRTFBuilder.Render: TRTF;
+function TRTFBuilder.Render: TRTFMarkup;
 begin
-  Result := TRTF.Create(AsString);
+  Result := TRTFMarkup.Create(AsString);
 end;
 
 procedure TRTFBuilder.ResetCharStyle;
diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index 6dffc5b76..8d5778fb0 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -75,7 +75,7 @@ interface
 type
   ///  <summary>Encapsulate rich text markup code.</summary>
   ///  <remarks>Valid rich text markup contains only ASCII characters.</remarks>
-  TRTF = record
+  TRTFMarkup = record
   strict private
     var
       ///  <summary>Byte array that stores RTF code as bytes</summary>
@@ -127,8 +127,8 @@   TRTF = record
   end;
 
 type
-  ///  <summary>Class of exception raised by TRTF</summary>
-  ERTF = class(Exception);
+  ///  <summary>Class of exception raised by TRTFMarkup</summary>
+  ERTFMarkup = class(Exception);
 
 ///  <summary>Returns a parameterless RTF control word of given kind.</summary>
 function RTFControl(const Ctrl: TRTFControl): ASCIIString; overload;
@@ -277,9 +277,9 @@ function RTFUnicodeSafeDestination(const DestCtrl: TRTFControl;
   end;
 end;
 
-{ TRTF }
+{ TRTFMarkup }
 
-constructor TRTF.Create(const AStream: TStream; const ReadAll: Boolean);
+constructor TRTFMarkup.Create(const AStream: TStream; const ReadAll: Boolean);
 var
   ByteCount: Integer;
 begin
@@ -290,12 +290,12 @@ constructor TRTF.Create(const AStream: TStream; const ReadAll: Boolean);
   AStream.ReadBuffer(Pointer(fData)^, ByteCount);
 end;
 
-constructor TRTF.Create(const ABytes: TBytes);
+constructor TRTFMarkup.Create(const ABytes: TBytes);
 begin
   fData := Copy(ABytes);
 end;
 
-constructor TRTF.Create(const AData: TEncodedData);
+constructor TRTFMarkup.Create(const AData: TEncodedData);
 resourcestring
   sErrorMsg = 'Encoded data must contain only valid ASCII characters';
 var
@@ -307,41 +307,41 @@ constructor TRTF.Create(const AData: TEncodedData);
   begin
     DataStr := AData.ToString;
     if not IsValidRTFCode(DataStr) then
-      raise ERTF.Create(sErrorMsg);
+      raise ERTFMarkup.Create(sErrorMsg);
     fData := TEncoding.ASCII.GetBytes(DataStr);
   end;
 end;
 
-constructor TRTF.Create(const ARTFCode: ASCIIString);
+constructor TRTFMarkup.Create(const ARTFCode: ASCIIString);
 begin
   fData := BytesOf(ARTFCode);
 end;
 
-constructor TRTF.Create(const AStr: UnicodeString);
+constructor TRTFMarkup.Create(const AStr: UnicodeString);
 resourcestring
   sErrorMsg = 'String "%s" must contain only valid ASCII characters';
 begin
   if not IsValidRTFCode(AStr) then
-    raise ERTF.CreateFmt(sErrorMsg, [AStr]);
+    raise ERTFMarkup.CreateFmt(sErrorMsg, [AStr]);
   fData := TEncoding.ASCII.GetBytes(AStr);
 end;
 
-function TRTF.IsValidRTFCode(const AStr: UnicodeString): Boolean;
+function TRTFMarkup.IsValidRTFCode(const AStr: UnicodeString): Boolean;
 begin
   Result := EncodingSupportsString(AStr, TEncoding.ASCII);
 end;
 
-function TRTF.ToBytes: TBytes;
+function TRTFMarkup.ToBytes: TBytes;
 begin
   Result := Copy(fData);
 end;
 
-function TRTF.ToRTFCode: ASCIIString;
+function TRTFMarkup.ToRTFCode: ASCIIString;
 begin
   Result := BytesToASCIIString(fData);
 end;
 
-procedure TRTF.ToStream(const Stream: TStream; const Overwrite: Boolean);
+procedure TRTFMarkup.ToStream(const Stream: TStream; const Overwrite: Boolean);
 begin
   if Overwrite then
   begin
@@ -351,7 +351,7 @@ procedure TRTF.ToStream(const Stream: TStream; const Overwrite: Boolean);
   Stream.WriteBuffer(Pointer(fData)^, Length(fData));
 end;
 
-function TRTF.ToString: UnicodeString;
+function TRTFMarkup.ToString: UnicodeString;
 begin
   Result := TEncoding.ASCII.GetString(fData);
 end;
diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index 123f04a99..133b7cbce 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -73,14 +73,14 @@ class function TSaveInfoMgr.CanHandleView(View: IView): Boolean;
 class procedure TSaveInfoMgr.Execute(View: IView);
 var
   FileName: string;
-  RTF: TRTF;
+  RTFMarkup: TRTFMarkup;
 begin
   Assert(Assigned(View), 'TSaveInfoMgr.Execute: View is nil');
   Assert(CanHandleView(View), 'TSaveInfoMgr.Execute: View not supported');
   if not TryGetFileNameFromUser(FileName) then
     Exit;
-  RTF := TRTF.Create(GenerateRichText(View));
-  TFileIO.WriteAllBytes(FileName, RTF.ToBytes);
+  RTFMarkup := TRTFMarkup.Create(GenerateRichText(View));
+  TFileIO.WriteAllBytes(FileName, RTFMarkup.ToBytes);
 end;
 
 class function TSaveInfoMgr.GenerateRichText(View: IView): TEncodedData;

From 4e0c6210fb2ea085b77340c1e28846bc95f50a4b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 18 Apr 2025 10:02:43 +0100
Subject: [PATCH 208/264] Group all RTF*** methods into TRTF record

All methods with names beginning with RTF in URTFUtils were replaced
with similarly named static class methods of the new TRTF record.
The functionality of these replacement methods is identical to the
original routines.

The constant array mapping RTF control IDs to their names was also moved
inside TRTF and renamed.

Updated affected code in URTFBuilder.
---
 Src/URTFBuilder.pas |  62 +++++++-------
 Src/URTFUtils.pas   | 203 +++++++++++++++++++++++++++-----------------
 2 files changed, 158 insertions(+), 107 deletions(-)

diff --git a/Src/URTFBuilder.pas b/Src/URTFBuilder.pas
index 200e80fa3..3c8a07bb1 100644
--- a/Src/URTFBuilder.pas
+++ b/Src/URTFBuilder.pas
@@ -234,7 +234,7 @@ procedure TRTFBuilder.AddText(const Text: string);
     fInControls := False;
   end;
   // Add text, escaping disallowed characters
-  AppendBody(RTFMakeSafeText(Text, fCodePage));
+  AppendBody(TRTF.MakeSafeText(Text, fCodePage));
 end;
 
 procedure TRTFBuilder.AppendBody(const S: ASCIIString);
@@ -269,7 +269,7 @@ procedure TRTFBuilder.BeginGroup;
 
 procedure TRTFBuilder.ClearParaFormatting;
 begin
-  AddControl(RTFControl(rcPard));
+  AddControl(TRTF.ControlWord(rcPard));
 end;
 
 constructor TRTFBuilder.Create(const CodePage: Integer);
@@ -296,11 +296,11 @@ destructor TRTFBuilder.Destroy;
 
 function TRTFBuilder.DocHeader: ASCIIString;
 begin
-  Result := RTFControl(rcRTF, cRTFVersion)
-    + RTFControl(rcAnsi)
-    + RTFControl(rcAnsiCodePage, fCodePage)
-    + RTFControl(rcDefFontNum, DefaultFontIdx)
-    + RTFControl(rcDefLanguage, DefaultLanguageID)
+  Result := TRTF.ControlWord(rcRTF, cRTFVersion)
+    + TRTF.ControlWord(rcAnsi)
+    + TRTF.ControlWord(rcAnsiCodePage, fCodePage)
+    + TRTF.ControlWord(rcDefFontNum, DefaultFontIdx)
+    + TRTF.ControlWord(rcDefLanguage, DefaultLanguageID)
     + fFontTable.AsString
     + fColourTable.AsString
     + fDocProperties.AsString
@@ -315,7 +315,7 @@ procedure TRTFBuilder.EndGroup;
 
 procedure TRTFBuilder.EndPara;
 begin
-  AddControl(RTFControl(rcPar));
+  AddControl(TRTF.ControlWord(rcPar));
   AppendBody(EOL);
   fInControls := False;
 end;
@@ -327,12 +327,12 @@ function TRTFBuilder.Render: TRTFMarkup;
 
 procedure TRTFBuilder.ResetCharStyle;
 begin
-  AddControl(RTFControl(rcPlain));
+  AddControl(TRTF.ControlWord(rcPlain));
 end;
 
 procedure TRTFBuilder.SetColour(const Colour: TColor);
 begin
-  AddControl(RTFControl(rcForeColorNum, fColourTable.ColourRef(Colour)));
+  AddControl(TRTF.ControlWord(rcForeColorNum, fColourTable.ColourRef(Colour)));
 end;
 
 procedure TRTFBuilder.SetFont(const FontName: string);
@@ -342,28 +342,28 @@ procedure TRTFBuilder.SetFont(const FontName: string);
   // We don't emit control if this is default font
   FontIdx := fFontTable.FontRef(FontName);
   if FontIdx <> DefaultFontIdx then
-    AddControl(RTFControl(rcFontNum, FontIdx));
+    AddControl(TRTF.ControlWord(rcFontNum, FontIdx));
 end;
 
 procedure TRTFBuilder.SetFontSize(const Points: Double);
 begin
-  AddControl(RTFControl(rcFontSize, FloatToInt(2 * Points)));
+  AddControl(TRTF.ControlWord(rcFontSize, FloatToInt(2 * Points)));
 end;
 
 procedure TRTFBuilder.SetFontStyle(const Style: TFontStyles);
 begin
   if fsBold in Style then
-    AddControl(RTFControl(rcBold));
+    AddControl(TRTF.ControlWord(rcBold));
   if fsItalic in Style then
-    AddControl(RTFControl(rcItalic));
+    AddControl(TRTF.ControlWord(rcItalic));
   if fsUnderline in Style then
-    AddControl(RTFControl(rcUnderline));
+    AddControl(TRTF.ControlWord(rcUnderline));
 end;
 
 procedure TRTFBuilder.SetIndents(const LeftIndent, FirstLineOffset: SmallInt);
 begin
-  AddControl(RTFControl(rcLeftIndent, LeftIndent));
-  AddControl(RTFControl(rcFirstLineOffset, FirstLineOffset));
+  AddControl(TRTF.ControlWord(rcLeftIndent, LeftIndent));
+  AddControl(TRTF.ControlWord(rcFirstLineOffset, FirstLineOffset));
 end;
 
 procedure TRTFBuilder.SetParaSpacing(const Spacing: TRTFParaSpacing);
@@ -371,10 +371,10 @@ procedure TRTFBuilder.SetParaSpacing(const Spacing: TRTFParaSpacing);
   TwipsPerPoint = 20; // Note: 20 Twips in a point
 begin
   AddControl(
-    RTFControl(rcSpaceBefore, FloatToInt(TwipsPerPoint * Spacing.Before))
+    TRTF.ControlWord(rcSpaceBefore, FloatToInt(TwipsPerPoint * Spacing.Before))
   );
   AddControl(
-    RTFControl(rcSpaceAfter, FloatToInt(TwipsPerPoint * Spacing.After))
+    TRTF.ControlWord(rcSpaceAfter, FloatToInt(TwipsPerPoint * Spacing.After))
   );
 end;
 
@@ -383,7 +383,7 @@ procedure TRTFBuilder.SetTabStops(const TabStops: array of SmallInt);
   Tab: SmallInt;
 begin
   for Tab in TabStops do
-    AddControl(RTFControl(rcTabStop, Tab));
+    AddControl(TRTF.ControlWord(rcTabStop, Tab));
 end;
 
 { TRTFFontTable }
@@ -420,15 +420,15 @@ function TRTFFontTable.AsString: ASCIIString;
   Idx: Integer;     // loops thru fonts in table
   Font: TRTFFont;   // reference to a font in table
 begin
-  Result := '{' + RTFControl(rcFontTable);
+  Result := '{' + TRTF.ControlWord(rcFontTable);
   for Idx := 0 to Pred(fFonts.Count) do
   begin
     Font := fFonts[Idx];
     Result := Result + '{'
-      + RTFControl(rcFontNum, Idx)
-      + RTFControl(rcFontPitch, 1)
-      + RTFControl(cGenericFonts[Font.Generic])
-      + RTFControl(rcFontCharset, Font.Charset)
+      + TRTF.ControlWord(rcFontNum, Idx)
+      + TRTF.ControlWord(rcFontPitch, 1)
+      + TRTF.ControlWord(cGenericFonts[Font.Generic])
+      + TRTF.ControlWord(rcFontCharset, Font.Charset)
       + ' '
       + StringToASCIIString(Font.Name)
       + '}';
@@ -488,7 +488,7 @@ function TRTFColourTable.AsString: ASCIIString;
 begin
   // Begin table
   Result := '{'
-    + RTFControl(rcColorTable)
+    + TRTF.ControlWord(rcColorTable)
     + ' ';
   // Add entry for each colour
   for Colour in fColours do
@@ -497,9 +497,9 @@ function TRTFColourTable.AsString: ASCIIString;
     begin
       RGB := ColorToRGB(Colour);
       Result := Result
-        + RTFControl(rcRed, GetRValue(RGB))
-        + RTFControl(rcGreen, GetGValue(RGB))
-        + RTFControl(rcBlue, GetBValue(RGB))
+        + TRTF.ControlWord(rcRed, GetRValue(RGB))
+        + TRTF.ControlWord(rcGreen, GetGValue(RGB))
+        + TRTF.ControlWord(rcBlue, GetBValue(RGB))
         + ';'
     end
     else
@@ -540,9 +540,9 @@ function TRTFDocProperties.AsString: ASCIIString;
     Exit;
   end;
   // Start with \info control word in group
-  Result := '{' + RTFControl(rcInfo);
+  Result := '{' + TRTF.ControlWord(rcInfo);
   if fTitle <> '' then
-    Result := Result + RTFUnicodeSafeDestination(rcTitle, fTitle, fCodePage);
+    Result := Result + TRTF.UnicodeSafeDestination(rcTitle, fTitle, fCodePage);
   // Close \info group
   Result := Result + '}';
 end;
diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index 8d5778fb0..66ca9c8e6 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -72,6 +72,90 @@ interface
     rcTabStop               // sets a tab stop in twips
   );
 
+type
+  ///  <summary>Container for related methods for generating valid RTF control
+  ///  words and destinations.</summary>
+  TRTF = record
+  strict private
+    const
+      ///  <summary>Map of RTF control ids to control words.</summary>
+      Controls: array[TRTFControl] of ASCIIString = (
+        'rtf', 'ansi', 'ansicpg', 'deff', 'deflang', 'fonttbl', 'fprq',
+        'fcharset', 'fnil', 'froman', 'fswiss', 'fmodern', 'fscript', 'fdecor',
+        'ftech', 'colortbl', 'red', 'green', 'blue', 'info', 'title', 'pard',
+        'par', 'plain', 'f', 'cf', 'b', 'i', 'ul', 'fs', 'sb', 'sa', 'u', 'upr',
+        'ud', '*', 'fi', 'li', 'tx'
+      );
+  strict private
+
+    ///  <summary>Returns an RTF escape sequence for an ASCII character.
+    ///  </summary>
+    ///  <param name="ACh"><c>AnsiChar</c> [in] Character to be escaped.</param>
+    ///  <returns><c>ASCIIString</c>. The required escape sequence.</returns>
+    ///  <remarks><c>ACh</c> should be a valid ASCII character, but this is not
+    ///  checked.</remarks>
+    class function Escape(const ACh: AnsiChar): ASCIIString; static;
+
+    ///  <summary>Returns an RTF hex escape sequence for a single byte
+    ///  character.</summary>
+    ///  <param name="ACh"><c>AnsiChar</c> [in] Character to be escaped.</param>
+    ///  <returns><c>ASCIIString</c>. The required hex escape sequence.
+    ///  </returns>
+    class function HexEscape(const Ch: AnsiChar): ASCIIString; static;
+
+  public
+
+    ///  <summary>Returns a parameterless RTF control word.</summary>
+    ///  <param name="ACtrlID"><c>TRTFControl</c> [in] Identifies the required
+    ///  control.</param>
+    ///  <returns><c>ASCIIString</c>. The required control word.</returns>
+    class function ControlWord(const ACtrlID: TRTFControl): ASCIIString;
+      overload; static;
+
+    ///  <summary>Returns a parameterised RTF control word.</summary>
+    ///  <param name="ACtrlID"><c>TRTFControl</c> [in] Identifies the required
+    ///  control.</param>
+    ///  <param name="AParam"><c>Int16</c> [in] The control's parameter value.
+    ///  </param>
+    ///  <returns><c>ASCIIString</c>. The required control word.</returns>
+    ///  control word identified by <c>Ctrl</c> with the parameter specified
+    class function ControlWord(const ACtrlID: TRTFControl; const AParam: Int16):
+      ASCIIString; overload; static;
+
+    ///  <summary>Converts Unicode text into valid RTF when encoded in a given
+    ///  ANSI code page.</summary>
+    ///  <param name="AText"><c>string</c> [in] The Unicode text to be
+    ///  processed.</param>
+    ///  <param name="ACodePage"><c>Integer</c> [in] ANSI code to be used for
+    ///  encoding the Unicode text.</param>
+    ///  <returns><c>ASCIIString</c>. Valid RTF code for the given code page.
+    ///  </returns>
+    ///  <remarks>Converted characters are escaped if necessary. Any characters
+    ///  that are not valid in the required code page are encoded in a Unicode
+    ///  RTF control word with <c>?</c> as the non-Unicode fallback.</remarks>
+    class function MakeSafeText(const AText: string; const ACodePage: Integer):
+      ASCIIString; static;
+
+    ///  <summary>Creates an RTF destination in a Unicode safe way.</summary>
+    ///  <param name="ADestCtrl"><c>TRTFControl</c> [in] Required destination
+    ///   control.</param>
+    ///  <param name="ADestText"><c>string</c> [in] Unicode text to be included
+    ///  in the destination.</param>
+    ///  <param name="ACodePage"><c>Integer</c> [in] ANSI Code page to use for
+    ///  encoding the Unicode text.</param>
+    ///  <returns><c>ASCIIString</c>. Destination RTF, containing ANSI and
+    ///  Unicode sub-destinations if necessary.</returns>
+    ///  <remarks>If <c>ADestText</c> contains only characters supported by
+    ///  <c>ACodePage</c> then a single, normal destination is returned,
+    ///  containing the encoded text, escaped as necessary. Should any
+    ///  characters in <c>ADestText</c> be incompatible with the code page then
+    ///  two sub-destinations are created, one containing Unicode characters and
+    ///  the other containing ANSI text, with unknown characters flagged with
+    ///  &quot;error&quot; characters such as <c>?</c>.</remarks>
+    class function UnicodeSafeDestination(const ADestCtrl: TRTFControl;
+      const ADestText: string; const ACodePage: Integer): ASCIIString; static;
+  end;
+
 type
   ///  <summary>Encapsulate rich text markup code.</summary>
   ///  <remarks>Valid rich text markup contains only ASCII characters.</remarks>
@@ -130,41 +214,6 @@   TRTFMarkup = record
   ///  <summary>Class of exception raised by TRTFMarkup</summary>
   ERTFMarkup = class(Exception);
 
-///  <summary>Returns a parameterless RTF control word of given kind.</summary>
-function RTFControl(const Ctrl: TRTFControl): ASCIIString; overload;
-
-///  <summary>Returns a parameterised RTF control word of given kind with given
-///  parameter value.</summary>
-function RTFControl(const Ctrl: TRTFControl;
-  const Param: SmallInt): ASCIIString; overload;
-
-///  <summary>Returns an RTF escape sequence for the given ANSI character.
-///  </summary>
-function RTFEscape(const Ch: AnsiChar): ASCIIString;
-
-///  <summary>returns an RTF hexadecimal escape sequence for given ANSI
-///  character.</summary>
-function RTFHexEscape(const Ch: AnsiChar): ASCIIString;
-
-///  <summary>Encodes given text for given code page so that any incompatible
-///  characters are replaced by suitable control words.</summary>
-function RTFMakeSafeText(const TheText: string; const CodePage: Integer):
-  ASCIIString;
-
-///  <summary>Creates an RTF destination in a Unicode safe way.</summary>
-///  <param name="DestCtrl">TRTFControl [in] Destination control.</param>
-///  <param name="DestText">string [in] Text of destination.</param>
-///  <param name="CodePage">Integer [in] Code page to use for encoding.</param>
-///  <returns>ASCIIString. Destination RTF, containing ANSI and Unicode
-///  sub-destinations if necessary.</returns>
-///  <remarks>If DestText contains only characters supported by the given code
-///  page then a normal destination is returned, containing only the given text.
-///  Should any characters in DestText be incompatible with the code page then
-///  two sub-destinations are created, one ANSI only and the other containing
-///  Unicode characters.</remarks>
-function RTFUnicodeSafeDestination(const DestCtrl: TRTFControl;
-  const DestText: string; const CodePage: Integer): ASCIIString;
-
 
 implementation
 
@@ -174,104 +223,106 @@ implementation
   UExceptions;
 
 
-const
-  // Map of RTF control ids to control word
-  cControls: array[TRTFControl] of ASCIIString = (
-    'rtf', 'ansi', 'ansicpg', 'deff', 'deflang', 'fonttbl', 'fprq', 'fcharset',
-    'fnil', 'froman', 'fswiss', 'fmodern', 'fscript', 'fdecor', 'ftech',
-    'colortbl', 'red', 'green', 'blue', 'info', 'title', 'pard', 'par', 'plain',
-    'f', 'cf', 'b', 'i', 'ul', 'fs', 'sb', 'sa', 'u', 'upr', 'ud', '*',
-    'fi', 'li', 'tx'
-  );
+{ TRTF }
 
-function RTFControl(const Ctrl: TRTFControl): ASCIIString;
+class function TRTF.ControlWord(const ACtrlID: TRTFControl): ASCIIString;
 begin
-  Result := '\' + cControls[Ctrl];
+  Result := '\' + Controls[ACtrlID];
 end;
 
-function RTFControl(const Ctrl: TRTFControl;
-  const Param: SmallInt): ASCIIString;
+class function TRTF.ControlWord(const ACtrlID: TRTFControl;
+  const AParam: Int16): ASCIIString;
 begin
-  Result := RTFControl(Ctrl) + StringToASCIIString(IntToStr(Param));
+  Result := ControlWord(ACtrlID) + StringToASCIIString(IntToStr(AParam));
 end;
 
-function RTFEscape(const Ch: AnsiChar): ASCIIString;
+class function TRTF.Escape(const ACh: AnsiChar): ASCIIString;
 begin
-  Result := AnsiChar('\') + Ch;
+  Result := AnsiChar('\') + ACh;
 end;
 
-function RTFHexEscape(const Ch: AnsiChar): ASCIIString;
+class function TRTF.HexEscape(const Ch: AnsiChar): ASCIIString;
 begin
   Result := StringToASCIIString('\''' + IntToHex(Ord(Ch), 2));
 end;
 
-function RTFMakeSafeText(const TheText: string; const CodePage: Integer):
+class function TRTF.MakeSafeText(const AText: string; const ACodePage: Integer):
   ASCIIString;
 var
   Ch: Char;                     // each Unicode character in TheText
-  AnsiChars: TArray<AnsiChar>;  // translation of a Ch into ANSI code page
+  AnsiChars: TArray<AnsiChar>;  // translation of a Ch into the ANSI code page
   AnsiCh: AnsiChar;             // each ANSI char in AnsiChars
 begin
   Result := '';
-  for Ch in TheText do
+  // Process each Unicode character in turn
+  for Ch in AText do
   begin
-    if WideCharToChar(Ch, CodePage, AnsiChars) then
+    // Convert Unicode char into one or more ANSI chars in required code page
+    if WideCharToChar(Ch, ACodePage, AnsiChars) then
     begin
+      // Conversion succeeded: check process each ANSI char
       for AnsiCh in AnsiChars do
       begin
         if (AnsiCh < #$20) or ((AnsiCh >= #$7F) and (AnsiCh <= #$FF)) then
-          Result := Result + RTFHexEscape(AnsiCh)
+          // Not an ASCII character
+          Result := Result + HexEscape(AnsiCh)
         else if (Ch = '{') or (Ch = '\') or (Ch = '}') then
-          Result := Result + RTFEscape(AnsiCh)
+          // Reserved RTF character: must be escaped
+          Result := Result + Escape(AnsiCh)
         else
+          // Valid character, use as is
           Result := Result + ASCIIString(AnsiCh);
       end;
     end
     else
-      Result := Result + RTFControl(rcUnicodeChar, SmallInt(Ord(Ch))) + ' ?';
+      // Conversion failed: we store Unicode char in a Unicode control word
+      Result := Result
+        + ControlWord(rcUnicodeChar, SmallInt(Ord(Ch)))
+        + ' ?';   // fallback "unprintable" value
   end;
 end;
 
-function RTFUnicodeSafeDestination(const DestCtrl: TRTFControl;
-  const DestText: string; const CodePage: Integer): ASCIIString;
+class function TRTF.UnicodeSafeDestination(const ADestCtrl: TRTFControl;
+  const ADestText: string; const ACodePage: Integer): ASCIIString;
 
-  ///  Makes a destination for DestCtrl using given text.
+  //  Makes a destination for ADestCtrl using given text.
   function MakeDestination(const S: string): ASCIIString;
   begin
     Result := '{'
-      + RTFControl(DestCtrl) + ' '
-      + RTFMakeSafeText(S, CodePage)
+      + ControlWord(ADestCtrl)
+      + ' '
+      + MakeSafeText(S, ACodePage)
       + '}'
   end;
 
 var
-  Encoding: TEncoding;  // encoding for CodePage
-  AnsiStr: string;      // Unicode string containing only characters of CodePage
+  Encoding: TEncoding;  // encoding for ACodePage
+  AnsiStr: string;      // Unicode string containing only chars from ACodePage
 begin
-  if CodePageSupportsString(DestText, CodePage) then
-    // All chars of DestText supported in code page => RTF text won't have any
+  if CodePageSupportsString(ADestText, ACodePage) then
+    // All chars of ADestText supported in code page => RTF text won't have any
     // \u characters => we can just output destination as normal
-    Result := MakeDestination(DestText)
+    Result := MakeDestination(ADestText)
   else
   begin
-    // DestText contains characters not supported by code page. We create twin
+    // ADestText contains characters not supported by code page. We create twin
     // destinations, one ANSI only and the other that includes Unicode
     // characters.
-    Encoding := TMBCSEncoding.Create(CodePage);
+    Encoding := TMBCSEncoding.Create(ACodePage);
     try
       // Create a Unicode string that contains only characters supported in
       // given code page (+ some "error" characters (e.g. "?")
-      AnsiStr := Encoding.GetString(Encoding.GetBytes(DestText));
+      AnsiStr := Encoding.GetString(Encoding.GetBytes(ADestText));
     finally
       Encoding.Free;
     end;
     Result := '{'
-      + RTFControl(rcUnicodePair)
+      + ControlWord(rcUnicodePair)
       + MakeDestination(AnsiStr)    // ANSI only destination
       + '{'
-      + RTFControl(rcIgnore)
-      + RTFControl(rcUnicodeDest)
-      + MakeDestination(DestText)   // Unicode destinatation
+      + ControlWord(rcIgnore)
+      + ControlWord(rcUnicodeDest)
+      + MakeDestination(ADestText)   // Unicode destinatation
       + '}'
       + '}';
   end;

From 36b0342b3d758d1e6142278a5cad75b381525bb9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 18 Apr 2025 10:08:11 +0100
Subject: [PATCH 209/264] Moved RTF version const inside TRTF.

The global cRTFVersion const exposed by URTFUtils was moved inside TRTF
as a public const named Version.

Updated code that uses this constance in URTFBuilder.
---
 Src/URTFBuilder.pas |  2 +-
 Src/URTFUtils.pas   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Src/URTFBuilder.pas b/Src/URTFBuilder.pas
index 3c8a07bb1..6e03bec93 100644
--- a/Src/URTFBuilder.pas
+++ b/Src/URTFBuilder.pas
@@ -296,7 +296,7 @@ destructor TRTFBuilder.Destroy;
 
 function TRTFBuilder.DocHeader: ASCIIString;
 begin
-  Result := TRTF.ControlWord(rcRTF, cRTFVersion)
+  Result := TRTF.ControlWord(rcRTF, TRTF.Version)
     + TRTF.ControlWord(rcAnsi)
     + TRTF.ControlWord(rcAnsiCodePage, fCodePage)
     + TRTF.ControlWord(rcDefFontNum, DefaultFontIdx)
diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index 66ca9c8e6..e75818c2a 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -22,11 +22,6 @@ interface
   UEncodings;
 
 
-const
-  ///  <summary>RTF version.</summary>
-  cRTFVersion = 1;
-
-
 type
   ///  <summary>Enumeration containing identifiers for each supported RTF
   ///  control word.</summary>
@@ -103,6 +98,11 @@   TRTF = record
     ///  </returns>
     class function HexEscape(const Ch: AnsiChar): ASCIIString; static;
 
+  public
+    const
+      ///  <summary>RTF major version number.</summary>
+      Version = 1;
+
   public
 
     ///  <summary>Returns a parameterless RTF control word.</summary>

From 57e4d74f4987ed2d4ea539e6b41133365a3dcdb9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 18 Apr 2025 10:19:56 +0100
Subject: [PATCH 210/264] Turn on scoped enums for TRTFControls & rename elems

The elements of TRTFControls in URTFUtils were stripped of their leading
"rc" characters.

The scoped enumeration compiler directive was switched on for
TRTFControls so that the elements now have to be prefixed with the type
name.

Modified all affected code in URTFBuilder and URTFUtils.
---
 Src/URTFBuilder.pas | 74 ++++++++++++++++++++++----------------
 Src/URTFUtils.pas   | 88 +++++++++++++++++++++++----------------------
 2 files changed, 88 insertions(+), 74 deletions(-)

diff --git a/Src/URTFBuilder.pas b/Src/URTFBuilder.pas
index 6e03bec93..739b82a84 100644
--- a/Src/URTFBuilder.pas
+++ b/Src/URTFBuilder.pas
@@ -269,7 +269,7 @@ procedure TRTFBuilder.BeginGroup;
 
 procedure TRTFBuilder.ClearParaFormatting;
 begin
-  AddControl(TRTF.ControlWord(rcPard));
+  AddControl(TRTF.ControlWord(TRTFControl.Pard));
 end;
 
 constructor TRTFBuilder.Create(const CodePage: Integer);
@@ -296,11 +296,11 @@ destructor TRTFBuilder.Destroy;
 
 function TRTFBuilder.DocHeader: ASCIIString;
 begin
-  Result := TRTF.ControlWord(rcRTF, TRTF.Version)
-    + TRTF.ControlWord(rcAnsi)
-    + TRTF.ControlWord(rcAnsiCodePage, fCodePage)
-    + TRTF.ControlWord(rcDefFontNum, DefaultFontIdx)
-    + TRTF.ControlWord(rcDefLanguage, DefaultLanguageID)
+  Result := TRTF.ControlWord(TRTFControl.RTF, TRTF.Version)
+    + TRTF.ControlWord(TRTFControl.Ansi)
+    + TRTF.ControlWord(TRTFControl.AnsiCodePage, fCodePage)
+    + TRTF.ControlWord(TRTFControl.DefFontNum, DefaultFontIdx)
+    + TRTF.ControlWord(TRTFControl.DefLanguage, DefaultLanguageID)
     + fFontTable.AsString
     + fColourTable.AsString
     + fDocProperties.AsString
@@ -315,7 +315,7 @@ procedure TRTFBuilder.EndGroup;
 
 procedure TRTFBuilder.EndPara;
 begin
-  AddControl(TRTF.ControlWord(rcPar));
+  AddControl(TRTF.ControlWord(TRTFControl.Par));
   AppendBody(EOL);
   fInControls := False;
 end;
@@ -327,12 +327,14 @@ function TRTFBuilder.Render: TRTFMarkup;
 
 procedure TRTFBuilder.ResetCharStyle;
 begin
-  AddControl(TRTF.ControlWord(rcPlain));
+  AddControl(TRTF.ControlWord(TRTFControl.Plain));
 end;
 
 procedure TRTFBuilder.SetColour(const Colour: TColor);
 begin
-  AddControl(TRTF.ControlWord(rcForeColorNum, fColourTable.ColourRef(Colour)));
+  AddControl(
+    TRTF.ControlWord(TRTFControl.ForeColorNum, fColourTable.ColourRef(Colour))
+  );
 end;
 
 procedure TRTFBuilder.SetFont(const FontName: string);
@@ -342,28 +344,28 @@ procedure TRTFBuilder.SetFont(const FontName: string);
   // We don't emit control if this is default font
   FontIdx := fFontTable.FontRef(FontName);
   if FontIdx <> DefaultFontIdx then
-    AddControl(TRTF.ControlWord(rcFontNum, FontIdx));
+    AddControl(TRTF.ControlWord(TRTFControl.FontNum, FontIdx));
 end;
 
 procedure TRTFBuilder.SetFontSize(const Points: Double);
 begin
-  AddControl(TRTF.ControlWord(rcFontSize, FloatToInt(2 * Points)));
+  AddControl(TRTF.ControlWord(TRTFControl.FontSize, FloatToInt(2 * Points)));
 end;
 
 procedure TRTFBuilder.SetFontStyle(const Style: TFontStyles);
 begin
   if fsBold in Style then
-    AddControl(TRTF.ControlWord(rcBold));
+    AddControl(TRTF.ControlWord(TRTFControl.Bold));
   if fsItalic in Style then
-    AddControl(TRTF.ControlWord(rcItalic));
+    AddControl(TRTF.ControlWord(TRTFControl.Italic));
   if fsUnderline in Style then
-    AddControl(TRTF.ControlWord(rcUnderline));
+    AddControl(TRTF.ControlWord(TRTFControl.Underline));
 end;
 
 procedure TRTFBuilder.SetIndents(const LeftIndent, FirstLineOffset: SmallInt);
 begin
-  AddControl(TRTF.ControlWord(rcLeftIndent, LeftIndent));
-  AddControl(TRTF.ControlWord(rcFirstLineOffset, FirstLineOffset));
+  AddControl(TRTF.ControlWord(TRTFControl.LeftIndent, LeftIndent));
+  AddControl(TRTF.ControlWord(TRTFControl.FirstLineOffset, FirstLineOffset));
 end;
 
 procedure TRTFBuilder.SetParaSpacing(const Spacing: TRTFParaSpacing);
@@ -371,10 +373,14 @@ procedure TRTFBuilder.SetParaSpacing(const Spacing: TRTFParaSpacing);
   TwipsPerPoint = 20; // Note: 20 Twips in a point
 begin
   AddControl(
-    TRTF.ControlWord(rcSpaceBefore, FloatToInt(TwipsPerPoint * Spacing.Before))
+    TRTF.ControlWord(
+      TRTFControl.SpaceBefore, FloatToInt(TwipsPerPoint * Spacing.Before)
+    )
   );
   AddControl(
-    TRTF.ControlWord(rcSpaceAfter, FloatToInt(TwipsPerPoint * Spacing.After))
+    TRTF.ControlWord(
+      TRTFControl.SpaceAfter, FloatToInt(TwipsPerPoint * Spacing.After)
+    )
   );
 end;
 
@@ -383,7 +389,7 @@ procedure TRTFBuilder.SetTabStops(const TabStops: array of SmallInt);
   Tab: SmallInt;
 begin
   for Tab in TabStops do
-    AddControl(TRTF.ControlWord(rcTabStop, Tab));
+    AddControl(TRTF.ControlWord(TRTFControl.TabStop, Tab));
 end;
 
 { TRTFFontTable }
@@ -413,22 +419,27 @@ function TRTFFontTable.AsString: ASCIIString;
 const
   // Map of generic font families to RTF controls
   cGenericFonts: array[TRTFGenericFont] of TRTFControl = (
-    rcFontFamilyNil, rcFontFamilyRoman, rcFontFamilySwiss, rcFontFamilyModern,
-    rcFontFamilyScript, rcFontFamilyDecor, rcFontFamilyTech
+    TRTFControl.FontFamilyNil,      // rgfDontCare
+    TRTFControl.FontFamilyRoman,    // rgfRoman
+    TRTFControl.FontFamilySwiss,    // rgfSwiss
+    TRTFControl.FontFamilyModern,   // rgfModern
+    TRTFControl.FontFamilyScript,   // rgfScript
+    TRTFControl.FontFamilyDecor,    // rgfDecorative
+    TRTFControl.FontFamilyTech      // rgfTechnical
   );
 var
   Idx: Integer;     // loops thru fonts in table
   Font: TRTFFont;   // reference to a font in table
 begin
-  Result := '{' + TRTF.ControlWord(rcFontTable);
+  Result := '{' + TRTF.ControlWord(TRTFControl.FontTable);
   for Idx := 0 to Pred(fFonts.Count) do
   begin
     Font := fFonts[Idx];
     Result := Result + '{'
-      + TRTF.ControlWord(rcFontNum, Idx)
-      + TRTF.ControlWord(rcFontPitch, 1)
+      + TRTF.ControlWord(TRTFControl.FontNum, Idx)
+      + TRTF.ControlWord(TRTFControl.FontPitch, 1)
       + TRTF.ControlWord(cGenericFonts[Font.Generic])
-      + TRTF.ControlWord(rcFontCharset, Font.Charset)
+      + TRTF.ControlWord(TRTFControl.FontCharset, Font.Charset)
       + ' '
       + StringToASCIIString(Font.Name)
       + '}';
@@ -488,7 +499,7 @@ function TRTFColourTable.AsString: ASCIIString;
 begin
   // Begin table
   Result := '{'
-    + TRTF.ControlWord(rcColorTable)
+    + TRTF.ControlWord(TRTFControl.ColorTable)
     + ' ';
   // Add entry for each colour
   for Colour in fColours do
@@ -497,9 +508,9 @@ function TRTFColourTable.AsString: ASCIIString;
     begin
       RGB := ColorToRGB(Colour);
       Result := Result
-        + TRTF.ControlWord(rcRed, GetRValue(RGB))
-        + TRTF.ControlWord(rcGreen, GetGValue(RGB))
-        + TRTF.ControlWord(rcBlue, GetBValue(RGB))
+        + TRTF.ControlWord(TRTFControl.Red, GetRValue(RGB))
+        + TRTF.ControlWord(TRTFControl.Green, GetGValue(RGB))
+        + TRTF.ControlWord(TRTFControl.Blue, GetBValue(RGB))
         + ';'
     end
     else
@@ -540,9 +551,10 @@ function TRTFDocProperties.AsString: ASCIIString;
     Exit;
   end;
   // Start with \info control word in group
-  Result := '{' + TRTF.ControlWord(rcInfo);
+  Result := '{' + TRTF.ControlWord(TRTFControl.Info);
   if fTitle <> '' then
-    Result := Result + TRTF.UnicodeSafeDestination(rcTitle, fTitle, fCodePage);
+    Result := Result
+      + TRTF.UnicodeSafeDestination(TRTFControl.Title, fTitle, fCodePage);
   // Close \info group
   Result := Result + '}';
 end;
diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index e75818c2a..dff0e59cd 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -23,49 +23,51 @@ interface
 
 
 type
+  {$ScopedEnums On}
   ///  <summary>Enumeration containing identifiers for each supported RTF
   ///  control word.</summary>
   TRTFControl = (
-    rcRTF,                  // RTF version
-    rcAnsi,                 // use ANSI character set
-    rcAnsiCodePage,         // specifies ANSI code page
-    rcDefFontNum,           // default font number
-    rcDefLanguage,          // default language
-    rcFontTable,            // introduces font table
-    rcFontPitch,            // font pitch
-    rcFontCharset,          // font character set
-    rcFontFamilyNil,        // unknown font family
-    rcFontFamilyRoman,      // serif, proportional fonts
-    rcFontFamilySwiss,      // sans-serif, proportional fonts
-    rcFontFamilyModern,     // fixed pitch serif and sans-serif fonts
-    rcFontFamilyScript,     // script fonts
-    rcFontFamilyDecor,      // decorative fonts
-    rcFontFamilyTech,       // technical, symbol and maths fonts
-    rcColorTable,           // introduces colour table
-    rcRed,                  // defines red colour component
-    rcGreen,                // defines gree colour component
-    rcBlue,                 // defines blue colour component
-    rcInfo,                 // introduces information group
-    rcTitle,                // sets document title
-    rcPard,                 // resets to default paragraph format
-    rcPar,                  // begins new paragraph
-    rcPlain,                // reset font (character) formatting properties
-    rcFontNum,              // font number (index to font table)
-    rcForeColorNum,         // foreground colour number (index to colour table)
-    rcBold,                 // sets or toggles bold style
-    rcItalic,               // sets or toggles italic style
-    rcUnderline,            // sets or toggles underline style
-    rcFontSize,             // font size in 1/2 points
-    rcSpaceBefore,          // space before paragraphs in twips
-    rcSpaceAfter,           // space after paragraph in twips
-    rcUnicodeChar,          // defines a Unicode character as signed 16bit value
-    rcUnicodePair,          // introduces pair of ANSI and Unicode destinations
-    rcUnicodeDest,          // introduces Unicode destination
-    rcIgnore,               // denotes following control can be ignored
-    rcFirstLineOffset,      // first line indent in twips (relative to \li)
-    rcLeftIndent,           // left indent in twips
-    rcTabStop               // sets a tab stop in twips
+    RTF,                  // RTF version
+    Ansi,                 // use ANSI character set
+    AnsiCodePage,         // specifies ANSI code page
+    DefFontNum,           // default font number
+    DefLanguage,          // default language
+    FontTable,            // introduces font table
+    FontPitch,            // font pitch
+    FontCharset,          // font character set
+    FontFamilyNil,        // unknown font family
+    FontFamilyRoman,      // serif, proportional fonts
+    FontFamilySwiss,      // sans-serif, proportional fonts
+    FontFamilyModern,     // fixed pitch serif and sans-serif fonts
+    FontFamilyScript,     // script fonts
+    FontFamilyDecor,      // decorative fonts
+    FontFamilyTech,       // technical, symbol and maths fonts
+    ColorTable,           // introduces colour table
+    Red,                  // defines red colour component
+    Green,                // defines gree colour component
+    Blue,                 // defines blue colour component
+    Info,                 // introduces information group
+    Title,                // sets document title
+    Pard,                 // resets to default paragraph format
+    Par,                  // begins new paragraph
+    Plain,                // reset font (character) formatting properties
+    FontNum,              // font number (index to font table)
+    ForeColorNum,         // foreground colour number (index to colour table)
+    Bold,                 // sets or toggles bold style
+    Italic,               // sets or toggles italic style
+    Underline,            // sets or toggles underline style
+    FontSize,             // font size in 1/2 points
+    SpaceBefore,          // space before paragraphs in twips
+    SpaceAfter,           // space after paragraph in twips
+    UnicodeChar,          // defines a Unicode character as signed 16bit value
+    UnicodePair,          // introduces pair of ANSI and Unicode destinations
+    UnicodeDest,          // introduces Unicode destination
+    Ignore,               // denotes following control can be ignored
+    FirstLineOffset,      // first line indent in twips (relative to \li)
+    LeftIndent,           // left indent in twips
+    TabStop               // sets a tab stop in twips
   );
+  {$ScopedEnums off}
 
 type
   ///  <summary>Container for related methods for generating valid RTF control
@@ -277,7 +279,7 @@ class function TRTF.MakeSafeText(const AText: string; const ACodePage: Integer):
     else
       // Conversion failed: we store Unicode char in a Unicode control word
       Result := Result
-        + ControlWord(rcUnicodeChar, SmallInt(Ord(Ch)))
+        + ControlWord(TRTFControl.UnicodeChar, SmallInt(Ord(Ch)))
         + ' ?';   // fallback "unprintable" value
   end;
 end;
@@ -317,11 +319,11 @@ class function TRTF.UnicodeSafeDestination(const ADestCtrl: TRTFControl;
       Encoding.Free;
     end;
     Result := '{'
-      + ControlWord(rcUnicodePair)
+      + ControlWord(TRTFControl.UnicodePair)
       + MakeDestination(AnsiStr)    // ANSI only destination
       + '{'
-      + ControlWord(rcIgnore)
-      + ControlWord(rcUnicodeDest)
+      + ControlWord(TRTFControl.Ignore)
+      + ControlWord(TRTFControl.UnicodeDest)
       + MakeDestination(ADestText)   // Unicode destinatation
       + '}'
       + '}';

From ada3a44d71d410c0927c8323d398c242761f6149 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 18 Apr 2025 19:00:15 +0100
Subject: [PATCH 211/264] Fix handling of Unicode chars in RTF generation.

Modified check in WideCharToChar in UEncodings unit to detect failed
conversions from WideChar to a given ANSI code page.

Added support for \uc RTF control word to TRTF in URTFUtils unit.

Fixed problem in TRTF.MakeSafeText that was not handling Unicode
correctly when a Unicode character cannot be represented in a given
code page.

Fixes #157

Also fixed error in detecting ASCII characters that need to be escaped#
in RTF (per issue 159)

Fixes #159
---
 Src/UEncodings.pas | 17 ++++++++++++++-
 Src/URTFUtils.pas  | 52 +++++++++++++++++++++++++++++-----------------
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/Src/UEncodings.pas b/Src/UEncodings.pas
index b8f6878bc..f85b5169e 100644
--- a/Src/UEncodings.pas
+++ b/Src/UEncodings.pas
@@ -437,7 +437,12 @@ function WideCharToChar(const Source: WideChar; const CodePage: Integer;
 var
   UsedDefChar: BOOL;
   BufSize: Integer;
+  Encoding: TEncoding;
+  TestStr: string;
+  TestBytes: TBytes;
+  Idx: Integer;
 begin
+  // Attempt to convert the Unicode char to ANSI char(s)
   BufSize := WideCharToMultiByte(
     CodePage, 0, @Source, 1, nil, 0, nil, nil
   );
@@ -447,7 +452,17 @@ function WideCharToChar(const Source: WideChar; const CodePage: Integer;
   ) = 0 then
     RaiseLastOSError;
   SetLength(Dest, Length(Dest) - 1);
-  Result := not UsedDefChar;
+  // Check if the conversion succeeded
+  Encoding := TMBCSEncoding.Create;
+  try
+    SetLength(TestBytes, Length(Dest));
+    for Idx := 0 to Pred(Length(Dest)) do
+      TestBytes[Idx] := Ord(Dest[Idx]);
+    TestStr := Encoding.GetString(TestBytes);
+    Result := (TestStr = Source) and not UsedDefChar;
+  finally
+    Encoding.Free;
+  end;
 end;
 
 { TEncodingHelper }
diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index dff0e59cd..57f1c2512 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -65,7 +65,8 @@ interface
     Ignore,               // denotes following control can be ignored
     FirstLineOffset,      // first line indent in twips (relative to \li)
     LeftIndent,           // left indent in twips
-    TabStop               // sets a tab stop in twips
+    TabStop,              // sets a tab stop in twips
+    UnicodeCharSize       // number of bytes of a given \uN Unicode character
   );
   {$ScopedEnums off}
 
@@ -81,7 +82,7 @@   TRTF = record
         'fcharset', 'fnil', 'froman', 'fswiss', 'fmodern', 'fscript', 'fdecor',
         'ftech', 'colortbl', 'red', 'green', 'blue', 'info', 'title', 'pard',
         'par', 'plain', 'f', 'cf', 'b', 'i', 'ul', 'fs', 'sb', 'sa', 'u', 'upr',
-        'ud', '*', 'fi', 'li', 'tx'
+        'ud', '*', 'fi', 'li', 'tx', 'uc'
       );
   strict private
 
@@ -134,13 +135,13 @@   TRTF = record
     ///  </returns>
     ///  <remarks>Converted characters are escaped if necessary. Any characters
     ///  that are not valid in the required code page are encoded in a Unicode
-    ///  RTF control word with <c>?</c> as the non-Unicode fallback.</remarks>
+    ///  RTF control word with a non-Unicode fallback.</remarks>
     class function MakeSafeText(const AText: string; const ACodePage: Integer):
       ASCIIString; static;
 
     ///  <summary>Creates an RTF destination in a Unicode safe way.</summary>
     ///  <param name="ADestCtrl"><c>TRTFControl</c> [in] Required destination
-    ///   control.</param>
+    ///  control.</param>
     ///  <param name="ADestText"><c>string</c> [in] Unicode text to be included
     ///  in the destination.</param>
     ///  <param name="ACodePage"><c>Integer</c> [in] ANSI Code page to use for
@@ -152,8 +153,7 @@   TRTF = record
     ///  containing the encoded text, escaped as necessary. Should any
     ///  characters in <c>ADestText</c> be incompatible with the code page then
     ///  two sub-destinations are created, one containing Unicode characters and
-    ///  the other containing ANSI text, with unknown characters flagged with
-    ///  &quot;error&quot; characters such as <c>?</c>.</remarks>
+    ///  the other containing ANSI text.</remarks>
     class function UnicodeSafeDestination(const ADestCtrl: TRTFControl;
       const ADestText: string; const ACodePage: Integer): ASCIIString; static;
   end;
@@ -250,6 +250,20 @@ class function TRTF.HexEscape(const Ch: AnsiChar): ASCIIString;
 
 class function TRTF.MakeSafeText(const AText: string; const ACodePage: Integer):
   ASCIIString;
+
+  function MakeSafeChar(const AChar: AnsiChar): ASCIIString;
+  begin
+    if (AChar < #$20) or ((AChar >= #$7F) and (AChar <= #$FF)) then
+      // Not an ASCII character
+      Result := HexEscape(AChar)
+    else if (AChar = '{') or (AChar = '\') or (AChar = '}') then
+      // Reserved RTF character: must be escaped
+      Result := Escape(AChar)
+    else
+      // Valid character, use as is
+      Result := ASCIIString(AChar);
+  end;
+
 var
   Ch: Char;                     // each Unicode character in TheText
   AnsiChars: TArray<AnsiChar>;  // translation of a Ch into the ANSI code page
@@ -264,23 +278,23 @@ class function TRTF.MakeSafeText(const AText: string; const ACodePage: Integer):
     begin
       // Conversion succeeded: check process each ANSI char
       for AnsiCh in AnsiChars do
-      begin
-        if (AnsiCh < #$20) or ((AnsiCh >= #$7F) and (AnsiCh <= #$FF)) then
-          // Not an ASCII character
-          Result := Result + HexEscape(AnsiCh)
-        else if (Ch = '{') or (Ch = '\') or (Ch = '}') then
-          // Reserved RTF character: must be escaped
-          Result := Result + Escape(AnsiCh)
-        else
-          // Valid character, use as is
-          Result := Result + ASCIIString(AnsiCh);
-      end;
+        Result := Result + MakeSafeChar(AnsiCh)
     end
     else
-      // Conversion failed: we store Unicode char in a Unicode control word
+    begin
+      // Conversion failed: create a Unicode character followed by fallback
+      // ANSI character
       Result := Result
+        + ControlWord(TRTFControl.UnicodeCharSize, 1)
         + ControlWord(TRTFControl.UnicodeChar, SmallInt(Ord(Ch)))
-        + ' ?';   // fallback "unprintable" value
+        + ' ';
+      if Length(AnsiChars) = 1 then
+        // Single alternate character: output it
+        Result := Result + MakeSafeChar(AnsiChars[0])
+      else
+        // Can't get alternate: use '?'
+        Result := Result + '?';
+    end;
   end;
 end;
 

From d5c7dce9b87a95e6ae7cd4d435ac741336b0a083 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 19 Apr 2025 08:05:31 +0100
Subject: [PATCH 212/264] Remove all hibernation bug fix hacks per v4.24.2

This is a merge of two commits proposed by @SirRufo per PR#160, with
trivial FrOverview.dfm changes removed.
---
 Src/FmMain.pas          | 20 ----------------
 Src/FrOverview.pas      | 52 -----------------------------------------
 Src/IntfFrameMgrs.pas   |  4 ----
 Src/UMainDisplayMgr.pas | 28 ----------------------
 4 files changed, 104 deletions(-)

diff --git a/Src/FmMain.pas b/Src/FmMain.pas
index 60556605c..6fc09ef54 100644
--- a/Src/FmMain.pas
+++ b/Src/FmMain.pas
@@ -526,12 +526,6 @@   TMainForm = class(THelpAwareForm)
       ///  <summary>Object that manages favourites.</summary>
       fFavouritesMgr: TFavouritesManager;
 
-    ///  <summary>Handles the <c>WM_POWERBROADCAST</c> messages to detect and
-    ///  respond to hibernation messages.</summary>
-    ///  <remarks>!! HACK necessary as part of the fix for an obscure bug. See
-    ///  https://github.com/delphidabbler/codesnip/issues/70</remarks>
-    procedure WMPowerBroadcast(var Msg: TMessage); message WM_POWERBROADCAST;
-
     ///  <summary>Displays view item given by TViewItemAction instance
     ///  referenced by Sender and adds to history list.</summary>
     procedure ActViewItemExecute(Sender: TObject);
@@ -1601,19 +1595,5 @@ procedure TMainForm.splitVertCanResize(Sender: TObject;
     Accept := False;
 end;
 
-procedure TMainForm.WMPowerBroadcast(var Msg: TMessage);
-begin
-  // !! HACK
-  // Sometimes when the computer is resumed from hibernation the tree view in
-  // the overview frame is destroyed and recreated by Windows. Unfortunately the
-  // IView instances associated with the recreated tree nodes are lost.
-  // Attempting to read those (now nil) IView instances was resulting in an
-  // access violation.
-  case Msg.WParam of
-    PBT_APMSUSPEND:
-      fMainDisplayMgr._HACK_PrepareForHibernate;
-  end;
-end;
-
 end.
 
diff --git a/Src/FrOverview.pas b/Src/FrOverview.pas
index 9cf76a2a8..e608e6d4a 100644
--- a/Src/FrOverview.pas
+++ b/Src/FrOverview.pas
@@ -26,29 +26,6 @@ interface
 
 type
 
-  // !! HACK
-  // Horrible hack to expose CreateWnd for overiding TTreeView.CreateWnd for the
-  // existing TTreeView component of TOverviewFrame. The hack avoids having to
-  // remove the component and replacing it with a descendant class that is
-  // manually constructed at run time.
-  // This is here to enable the tree view to be recreated with correctly
-  // instantiated TViewItemTreeNode nodes after Windows recreates the tree
-  // behind the scenes after resuming from hibernation.
-  // I am deeply ashamed of this hack.
-  TTreeView = class(ComCtrls.TTreeView)
-  strict private
-    var
-      _HACK_fOnAfterCreateNilViews: TNotifyEvent;
-  protected
-    procedure CreateWnd; override;
-  public
-    ///  <summary>!! HACK. Event triggered after the inherited CreateWnd is
-    ///  called. Only called if the tree view has nil references to IView
-    ///  objects.</summary>
-    property _HACK_OnAfterCreateNilViews: TNotifyEvent
-      read _HACK_fOnAfterCreateNilViews write _HACK_fOnAfterCreateNilViews;
-  end;
-
   {
   TOverviewFrame:
     Titled frame that displays lists of snippets grouped in various ways and
@@ -237,10 +214,6 @@       TTVDraw = class(TSnippetsTVDraw)
     procedure RestoreTreeState;
       {Restores last saved treeview expansion state from memory.
       }
-    ///  <summary>!! HACK: Sets an event handler on the tree view to work
-    ///  around a bug that can occur after resuming from hibernation.</summary>
-    ///  <remarks>Method of IOverviewDisplayMgr.</remarks>
-    procedure _HACK_SetHibernateHandler(const AHandler: TNotifyEvent);
     { IPaneInfo }
     function IsInteractive: Boolean;
       {Checks if the pane is currently interactive with user.
@@ -982,12 +955,6 @@ procedure TOverviewFrame.UpdateTreeState(const State: TTreeNodeAction);
   end;
 end;
 
-procedure TOverviewFrame._HACK_SetHibernateHandler(
-  const AHandler: TNotifyEvent);
-begin
-  tvSnippets._HACK_OnAfterCreateNilViews := AHandler;
-end;
-
 { TOverviewFrame.TTVDraw }
 
 function TOverviewFrame.TTVDraw.IsSectionHeadNode(
@@ -1026,24 +993,5 @@ function TOverviewFrame.TTVDraw.IsUserDefinedNode(
     Result := False;
 end;
 
-{ TTreeView }
-
-procedure TTreeView.CreateWnd;
-var
-  HasNilViews: Boolean;
-  Node: TTreeNode;
-begin
-  inherited;
-  HasNilViews := False;
-  for Node in Items do
-  begin
-    HasNilViews := not Assigned((Node as TViewItemTreeNode).ViewItem);
-    if HasNilViews then
-      Break;
-  end;
-  if HasNilViews and Assigned(_HACK_fOnAfterCreateNilViews) then
-    _HACK_fOnAfterCreateNilViews(Self);
-end;
-
 end.
 
diff --git a/Src/IntfFrameMgrs.pas b/Src/IntfFrameMgrs.pas
index b3cb76101..813d320ad 100644
--- a/Src/IntfFrameMgrs.pas
+++ b/Src/IntfFrameMgrs.pas
@@ -19,7 +19,6 @@ interface
 uses
   // Delphi
   SHDocVw, ActiveX,
-  Classes, // !! For HACK
   // Project
   Browser.IntfDocHostUI, DB.USnippet, Compilers.UGlobals, UCommandBars, UView;
 
@@ -146,9 +145,6 @@ interface
     ///  <summary>Restore expand / collapse state of treeview to last save
     ///  state.</summary>
     procedure RestoreTreeState;
-    ///  <summary>!! HACK: Sets an event handler on the tree view to work
-    ///  around a bug that can occur after resuming from hibernation.</summary>
-    procedure _HACK_SetHibernateHandler(const AHandler: TNotifyEvent);
   end;
 
 type
diff --git a/Src/UMainDisplayMgr.pas b/Src/UMainDisplayMgr.pas
index 0c64a17d5..15020fb34 100644
--- a/Src/UMainDisplayMgr.pas
+++ b/Src/UMainDisplayMgr.pas
@@ -165,11 +165,6 @@   TMainDisplayMgr = class(TObject)
     procedure DisplayViewItem(ViewItem: IView; Mode: TDetailPageDisplayMode);
       overload;
 
-    ///  <summary>!! HACK event handle to redisplay the overview pane treeview.
-    ///  Called only if Windows has mysteriously recreated the treeview and lost
-    ///  necessary object references.</summary>
-    procedure _HACK_HibernateHandler(Sender: TObject);
-
   public
     ///  <summary>Object contructor. Sets up object to work with given frame
     ///  manager objects.</summary>
@@ -297,13 +292,6 @@   TMainDisplayMgr = class(TObject)
     /// <summary>Prepares display ready for database to be reloaded.</summary>
     procedure PrepareForDBReload;
 
-    ///  <summary>!!HACK: gets the overview frame prepared for program
-    ///  hibernation.</summary>
-    ///  <remarks>Saves the overview tree view state ready for restoring after
-    ///  hibernation if Windows has recreated the overview pane's treeview,
-    ///  losing necessary IView object references..</remarks>
-    procedure _HACK_PrepareForHibernate;
-
   end;
 
 
@@ -704,21 +692,5 @@ procedure TMainDisplayMgr.UpdateOverviewTreeState(const State: TTreeNodeAction);
   (fOverviewMgr as IOverviewDisplayMgr).UpdateTreeState(State);
 end;
 
-procedure TMainDisplayMgr._HACK_HibernateHandler(Sender: TObject);
-begin
-  (fOverviewMgr as IOverviewDisplayMgr).Display(Query.Selection, True);
-  (fOverviewMgr as IOverviewDisplayMgr).RestoreTreeState;
-  // disable this handler until next resume from hibernation
-  (fOverviewMgr as IOverviewDisplayMgr)._HACK_SetHibernateHandler(nil);
-end;
-
-procedure TMainDisplayMgr._HACK_PrepareForHibernate;
-begin
-  (fOverviewMgr as IOverviewDisplayMgr).SaveTreeState;
-  (fOverviewMgr as IOverviewDisplayMgr)._HACK_SetHibernateHandler(
-    _HACK_HibernateHandler
-  );
-end;
-
 end.
 

From 54c3b5fc2f9be467e37286e50ddc80d2b73a88e8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 19 Apr 2025 08:30:25 +0100
Subject: [PATCH 213/264] Manage IViews references in a list

Implements a list of IView instances that are referenced by tree nodes.

This list is necessary to maintain IView reference counts since the
tree nodes only maintain weak references via pointers.

Original commit by @SirRufo per PR#160 modified only by adding /
updating comments.
---
 Src/FrOverview.pas           |  7 ++++-
 Src/UOverviewTreeBuilder.pas | 51 +++++++++++++++++++++++++-----------
 Src/UViewItemTreeNode.pas    | 28 ++++++++++++++------
 3 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/Src/FrOverview.pas b/Src/FrOverview.pas
index e608e6d4a..29ce4cd08 100644
--- a/Src/FrOverview.pas
+++ b/Src/FrOverview.pas
@@ -18,6 +18,7 @@ interface
 
 uses
   // Delphi
+  Generics.Collections,
   ComCtrls, Controls, Classes, Windows, ExtCtrls, StdCtrls, ToolWin, Menus,
   // Project
   DB.USnippet, FrTitled, IntfFrameMgrs, IntfNotifier, UCommandBars,
@@ -88,6 +89,8 @@       TTVDraw = class(TSnippetsTVDraw)
       end;
 
     var
+      fViewStore : TList<IView>;    // Stores references to IView instances that
+                                    // have weak references in tree nodes
       fTVDraw: TTVDraw;             // Object that renders tree view nodes
       fNotifier: INotifier;         // Notifies app of user initiated events
       fCanChange: Boolean;          // Whether selected node allowed to change
@@ -284,6 +287,7 @@ constructor TOverviewFrame.Create(AOwner: TComponent);
   TabIdx: Integer;  // loops through tabs
 begin
   inherited;
+  fViewStore := TList<IView>.Create;
   // Create delegated (contained) command bar manager for toolbar and popup menu
   fCommandBars := TCommandBarMgr.Create(Self);
   fCommandBars.AddCommandBar(
@@ -319,6 +323,7 @@ destructor TOverviewFrame.Destroy;
   fSelectedItem := nil;
   fSnippetList.Free;  // does not free referenced snippets
   fCommandBars.Free;
+  fViewStore.Free;
   inherited;
 end;
 
@@ -520,7 +525,7 @@ procedure TOverviewFrame.Redisplay;
       Exit;
     // Build new treeview using grouping determined by selected tab
     Builder := BuilderClasses[tcDisplayStyle.TabIndex].Create(
-      tvSnippets, fSnippetList
+      tvSnippets, fSnippetList, fViewStore
     );
     Builder.Build;
     // Restore state of treeview based on last time it was displayed
diff --git a/Src/UOverviewTreeBuilder.pas b/Src/UOverviewTreeBuilder.pas
index 87a32f23c..af5c9c924 100644
--- a/Src/UOverviewTreeBuilder.pas
+++ b/Src/UOverviewTreeBuilder.pas
@@ -18,6 +18,7 @@ interface
 
 uses
   // Delphu
+  Generics.Collections,
   ComCtrls,
   // Project
   DB.USnippet, UGroups, UView, UViewItemTreeNode;
@@ -32,13 +33,23 @@ interface
   TOverviewTreeBuilder = class abstract(TObject)
   strict private
     var
-      fTreeView: TTreeView;       // Value of TreeView property
-      fSnippetList: TSnippetList; // Value of SnippetList property
+      // Property values
+      fTreeView: TTreeView;
+      fSnippetList: TSnippetList;
+      fViewStore: TList<IView>;
   strict protected
     property TreeView: TTreeView read fTreeView;
       {Reference to treeview populated by class}
     property SnippetList: TSnippetList read fSnippetList;
       {List of snippets to be displayed in treeview}
+    ///  <summary>List of <c>IView</c> instances referenced by treeview nodes.
+    ///  </summary>
+    ///  <remarks>This list is required to maintain reference counting of
+    ///  <c>IView</c>s because the tree nodes only store weak references.
+    ///  </remarks>
+    property ViewStore : TList<IView> read fViewStore;
+      {List of IView instances referenced (weakly) by treeview nodes. This list
+      maintains maintains reference counting}
     function AddViewItemNode(const ParentNode: TViewItemTreeNode;
       ViewItem: IView): TViewItemTreeNode;
       {Adds a new node to the tree view that represents a view item.
@@ -57,12 +68,16 @@   TOverviewTreeBuilder = class abstract(TObject)
         @return Required view item object.
       }
   public
-    constructor Create(const TV: TTreeView; const SnippetList: TSnippetList);
-      {Class constructor. Sets up object to populate a treeview with a list of
-      snippets.
-        @param TV [in] Treeview control to be populated.
-        @param SnippetList [in] List of snippets to be added to TV.
-      }
+    ///  <summary>Constructs an object to populate a tree view with a list of
+    ///  snippets.</summary>
+    ///  <param name="TV"><c>TTreeView</c> [in] Treeview control to be
+    ///  populated.</param>
+    ///  <param name="SnippetList"><c>TSnippetList</c> [in] List of snippets to
+    ///  be added to the treeview.</param>
+    ///  <param name="ViewStore"><c>TList&lt;IView&gt;</c> [in] Receives a list
+    ///  of view items, one per tree node.</param>
+    constructor Create(const TV: TTreeView; const SnippetList: TSnippetList;
+      const ViewStore: TList<IView>);
     procedure Build;
       {Populates the treeview.
       }
@@ -177,7 +192,9 @@ procedure TOverviewTreeBuilder.Build;
   ParentNode: TViewItemTreeNode;  // each section node in tree
   Grouping: TGrouping;            // groups snippets
   Group: TGroupItem;              // each group of snippets
+  View: IView;
 begin
+  ViewStore.Clear;
   // Create required grouping of snippets
   Grouping := CreateGrouping;
   try
@@ -186,11 +203,17 @@ procedure TOverviewTreeBuilder.Build;
     begin
       if not Group.IsEmpty or Preferences.ShowEmptySections then
       begin
-        ParentNode := AddViewItemNode(nil, CreateViewItemForGroup(Group));
+        View := CreateViewItemForGroup(Group);
+        ParentNode := AddViewItemNode(nil, View);
+        ViewStore.Add(View);
         for Snippet in Group.SnippetList do
+        begin
+          View := TViewFactory.CreateSnippetView(Snippet);
           AddViewItemNode(
-            ParentNode, TViewFactory.CreateSnippetView(Snippet)
+            ParentNode, View
           );
+          ViewStore.Add(View);
+        end;
       end;
     end;
   finally
@@ -199,16 +222,12 @@ procedure TOverviewTreeBuilder.Build;
 end;
 
 constructor TOverviewTreeBuilder.Create(const TV: TTreeView;
-  const SnippetList: TSnippetList);
-  {Class constructor. Sets up object to populate a treeview with a list of
-  snippets.
-    @param TV [in] Treeview control to be populated.
-    @param SnippetList [in] List of snippets to be added to TV.
-  }
+  const SnippetList: TSnippetList; const ViewStore: TList<IView>);
 begin
   inherited Create;
   fTreeView := TV;
   fSnippetList := SnippetList;
+  fViewStore := ViewStore;
 end;
 
 { TOverviewCategorisedTreeBuilder }
diff --git a/Src/UViewItemTreeNode.pas b/Src/UViewItemTreeNode.pas
index 44e258c24..ca2f969e4 100644
--- a/Src/UViewItemTreeNode.pas
+++ b/Src/UViewItemTreeNode.pas
@@ -24,21 +24,33 @@ interface
 
 
 type
-  {
-  TViewItemTreeNode:
-    Custom tree node class that adds ability to store reference to a view item
-    in a tree node.
-  }
+  ///  <summary>Custom tree node class that adds a property to store a weak
+  ///  reference to an <c>IView</c> instance in a tree node.</summary>
   TViewItemTreeNode = class(TTreeNode)
   strict private
-    var fViewItem: IView; // Value of ViewItem property
+    function GetViewItem: IView;
+    procedure SetViewItem(const Value: IView);
   public
-    property ViewItem: IView read fViewItem write fViewItem;
-      {View item associated with tree node}
+    ///  <summary>View item associated with tree node.</summary>
+    ///  <remarks>NOTE: This view item is stored as a weak reference via a
+    ///  pointer so the reference count is not updated.</remarks>
+    property ViewItem: IView read GetViewItem write SetViewItem;
   end;
 
 
 implementation
 
+{ TViewItemTreeNode }
+
+function TViewItemTreeNode.GetViewItem: IView;
+begin
+  Result := IView(Data);
+end;
+
+procedure TViewItemTreeNode.SetViewItem(const Value: IView);
+begin
+  Data := Pointer(Value);
+end;
+
 end.
 

From 472567ae9f16b52de70bf61c707c9f7d12d255c3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 19 Apr 2025 09:12:12 +0100
Subject: [PATCH 214/264] Add acknowledgement of contribution by @SirRufo

See issue 158 & PR 160
---
 Src/FrOverview.pas           | 3 +++
 Src/UOverviewTreeBuilder.pas | 3 +++
 Src/UViewItemTreeNode.pas    | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/Src/FrOverview.pas b/Src/FrOverview.pas
index 29ce4cd08..17f912f81 100644
--- a/Src/FrOverview.pas
+++ b/Src/FrOverview.pas
@@ -7,6 +7,9 @@
  *
  * Implements a titled frame that displays lists of snippets, arranged in
  * different ways, and manages user interaction with the displayed items.
+ *
+ * ACKNOWLEDGEMENT: fViewStore view list implemented by @SirRufo (GitHub PR
+ * #160 & Issue #158).
 }
 
 
diff --git a/Src/UOverviewTreeBuilder.pas b/Src/UOverviewTreeBuilder.pas
index af5c9c924..465a5e293 100644
--- a/Src/UOverviewTreeBuilder.pas
+++ b/Src/UOverviewTreeBuilder.pas
@@ -7,6 +7,9 @@
  *
  * Implements a set of classes that populate the overview treeview with a list
  * of snippets. Each class groups the snippets in different ways.
+ *
+ * ACKNOWLEDGEMENT: ViewStore property and its use implemented by @SirRufo
+ * (GitHub PR #160 & Issue #158).
 }
 
 
diff --git a/Src/UViewItemTreeNode.pas b/Src/UViewItemTreeNode.pas
index ca2f969e4..23869c1f2 100644
--- a/Src/UViewItemTreeNode.pas
+++ b/Src/UViewItemTreeNode.pas
@@ -7,6 +7,9 @@
  *
  * Implements class that extends TTreeNode by adding a property that references
  * a view item.
+ *
+ * ACKNOWLEDGEMENT: GetViewItem & SetViewItem property accessors implemented by
+ * @SirRufo (GitHub PR #160 & Issue #158).
 }
 
 

From 6329b76045af9e6315c68050de046521c399a87d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 19 Apr 2025 10:54:03 +0100
Subject: [PATCH 215/264] Clarified change log entry for v4.24.1

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16846323a..ff7d2c58e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ Hotfix release.
 ## Release v4.24.1 of 13 April 2025
 
 * Fixed bug where CodeSnip occasionally crashes after a computer resumes from hibernation [issue #70].
-* Bumped some copyright dates for 2025.
+* Updated license copyright dates for 2025.
 
 ## Release v4.24.0 of 23 October 2024
 

From dbcf3c81cd5de97e7ff88016ee579fe340f4008d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 19 Apr 2025 09:44:09 +0100
Subject: [PATCH 216/264] Bump copyright dates for 2025

---
 Src/ActiveText.UHTMLRenderer.pas  | 2 +-
 Src/Browser.UHighlighter.pas      | 2 +-
 Src/CodeSnip.dpr                  | 2 +-
 Src/FmAboutDlg.pas                | 2 +-
 Src/FmCompErrorDlg.pas            | 2 +-
 Src/FrHiliterPrefs.pas            | 2 +-
 Src/FrPrintingPrefs.pas           | 2 +-
 Src/FrRTFPreview.pas              | 2 +-
 Src/FrSourcePrefs.pas             | 2 +-
 Src/Help/CodeSnip.hhp             | 2 +-
 Src/Help/HTML/dlg_savesnippet.htm | 2 +-
 Src/Help/HTML/dlg_saveunit.htm    | 2 +-
 Src/Help/HTML/menu_file.htm       | 2 +-
 Src/Help/Index.hhk                | 2 +-
 Src/Hiliter.UFileHiliter.pas      | 2 +-
 Src/Hiliter.UHiliters.pas         | 2 +-
 Src/UCompResHTML.pas              | 2 +-
 Src/UCopyViewMgr.pas              | 2 +-
 Src/UDetailPageHTML.pas           | 2 +-
 Src/UEncodings.pas                | 2 +-
 Src/UHTMLBuilder.pas              | 2 +-
 Src/UHTMLTemplate.pas             | 2 +-
 Src/UHTMLUtils.pas                | 2 +-
 Src/UOpenDialogHelper.pas         | 2 +-
 Src/UOverviewTreeBuilder.pas      | 2 +-
 Src/UPrintDocuments.pas           | 2 +-
 Src/UPrintEngine.pas              | 2 +-
 Src/UPrintMgr.pas                 | 2 +-
 Src/UREMLDataIO.pas               | 2 +-
 Src/URTFBuilder.pas               | 2 +-
 Src/URTFUtils.pas                 | 2 +-
 Src/USaveSnippetMgr.pas           | 2 +-
 Src/USaveSourceDlg.pas            | 2 +-
 Src/USaveSourceMgr.pas            | 2 +-
 Src/USaveUnitMgr.pas              | 2 +-
 Src/USnippetHTML.pas              | 2 +-
 Src/USnippetPageHTML.pas          | 2 +-
 Src/USourceFileInfo.pas           | 2 +-
 Src/UViewItemTreeNode.pas         | 2 +-
 39 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/Src/ActiveText.UHTMLRenderer.pas b/Src/ActiveText.UHTMLRenderer.pas
index ec9c19d23..e58ad92f2 100644
--- a/Src/ActiveText.UHTMLRenderer.pas
+++ b/Src/ActiveText.UHTMLRenderer.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides a class that renders active text as HTML.
 }
diff --git a/Src/Browser.UHighlighter.pas b/Src/Browser.UHighlighter.pas
index 5405008cd..68f2ac0e2 100644
--- a/Src/Browser.UHighlighter.pas
+++ b/Src/Browser.UHighlighter.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Class that highlights text in web browser that match a search criteria.
 }
diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index 8e5662dfe..719053105 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2024, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip application project file.
 }
diff --git a/Src/FmAboutDlg.pas b/Src/FmAboutDlg.pas
index dafdfb627..a26397685 100644
--- a/Src/FmAboutDlg.pas
+++ b/Src/FmAboutDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements the program's About dialogue box.
 }
diff --git a/Src/FmCompErrorDlg.pas b/Src/FmCompErrorDlg.pas
index b9cdf0a3e..56744cc6a 100644
--- a/Src/FmCompErrorDlg.pas
+++ b/Src/FmCompErrorDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a dialogue box that displays compiler error and warning logs.
 }
diff --git a/Src/FrHiliterPrefs.pas b/Src/FrHiliterPrefs.pas
index 0910a505f..61f6816f2 100644
--- a/Src/FrHiliterPrefs.pas
+++ b/Src/FrHiliterPrefs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that allows the user to set syntax highlighter
  * preferences.
diff --git a/Src/FrPrintingPrefs.pas b/Src/FrPrintingPrefs.pas
index f825f511e..d5a2b3034 100644
--- a/Src/FrPrintingPrefs.pas
+++ b/Src/FrPrintingPrefs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that allows user to set printing preferences.
  *
diff --git a/Src/FrRTFPreview.pas b/Src/FrRTFPreview.pas
index 16eb4f70b..294602dab 100644
--- a/Src/FrRTFPreview.pas
+++ b/Src/FrRTFPreview.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame used to display previews of RTF documents.
 }
diff --git a/Src/FrSourcePrefs.pas b/Src/FrSourcePrefs.pas
index 6b925973b..da40b5e00 100644
--- a/Src/FrSourcePrefs.pas
+++ b/Src/FrSourcePrefs.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a frame that allows user to set source code preferences.
  *
diff --git a/Src/Help/CodeSnip.hhp b/Src/Help/CodeSnip.hhp
index 73163ca7e..c7bb1a367 100644
--- a/Src/Help/CodeSnip.hhp
+++ b/Src/Help/CodeSnip.hhp
@@ -2,7 +2,7 @@
 ; v. 2.0. If a copy of the MPL was not distributed with this file, You can
 ; obtain one at https://mozilla.org/MPL/2.0/
 ;
-; Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+; Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
 ;
 ; CodeSnip help project file.
 
diff --git a/Src/Help/HTML/dlg_savesnippet.htm b/Src/Help/HTML/dlg_savesnippet.htm
index bdddfe9b1..7ef34cb1b 100644
--- a/Src/Help/HTML/dlg_savesnippet.htm
+++ b/Src/Help/HTML/dlg_savesnippet.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic for Save Annotated Source dialogue box.
 -->
diff --git a/Src/Help/HTML/dlg_saveunit.htm b/Src/Help/HTML/dlg_saveunit.htm
index 9dfb25358..3691a8e44 100644
--- a/Src/Help/HTML/dlg_saveunit.htm
+++ b/Src/Help/HTML/dlg_saveunit.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic for Save Unit dialogue box.
 -->
diff --git a/Src/Help/HTML/menu_file.htm b/Src/Help/HTML/menu_file.htm
index badf54294..a7beabcd4 100644
--- a/Src/Help/HTML/menu_file.htm
+++ b/Src/Help/HTML/menu_file.htm
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Help topic describing File menu.
 -->
diff --git a/Src/Help/Index.hhk b/Src/Help/Index.hhk
index 5a74ad8ed..dbc1a4d8c 100644
--- a/Src/Help/Index.hhk
+++ b/Src/Help/Index.hhk
@@ -4,7 +4,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2022, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * CodeSnip help index file.
 -->
diff --git a/Src/Hiliter.UFileHiliter.pas b/Src/Hiliter.UFileHiliter.pas
index 43838cb87..609a4cd74 100644
--- a/Src/Hiliter.UFileHiliter.pas
+++ b/Src/Hiliter.UFileHiliter.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that generates hilighted and formatted source code for a
  * specified file type.
diff --git a/Src/Hiliter.UHiliters.pas b/Src/Hiliter.UHiliters.pas
index 8433ab199..45267ca81 100644
--- a/Src/Hiliter.UHiliters.pas
+++ b/Src/Hiliter.UHiliters.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides highlighter classes used to format and highlight source code in
  * various file formats. Contains a factory object and implementation of various
diff --git a/Src/UCompResHTML.pas b/Src/UCompResHTML.pas
index 7ed706983..829f15bd0 100644
--- a/Src/UCompResHTML.pas
+++ b/Src/UCompResHTML.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Static class that generate HTML of parts of tables used to display compiler
  * results in details pane.
diff --git a/Src/UCopyViewMgr.pas b/Src/UCopyViewMgr.pas
index 27c329634..885c838c2 100644
--- a/Src/UCopyViewMgr.pas
+++ b/Src/UCopyViewMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements an abstract base class for objects that copy a representation of a
  * view to the clipboard.
diff --git a/Src/UDetailPageHTML.pas b/Src/UDetailPageHTML.pas
index d278ab931..fe7946c5b 100644
--- a/Src/UDetailPageHTML.pas
+++ b/Src/UDetailPageHTML.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Heirachy of classes that render views as HTML. The HTML is used to display
  * the view item in a tab in the detail pane. A factory is provided that can
diff --git a/Src/UEncodings.pas b/Src/UEncodings.pas
index f85b5169e..ea3e5a870 100644
--- a/Src/UEncodings.pas
+++ b/Src/UEncodings.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides support for certain character encodings used by the program.
 }
diff --git a/Src/UHTMLBuilder.pas b/Src/UHTMLBuilder.pas
index 1c9afdab0..1b224c0f3 100644
--- a/Src/UHTMLBuilder.pas
+++ b/Src/UHTMLBuilder.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class used to create content of an XHTML strict document.
 }
diff --git a/Src/UHTMLTemplate.pas b/Src/UHTMLTemplate.pas
index 54ae6a876..61c35806e 100644
--- a/Src/UHTMLTemplate.pas
+++ b/Src/UHTMLTemplate.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that loads a HTML template from resources and permits
  * replacing of placeholders with values.
diff --git a/Src/UHTMLUtils.pas b/Src/UHTMLUtils.pas
index ddc441e88..eda6160fc 100644
--- a/Src/UHTMLUtils.pas
+++ b/Src/UHTMLUtils.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Helper interfaces and classes used to generate HTML.
 }
diff --git a/Src/UOpenDialogHelper.pas b/Src/UOpenDialogHelper.pas
index 68382f1af..73cb008ef 100644
--- a/Src/UOpenDialogHelper.pas
+++ b/Src/UOpenDialogHelper.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Helper routines for use when working with standard windows open and save file
  * dialog boxes.
diff --git a/Src/UOverviewTreeBuilder.pas b/Src/UOverviewTreeBuilder.pas
index 465a5e293..d9b61beb5 100644
--- a/Src/UOverviewTreeBuilder.pas
+++ b/Src/UOverviewTreeBuilder.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a set of classes that populate the overview treeview with a list
  * of snippets. Each class groups the snippets in different ways.
diff --git a/Src/UPrintDocuments.pas b/Src/UPrintDocuments.pas
index 402971a5c..51b6600a1 100644
--- a/Src/UPrintDocuments.pas
+++ b/Src/UPrintDocuments.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Provides interface and classes that can generate output suitable for printing
  * using print engine.
diff --git a/Src/UPrintEngine.pas b/Src/UPrintEngine.pas
index 318940e4c..f0329bb72 100644
--- a/Src/UPrintEngine.pas
+++ b/Src/UPrintEngine.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that uses a rich edit control to print a rich text format
  * document.
diff --git a/Src/UPrintMgr.pas b/Src/UPrintMgr.pas
index c361d2ae8..825753c5a 100644
--- a/Src/UPrintMgr.pas
+++ b/Src/UPrintMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2007-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2007-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements a class that manages printing of a document providing information
  * about certain view items.
diff --git a/Src/UREMLDataIO.pas b/Src/UREMLDataIO.pas
index 249990248..f96e95c65 100644
--- a/Src/UREMLDataIO.pas
+++ b/Src/UREMLDataIO.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2008-2024, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2008-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements classes that render and parse Routine Extra Markup Language (REML)
  * code. This markup is used to read and store active text objects as used by
diff --git a/Src/URTFBuilder.pas b/Src/URTFBuilder.pas
index 739b82a84..2de1ec99d 100644
--- a/Src/URTFBuilder.pas
+++ b/Src/URTFBuilder.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements various classes used to create content of a rich text document.
 }
diff --git a/Src/URTFUtils.pas b/Src/URTFUtils.pas
index 57f1c2512..810448358 100644
--- a/Src/URTFUtils.pas
+++ b/Src/URTFUtils.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Utility functions used when processing RTF.
 }
diff --git a/Src/USaveSnippetMgr.pas b/Src/USaveSnippetMgr.pas
index 61f37bef6..9426baa94 100644
--- a/Src/USaveSnippetMgr.pas
+++ b/Src/USaveSnippetMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a class that manages generation, previewing and saving of a code
  * snippet.
diff --git a/Src/USaveSourceDlg.pas b/Src/USaveSourceDlg.pas
index 8a5aeaa5b..c089147f7 100644
--- a/Src/USaveSourceDlg.pas
+++ b/Src/USaveSourceDlg.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2005-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2005-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements customised Save dialog box for source code. Dialog has additional
  * controls to allow user to choose output file format, commenting style and
diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index bf35fc824..4739ac596 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements abstract base class for classes that manage generation, previewing
  * and saving to disk of a source code files in various formats and encodings.
diff --git a/Src/USaveUnitMgr.pas b/Src/USaveUnitMgr.pas
index 45d2b4529..7015767dc 100644
--- a/Src/USaveUnitMgr.pas
+++ b/Src/USaveUnitMgr.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2023, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines a class that manages generation, previewing and saving of a pascal
  * unit.
diff --git a/Src/USnippetHTML.pas b/Src/USnippetHTML.pas
index 8035a7474..3f53d12fd 100644
--- a/Src/USnippetHTML.pas
+++ b/Src/USnippetHTML.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Classes that generates HTML used to display snippets in detail pane.
 }
diff --git a/Src/USnippetPageHTML.pas b/Src/USnippetPageHTML.pas
index 9ad1f082a..90715e256 100644
--- a/Src/USnippetPageHTML.pas
+++ b/Src/USnippetPageHTML.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2012-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2012-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Defines classes etc that render different fragments of information about a
  * snippet as HTML for display in the detail pane. Page content is flexible and
diff --git a/Src/USourceFileInfo.pas b/Src/USourceFileInfo.pas
index a4b4f49a5..8f721679f 100644
--- a/Src/USourceFileInfo.pas
+++ b/Src/USourceFileInfo.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2006-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2006-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements class that provides information about types of source code output
  * that are supported.
diff --git a/Src/UViewItemTreeNode.pas b/Src/UViewItemTreeNode.pas
index 23869c1f2..e0e4139a0 100644
--- a/Src/UViewItemTreeNode.pas
+++ b/Src/UViewItemTreeNode.pas
@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2009-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2009-2025, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Implements class that extends TTreeNode by adding a property that references
  * a view item.

From 5c64b2941f90d46248467981a79a7b2c57a6ce87 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 19 Apr 2025 09:51:07 +0100
Subject: [PATCH 217/264] Bump version number to v4.25.0 build 275

---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index fbd558db1..e23088aa2 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.24.2
-build=274
+version=4.25.0
+build=275
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From 1c0566e24e73d4f44d7d37e66cb77f9d5c2beae5 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sat, 19 Apr 2025 10:53:10 +0100
Subject: [PATCH 218/264] Update change log with details of release v4.25.0

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff7d2c58e..15b4636c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,23 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
+## Release v4.25.0 of 19 April 2025
+
+* Added new feature to save snippet information to file in RTF format using the new _File | Save Snippet Information_ menu option [issue #140].
+* Added the option to save optionally highlighted annotated source code and units in HTML 5 format [issue #87]. 
+* Fixed malformed bullet character(s) in the list of imported snippets on the last page of the Snippets Import Wizard dialogue box [issue #147].
+* Improved the solution to the crash after hibernation bug, initially fixed in v4.24.1 and v4.24.2, with much improved and more stable code [issue #158]. Implemented by [@SirRufo](https://github.com/SirRufo). 
+* Overhauled rich text format processing:
+  * Fixed bug where Unicode characters that don't exist in the system code page were not being displayed correctly [issue #157].
+  * Fixed potential bug where some reserved ASCII characters may not be escaped properly [issue #159].
+  * Refactored and improved the rich text handling code [issue #100].
+* Corrected the copyright date displayed in the About Box to include 2025 [issue #149].
+* Documentation changes:
+  * Fixed error in the export file formation documentation and related help topic [issue #151].
+  * Corrected erroneous comments for the _TREMLEntities.MapToEntity_ method [issue #84].
+  * Updated file format documentation with details the changes introduced when implementing issues #87 and #140.
+  * Updated the help file with details of the new features added in this release.
+
 ## Release v4.24.2 of 14 April 2025
 
 Hotfix release.

From 5b174d795f0815866ba8ce35ae12912a8429b01d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 20 Apr 2025 08:54:24 +0100
Subject: [PATCH 219/264] Reimplement TSourceFileInfo.FileTypeInfo[] property

Changed the field and read/write accessor for this property to store the
property values in a dictionary instead of in a fixed size array.
Functionality was changed only in as much that attempts to access an
"array" value will now fail with an exception if an attempt is made to
get a value that has not been previously set. Before garbage results
would be returned.

This change was made to enable fewer file types than the maximum to be
supported in the filter string created by TSourceFileInfo.FilterString.
---
 Src/USourceFileInfo.pas | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/Src/USourceFileInfo.pas b/Src/USourceFileInfo.pas
index 8f721679f..776eb5af3 100644
--- a/Src/USourceFileInfo.pas
+++ b/Src/USourceFileInfo.pas
@@ -17,6 +17,8 @@ interface
 
 
 uses
+  // Delphi
+  Generics.Collections,
   // Project
   UEncodings;
 
@@ -89,10 +91,12 @@   TSourceFileInfo = class(TObject)
     var
       ///  <summary>Stores information about the different source code output
       //   types required by save source dialog boxes.</summary>
-      fFileTypeInfo: array[TSourceFileType] of TSourceFileTypeInfo;
+      fFileTypeInfo: TDictionary<TSourceFileType,TSourceFileTypeInfo>;
       //   <summary>Value of DefaultFileName property.</summary>
       fDefaultFileName: string;
     ///  <summary>Read accessor for FileTypeInfo property.</summary>
+    ///  <exception>Raises <c>EListError</c> if <c>FileType</c> is not contained
+    ///  in the property.</exception>
     function GetFileTypeInfo(const FileType: TSourceFileType):
       TSourceFileTypeInfo;
     ///  <summary>Write accessor for FileTypeInfo property.</summary>
@@ -103,11 +107,17 @@   TSourceFileInfo = class(TObject)
     ///  necessary.</remarks>
     procedure SetDefaultFileName(const Value: string);
   public
+    constructor Create;
+    destructor Destroy; override;
+
     ///  <summary>Builds filter string for use in open / save dialog boxes from
     ///  descriptions and file extensions of each supported file type.</summary>
     function FilterString: string;
-    ///  <summary>Array of information about each supported file type that is
-    ///  of use to save source dialog boxes.</summary>
+    ///  <summary>Information about each supported file type that is of use to
+    ///  save source dialog boxes.</summary>
+    ///  <exception>A <c>EListError</c> exception is raised if no information
+    ///  relating to <c>FileType</c> has been stored in this property.
+    ///  </exception>
     property FileTypeInfo[const FileType: TSourceFileType]: TSourceFileTypeInfo
       read GetFileTypeInfo write SetFileTypeInfo;
     ///  <summary>Default source code file name.</summary>
@@ -130,6 +140,18 @@ implementation
 
 { TSourceFileInfo }
 
+constructor TSourceFileInfo.Create;
+begin
+  inherited Create;
+  fFileTypeInfo := TDictionary<TSourceFileType,TSourceFileTypeInfo>.Create;
+end;
+
+destructor TSourceFileInfo.Destroy;
+begin
+  fFileTypeInfo.Free;
+  inherited;
+end;
+
 function TSourceFileInfo.FilterString: string;
 const
   cFilterFmt = '%0:s (*%1:s)|*%1:s';  // format string for creating file filter
@@ -139,6 +161,8 @@ function TSourceFileInfo.FilterString: string;
   Result := '';
   for FT := Low(TSourceFileType) to High(TSourceFileType) do
   begin
+    if not fFileTypeInfo.ContainsKey(FT) then
+      Continue;
     if Result <> '' then
       Result := Result + '|';
     Result := Result + Format(
@@ -175,7 +199,10 @@ procedure TSourceFileInfo.SetDefaultFileName(const Value: string);
 procedure TSourceFileInfo.SetFileTypeInfo(const FileType: TSourceFileType;
   const Info: TSourceFileTypeInfo);
 begin
-  fFileTypeInfo[FileType] := Info;
+  if fFileTypeInfo.ContainsKey(FileType) then
+    fFileTypeInfo[FileType] := Info
+  else
+    fFileTypeInfo.Add(FileType, Info);
 end;
 
 { TSourceFileTypeInfo }

From 5d8cb55902db4dfb81fa4ae30361442b0b28cade Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 20 Apr 2025 10:01:36 +0100
Subject: [PATCH 220/264] Add new TSourceFileInfo.FileTypeFromFilterIdx method

New method to get the file type associated with a given index within a
filter string.

To implement this many changes were made to the internals of
TSourceFileInfo, the main one of which was that the filter string is
now generated every time the FileTypeInfo property is updated instead of
the filter string being built on request.
---
 Src/USourceFileInfo.pas | 52 +++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/Src/USourceFileInfo.pas b/Src/USourceFileInfo.pas
index 776eb5af3..d0e318f01 100644
--- a/Src/USourceFileInfo.pas
+++ b/Src/USourceFileInfo.pas
@@ -90,10 +90,24 @@   TSourceFileInfo = class(TObject)
   strict private
     var
       ///  <summary>Stores information about the different source code output
-      //   types required by save source dialog boxes.</summary>
+      ///  types required by save source dialog boxes.</summary>
       fFileTypeInfo: TDictionary<TSourceFileType,TSourceFileTypeInfo>;
-      //   <summary>Value of DefaultFileName property.</summary>
+      ///  <summary>Maps a one-based index of a file filter within the current
+      ///  filter string to the corresponding <c>TSourceFileType</c> that was
+      ///  used to create the filter string entry.</summary>
+      fFilterIdxToFileTypeMap: TDictionary<Integer,TSourceFileType>;
+      ///  <summary>Value of DefaultFileName property.</summary>
       fDefaultFileName: string;
+      ///  <summary>Filter string for use in open / save dialog boxes from
+      ///  descriptions and file extensions of each supported file type.
+      ///  </summary>
+      fFilterString: string;
+    ///  <summary>Generates a new filter string and filter index to file type
+    ///  map from the current state of the <c>FileTypeInfo</c> property.
+    ///  </summary>
+    ///  <remarks>This method MUST be called every time the <c>FileTypeInfo</c>
+    ///  property is updated.</remarks>
+    procedure GenerateFilterInfo;
     ///  <summary>Read accessor for FileTypeInfo property.</summary>
     ///  <exception>Raises <c>EListError</c> if <c>FileType</c> is not contained
     ///  in the property.</exception>
@@ -110,9 +124,14 @@   TSourceFileInfo = class(TObject)
     constructor Create;
     destructor Destroy; override;
 
-    ///  <summary>Builds filter string for use in open / save dialog boxes from
+    ///  <summary>Returns filter string for use in open / save dialog boxes from
     ///  descriptions and file extensions of each supported file type.</summary>
     function FilterString: string;
+
+    ///  <summary>Returns the file type associated with a file filter at the
+    ///  given one-based index within the current filter string.</summary>
+    function FileTypeFromFilterIdx(const Idx: Integer): TSourceFileType;
+
     ///  <summary>Information about each supported file type that is of use to
     ///  save source dialog boxes.</summary>
     ///  <exception>A <c>EListError</c> exception is raised if no information
@@ -144,30 +163,48 @@ constructor TSourceFileInfo.Create;
 begin
   inherited Create;
   fFileTypeInfo := TDictionary<TSourceFileType,TSourceFileTypeInfo>.Create;
+  fFilterIdxToFileTypeMap := TDictionary<Integer,TSourceFileType>.Create;
 end;
 
 destructor TSourceFileInfo.Destroy;
 begin
+  fFilterIdxToFileTypeMap.Free;
   fFileTypeInfo.Free;
   inherited;
 end;
 
+function TSourceFileInfo.FileTypeFromFilterIdx(
+  const Idx: Integer): TSourceFileType;
+begin
+  Result := fFilterIdxToFileTypeMap[Idx];
+end;
+
 function TSourceFileInfo.FilterString: string;
+begin
+  Result := fFilterString;
+end;
+
+procedure TSourceFileInfo.GenerateFilterInfo;
 const
   cFilterFmt = '%0:s (*%1:s)|*%1:s';  // format string for creating file filter
 var
   FT: TSourceFileType;  // loops thru all source file types
+  FilterIdx: Integer;   // current index in filter string
 begin
-  Result := '';
+  fFilterIdxToFileTypeMap.Clear;
+  FilterIdx := 1;     // filter index is one based
+  fFilterString := '';
   for FT := Low(TSourceFileType) to High(TSourceFileType) do
   begin
     if not fFileTypeInfo.ContainsKey(FT) then
       Continue;
-    if Result <> '' then
-      Result := Result + '|';
-    Result := Result + Format(
+    if fFilterString <> '' then
+      fFilterString := fFilterString + '|';
+    fFilterString := fFilterString + Format(
       cFilterFmt, [fFileTypeInfo[FT].DisplayName, fFileTypeInfo[FT].Extension]
     );
+    fFilterIdxToFileTypeMap.Add(FilterIdx, FT);
+    Inc(FilterIdx);
   end;
 end;
 
@@ -203,6 +240,7 @@ procedure TSourceFileInfo.SetFileTypeInfo(const FileType: TSourceFileType;
     fFileTypeInfo[FileType] := Info
   else
     fFileTypeInfo.Add(FileType, Info);
+  GenerateFilterInfo;
 end;
 
 { TSourceFileTypeInfo }

From c574ce2d5b386739fffb118ab7716c1b04ed3aa7 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 20 Apr 2025 10:04:32 +0100
Subject: [PATCH 221/264] Reimplement TSaveSourceMgr.FileTypeFromFilterIdx

This method was changed to simply call
TSourceFileInfo.FileTypeFromFilterIdx for the currently selected filter
in the associated dialogue's filter string, instead of calculating the
value locally.

Note that the new method is much more resilient to future changes than
the original implementation which made assumptions about a one to one
relationship between filter indexes and file types.
---
 Src/USaveSourceMgr.pas | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index 4739ac596..2811d7a75 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -215,16 +215,8 @@ procedure TSaveSourceMgr.EncodingQueryHandler(Sender: TObject;
 end;
 
 function TSaveSourceMgr.FileTypeFromFilterIdx: TSourceFileType;
-var
-  FilterIdx: Integer; // dlg FilterIndex adjusted to be 0 based
 begin
-  FilterIdx := fSaveDlg.FilterIndex - 1;
-  Assert(
-    (FilterIdx >= Ord(Low(TSourceFileType)))
-      and (FilterIdx <= Ord(High(TSourceFileType))),
-    ClassName + '.FileTypeFromFilterIdx: FilerIdx out of range'
-  );
-  Result := TSourceFileType(FilterIdx)
+  Result := fSourceFileInfo.FileTypeFromFilterIdx(fSaveDlg.FilterIndex);
 end;
 
 function TSaveSourceMgr.GenerateOutput(const FileType: TSourceFileType):

From 300739c8364b0e0c20f390211557c264f16d0165 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 20 Apr 2025 13:08:38 +0100
Subject: [PATCH 222/264] Add EnableCommentStyles to TSaveSourceDlg

This property disables the comment style selection combo, and associated
controls when False. The default is True.
---
 Src/USaveSourceDlg.pas | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Src/USaveSourceDlg.pas b/Src/USaveSourceDlg.pas
index c089147f7..6d0c44940 100644
--- a/Src/USaveSourceDlg.pas
+++ b/Src/USaveSourceDlg.pas
@@ -93,6 +93,9 @@   TSaveSourceDlg = class(TSaveDialogEx)
       fSelectedFilterIdx: Integer;
       ///  <summary>Stores type of selected encoding.</summary>
       fSelectedEncoding: TEncodingType;
+      ///  <summary>Value of <c>EnableCommentStyles</c> property.</summary>
+      fEnableCommentStyles: Boolean;
+
     ///  <summary>Handles click on Help button.</summary>
     ///  <remarks>Calls help with required keyword.</remarks>
     procedure HelpClickHandler(Sender: TObject);
@@ -201,6 +204,10 @@   TSaveSourceDlg = class(TSaveDialogEx)
     ///  encodings supported for the file type.</summary>
     property OnEncodingQuery: TEncodingQuery
       read fOnEncodingQuery write fOnEncodingQuery;
+    ///  <summary>Determines whether the comment styles combo and associated
+    ///  controls are enabled, and so can be changed, or are disabled.</summary>
+    property EnableCommentStyles: Boolean
+      read fEnableCommentStyles write fEnableCommentStyles default True;
     ///  <summary>Re-implementation of inherited property to overcome apparent
     ///  bug where property forgets selected filter when dialog box is closed.
     ///  </summary>
@@ -317,6 +324,9 @@ constructor TSaveSourceDlg.Create(AOwner: TComponent);
   // set dialog options
   Options := [ofPathMustExist, ofEnableIncludeNotify];
 
+  // enable comment style selection
+  fEnableCommentStyles := True;
+
   // inhibit default help processing: we provide own help button and handling
   WantDefaultHelpSupport := False;
 end;
@@ -579,6 +589,9 @@ procedure TSaveSourceDlg.UpdateCommentStyle;
     if TCommentStyle(fCmbCommentStyle.Items.Objects[Idx]) = fCommentStyle then
       fCmbCommentStyle.ItemIndex := Idx;
   end;
+  fCmbCommentStyle.Enabled := fEnableCommentStyles;
+  fLblCommentStyle.Enabled := fEnableCommentStyles;
+  fChkTruncateComment.Enabled := fEnableCommentStyles;
 end;
 
 procedure TSaveSourceDlg.UpdateCommentTruncation;

From a8da07d8dcffa74f176c4a6471a3a663ca07509e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 20 Apr 2025 14:50:58 +0100
Subject: [PATCH 223/264] Remove unnecessary params from TSaveSourceDlg events

The OnHiliteQuery and OnEncodingQuery both had parameters that were not
being used, so they were removed.

USaveSourceMgr was modified re these changes.
---
 Src/USaveSourceDlg.pas | 13 ++++---------
 Src/USaveSourceMgr.pas | 12 ++++--------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Src/USaveSourceDlg.pas b/Src/USaveSourceDlg.pas
index 6d0c44940..78b301487 100644
--- a/Src/USaveSourceDlg.pas
+++ b/Src/USaveSourceDlg.pas
@@ -27,22 +27,17 @@ interface
   ///  <summary>Type of handler for events triggered by TSaveSourceDlg to check
   ///  if a file type supports syntax highlighting.</summary>
   ///  <param name="Sender">TObject [in] Object triggering event.</param>
-  ///  <param name="Ext">string [in] Extension that defines type of file being
-  ///  queried.</param>
   ///  <param name="CanHilite">Boolean [in/out] Set to true if file type
   ///  supports syntax highlighting.</param>
-  THiliteQuery = procedure(Sender: TObject; const Ext: string;
-    var CanHilite: Boolean) of object;
+  THiliteQuery = procedure(Sender: TObject; var CanHilite: Boolean) of object;
 
 type
   ///  <summary>Type of handler for event triggered by TSaveSourceDlg to get
   ///  list of encodings supported for a file type.</summary>
   ///  <param name="Sender">TObject [in] Object triggering event.</param>
-  ///  <param name="FilterIdx">string [in] Filter index that specifies the type
-  ///  of file being queried.</param>
   ///  <param name="Encodings">TSourceFileEncodings [in/out] Assigned an array
   ///  of records that specify supported encodings.</param>
-  TEncodingQuery = procedure(Sender: TObject; const FilterIdx: Integer;
+  TEncodingQuery = procedure(Sender: TObject;
     var Encodings: TSourceFileEncodings) of object;
 
 type
@@ -475,7 +470,7 @@ procedure TSaveSourceDlg.DoTypeChange;
   // Update enabled state of syntax highlighter checkbox
   CanHilite := False;
   if Assigned(fOnHiliteQuery) then
-    fOnHiliteQuery(Self, SelectedExt, CanHilite);
+    fOnHiliteQuery(Self, CanHilite);
   fChkSyntaxHilite.Enabled := CanHilite;
 
   // Store selected type
@@ -485,7 +480,7 @@ procedure TSaveSourceDlg.DoTypeChange;
   // handle OnEncodingQuery)
   SetLength(Encodings, 0);
   if Assigned(fOnEncodingQuery) then
-    fOnEncodingQuery(Self, FilterIndex, Encodings);
+    fOnEncodingQuery(Self, Encodings);
   if Length(Encodings) = 0 then
     Encodings := TSourceFileEncodings.Create(
       TSourceFileEncoding.Create(etSysDefault, sANSIEncoding)
diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index 2811d7a75..4be7c6fcc 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -40,20 +40,16 @@   TSaveSourceMgr = class abstract(TNoPublicConstructObject)
     ///  extension.</summary>
     ///  <param name="Sender">TObject [in] Reference to object that triggered
     ///  event.</param>
-    ///  <param name="Ext">string [in] Name of extension to check.</param>
     ///  <param name="CanHilite">Boolean [in/out] Set to True if highlighting
     ///  supported for extension or False if not.</param>
-    procedure HiliteQueryHandler(Sender: TObject; const Ext: string;
-      var CanHilite: Boolean);
+    procedure HiliteQueryHandler(Sender: TObject; var CanHilite: Boolean);
     ///  <summary>Handles custom save dialog box's OnEncodingQuery event.
     ///  Provides array of encodings supported for a file extension.</summary>
     ///  <param name="Sender">TObject [in] Reference to object that triggered
     ///  event.</param>
-    ///  <param name="FilterIdx">string [in] Index of file type withing dialog's
-    ///  filter string to check.</param>
     ///  <param name="Encodings">TSourceFileEncodings [in/out] Receives array of
     ///  supported encodings.</param>
-    procedure EncodingQueryHandler(Sender: TObject; const FilterIdx: Integer;
+    procedure EncodingQueryHandler(Sender: TObject;
       var Encodings: TSourceFileEncodings);
     ///  <summary>Handles custom save dialog's OnPreview event. Displays source
     ///  code appropriately formatted in preview dialog box.</summary>
@@ -206,7 +202,7 @@ procedure TSaveSourceMgr.DoExecute;
 end;
 
 procedure TSaveSourceMgr.EncodingQueryHandler(Sender: TObject;
-  const FilterIdx: Integer; var Encodings: TSourceFileEncodings);
+  var Encodings: TSourceFileEncodings);
 var
   FileType: TSourceFileType;  // type of file that has given extension
 begin
@@ -238,7 +234,7 @@ function TSaveSourceMgr.GenerateOutput(const FileType: TSourceFileType):
   end;
 end;
 
-procedure TSaveSourceMgr.HiliteQueryHandler(Sender: TObject; const Ext: string;
+procedure TSaveSourceMgr.HiliteQueryHandler(Sender: TObject;
   var CanHilite: Boolean);
 begin
   CanHilite := IsHilitingSupported(FileTypeFromFilterIdx);

From 567e1c3c2847b52ce24b089e39b6eff87e4de275 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 20 Apr 2025 15:12:25 +0100
Subject: [PATCH 224/264] Rewrite of USaveInfoMgr ready for extra file types

The unit was rewritten to use the TSaveSourceDlg dialogue box instead of
the simple TSaveDialogEx.

Nearly all code was rewritten, although, despite using a different
dialogue box, only RTF files are supported for output. The only
difference being that highlighting the source code in the output can now
be switched off.

The code was rewritten to make it easier to add support for other file
formats.
---
 Src/USaveInfoMgr.pas | 241 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 197 insertions(+), 44 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index 133b7cbce..12192672e 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -16,34 +16,90 @@ interface
 
 uses
   // Project
+  UBaseObjects,
   UEncodings,
+  USaveSourceDlg,
+  USourceFileInfo,
   UView;
 
 
 type
-  ///  <summary>Method-only record that saves information about a snippet to
-  ///  file in rich text format. The snippet is obtained from a view. Only
-  ///  snippet views are supported.</summary>
-  TSaveInfoMgr = record
+  ///  <summary>Class that saves information about a snippet to file in rich
+  ///  text format. The snippet is obtained from a view. Only snippet views are
+  ///  supported.</summary>
+  TSaveInfoMgr = class(TNoPublicConstructObject)
   strict private
-    ///  <summary>Attempts to name of the file to be written from the user.
-    ///  </summary>
-    ///  <param name="AFileName"><c>string</c> [out] Set to the name of the file
-    ///  entered by the user. Undefined if the user cancelled.</param>
-    ///  <returns><c>Boolean</c>. <c>True</c> if the user entered and accepted a
-    ///  file name of <c>False</c> if the user cancelled.</returns>
-    class function TryGetFileNameFromUser(out AFileName: string): Boolean;
-      static;
+    var
+      fView: IView;
+      fSaveDlg: TSaveSourceDlg;
+      fSourceFileInfo: TSourceFileInfo;
+
     ///  <summary>Returns encoded data containing a RTF representation of
     ///  information about the snippet represented by the given view.</summary>
-    class function GenerateRichText(View: IView): TEncodedData; static;
+    class function GenerateRichText(View: IView; const AUseHiliting: Boolean):
+      TEncodedData; static;
+
+    ///  <summary>Returns type of file selected in the associated save dialogue
+    ///  box.</summary>
+    function SelectedFileType: TSourceFileType;
+
+    ///  <summary>Handles the custom save dialogue's <c>OnPreview</c> event.
+    ///  Displays the required snippet information, appropriately formatted, in
+    ///  a preview dialogues box.</summary>
+    ///  <param name="Sender"><c>TObject</c> [in] Reference to the object that
+    ///  triggered the event.</param>
+    procedure PreviewHandler(Sender: TObject);
+
+    ///  <summary>Handles the custom save dialogue's <c>OnHiliteQuery</c> event.
+    ///  Determines whether syntax highlighting is supported for the source code
+    ///  section of the required snippet information..</summary>
+    ///  <param name="Sender"><c>TObject</c> [in] Reference to the object that
+    ///  triggered the event.</param>
+    ///  <param name="CanHilite"><c>Boolean</c> [in/out] Set to <c>False</c>
+    ///  when called. Should be set to <c>True</c> iff highlighting is
+    ///  supported.</param>
+    procedure HighlightQueryHandler(Sender: TObject; var CanHilite: Boolean);
+
+    ///  <summary>Handles the custom save dialogue's <c>OnEncodingQuery</c>
+    ///  event.</summary>
+    ///  <param name="Sender"><c>TObject</c> [in] Reference to the object that
+    ///  triggered the event.</param>
+    ///  <param name="Encodings"><c>TSourceFileEncodings</c> [in/out] Called
+    ///  with an empty array which the event handler must be set to contain the
+    ///  encodings supported by the currently selected file type.</param>
+    procedure EncodingQueryHandler(Sender: TObject;
+      var Encodings: TSourceFileEncodings);
+
+    ///  <summary>Generates the required snippet information in the requested
+    ///  format.</summary>
+    ///  <param name="FileType"><c>TSourceFileType</c> [in] Type of file to be
+    ///  generated.</param>
+    ///  <returns><c>TEncodedData</c>. The formatted snippet information, syntax
+    ///  highlighted if required.</returns>
+    function GenerateOutput(const FileType: TSourceFileType): TEncodedData;
+
+    ///  <summary>Displays the save dialogue box and creates required type of
+    ///  snippet information file if the user OKs.</summary>
+    procedure DoExecute;
+
+  strict protected
+
+    ///  <summary>Internal constructor. Initialises managed save source dialogue
+    ///  box and records information about supported file types.</summary>
+    constructor InternalCreate(AView: IView);
+
   public
+
+    ///  <summary>Object descructor. Tears down object.</summary>
+    destructor Destroy; override;
+
     ///  <summary>Saves information about the snippet referenced by the a given
     ///  view to file.</summary>
     ///  <remarks>The view must be a snippet view.</remarks>
     class procedure Execute(View: IView); static;
-    ///  <summary>Checks if a given view can be saved to the clipboard. Returns
-    ///  True only if the view represents a snippet.</summary>
+
+    ///  <summary>Checks if the given view can be saved to file. Returns
+    ///  <c>True</c> if the view represents a snippet.</summary>
     class function CanHandleView(View: IView): Boolean; static;
 
   end;
@@ -55,13 +111,16 @@ implementation
   SysUtils,
   Dialogs,
   // Project
+  FmPreviewDlg,
   Hiliter.UAttrs,
+  Hiliter.UFileHiliter,
   Hiliter.UGlobals,
   UIOUtils,
   UOpenDialogHelper,
+  UPreferences,
   URTFSnippetDoc,
   URTFUtils,
-  USaveDialogEx;
+  USourceGen;
 
 { TSaveInfoMgr }
 
@@ -70,27 +129,84 @@ class function TSaveInfoMgr.CanHandleView(View: IView): Boolean;
   Result := Supports(View, ISnippetView);
 end;
 
+destructor TSaveInfoMgr.Destroy;
+begin
+  fSourceFileInfo.Free;
+  fSaveDlg.Free;
+  inherited;
+end;
+
+procedure TSaveInfoMgr.DoExecute;
+var
+  Encoding: TEncoding;        // encoding to use for output file
+  FileContent: string;        // output file content before encoding
+  FileType: TSourceFileType;  // type of source file
+begin
+  // Set up dialog box
+  fSaveDlg.Filter := fSourceFileInfo.FilterString;
+  fSaveDlg.FilterIndex := FilterDescToIndex(
+    fSaveDlg.Filter,
+    fSourceFileInfo.FileTypeInfo[Preferences.SourceDefaultFileType].DisplayName,
+    1
+  );
+  fSaveDlg.FileName := fSourceFileInfo.DefaultFileName;
+  // Display dialog box and save file if user OKs
+  if fSaveDlg.Execute then
+  begin
+    FileType := SelectedFileType;
+    FileContent := GenerateOutput(FileType).ToString;
+    Encoding := TEncodingHelper.GetEncoding(fSaveDlg.SelectedEncoding);
+    try
+      FileContent := GenerateOutput(FileType).ToString;
+      TFileIO.WriteAllText(fSaveDlg.FileName, FileContent, Encoding, True);
+    finally
+      TEncodingHelper.FreeEncoding(Encoding);
+    end;
+  end;
+end;
+
+procedure TSaveInfoMgr.EncodingQueryHandler(Sender: TObject;
+  var Encodings: TSourceFileEncodings);
+begin
+  Encodings := fSourceFileInfo.FileTypeInfo[SelectedFileType].Encodings;
+end;
+
 class procedure TSaveInfoMgr.Execute(View: IView);
 var
-  FileName: string;
-  RTFMarkup: TRTFMarkup;
+  Instance: TSaveInfoMgr;
 begin
   Assert(Assigned(View), 'TSaveInfoMgr.Execute: View is nil');
   Assert(CanHandleView(View), 'TSaveInfoMgr.Execute: View not supported');
-  if not TryGetFileNameFromUser(FileName) then
-    Exit;
-  RTFMarkup := TRTFMarkup.Create(GenerateRichText(View));
-  TFileIO.WriteAllBytes(FileName, RTFMarkup.ToBytes);
+
+  Instance := TSaveInfoMgr.InternalCreate(View);
+  try
+    Instance.DoExecute;
+  finally
+    Instance.Free;
+  end;
+end;
+
+function TSaveInfoMgr.GenerateOutput(const FileType: TSourceFileType):
+  TEncodedData;
+var
+  UseHiliting: Boolean;
+begin
+  UseHiliting := fSaveDlg.UseSyntaxHiliting and
+    TFileHiliter.IsHilitingSupported(FileType);
+  case FileType of
+    sfRTF: Result := GenerateRichText(fView, UseHiliting);
+  end;
 end;
 
-class function TSaveInfoMgr.GenerateRichText(View: IView): TEncodedData;
+class function TSaveInfoMgr.GenerateRichText(View: IView;
+  const AUseHiliting: Boolean): TEncodedData;
 var
   Doc: TRTFSnippetDoc;        // object that generates RTF document
   HiliteAttrs: IHiliteAttrs;  // syntax highlighter formatting attributes
 begin
   Assert(Supports(View, ISnippetView),
     'TSaveInfoMgr.GenerateRichText: View is not a snippet view');
-  if (View as ISnippetView).Snippet.HiliteSource then
+  if (View as ISnippetView).Snippet.HiliteSource and AUseHiliting then
     HiliteAttrs := THiliteAttrsFactory.CreateUserAttrs
   else
     HiliteAttrs := THiliteAttrsFactory.CreateNulAttrs;
@@ -105,28 +221,65 @@ class function TSaveInfoMgr.GenerateRichText(View: IView): TEncodedData;
   end;
 end;
 
-class function TSaveInfoMgr.TryGetFileNameFromUser(
-  out AFileName: string): Boolean;
-var
-  Dlg: TSaveDialogEx;
+procedure TSaveInfoMgr.HighlightQueryHandler(Sender: TObject;
+  var CanHilite: Boolean);
+begin
+  CanHilite := TFileHiliter.IsHilitingSupported(SelectedFileType);
+end;
+
+constructor TSaveInfoMgr.InternalCreate(AView: IView);
+const
+  DlgHelpKeyword = 'SnippetInfoFileDlg';
 resourcestring
-  sCaption = 'Save Snippet Information';     // dialogue box caption
-  sFilter = 'Rich Text File (*.rtf)|*.rtf|'  // file filter
-    + 'All files (*.*)|*.*';
+  sDefFileName = 'SnippetInfo';
+  sDlgCaption = 'Save Snippet Information';
+  // descriptions of supported encodings
+  sASCIIEncoding = 'ASCII';
+  // descriptions of supported file filter strings
+  sRTFDesc = 'Rich text file';
 begin
-  Dlg := TSaveDialogEx.Create(nil);
-  try
-    Dlg.Title := sCaption;
-    Dlg.Options := [ofShowHelp, ofNoTestFileCreate, ofEnableSizing];
-    Dlg.Filter := sFilter;
-    Dlg.FilterIndex := 1;
-    Dlg.HelpKeyword := 'SnippetInfoFileDlg';
-    Result := Dlg.Execute;
-    if Result then
-      AFileName := FileOpenFileNameWithExt(Dlg)
-  finally
-    Dlg.Free;
-  end;
+  inherited InternalCreate;
+  fView := AView;
+  fSourceFileInfo := TSourceFileInfo.Create;
+  // only RTF file type supported at present
+  fSourceFileInfo.FileTypeInfo[sfRTF] := TSourceFileTypeInfo.Create(
+    '.rtf',
+    sRTFDesc,
+    [
+      TSourceFileEncoding.Create(etASCII, sASCIIEncoding)
+    ]
+ );
+  fSourceFileInfo.DefaultFileName := sDefFileName;
+
+  fSaveDlg := TSaveSourceDlg.Create(nil);
+  fSaveDlg.Title := sDlgCaption;
+  fSaveDlg.HelpKeyword := DlgHelpKeyword;
+  fSaveDlg.CommentStyle := TCommentStyle.csNone;
+  fSaveDlg.EnableCommentStyles := False;
+  fSaveDlg.TruncateComments := Preferences.TruncateSourceComments;
+  fSaveDlg.UseSyntaxHiliting := Preferences.SourceSyntaxHilited;
+  fSaveDlg.OnPreview := PreviewHandler;
+  fSaveDlg.OnHiliteQuery := HighlightQueryHandler;
+  fSaveDlg.OnEncodingQuery := EncodingQueryHandler;
+end;
+
+procedure TSaveInfoMgr.PreviewHandler(Sender: TObject);
+resourcestring
+  sDocTitle = '"%0:s" snippet';
+begin
+  // Display preview dialog box. We use save dialog as owner to ensure preview
+  // dialog box is aligned over save dialog box
+  TPreviewDlg.Execute(
+    fSaveDlg,
+    GenerateOutput(sfRTF),
+    dtRTF,
+    Format(sDocTitle, [fView.Description])
+  );
+end;
+
+function TSaveInfoMgr.SelectedFileType: TSourceFileType;
+begin
+  Result := fSourceFileInfo.FileTypeFromFilterIdx(fSaveDlg.FilterIndex);
 end;
 
 end.

From 7f2f9d9204b7ba7fc491841f955470d979f7d5f0 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 20 Apr 2025 17:14:18 +0100
Subject: [PATCH 225/264] Added support for plain text snippet information

TSaveInfoMgr was adapted to offer plain text output of snippet
information in Unicode LE & BE, UTF-8 or ANSI format.
---
 Src/USaveInfoMgr.pas | 76 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 8 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index 12192672e..853c6e24f 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -24,9 +24,9 @@ interface
 
 
 type
-  ///  <summary>Class that saves information about a snippet to file in rich
-  ///  text format. The snippet is obtained from a view. Only snippet views are
-  ///  supported.</summary>
+  ///  <summary>Class that saves information about a snippet to file a user
+  ///  specified format. The snippet is obtained from a view. Only snippet views
+  ///  are supported.</summary>
   TSaveInfoMgr = class(TNoPublicConstructObject)
   strict private
     var
@@ -39,6 +39,10 @@   TSaveInfoMgr = class(TNoPublicConstructObject)
     class function GenerateRichText(View: IView; const AUseHiliting: Boolean):
       TEncodedData; static;
 
+    ///  <summary>Returns encoded data containing a plain text representation of
+    ///  information about the snippet represented by the given view.</summary>
+    function GeneratePlainText: TEncodedData;
+
     ///  <summary>Returns type of file selected in the associated save dialogue
     ///  box.</summary>
     function SelectedFileType: TSourceFileType;
@@ -120,7 +124,8 @@ implementation
   UPreferences,
   URTFSnippetDoc,
   URTFUtils,
-  USourceGen;
+  USourceGen,
+  UTextSnippetDoc;
 
 { TSaveInfoMgr }
 
@@ -195,6 +200,23 @@ function TSaveInfoMgr.GenerateOutput(const FileType: TSourceFileType):
     TFileHiliter.IsHilitingSupported(FileType);
   case FileType of
     sfRTF: Result := GenerateRichText(fView, UseHiliting);
+    sfText: Result := GeneratePlainText;
+  end;
+end;
+
+function TSaveInfoMgr.GeneratePlainText: TEncodedData;
+var
+  Doc: TTextSnippetDoc;        // object that generates RTF document
+  HiliteAttrs: IHiliteAttrs;  // syntax highlighter formatting attributes
+begin
+  Assert(Supports(fView, ISnippetView),
+    ClassName + '.GeneratePlainText: View is not a snippet view');
+  HiliteAttrs := THiliteAttrsFactory.CreateNulAttrs;
+  Doc := TTextSnippetDoc.Create;
+  try
+    Result := Doc.Generate((fView as ISnippetView).Snippet);
+  finally
+    Doc.Free;
   end;
 end;
 
@@ -235,20 +257,35 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
   sDlgCaption = 'Save Snippet Information';
   // descriptions of supported encodings
   sASCIIEncoding = 'ASCII';
+  sANSIDefaultEncoding = 'ANSI (Default)';
+  sUTF8Encoding = 'UTF-8';
+  sUTF16LEEncoding = 'Unicode (Little Endian)';
+  sUTF16BEEncoding = 'Unicode (Big Endian)';
   // descriptions of supported file filter strings
   sRTFDesc = 'Rich text file';
+  sTextDesc = 'Plain text file';
 begin
   inherited InternalCreate;
   fView := AView;
   fSourceFileInfo := TSourceFileInfo.Create;
-  // only RTF file type supported at present
+  // RTF and plain text files supported at present
   fSourceFileInfo.FileTypeInfo[sfRTF] := TSourceFileTypeInfo.Create(
     '.rtf',
     sRTFDesc,
     [
       TSourceFileEncoding.Create(etASCII, sASCIIEncoding)
     ]
- );
+  );
+  fSourceFileInfo.FileTypeInfo[sfText] := TSourceFileTypeInfo.Create(
+    '.txt',
+    sTextDesc,
+    [
+      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding),
+      TSourceFileEncoding.Create(etUTF16LE, sUTF16LEEncoding),
+      TSourceFileEncoding.Create(etUTF16BE, sUTF16BEEncoding),
+      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding)
+    ]
+  );
   fSourceFileInfo.DefaultFileName := sDefFileName;
 
   fSaveDlg := TSaveSourceDlg.Create(nil);
@@ -266,13 +303,36 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
 procedure TSaveInfoMgr.PreviewHandler(Sender: TObject);
 resourcestring
   sDocTitle = '"%0:s" snippet';
+var
+  // Type of snippet information document to preview: this is not always the
+  // same as the selected file type, because preview dialogue box doesn't
+  // support some types & we have to use an alternate.
+  PreviewFileType: TSourceFileType;
+  // Type of preview document supported by preview dialogue box
+  PreviewDocType: TPreviewDocType;
 begin
+  case SelectedFileType of
+    sfRTF:
+    begin
+      PreviewDocType := dtRTF;
+      PreviewFileType := sfRTF;
+    end;
+    sfText:
+    begin
+      PreviewDocType := dtPlainText;
+      PreviewFileType := sfText;
+    end;
+    else
+      raise Exception.Create(
+        ClassName + '.PreviewHandler: unsupported file type'
+      );
+  end;
   // Display preview dialog box. We use save dialog as owner to ensure preview
   // dialog box is aligned over save dialog box
   TPreviewDlg.Execute(
     fSaveDlg,
-    GenerateOutput(sfRTF),
-    dtRTF,
+    GenerateOutput(PreviewFileType),
+    PreviewDocType,
     Format(sDocTitle, [fView.Description])
   );
 end;

From 2d6dff051bd74e01ecdc983e054f285bde5457a2 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 22 Apr 2025 08:21:47 +0100
Subject: [PATCH 226/264] Change how TCSSBuilder generates CSS

The order the selectors were generated by TCSSBuilder.AsString was
indeterminate (it was the order a dictionary enumerated them). This was
changed so the the selectors are now rendered in the order they were
created.

This was done for cases where the ordering of the CSS selectors matters.
---
 Src/UCSSBuilder.pas | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/Src/UCSSBuilder.pas b/Src/UCSSBuilder.pas
index 172f8b07d..3be1b266a 100644
--- a/Src/UCSSBuilder.pas
+++ b/Src/UCSSBuilder.pas
@@ -77,7 +77,8 @@   TCSSBuilder = class(TObject)
       // Class that maps CSS selector names to selector objects
       TCSSSelectorMap = TObjectDictionary<string,TCSSSelector>;
     var
-      fSelectors: TCSSSelectorMap;  // Maps selector names to selector objects
+      fSelectors: TCSSSelectorMap;    // Maps selector names to selector objects
+      fSelectorNames: TList<string>;  // Lists selector names in order created
     function GetSelector(const Selector: string): TCSSSelector;
       {Read access method for Selectors property. Returns selector object with
       given name.
@@ -105,10 +106,13 @@   TCSSBuilder = class(TObject)
     procedure Clear;
       {Clears all selectors from style sheet and frees selector objects.
       }
+
+    ///  <summary>Generates CSS code representing the style sheet.</summary>
+    ///  <returns><c>string</c>. The required CSS.</returns>
+    ///  <remarks>The selectors are returned in the order they were created.
+    ///  </remarks>
     function AsString: string;
-      {Generates CSS code representing the style sheet.
-        @return Required CSS code.
-      }
+
     property Selectors[const Selector: string]: TCSSSelector
       read GetSelector;
       {Array of CSS selectors in style sheet, indexed by selector name}
@@ -189,26 +193,29 @@ function TCSSBuilder.AddSelector(const Selector: string): TCSSSelector;
 begin
   Result := TCSSSelector.Create(Selector);
   fSelectors.Add(Selector, Result);
+  fSelectorNames.Add(Selector);
 end;
 
 function TCSSBuilder.AsString: string;
-  {Generates CSS code representing the style sheet.
-    @return Required CSS code.
-  }
 var
+  SelectorName: string;   // name of each selector
   Selector: TCSSSelector; // reference to each selector in map
 begin
   Result := '';
-  for Selector in fSelectors.Values do
+  for SelectorName in fSelectorNames do
+  begin
+    Selector := fSelectors[SelectorName];
     if not Selector.IsEmpty then
       Result := Result + Selector.AsString;
+  end;
 end;
 
 procedure TCSSBuilder.Clear;
   {Clears all selectors from style sheet and frees selector objects.
   }
 begin
-  fSelectors.Clear; // frees selector objects in .Values[]
+  fSelectorNames.Clear;
+  fSelectors.Clear;       // frees owened selector objects in dictionary
 end;
 
 constructor TCSSBuilder.Create;
@@ -221,13 +228,15 @@ constructor TCSSBuilder.Create;
   fSelectors := TCSSSelectorMap.Create(
     [doOwnsValues], TTextEqualityComparer.Create
   );
+  fSelectorNames := TList<string>.Create;
 end;
 
 destructor TCSSBuilder.Destroy;
   {Destructor. Tears down object.
   }
 begin
-  fSelectors.Free;    // frees selector objects in fSelectors.Values[]
+  fSelectorNames.Free;
+  fSelectors.Free;    // frees owened selector objects in dictionary
   inherited;
 end;
 

From b7943ec3d58c6412c724e4a71e626030d5931c0b Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 21 Apr 2025 11:17:18 +0100
Subject: [PATCH 227/264] Add support to TCSS for margin & padding units

Modified all TCSS.PaddingProp and TCSS.MarginProp overloaded methods to
add a new optional parameter to specify which length units to use.
Previously only px was permitted.

In order to permit fractional lengths to be specified for use with
relative units, length parameters were changed to floating point from
Integer. Non-Integer values are truncated to a maximum of 2 decimal
places.
---
 Src/UCSSUtils.pas | 207 +++++++++++++++++++++++++++++-----------------
 1 file changed, 133 insertions(+), 74 deletions(-)

diff --git a/Src/UCSSUtils.pas b/Src/UCSSUtils.pas
index 53d6bb4f0..4d0a9c818 100644
--- a/Src/UCSSUtils.pas
+++ b/Src/UCSSUtils.pas
@@ -200,28 +200,38 @@   TCSS = record
     ///  <returns>string. Required length unit as text.</returns>
     class function LengthUnit(const LU: TCSSLengthUnit): string; static;
 
-    ///  <summary>Builds a space separated list of lengths using specified
-    ///  units.</summary>
-    ///  <param name="List">array of Integer [in] List of lengths.</param>
-    ///  <param name="LU">TCSSLengthUnit [in] Specifies length unit to apply tp
-    ///  each length.</param>
-    ///  <returns>string. Required spaced separated list.</returns>
-    class function LengthList(const List: array of Integer;
+    ///  <summary>Builds a space separated list of lengths using the specified
+    ///  unit.</summary>
+    ///  <param name="List"><c>array of Single</c> [in] List of lengths.</param>
+    ///  <param name="LU"><c>TCSSLengthUnit</c> [in] Specifies length unit to
+    ///  apply to each length.</param>
+    ///  <returns><c>string</c>. Required spaced separated list.</returns>
+    ///  <remarks>Note that lengths are rounded to a maximum of 2 decimal
+    ///  places.</remarks>
+    class function LengthList(const List: array of Single;
       const LU: TCSSLengthUnit = cluPixels): string; static;
 
     ///  <summary>Creates a CSS "margin" property.</summary>
-    ///  <param name="Margin">array of Integer [in] Array of margin widths. Must
-    ///  contain either 1, 2 or 4 values.</param>
-    ///  <returns>string. Required CSS property.</returns>
-    class function MarginProp(const Margin: array of Integer): string;
-      overload; static;
+    ///  <param name="Margin"><c>array of Single</c> [in] Array of margin
+    ///  widths. Must contain either 1, 2 or 4 values.</param>
+    ///  <param name="LU"><c>TCSSLengthUnit</c> [in] Optional length unit to use
+    ///  for each margin width. Defaults to <c>cluPixels</c>.</param>
+    ///  <returns><c>string</c>. Required CSS property.</returns>
+    ///  <remarks>Note that margin values are rounded to a maximum of 2 decimal
+    ///  places.</remarks>
+    class function MarginProp(const Margin: array of Single;
+      const LU: TCSSLengthUnit = cluPixels): string; overload; static;
 
     ///  <summary>Creates a CSS "padding" property.</summary>
-    ///  <param name="Padding">array of Integer [in] Array of padding widths.
-    ///  Must contain either 1, 2 or 4 values.</param>
-    ///  <returns>string. Required CSS property.</returns>
-    class function PaddingProp(const Padding: array of Integer): string;
-      overload; static;
+    ///  <param name="Padding"><c>array of Single</c> [in] Array of padding
+    ///  widths. Must contain either 1, 2 or 4 values.</param>
+    ///  <param name="LU"><c>TCSSLengthUnit</c> [in] Optional length unit to use
+    ///  for each padding width. Defaults to <c>cluPixels</c>.</param>
+    ///  <returns><c>string</c>. Required CSS property.</returns>
+    ///  <remarks>Note that padding values are rounded to a maximum of 2 decimal
+    ///  places.</remarks>
+    class function PaddingProp(const Padding: array of Single;
+      const LU: TCSSLengthUnit = cluPixels): string; overload; static;
 
   public
     ///  <summary>Creates a CSS "color" property.</summary>
@@ -312,54 +322,77 @@   TCSS = record
 
     ///  <summary>Creates CSS "margin" property with same width on all edges.
     ///  </summary>
-    ///  <param name="Margin">Integer [in] Margin width in pixels.</param>
-    ///  <returns>string. Required CSS property.</returns>
-    class function MarginProp(const Margin: Integer): string; overload; static;
+    ///  <param name="Margin"><c>Single</c> [in] Margin width.</param>
+    ///  <param name="LU"><c>TCSSLengthUnit</c> [in] Optional length unit to use
+    ///  for the margin width. Defaults to <c>cluPixels</c>.</param>
+    ///  <returns><c>string</c>. Required CSS property.</returns>
+    ///  <remarks>Note that the margin value is rounded to a maximum of 2
+    ///  decimal places.</remarks>
+    class function MarginProp(const Margin: Single;
+      const LU: TCSSLengthUnit = cluPixels): string; overload; static;
 
     ///  <summary>Creates CSS "margin" property with potentially different
     ///  margin widths on each side.</summary>
-    ///  <param name="Top">Integer [in] Top margin in pixels.</param>
-    ///  <param name="Right">Integer [in] Right margin in pixels.</param>
-    ///  <param name="Bottom">Integer [in] Bottom margin in pixels.</param>
-    ///  <param name="Left">Integer [in] Left margin in pixels.</param>
-    ///  <returns>string. Required CSS property.</returns>
-    class function MarginProp(const Top, Right, Bottom, Left: Integer): string;
-      overload; static;
+    ///  <param name="Top"><c>Single</c> [in] Top margin.</param>
+    ///  <param name="Right"><c>Single</c> [in] Right margin.</param>
+    ///  <param name="Bottom"><c>Single</c> [in] Bottom margin.</param>
+    ///  <param name="Left"><c>Single</c> [in] Left margin.</param>
+    ///  <param name="LU"><c>TCSSLengthUnit</c> [in] Optional length unit to use
+    ///  for each margin width. Defaults to <c>cluPixels</c>.</param>
+    ///  <returns><c>string</c>. Required CSS property.</returns>
+    ///  <remarks>Note that margin values are rounded to a maximum of 2 decimal
+    ///  places.</remarks>
+    class function MarginProp(const Top, Right, Bottom, Left: Single;
+      const LU: TCSSLengthUnit = cluPixels): string; overload; static;
 
     ///  <summary>Creates CSS "margin" or "margin-xxx" property (where "xxx" is
     ///  a side).</summary>
-    ///  <param name="Side">TCSSSide [in] Specifies side(s) of element whose
-    ///  margin is to be set.</param>
-    ///  <param name="Margin">Integer [in] Width of margin in pixels.</param>
-    ///  <returns>string. Required CSS property.</returns>
-    class function MarginProp(const Side: TCSSSide; const Margin: Integer):
-      string; overload; static;
+    ///  <param name="Side"><c>TCSSSide</c> [in] Specifies the side(s) of the
+    ///  element whose margin is to be set.</param>
+    ///  <param name="Margin"><c>Single</c> [in] Width of margin in pixels.</param>
+    ///  <returns><c>string</c>. Required CSS property.</returns>
+    ///  <remarks>Note that the margin is rounded to a maximum of 2 decimal
+    ///  places.</remarks>
+    class function MarginProp(const Side: TCSSSide; const Margin: Single;
+      const LU: TCSSLengthUnit = cluPixels): string; overload; static;
 
     ///  <summary>Creates CSS "padding" property with same width on all sides.
     ///  </summary>
-    ///  <param name="Padding">Integer [in] Padding width in pixels.</param>
-    ///  <returns>string. Required CSS property.</returns>
-    class function PaddingProp(const Padding: Integer): string; overload;
-      static;
+    ///  <param name="Padding"><c>Single</c> [in] Padding width.</param>
+    ///  <param name="LU"><c>TCSSLengthUnit</c> [in] Optional length unit to use
+    ///  for the padding width. Defaults to <c>cluPixels</c>.</param>
+    ///  <returns><c>string</c>. Required CSS property.</returns>
+    ///  <remarks>Note that the padding value is rounded to a maximum of 2
+    ///  decimal places.</remarks>
+    class function PaddingProp(const Padding: Single;
+      const LU: TCSSLengthUnit = cluPixels): string; overload; static;
 
     ///  <summary>Creates CSS "padding" property with potentially different
     ///  padding widths on each side.</summary>
-    ///  <param name="Top">Integer [in] Top margin in pixels.</param>
-    ///  <param name="Right">Integer [in] Right margin in pixels.</param>
-    ///  <param name="Bottom">Integer [in] Bottom margin in pixels.</param>
-    ///  <param name="Left">Integer [in] Left margin in pixels.</param>
-    ///  <returns>string. Required CSS property.</returns>
-    class function PaddingProp(const Top, Right, Bottom, Left: Integer):
-      string; overload; static;
+    ///  <param name="Top"><c>Single</c> [in] Top margin.</param>
+    ///  <param name="Right"><c>Single</c> [in] Right margin.</param>
+    ///  <param name="Bottom"><c>Single</c> [in] Bottom margin.</param>
+    ///  <param name="Left"><c>Single</c> [in] Left margin.</param>
+    ///  <param name="LU"><c>TCSSLengthUnit</c> [in] Optional length unit to use
+    ///  for each padding width. Defaults to <c>cluPixels</c>.</param>
+    ///  <returns><c>string</c>. Required CSS property.</returns>
+    ///  <remarks>Note that padding values are rounded to a maximum of 2 decimal
+    ///  places.</remarks>
+    class function PaddingProp(const Top, Right, Bottom, Left: Single;
+      const LU: TCSSLengthUnit = cluPixels): string; overload; static;
 
     ///  <summary>Creates CSS "padding" or "padding-xxx" property (where "xxx"
     ///  is a side).</summary>
-    ///  <param name="Side">TCSSSide [in] Specifies side(s) of element whose
-    ///  padding is to be set.</param>
-    ///  <param name="Padding">Integer [in] Width of padding in pixels.</param>
-    ///  <returns>string. Required CSS property.</returns>
-    class function PaddingProp(const Side: TCSSSide; const Padding: Integer):
-      string; overload; static;
+    ///  <param name="Side"><c>TCSSSide</c> [in] Specifies side(s) of element
+    ///  whose padding is to be set.</param>
+    ///  <param name="Padding"><c>Single</c> [in] Width of padding.</param>
+    ///  <param name="LU"><c>TCSSLengthUnit</c> [in] Optional length unit to use
+    ///  for the padding width. Defaults to <c>cluPixels</c>.</param>
+    ///  <returns><c>string</c>. Required CSS property.</returns>
+    ///  <remarks>Note that the padding value is rounded to a maximum of 2
+    ///  decimal places.</remarks>
+    class function PaddingProp(const Side: TCSSSide; const Padding: Single;
+      const LU: TCSSLengthUnit = cluPixels): string; overload; static;
 
     ///  <summary>Creates a CSS "text-decoration" property.</summary>
     ///  <returns>string. Required CSS property.</returns>
@@ -477,7 +510,7 @@ implementation
 
 uses
   // Delphi
-  SysUtils, Windows,
+  SysUtils, Windows, Math,
   // Project
   UIStringList, UStrUtils;
 
@@ -519,7 +552,7 @@ class function TCSS.BorderProp(const Side: TCSSSide; const WidthPx: Cardinal;
     )
   else
     // Hiding border
-    Result := Format('%s: %s;', [BorderSides[Side], LengthList([Cardinal(0)])]);
+    Result := Format('%s: %s;', [BorderSides[Side], LengthList([0])]);
 end;
 
 class function TCSS.ColorProp(const Color: TColor): string;
@@ -641,11 +674,32 @@ class function TCSS.InlineDisplayProp(const Show: Boolean): string;
   Result := DisplayProp(BlockDisplayStyles[Show]);
 end;
 
-class function TCSS.LengthList(const List: array of Integer;
+class function TCSS.LengthList(const List: array of Single;
   const LU: TCSSLengthUnit): string;
+
+  function FmtLength(const L: Single): string;
+  var
+    NumX100: Int64;
+    WholePart, DecPart: Int64;
+  begin
+    Assert(not (L < 0), 'TCSS.LengthList: Length < 0'); // avoiding using >=
+    NumX100 := Round(Abs(L) * 100);
+    WholePart := NumX100 div 100;
+    DecPart := NumX100 mod 100;
+    Result := IntToStr(WholePart);
+    if DecPart <> 0 then
+    begin
+      Result := Result + '.'; // TODO: check CSS spec re localisation of '.'
+      if DecPart mod 10 = 0 then
+        Result := Result + IntToStr(DecPart div 10)
+      else
+        Result := Result + IntToStr(DecPart);
+    end;
+  end;
+
 var
   Idx: Integer;     // loops thru list of values
-  ALength: Integer; // a length from list
+  ALength: Single;  // a length from list
 begin
   Assert((LU <> cluAuto) or (Length(List) = 1),
     'TCSS.LengthList: List size may only be 1 when length type is cltAuto');
@@ -659,7 +713,7 @@ class function TCSS.LengthList(const List: array of Integer;
       ALength := List[Idx];
       if Result <> '' then
         Result := Result + ' ';
-      Result := Result + IntToStr(ALength);
+      Result := Result + FmtLength(ALength);
       if ALength <> 0 then
         Result := Result + LengthUnit(LU);  // only add unit if length not 0
     end;
@@ -701,32 +755,35 @@ class function TCSS.ListStyleTypeProp(const Value: TCSSListStyleType): string;
   Result := 'list-style-type: ' + Types[Value] + ';';
 end;
 
-class function TCSS.MarginProp(const Margin: array of Integer): string;
+class function TCSS.MarginProp(const Margin: array of Single;
+  const LU: TCSSLengthUnit): string;
 begin
   Assert(Length(Margin) in [1,2,4],
     'TCSS.MarginProp: Invalid margin parameters');
-  Result := 'margin: ' + LengthList(Margin) + ';';
+  Result := 'margin: ' + LengthList(Margin, LU) + ';';
 end;
 
-class function TCSS.MarginProp(const Top, Right, Bottom, Left: Integer): string;
+class function TCSS.MarginProp(const Top, Right, Bottom, Left: Single;
+  const LU: TCSSLengthUnit): string;
 begin
-  Result := MarginProp([Top, Right, Bottom, Left]);
+  Result := MarginProp([Top, Right, Bottom, Left], LU);
 end;
 
-class function TCSS.MarginProp(const Margin: Integer): string;
+class function TCSS.MarginProp(const Margin: Single; const LU: TCSSLengthUnit):
+  string;
 begin
-  Result := MarginProp([Margin]);
+  Result := MarginProp([Margin], LU);
 end;
 
-class function TCSS.MarginProp(const Side: TCSSSide; const Margin: Integer):
-  string;
+class function TCSS.MarginProp(const Side: TCSSSide; const Margin: Single;
+  const LU: TCSSLengthUnit): string;
 const
   // Map of element sides to associated margin properties
   MarginSides: array[TCSSSide] of string = (
     'margin', 'margin-top', 'margin-left', 'margin-bottom', 'margin-right'
   );
 begin
-  Result := Format('%s: %s;', [MarginSides[Side], LengthList([Margin])]);
+  Result := Format('%s: %s;', [MarginSides[Side], LengthList([Margin], LU)]);
 end;
 
 class function TCSS.MaxHeightProp(const HeightPx: Integer): string;
@@ -747,33 +804,35 @@ class function TCSS.OverflowProp(const Value: TCSSOverflowValue;
   Result := Format('%0:s: %1:s;', [Props[Direction], Values[Value]]);
 end;
 
-class function TCSS.PaddingProp(const Padding: array of Integer): string;
+class function TCSS.PaddingProp(const Padding: array of Single;
+  const LU: TCSSLengthUnit): string;
 begin
   Assert(Length(Padding) in [1,2,4],
     'TCSS.PaddingProp: Invalid padding parameters');
-  Result := 'padding: ' + LengthList(Padding) + ';';
+  Result := 'padding: ' + LengthList(Padding, LU) + ';';
 end;
 
-class function TCSS.PaddingProp(const Top, Right, Bottom, Left: Integer):
-  string;
+class function TCSS.PaddingProp(const Top, Right, Bottom, Left: Single;
+  const LU: TCSSLengthUnit): string;
 begin
-  Result := PaddingProp([Top, Right, Bottom, Left]);
+  Result := PaddingProp([Top, Right, Bottom, Left], LU);
 end;
 
-class function TCSS.PaddingProp(const Padding: Integer): string;
+class function TCSS.PaddingProp(const Padding: Single;
+  const LU: TCSSLengthUnit): string;
 begin
-  Result := PaddingProp([Padding]);
+  Result := PaddingProp([Padding], LU);
 end;
 
-class function TCSS.PaddingProp(const Side: TCSSSide;
-  const Padding: Integer): string;
+class function TCSS.PaddingProp(const Side: TCSSSide; const Padding: Single;
+  const LU: TCSSLengthUnit): string;
 const
   // Map of element sides to associated padding properties
   PaddingSides: array[TCSSSide] of string = (
     'padding', 'padding-top', 'padding-left', 'padding-bottom', 'padding-right'
   );
 begin
-  Result := Format('%s: %s;', [PaddingSides[Side], LengthList([Padding])]);
+  Result := Format('%s: %s;', [PaddingSides[Side], LengthList([Padding], LU)]);
 end;
 
 class function TCSS.TextAlignProp(const TA: TCSSTextAlign): string;

From 616a85da22cd06999573d64004587b0a98abdc08 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 21 Apr 2025 20:23:14 +0100
Subject: [PATCH 228/264] Modify active text HTML renderer to support HTML 5

Added support for rendering active text as HTML 5 in addition to XHTML.

Implmented in such a way that existing code that expects the original
behaviour in rendering XHTML does not need to be modified.
---
 Src/ActiveText.UHTMLRenderer.pas | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Src/ActiveText.UHTMLRenderer.pas b/Src/ActiveText.UHTMLRenderer.pas
index e58ad92f2..14ad5a3bb 100644
--- a/Src/ActiveText.UHTMLRenderer.pas
+++ b/Src/ActiveText.UHTMLRenderer.pas
@@ -65,6 +65,7 @@       TCSSStyles = class(TObject)
       fTagInfoMap: TTagInfoMap;
       fIsStartOfTextLine: Boolean;
       fLINestingDepth: Cardinal;
+      fTagGen: THTMLClass;
     const
       IndentMult = 2;
     procedure InitialiseTagInfoMap;
@@ -73,7 +74,7 @@       TCSSStyles = class(TObject)
     function MakeOpeningTag(const Elem: IActiveTextActionElem): string;
     function MakeClosingTag(const Elem: IActiveTextActionElem): string;
   public
-    constructor Create;
+    constructor Create(const ATagGenerator: THTMLClass = nil);
     destructor Destroy; override;
     function Render(ActiveText: IActiveText): string;
   end;
@@ -87,13 +88,18 @@ implementation
 
 { TActiveTextHTML }
 
-constructor TActiveTextHTML.Create;
+constructor TActiveTextHTML.Create(const ATagGenerator: THTMLClass);
 begin
   inherited Create;
   fCSSStyles := TCSSStyles.Create;
   fBuilder := TStringBuilder.Create;
   fLINestingDepth := 0;
   InitialiseTagInfoMap;
+  if not Assigned(ATagGenerator) then
+    // default behaviour before ATagGenerator parameter was added
+    fTagGen := TXHTML
+  else
+    fTagGen := ATagGenerator;
 end;
 
 destructor TActiveTextHTML.Destroy;
@@ -145,7 +151,7 @@ procedure TActiveTextHTML.InitialiseTagInfoMap;
 function TActiveTextHTML.MakeClosingTag(const Elem: IActiveTextActionElem):
   string;
 begin
-  Result := TXHTML.ClosingTag(fTagInfoMap[Elem.Kind].Name);
+  Result := fTagGen.ClosingTag(fTagInfoMap[Elem.Kind].Name);
 end;
 
 function TActiveTextHTML.MakeOpeningTag(const Elem: IActiveTextActionElem):
@@ -160,7 +166,7 @@ function TActiveTextHTML.MakeOpeningTag(const Elem: IActiveTextActionElem):
       Attrs := THTMLAttributes.Create;
     Attrs.Add('class', fCSSStyles.ElemClasses[Elem.Kind])
   end;
-  Result := TXHTML.OpeningTag(fTagInfoMap[Elem.Kind].Name, Attrs);
+  Result := fTagGen.OpeningTag(fTagInfoMap[Elem.Kind].Name, Attrs);
 end;
 
 function TActiveTextHTML.Render(ActiveText: IActiveText): string;
@@ -242,7 +248,7 @@ function TActiveTextHTML.RenderText(const TextElem: IActiveTextTextElem):
   end
   else
     Result := '';
-  Result := Result + TXHTML.Entities(TextElem.Text);
+  Result := Result + fTagGen.Entities(TextElem.Text);
 end;
 
 { TActiveTextHTML.TCSSStyles }

From d49f268e94bcf18adbc9d46938d76a7e0c5fa02d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 21 Apr 2025 20:27:01 +0100
Subject: [PATCH 229/264] Modify HTML builder to expose some protected methods

All the formaer virtual abstract protected instance were made public and
changed to class methods. This is so that the information they provide
is made available to calling code without instantiating a THTMLBuilder
derivative object.
---
 Src/UHTMLBuilder.pas | 46 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/Src/UHTMLBuilder.pas b/Src/UHTMLBuilder.pas
index 1b224c0f3..a3a0418bf 100644
--- a/Src/UHTMLBuilder.pas
+++ b/Src/UHTMLBuilder.pas
@@ -76,19 +76,19 @@   THTMLBuilder = class abstract (TObject)
       BodyTagName = 'body';
       PreTagName = 'pre';
       SpanTagName = 'span';
-  strict protected
+  public
     ///  <summary>Returns the class used to generate tags for the appropriate
     ///  type of HTML.</summary>
-    function TagGenerator: THTMLClass; virtual; abstract;
+    class function TagGenerator: THTMLClass; virtual; abstract;
     ///  <summary>Returns any preamble to be written to the HTML before the
     ///  opening &lt;html&gt; tag.</summary>
-    function Preamble: string; virtual; abstract;
+    class function Preamble: string; virtual; abstract;
     ///  <summary>Returns the attributes of the document's &lt;html&gt; tag.
     ///  </summary>
-    function HTMLTagAttrs: IHTMLAttributes; virtual; abstract;
+    class function HTMLTagAttrs: IHTMLAttributes; virtual; abstract;
     ///  <summary>Returns any &lt;meta&gt; tags to be included within the
     ///  document's &lt;head&gt; tag.</summary>
-    function MetaTags: string; virtual; abstract;
+    class function MetaTags: string; virtual; abstract;
   public
     ///  <summary>Object constructor. Initialises object with empty body.
     ///  </summary>
@@ -146,19 +146,19 @@   TXHTMLBuilder = class sealed(THTMLBuilder)
       // XML document type
       XHTMLDocType = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" '
         + '"https://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-  strict protected
+  public
     ///  <summary>Returns the class used to generate XHTML compliant tags.
     ///  </summary>
-    function TagGenerator: THTMLClass; override;
+    class function TagGenerator: THTMLClass; override;
     ///  <summary>Returns the XML processing instruction followed by the XHTML
     ///  doctype.</summary>
-    function Preamble: string; override;
+    class function Preamble: string; override;
     ///  <summary>Returns the attributes required for an XHTML &lt;html&gt; tag.
     ///  </summary>
-    function HTMLTagAttrs: IHTMLAttributes; override;
+    class function HTMLTagAttrs: IHTMLAttributes; override;
     ///  <summary>Returns a &lt;meta&gt; tag that specifies the text/html
     ///  content type and UTF-8 encodiing.</summary>
-    function MetaTags: string; override;
+    class function MetaTags: string; override;
   end;
 
   ///  <summary>Class used to create the content of a HTML 5 document.</summary>
@@ -167,18 +167,18 @@   THTML5Builder = class sealed(THTMLBuilder)
     const
       // HTML 5 document type
       HTML5DocType = '<!DOCTYPE HTML>';
-  strict protected
+  public
     ///  <summary>Returns the class used to generate HTML 5 compliant tags.
     ///  </summary>
-    function TagGenerator: THTMLClass; override;
+    class function TagGenerator: THTMLClass; override;
     ///  <summary>Returns the HTML 5 doctype.</summary>
-    function Preamble: string; override;
+    class function Preamble: string; override;
     ///  <summary>Returns the attributes required for an HTML 5 &lt;html&gt;
     ///  tag.</summary>
-    function HTMLTagAttrs: IHTMLAttributes; override;
+    class function HTMLTagAttrs: IHTMLAttributes; override;
     ///  <summary>Returns a &lt;meta&gt; tag that specifies that the document
     ///  uses UTF-8 encoding.</summary>
-    function MetaTags: string; override;
+    class function MetaTags: string; override;
   end;
 
 
@@ -312,7 +312,7 @@ function THTMLBuilder.TitleTag: string;
 
 { TXHTMLBuilder }
 
-function TXHTMLBuilder.HTMLTagAttrs: IHTMLAttributes;
+class function TXHTMLBuilder.HTMLTagAttrs: IHTMLAttributes;
 begin
   Result := THTMLAttributes.Create(
     [THTMLAttribute.Create('xmlns', 'https://www.w3.org/1999/xhtml'),
@@ -321,7 +321,7 @@ function TXHTMLBuilder.HTMLTagAttrs: IHTMLAttributes;
   );
 end;
 
-function TXHTMLBuilder.MetaTags: string;
+class function TXHTMLBuilder.MetaTags: string;
 begin
   Result := TagGenerator.SimpleTag(
     MetaTagName,
@@ -332,24 +332,24 @@ function TXHTMLBuilder.MetaTags: string;
   );
 end;
 
-function TXHTMLBuilder.Preamble: string;
+class function TXHTMLBuilder.Preamble: string;
 begin
   Result := XMLProcInstruction + EOL + XHTMLDocType;
 end;
 
-function TXHTMLBuilder.TagGenerator: THTMLClass;
+class function TXHTMLBuilder.TagGenerator: THTMLClass;
 begin
   Result := TXHTML;
 end;
 
 { THTML5Builder }
 
-function THTML5Builder.HTMLTagAttrs: IHTMLAttributes;
+class function THTML5Builder.HTMLTagAttrs: IHTMLAttributes;
 begin
   Result := THTMLAttributes.Create('lang', 'en');
 end;
 
-function THTML5Builder.MetaTags: string;
+class function THTML5Builder.MetaTags: string;
 begin
   // <meta charset="UTF-8">
   Result := TagGenerator.SimpleTag(
@@ -358,12 +358,12 @@ function THTML5Builder.MetaTags: string;
   );
 end;
 
-function THTML5Builder.Preamble: string;
+class function THTML5Builder.Preamble: string;
 begin
   Result := HTML5DocType;
 end;
 
-function THTML5Builder.TagGenerator: THTMLClass;
+class function THTML5Builder.TagGenerator: THTMLClass;
 begin
   Result := THTML5;
 end;

From 4f9214ff82863b4d2da600bf6298192681f85d6f Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 21 Apr 2025 20:20:57 +0100
Subject: [PATCH 230/264] Add support for outputting snippet info as HTML

Added new UHTMLSnippetDoc unit to project that contains classes to
render snippet information in either HTML 5 or XHTML.
---
 Src/CodeSnip.dpr        |   3 +-
 Src/CodeSnip.dproj      |   1 +
 Src/UHTMLSnippetDoc.pas | 528 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 531 insertions(+), 1 deletion(-)
 create mode 100644 Src/UHTMLSnippetDoc.pas

diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index 719053105..522a95b04 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -376,7 +376,8 @@ uses
   ClassHelpers.UGraphics in 'ClassHelpers.UGraphics.pas',
   ClassHelpers.UActions in 'ClassHelpers.UActions.pas',
   USaveInfoMgr in 'USaveInfoMgr.pas',
-  ClassHelpers.RichEdit in 'ClassHelpers.RichEdit.pas';
+  ClassHelpers.RichEdit in 'ClassHelpers.RichEdit.pas',
+  UHTMLSnippetDoc in 'UHTMLSnippetDoc.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index e430334ce..19c55d1ec 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -583,6 +583,7 @@
 			<DCCReference Include="ClassHelpers.UActions.pas"/>
 			<DCCReference Include="USaveInfoMgr.pas"/>
 			<DCCReference Include="ClassHelpers.RichEdit.pas"/>
+			<DCCReference Include="UHTMLSnippetDoc.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
diff --git a/Src/UHTMLSnippetDoc.pas b/Src/UHTMLSnippetDoc.pas
new file mode 100644
index 000000000..27ca5d861
--- /dev/null
+++ b/Src/UHTMLSnippetDoc.pas
@@ -0,0 +1,528 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2025, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Implements a class that renders a HTML document that describes a snippet.
+}
+
+
+unit UHTMLSnippetDoc;
+
+interface
+
+uses
+  // Delphi
+  SysUtils,
+  Graphics,
+  // Project
+  ActiveText.UHTMLRenderer,
+  ActiveText.UMain,
+  Hiliter.UGlobals,
+  UColours,
+  UEncodings,
+  UHTMLBuilder,
+  UHTMLUtils,
+  UIStringList,
+  USnippetDoc;
+
+type
+  THTMLSnippetDocClass = class of THTMLSnippetDoc;
+
+  ///  <summary>Abstract base class for classes that render a document that
+  ///  describes a snippet using HTML.</summary>
+  THTMLSnippetDoc = class abstract (TSnippetDoc)
+  strict private
+    var
+      ///  <summary>Attributes that determine the formatting of highlighted
+      ///  source code.</summary>
+      fHiliteAttrs: IHiliteAttrs;
+      ///  <summary>Flag indicates whether to output in colour.</summary>
+      fUseColour: Boolean;
+      ///  <summary>Object used to build HTML source code document.</summary>
+      fDocument: TStringBuilder;
+      ///  <summary>Type of class used to generate the HTML of the snippet's
+      ///  source code and to provide addition HTML information.</summary>
+      fBuilderClass: THTMLBuilderClass;
+      ///  <summary>Static class used to generate HTML tags.</summary>
+      fTagGen: THTMLClass;
+    const
+      ///  <summary>Colour of plain text in the HTML document.</summary>
+      TextColour = clBlack;
+      ///  <summary>Colour of HTML links in the document.</summary>
+      LinkColour = clExternalLink;
+      ///  <summary>Colour of warning text in the HTML document.</summary>
+      WarningColour = clWarningText;
+      ///  <summary>Colour used for &lt;var&gt; tags in the HTML document.
+      ///  </summary>
+      VarColour = clVarText;
+
+      // Names of various HTML tags used in the document
+      HTMLTag = 'html';
+      HeadTag = 'head';
+      TitleTag = 'title';
+      BodyTag = 'body';
+      H1Tag = 'h1';
+      H2Tag = 'h2';
+      DivTag = 'div';
+      ParaTag = 'p';
+      StrongTag = 'strong';
+      EmphasisTag = 'em';
+      CodeTag = 'code';
+      LinkTag = 'a';
+      StyleTag = 'style';
+      TableTag = 'table';
+      TableBodyTag = 'tbody';
+      TableRowTag = 'tr';
+      TableColTag = 'td';
+
+      // Names of HTML attributes used in the document
+      ClassAttr = 'class';
+
+      // Names of HTML classes used in the document
+      DBInfoClass = 'db-info';
+      MainDBClass = 'main-db';
+      UserDBClass = 'user-db';
+      IndentClass = 'indent';
+      WarningClass = 'warning';
+
+      ///  <summary>Name of document body font.</summary>
+      BodyFontName = 'Tahoma';
+      ///  <summary>Size of paragraph font, in points.</summary>
+      BodyFontSize = 10;  // points
+      ///  <summary>Size of H1 heading font, in points.</summary>
+      H1FontSize = 14;    // points
+      ///  <summary>Size of H2 heading font, in points.</summary>
+      H2FontSize = 12;    // points
+      ///  <summary>Size of font used for database information, in points.
+      ///  </summary>
+      DBInfoFontSize = 9; // points
+
+  strict private
+    ///  <summary>Creates and returns the inline CSS used in the HTML document.
+    ///  </summary>
+    function BuildCSS: string;
+    ///  <summary>Renders the given active text as HTML.</summary>
+    function ActiveTextToHTML(ActiveText: IActiveText): string;
+  strict protected
+    ///  <summary>Returns a reference to the builder class used to create the
+    ///  required flavour of HTML.</summary>
+    function BuilderClass: THTMLBuilderClass; virtual; abstract;
+    ///  <summary>Initialises the HTML document.</summary>
+    procedure InitialiseDoc; override;
+    ///  <summary>Adds the given heading (i.e. snippet name) to the document.
+    ///  Can be user defined or from main database.</summary>
+    ///  <remarks>The heading is coloured according to whether user defined or
+    ///  not iff coloured output is required.</remarks>
+    procedure RenderHeading(const Heading: string; const UserDefined: Boolean);
+      override;
+    ///  <summary>Adds the given snippet description to the document.</summary>
+    ///  <remarks>Active text formatting is observed and styled to suit the
+    ///  document.</remarks>
+    procedure RenderDescription(const Desc: IActiveText); override;
+    ///  <summary>Highlights the given source code and adds it to the document.
+    ///  </summary>
+    procedure RenderSourceCode(const SourceCode: string); override;
+    ///  <summary>Adds the given title, followed by the given text, to the
+    ///  document.</summary>
+    procedure RenderTitledText(const Title, Text: string); override;
+    ///  <summary>Adds a comma-separated list of text, preceded by the given
+    ///  title, to the document.</summary>
+    procedure RenderTitledList(const Title: string; List: IStringList);
+      override;
+    ///  <summary>Outputs the given compiler test info, preceded by the given
+    ///  heading.</summary>
+    procedure RenderCompilerInfo(const Heading: string;
+      const Info: TCompileDocInfoArray); override;
+    ///  <summary>Outputs the given message stating that there is no compiler
+    ///  test info, preceded by the given heading.</summary>
+    procedure RenderNoCompilerInfo(const Heading, NoCompileTests: string);
+      override;
+    ///  <summary>Adds the given extra information about the snippet to the
+    ///  document.</summary>
+    ///  <remarks>Active text formatting is observed and styled to suit the
+    ///  document.</remarks>
+    procedure RenderExtra(const ExtraText: IActiveText); override;
+    ///  <summary>Adds the given information about a code snippets database to
+    ///  the document.</summary>
+    procedure RenderDBInfo(const Text: string); override;
+    ///  <summary>Finalises the document and returns its content as encoded
+    ///  data.</summary>
+    function FinaliseDoc: TEncodedData; override;
+  public
+    ///  <summary>Constructs an object to render snippet information.</summary>
+    ///  <param name="HiliteAttrs"><c>IHiliteAttrs</c> [in] Defines the style of
+    ///  syntax highlighting to be used for the source code.</param>
+    ///  <param name="UseColour"><c>Boolean</c> [in] Set <c>True</c> to render
+    ///  the document in colour or <c>False</c> for black and white.</param>
+    constructor Create(const HiliteAttrs: IHiliteAttrs;
+      const UseColour: Boolean = True);
+    ///  <summary>Destroys the object.</summary>
+    destructor Destroy; override;
+  end;
+
+  ///  <summary>Class that renders a document that describes a snippet using
+  ///  XHTML.</summary>
+  TXHTMLSnippetDoc = class sealed (THTMLSnippetDoc)
+  strict protected
+    ///  <summary>Returns a reference to the builder class used to create valid
+    ///  XHTML.</summary>
+    function BuilderClass: THTMLBuilderClass; override;
+  end;
+
+  ///  <summary>Class that renders a document that describes a snippet using
+  ///  HTML 5.</summary>
+  THTML5SnippetDoc = class sealed (THTMLSnippetDoc)
+  strict protected
+    ///  <summary>Returns a reference to the builder class used to create valid
+    ///  HTML 5.</summary>
+    function BuilderClass: THTMLBuilderClass; override;
+  end;
+
+implementation
+
+uses
+  // Project
+  Hiliter.UCSS,
+  Hiliter.UHiliters,
+  UCSSBuilder,
+  UCSSUtils,
+  UFontHelper,
+  UPreferences;
+
+{ THTMLSnippetDoc }
+
+function THTMLSnippetDoc.ActiveTextToHTML(ActiveText: IActiveText): string;
+var
+  HTMLWriter: TActiveTextHTML;  // Object that generates HTML from active text
+begin
+  HTMLWriter := TActiveTextHTML.Create(fTagGen);
+  try
+    Result := HTMLWriter.Render(ActiveText);
+  finally
+    HTMLWriter.Free;
+  end;
+end;
+
+function THTMLSnippetDoc.BuildCSS: string;
+var
+  CSS: TCSSBuilder;
+  HiliterCSS: THiliterCSS;
+  BodyFont: TFont;                // default content font sized per preferences
+  MonoFont: TFont;                // default mono font sized per preferences
+begin
+  BodyFont := nil;
+  MonoFont := nil;
+  CSS := TCSSBuilder.Create;
+  try
+    MonoFont := TFont.Create;
+    TFontHelper.SetDefaultMonoFont(MonoFont);
+    BodyFont := TFont.Create;
+    BodyFont.Name := BodyFontName;
+    BodyFont.Size := BodyFontSize;
+    MonoFont.Size := BodyFontSize;
+
+    // <body> tag style
+    CSS.AddSelector(BodyTag)
+      .AddProperty(TCSS.FontProps(BodyFont))
+      .AddProperty(TCSS.ColorProp(TextColour));
+    // <h1> tag style
+    CSS.AddSelector(H1Tag)
+      .AddProperty(TCSS.FontSizeProp(H1FontSize))
+      .AddProperty(TCSS.FontWeightProp(cfwBold))
+      .AddProperty(TCSS.MarginProp(0.75, 0, 0.75, 0, cluEm));
+    // <h2> tag
+    CSS.AddSelector(H2Tag)
+      .AddProperty(TCSS.FontSizeProp(H2FontSize));
+    // <p> tag style
+    CSS.AddSelector(ParaTag)
+      .AddProperty(TCSS.MarginProp(0.5, 0, 0.5, 0, cluEm));
+    // <table> tag style
+    // note: wanted to use :last-child to style right column, but not supported
+    // by TWebBrowser that is used for the preview
+    CSS.AddSelector(TableTag)
+      .AddProperty(TCSS.MarginProp(0.5, 0, 0.5, 0, cluEm));
+    CSS.AddSelector(TableColTag)
+      .AddProperty(TCSS.PaddingProp(cssRight, 0.5, cluEm))
+      .AddProperty(TCSS.PaddingProp(cssLeft, 0));
+    // <code> tag style
+    CSS.AddSelector(CodeTag)
+      .AddProperty(TCSS.FontProps(MonoFont));
+    // <a> tag style
+    CSS.AddSelector(LinkTag)
+      .AddProperty(TCSS.ColorProp(LinkColour))
+      .AddProperty(TCSS.TextDecorationProp([ctdUnderline]));
+    // <var> tag style
+    CSS.AddSelector('var')
+      .AddProperty(TCSS.ColorProp(VarColour))
+      .AddProperty(TCSS.FontStyleProp(cfsItalic));
+
+    // Set active text list classes
+
+    // list styling
+    CSS.AddSelector('ul, ol')
+      .AddProperty(TCSS.MarginProp(0.5, 0, 0.5, 0, cluEm))
+      .AddProperty(TCSS.PaddingProp(cssAll, 0))
+      .AddProperty(TCSS.PaddingProp(cssLeft, 1.5, cluEm))
+      .AddProperty(TCSS.ListStylePositionProp(clspOutside))
+      .AddProperty(TCSS.ListStyleTypeProp(clstDisc));
+    CSS.AddSelector('ul')
+      .AddProperty(TCSS.ListStyleTypeProp(clstDisc));
+    CSS.AddSelector('ol')
+      .AddProperty(TCSS.ListStyleTypeProp(clstDecimal));
+    CSS.AddSelector('li')
+      .AddProperty(TCSS.PaddingProp(cssAll, 0))
+      .AddProperty(TCSS.MarginProp(0.25, 0, 0.25, 0, cluEm));
+    CSS.AddSelector('li ol, li ul')
+      .AddProperty(TCSS.MarginProp(0.25, 0, 0.25, 0, cluEm));
+    CSS.AddSelector('li li')
+      .AddProperty(TCSS.PaddingProp(cssLeft, 0))
+      .AddProperty(TCSS.MarginProp(0));
+
+    // class used to denote snippet is user defined
+    CSS.AddSelector('.' + UserDBClass)
+      .AddProperty(TCSS.ColorProp(Preferences.DBHeadingColours[True]));
+    // class used for smaller text describing database
+    CSS.AddSelector('.' + DBInfoClass)
+      .AddProperty(TCSS.FontSizeProp(DBInfoFontSize))
+      .AddProperty(TCSS.FontStyleProp(cfsItalic));
+    // class used to indent tag content
+    CSS.AddSelector('.' + IndentClass)
+      .AddProperty(TCSS.MarginProp(cssLeft, 1.5, cluEm));
+
+    // default active text classes
+    CSS.AddSelector('.' + WarningClass)
+      .AddProperty(TCSS.ColorProp(WarningColour))
+      .AddProperty(TCSS.FontWeightProp(cfwBold));
+
+    // CSS used by highlighters
+    fHiliteAttrs.FontSize := BodyFontSize;
+    HiliterCSS := THiliterCSS.Create(fHiliteAttrs);
+    try
+      HiliterCSS.BuildCSS(CSS);
+    finally
+      HiliterCSS.Free;
+    end;
+
+    Result := CSS.AsString;
+  finally
+    BodyFont.Free;
+    MonoFont.Free;
+    CSS.Free;
+  end;
+end;
+
+constructor THTMLSnippetDoc.Create(const HiliteAttrs: IHiliteAttrs;
+  const UseColour: Boolean);
+begin
+  inherited Create;
+  fDocument := TStringBuilder.Create;
+  fBuilderClass := BuilderClass;
+  fTagGen := BuilderClass.TagGenerator;
+  fHiliteAttrs := HiliteAttrs;
+  fUseColour := UseColour;
+end;
+
+destructor THTMLSnippetDoc.Destroy;
+begin
+  fDocument.Free;
+  inherited;
+end;
+
+function THTMLSnippetDoc.FinaliseDoc: TEncodedData;
+begin
+  // </body>
+  fDocument.AppendLine(fTagGen.ClosingTag(BodyTag));
+  // </html>
+  fDocument.AppendLine(fTagGen.ClosingTag(HTMLTag));
+
+  Result := TEncodedData.Create(fDocument.ToString, etUTF8);
+end;
+
+procedure THTMLSnippetDoc.InitialiseDoc;
+resourcestring
+  sTitle = 'Snippet Information';
+begin
+  // doc type etc
+  fDocument.AppendLine(BuilderClass.Preamble);
+  // <html>
+  fDocument.AppendLine(fTagGen.OpeningTag(HTMLTag, BuilderClass.HTMLTagAttrs));
+  // <head>
+  fDocument.AppendLine(fTagGen.OpeningTag(HeadTag));
+  // <meta /> ..
+  fDocument.AppendLine(BuilderClass.MetaTags);
+  // <title />
+  fDocument.AppendLine(fTagGen.CompoundTag(TitleTag, fTagGen.Entities(sTitle)));
+  // <style>
+  fDocument.AppendLine(
+    fTagGen.OpeningTag(StyleTag, THTMLAttributes.Create('type', 'text/css'))
+  );
+  fDocument.Append(BuildCSS);
+  // </style>
+  fDocument.AppendLine(fTagGen.ClosingTag(StyleTag));
+  // </head>
+  fDocument.AppendLine(fTagGen.ClosingTag(HeadTag));
+  // <body>
+  fDocument.AppendLine(fTagGen.OpeningTag(BodyTag));
+end;
+
+procedure THTMLSnippetDoc.RenderCompilerInfo(const Heading: string;
+  const Info: TCompileDocInfoArray);
+var
+  CompilerInfo: TCompileDocInfo;  // info about each compiler
+begin
+  fDocument.AppendLine(
+    fTagGen.CompoundTag(
+      ParaTag, fTagGen.CompoundTag(StrongTag, fTagGen.Entities(Heading))
+    )
+  );
+  fDocument
+    .AppendLine(
+      fTagGen.OpeningTag(
+        TableTag, THTMLAttributes.Create(ClassAttr, IndentClass)
+      )
+    )
+    .AppendLine(fTagGen.OpeningTag(TableBodyTag));
+
+  for CompilerInfo in Info do
+  begin
+    fDocument
+      .AppendLine(fTagGen.OpeningTag(TableRowTag))
+      .AppendLine(
+        fTagGen.CompoundTag(
+          TableColTag, fTagGen.Entities(CompilerInfo.Compiler)
+        )
+      )
+      .AppendLine(
+        fTagGen.CompoundTag(
+          TableColTag,
+          fTagGen.CompoundTag(
+            EmphasisTag, fTagGen.Entities(CompilerInfo.Result)
+          )
+        )
+      )
+      .AppendLine(fTagGen.ClosingTag(TableRowTag));
+  end;
+
+  fDocument
+    .AppendLine(fTagGen.ClosingTag(TableBodyTag))
+    .AppendLine(fTagGen.ClosingTag(TableTag));
+end;
+
+procedure THTMLSnippetDoc.RenderDBInfo(const Text: string);
+begin
+  fDocument.AppendLine(
+    fTagGen.CompoundTag(
+      ParaTag,
+      THTMLAttributes.Create(ClassAttr, DBInfoClass),
+      fTagGen.Entities(Text)
+    )
+  );
+end;
+
+procedure THTMLSnippetDoc.RenderDescription(const Desc: IActiveText);
+begin
+  fDocument.AppendLine(ActiveTextToHTML(Desc));
+end;
+
+procedure THTMLSnippetDoc.RenderExtra(const ExtraText: IActiveText);
+begin
+  fDocument.AppendLine(ActiveTextToHTML(ExtraText));
+end;
+
+procedure THTMLSnippetDoc.RenderHeading(const Heading: string;
+  const UserDefined: Boolean);
+var
+  Attrs: IHTMLAttributes;
+const
+  DBClasses: array[Boolean] of string = (MainDBClass, UserDBClass);
+begin
+  Attrs := THTMLAttributes.Create(ClassAttr, DBClasses[UserDefined]);
+  fDocument.AppendLine(
+    fTagGen.CompoundTag(H1Tag, Attrs, fTagGen.Entities(Heading))
+  );
+end;
+
+procedure THTMLSnippetDoc.RenderNoCompilerInfo(const Heading,
+  NoCompileTests: string);
+begin
+  fDocument.AppendLine(
+    fTagGen.CompoundTag(
+      ParaTag, fTagGen.CompoundTag(StrongTag, fTagGen.Entities(Heading))
+    )
+  );
+  fDocument.AppendLine(
+    fTagGen.CompoundTag(
+      ParaTag,
+      THTMLAttributes.Create(ClassAttr, IndentClass),
+      fTagGen.Entities(NoCompileTests)
+    )
+  );
+end;
+
+procedure THTMLSnippetDoc.RenderSourceCode(const SourceCode: string);
+var
+  Renderer: IHiliteRenderer;  // renders highlighted source as RTF
+  HTMLBuilder: THTMLBuilder;  // constructs the HTML of the highlighted source
+resourcestring
+  sHeading = 'Source Code:';
+begin
+  fDocument.AppendLine(
+    fTagGen.CompoundTag(
+      ParaTag,
+      fTagGen.CompoundTag(StrongTag, fTagGen.Entities(sHeading))
+    )
+  );
+  fDocument.AppendLine(
+    fTagGen.OpeningTag(DivTag, THTMLAttributes.Create(ClassAttr, IndentClass))
+  );
+  HTMLBuilder := THTML5Builder.Create;
+  try
+    Renderer := THTMLHiliteRenderer.Create(HTMLBuilder, fHiliteAttrs);
+    TSyntaxHiliter.Hilite(SourceCode, Renderer);
+    fDocument.AppendLine(HTMLBuilder.HTMLFragment);
+  finally
+    HTMLBuilder.Free;
+  end;
+  fDocument.AppendLine(fTagGen.ClosingTag(DivTag));
+end;
+
+procedure THTMLSnippetDoc.RenderTitledList(const Title: string;
+  List: IStringList);
+begin
+  RenderTitledText(Title, CommaList(List));
+end;
+
+procedure THTMLSnippetDoc.RenderTitledText(const Title, Text: string);
+begin
+  fDocument.AppendLine(
+    fTagGen.CompoundTag(
+      ParaTag, fTagGen.CompoundTag(StrongTag, fTagGen.Entities(Title))
+    )
+  );
+  fDocument.AppendLine(
+    fTagGen.CompoundTag(
+      ParaTag,
+      THTMLAttributes.Create(ClassAttr, IndentClass),
+      fTagGen.Entities(Text)
+    )
+  );
+end;
+
+{ TXHTMLSnippetDoc }
+
+function TXHTMLSnippetDoc.BuilderClass: THTMLBuilderClass;
+begin
+  Result := TXHTMLBuilder;
+end;
+
+{ THTML5SnippetDoc }
+
+function THTML5SnippetDoc.BuilderClass: THTMLBuilderClass;
+begin
+  Result := THTML5Builder;
+end;
+
+end.

From b4efc1bf0a882679ef49ab845e05dbad29331efc Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 21 Apr 2025 20:29:43 +0100
Subject: [PATCH 231/264] Added support for HTML 5 & XHTML snippet information

TSaveInfoMgr was adapted to offer HTML 5 and XML output of snippet
information in UTF-8 format.
---
 Src/USaveInfoMgr.pas | 60 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index 853c6e24f..8f5e1f7c0 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -18,6 +18,7 @@ interface
   // Project
   UBaseObjects,
   UEncodings,
+  UHTMLSnippetDoc,
   USaveSourceDlg,
   USourceFileInfo,
   UView;
@@ -39,6 +40,17 @@   TSaveInfoMgr = class(TNoPublicConstructObject)
     class function GenerateRichText(View: IView; const AUseHiliting: Boolean):
       TEncodedData; static;
 
+    ///  <summary>Returns encoded data containing a HTML representation of the
+    ///  required snippet information.</summary>
+    ///  <param name="AUseHiliting"><c>Boolean</c> [in] Determines whether
+    ///  source code is syntax highlighted or not.</param>
+    ///  <param name="GeneratorClass"><c>THTMLSnippetDocClass</c> [in] Class of
+    ///  object used to generate the required flavour of HTML.</param>
+    ///  <returns><c>TEncodedData</c>. Required HTML document, encoded as UTF-8.
+    ///  </returns>
+    function GenerateHTML(const AUseHiliting: Boolean;
+      const GeneratorClass: THTMLSnippetDocClass): TEncodedData;
+
     ///  <summary>Returns encoded data containing a plain text representation of
     ///  information about the snippet represented by the given view.</summary>
     function GeneratePlainText: TEncodedData;
@@ -191,6 +203,24 @@ class procedure TSaveInfoMgr.Execute(View: IView);
   end;
 end;
 
+function TSaveInfoMgr.GenerateHTML(const AUseHiliting: Boolean;
+  const GeneratorClass: THTMLSnippetDocClass): TEncodedData;
+var
+  Doc: THTMLSnippetDoc;      // object that generates RTF document
+  HiliteAttrs: IHiliteAttrs;  // syntax highlighter formatting attributes
+begin
+  if (fView as ISnippetView).Snippet.HiliteSource and AUseHiliting then
+    HiliteAttrs := THiliteAttrsFactory.CreateUserAttrs
+  else
+    HiliteAttrs := THiliteAttrsFactory.CreateNulAttrs;
+  Doc := GeneratorClass.Create(HiliteAttrs);
+  try
+    Result := Doc.Generate((fView as ISnippetView).Snippet);
+  finally
+    Doc.Free;
+  end;
+end;
+
 function TSaveInfoMgr.GenerateOutput(const FileType: TSourceFileType):
   TEncodedData;
 var
@@ -201,6 +231,8 @@ function TSaveInfoMgr.GenerateOutput(const FileType: TSourceFileType):
   case FileType of
     sfRTF: Result := GenerateRichText(fView, UseHiliting);
     sfText: Result := GeneratePlainText;
+    sfHTML5: Result := GenerateHTML(UseHiliting, THTML5SnippetDoc);
+    sfXHTML: Result := GenerateHTML(UseHiliting, TXHTMLSnippetDoc);
   end;
 end;
 
@@ -264,6 +296,8 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
   // descriptions of supported file filter strings
   sRTFDesc = 'Rich text file';
   sTextDesc = 'Plain text file';
+  sHTML5Desc = 'HTML 5 file';
+  sXHTMLDesc = 'XHTML file';
 begin
   inherited InternalCreate;
   fView := AView;
@@ -286,6 +320,21 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
       TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding)
     ]
   );
+  fSourceFileInfo.FileTypeInfo[sfHTML5] := TSourceFileTypeInfo.Create(
+    '.html',
+    sHTML5Desc,
+    [
+      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
+    ]
+  );
+  fSourceFileInfo.DefaultFileName := sDefFileName;
+  fSourceFileInfo.FileTypeInfo[sfXHTML] := TSourceFileTypeInfo.Create(
+    '.html',
+    sXHTMLDesc,
+    [
+      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
+    ]
+  );
   fSourceFileInfo.DefaultFileName := sDefFileName;
 
   fSaveDlg := TSaveSourceDlg.Create(nil);
@@ -314,21 +363,28 @@ procedure TSaveInfoMgr.PreviewHandler(Sender: TObject);
   case SelectedFileType of
     sfRTF:
     begin
+      // RTF is previewed as is
       PreviewDocType := dtRTF;
       PreviewFileType := sfRTF;
     end;
     sfText:
     begin
+      // Plain text us previewed as is
       PreviewDocType := dtPlainText;
       PreviewFileType := sfText;
     end;
+    sfHTML5, sfXHTML:
+    begin
+      // Both HTML 5 and XHTML are previewed as XHTML
+      PreviewDocType := dtHTML;
+      PreviewFileType := sfXHTML;
+    end;
     else
       raise Exception.Create(
         ClassName + '.PreviewHandler: unsupported file type'
       );
   end;
-  // Display preview dialog box. We use save dialog as owner to ensure preview
-  // dialog box is aligned over save dialog box
+  // Display preview dialogue box aligned over the save dialogue
   TPreviewDlg.Execute(
     fSaveDlg,
     GenerateOutput(PreviewFileType),

From e394eb3ef7c2879eef1be9bdf859ba86125aca85 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 22 Apr 2025 20:40:55 +0100
Subject: [PATCH 232/264] Add new StrMaxSequenceLength routine & unit test

Added the new function to the UStrUtils unit.

Added unit test for the function to Tests/Src/DUnit/TestUStrUtils unit.
---
 Src/UStrUtils.pas                 | 32 +++++++++++++++++++++++++++++++
 Tests/Src/DUnit/TestUStrUtils.pas | 18 +++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/Src/UStrUtils.pas b/Src/UStrUtils.pas
index 4e0e29584..5e613eebc 100644
--- a/Src/UStrUtils.pas
+++ b/Src/UStrUtils.pas
@@ -289,6 +289,15 @@ function StrOfChar(const Ch: Char; const Count: Word): string;
 ///  <remarks>If Count is zero then an empty string is returned.</remarks>
 function StrOfSpaces(const Count: Word): string;
 
+///  <summary>Returns the length of the longest repeating sequence of a given
+///  character in a given string.</summary>
+///  <param name="Ch"><c>Char</c> [in] Character to search for.</param>
+///  <param name="S"><c>string</c> [in] String to search within.</param>
+///  <returns><c>Cardinal</c>. Length of the longest sequence of <c>Ch</c> in
+///  <c>S</c>, or <c>0</c> if <c>Ch</c> is not in <c>S</c>.</returns>
+function StrMaxSequenceLength(const Ch: Char; const S: UnicodeString): Cardinal;
+
+
 implementation
 
 
@@ -944,5 +953,28 @@ function StrOfSpaces(const Count: Word): string;
   Result := StrOfChar(' ', Count);
 end;
 
+function StrMaxSequenceLength(const Ch: Char; const S: UnicodeString): Cardinal;
+var
+  StartPos: Integer;
+  Count: Cardinal;
+  Idx: Integer;
+begin
+  Result := 0;
+  StartPos := StrPos(Ch, S);
+  while StartPos > 0 do
+  begin
+    Count := 1;
+    Idx := StartPos + 1;
+    while (Idx <= Length(S)) and (S[Idx] = Ch) do
+    begin
+      Inc(Idx);
+      Inc(Count);
+    end;
+    if Count > Result then
+      Result := Count;
+    StartPos := StrPos(Ch, S, Idx);
+  end;
+end;
+
 end.
 
diff --git a/Tests/Src/DUnit/TestUStrUtils.pas b/Tests/Src/DUnit/TestUStrUtils.pas
index b540f3171..caeed5503 100644
--- a/Tests/Src/DUnit/TestUStrUtils.pas
+++ b/Tests/Src/DUnit/TestUStrUtils.pas
@@ -70,6 +70,8 @@   TTestStrUtilsRoutines = class(TTestCase)
     procedure TestStrMakeSentence;
     procedure TestStrIf;
     procedure TestStrBackslashEscape;
+    procedure TestStrMaxSequenceLength;
+
   end;
 
 
@@ -672,6 +674,22 @@ procedure TTestStrUtilsRoutines.TestStrMatchText;
   );
 end;
 
+procedure TTestStrUtilsRoutines.TestStrMaxSequenceLength;
+begin
+  CheckEquals(0, StrMaxSequenceLength('~', ''), 'Test 1');
+  CheckEquals(0, StrMaxSequenceLength('~', 'freda'), 'Test 2');
+  CheckEquals(1, StrMaxSequenceLength('~', 'fre~da'), 'Test 3');
+  CheckEquals(1, StrMaxSequenceLength('|', '|fre~da'), 'Test 4');
+  CheckEquals(1, StrMaxSequenceLength('|', 'fre~da|'), 'Test 5');
+  CheckEquals(3, StrMaxSequenceLength('|', '|fre||da|||'), 'Test 6');
+  CheckEquals(3, StrMaxSequenceLength('|', '|||fre||da|||'), 'Test 7');
+  CheckEquals(4, StrMaxSequenceLength('|', '|||fre||||da|||'), 'Test 8');
+  CheckEquals(4, StrMaxSequenceLength('|', '|||f||re||||da|||'), 'Test 9');
+  CheckEquals(10, StrMaxSequenceLength('|', '||||||||||'), 'Test 10');
+  CheckEquals(1, StrMaxSequenceLength('|', '|'), 'Test 11');
+  CheckEquals(0, StrMaxSequenceLength('~', 'x'), 'Test 12');
+end;
+
 procedure TTestStrUtilsRoutines.TestStrPos_overload1;
 begin
   CheckEquals(0, StrPos('Fo', 'Bar'), 'Test 1');

From 7410c9caddd3917ec25dd77298ac434348b710e4 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 27 Apr 2025 20:19:18 +0100
Subject: [PATCH 233/264] Add TMarkdown class to format Markdown code

Added new UMarkdownUtils unit to the project that contains the new
TMarkdown static class that creates correctly formatted and escaped
Markdown code.
---
 Src/CodeSnip.dpr       |   3 +-
 Src/CodeSnip.dproj     |   1 +
 Src/UMarkdownUtils.pas | 478 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 481 insertions(+), 1 deletion(-)
 create mode 100644 Src/UMarkdownUtils.pas

diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index 522a95b04..e8f354285 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -377,7 +377,8 @@ uses
   ClassHelpers.UActions in 'ClassHelpers.UActions.pas',
   USaveInfoMgr in 'USaveInfoMgr.pas',
   ClassHelpers.RichEdit in 'ClassHelpers.RichEdit.pas',
-  UHTMLSnippetDoc in 'UHTMLSnippetDoc.pas';
+  UHTMLSnippetDoc in 'UHTMLSnippetDoc.pas',
+  UMarkdownUtils in 'UMarkdownUtils.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index 19c55d1ec..b8d02d11e 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -584,6 +584,7 @@
 			<DCCReference Include="USaveInfoMgr.pas"/>
 			<DCCReference Include="ClassHelpers.RichEdit.pas"/>
 			<DCCReference Include="UHTMLSnippetDoc.pas"/>
+			<DCCReference Include="UMarkdownUtils.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
diff --git a/Src/UMarkdownUtils.pas b/Src/UMarkdownUtils.pas
new file mode 100644
index 000000000..bbc49188b
--- /dev/null
+++ b/Src/UMarkdownUtils.pas
@@ -0,0 +1,478 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2025, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Helper class used to generate Markdown formatted text.
+}
+
+unit UMarkdownUtils;
+
+interface
+
+uses
+  // Project
+  UConsts;
+
+type
+  TMarkdown = class
+  strict private
+    const
+      ///  <summary>Character used in multiples of 1 to 6 to introduce a
+      ///  heading.</summary>
+      HeadingOpenerChar = Char('#');
+      ///  <summary>Character used to introduce a block quote. Sometimes used in
+      ///  multiple for nested block quotes.</summary>
+      BlockquoteOpenerChar = Char('>');
+      ///  <summary>Character used to delimit inline code, sometimes in
+      ///  multiple, or in multiples of at least three for code fences.
+      ///  </summary>
+      CodeDelim = Char('`');
+      ///  <summary>Characters used to delimit strongly emphasised text (bold).
+      ///  </summary>
+      StrongEmphasisDelim = '**';
+      ///  <summary>Character used to delimit weakly emphasised text (italic).
+      ///  </summary>
+      WeakEmphasisDelim = Char('*');
+      ///  <summary>Format string used to render a link (description first, URL
+      ///  second).</summary>
+      LinkFmtStr = '[%0:s](%1:s)';
+      ///  <summary>Character used to introduce a bare URL.</summary>
+      URLOpenerChar = Char('<');
+      ///  <summary>Character used to close a bare URL.</summary>
+      URLCloserChar = Char('>');
+      ///  <summary>Character used to delimit table columns.</summary>
+      TableColDelim = Char('|');
+      ///  <summary>Character used in multiple for the ruling that separates a
+      ///  table head from the body.</summary>
+      TableRulingChar = Char('-');
+      ///  <summary>Character used to introduce a bullet list item.</summary>
+      ListItemBullet = Char('-');
+      ///  <summary>String used to format a number that introduces a number list
+      ///  item.</summary>
+      ListItemNumberFmt = '%d.';
+      ///  <summary>String used to indicate a ruling.</summary>
+      Ruling = '----';
+      ///  <summary>Characters that are escaped by prepending a \ to the same
+      ///  character.</summary>
+      EscapeChars = '\`*_{}[]<>()#+-!|';
+      ///  <summary>Escape sequence used to specify a non-breaking space.
+      ///  </summary>
+      NonBreakingSpace = '\ ';
+
+      ///  <summary>Size of each level of indentation in spaces.</summary>
+      IndentSize = UInt8(4);
+
+      ///  <summary>Minimum length of a code fence delimiter.</summary>
+      MinCodeFenceLength = Cardinal(3);
+
+    ///  <summary>Prepends an indent to the lines of given text.</summary>
+    ///  <param name="AText"><c>string</c> [in] Text to be indented. If the text
+    ///  contains multiple lines then each line is indented.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation to be applied. If zero then no indentation is performed.
+    ///  </param>
+    ///  <remarks>Empty lines are not indented.</remarks>
+    class function ApplyIndent(const AText: string; const AIndentLevel: UInt8):
+      string;
+
+  public
+
+    ///  <summary>Replaces any escapable characters in given text with escaped
+    ///  versions of the characters, to make the text suitable for inclusion in
+    ///  Markdown code.</summary>
+    ///  <param name="AText"><c>string</c> [in] Text to be escaped.</param>
+    ///  <returns><c>string</c>. The escaped text.</returns>
+    ///  <remarks>
+    ///  <para>If <c>AText</c> includes any markdown code then it will be
+    ///  escaped and will be rendered literally and have no effect. For example,
+    ///  <c>**bold**</c> will be transformed to <c>\*\*bold\*\*</c>.</para>
+    ///  <para>Sequences of N spaces, where N &gt;= 2, will be replaced with a
+    ///  single space followed by N-1 non-breaking spaces.</para>
+    ///  </remarks>
+    class function EscapeText(const AText: string): string;
+
+    ///  <summary>Renders markdown as a heading, optionally indented.</summary>
+    ///  <param name="AMarkdown"><c>string</c> [in] Valid Markdown to include in
+    ///  the heading. Will not be escaped.</param>
+    ///  <param name="AHeadingLevel"><c>UInt8</c> [in] The heading level. Must
+    ///  be in the range <c>1</c> to <c>6</c>.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required. Set to <c>0</c> (the default) for no indentation.
+    ///  </param>
+    ///  <returns><c>string</c>. The required heading Markdown.</returns>
+    class function Heading(const AMarkdown: string; const AHeadingLevel: UInt8;
+      const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders markdown as a paragraph, optionally indented.
+    ///  </summary>
+    ///  <param name="AMarkdown"><c>string</c> [in] Valid Markdown to include in
+    ///  the paragraph. Will not be escaped.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required. Set to <c>0</c> (the default) for no indentation.
+    ///  </param>
+    ///  <returns><c>string</c>. The required paragraph Markdown.</returns>
+    class function Paragraph(const AMarkdown: string;
+      const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders markdown as a block quote, optionally indented.
+    ///  </summary>
+    ///  <param name="AMarkdown"><c>string</c> [in] Valid Markdown to include in
+    ///  the block quote. Will not be escaped.</param>
+    ///  <param name="ANestLevel"><c>UInt8</c> [in] The nesting level of the
+    ///  block quote.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required. Set to <c>0</c> (the default) for no indentation.
+    ///  </param>
+    ///  <returns><c>string</c>. The required block quote Markdown.</returns>
+    class function BlockQuote(const AMarkdown: string;
+      const ANestLevel: UInt8 = 0; const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders markdown as a bullet list item, optionally indented.
+    ///  </summary>
+    ///  <param name="AMarkdown"><c>string</c> [in] Valid Markdown to include in
+    ///  the list item. Will not be escaped.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required. Set to <c>0</c> (the default) for no indentation.
+    ///  </param>
+    ///  <returns><c>string</c>. The required bullet list item Markdown.
+    ///  </returns>
+    class function BulletListItem(const AMarkdown: string;
+      const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders markdown as a number list item, optionally indented.
+    ///  </summary>
+    ///  <param name="AMarkdown"><c>string</c> [in] Valid Markdown to include in
+    ///  the list item. Will not be escaped.</param>
+    ///  <param name="ANumber"><c>UInt8</c> [in] The number to be used in the
+    ///  list item. Must be &gt; <c>0</c>.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required. Set to <c>0</c> (the default) for no indentation.
+    ///  </param>
+    ///  <returns><c>string</c>. The required number list item Markdown.
+    ///  </returns>
+    class function NumberListItem(const AMarkdown: string;
+      const ANumber: UInt8; const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders pre-formatted code within code fences, optionally
+    ///  indented.</summary>
+    ///  <param name="ACode"><c>string</c> [in] The text of the code, which may
+    ///  contain more than one line. Any markdown formatting within <c>ACode</c>
+    ///  will be rendered literally.</param>
+    ///  <param name="ALanguage"><c>string</c> [in] The name of any programming
+    ///  language associated with the code. Set to an empty string (the default)
+    ///  if there is no such language.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required. Set to <c>0</c> (the default) for no indentation.
+    ///  </param>
+    ///  <returns><c>string</c>. The required fenced code.</returns>
+    class function FencedCode(const ACode: string; const ALanguage: string = '';
+      const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders pre-formatted code using indentation, optionally
+    ///  indented further.</summary>
+    ///  <param name="ACode"><c>string</c> [in] The text of the code block,
+    ///  which may contain more than one line. Any markdown formatting within
+    ///  <c>ACode</c> will be rendered literally.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required in addition to that required for the code block.
+    ///  Set to <c>0</c> (the default) for no additional indentation.</param>
+    ///  <returns><c>string</c>. The required fenced code.</returns>
+    class function CodeBlock(const ACode: string;
+      const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders the headings to use at the top of a Markdown table.
+    ///  Includes the ruling the is required below the table heading.
+    ///  </summary>
+    ///  <param name="AHeadings"><c>array of string</c> [in] An array of heading
+    ///  text. There will be one table column per element. Each heading is
+    ///  assumed to be valid Markdown and will not be escaped.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required before the table. Set to <c>0</c> (the default)
+    ///  for no indentation.</param>
+    ///  <returns><c>string</c>. The required Markdown formatted table heading.
+    ///  </returns>
+    ///  <remarks>This method MUST be called before the 1st call to
+    ///  <c>TableRow</c>.</remarks>
+    class function TableHeading(const AHeadings: array of string;
+      const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders the columns of text to use for a row of a Markdown
+    ///  table.</summary>
+    ///  <param name="AEntries"><c>array of string</c> [in] An array of column
+    ///  text. There will be one table column per element. Each element is
+    ///  assumed to be valid Markdown and will not be escaped.</param>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required before the table. Set to <c>0</c> (the default)
+    ///  for no indentation.</param>
+    ///  <returns><c>string</c>. The required Markdown formatted table row.
+    ///  </returns>
+    ///  <remarks>
+    ///  <para>Call this method once per table row.</para>
+    ///  <para>The 1st call to this method MUST follow a call to
+    ///  <c>TableHeading</c>.</para>
+    ///  <para>The number of elements of <c>AEntries</c> should be the same for
+    ///  each call of the method in the same table, and should be the same as
+    ///  the number of headings passed to <c>TableHeading</c>.</para>
+    ///  </remarks>
+    class function TableRow(const AEntries: array of string;
+      const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders the Markdown representation of a ruling.</summary>
+    ///  <param name="AIndentLevel"><c>UInt8</c> [in] The number of levels of
+    ///  indentation required before the ruling. Set to <c>0</c> (the default)
+    ///  for no indentation.</param>
+    ///  <returns><c>string</c>. The required Markdown ruling.</returns>
+    class function Rule(const AIndentLevel: UInt8 = 0): string;
+
+    ///  <summary>Renders text as inline code.</summary>
+    ///  <param name="ACode"><c>string</c> [in] The code. Any markdown
+    ///  formatting within <c>ACode</c> will be rendered literally.</param>
+    ///  <returns><c>string</c>. The required Markdown formatted code.</returns>
+    class function InlineCode(const ACode: string): string;
+
+    ///  <summary>Renders weakly formatted text.</summary>
+    ///  <param name="AMarkdown"><c>string</c> [in] Text to be formatted.
+    ///  May contain other inline Mardown formatting. Will not be escaped.
+    ///  </param>
+    ///  <returns><c>string</c>. The required Markdown formatted text.</returns>
+    ///  <remarks>Usually rendered in italics.</remarks>
+    class function WeakEmphasis(const AMarkdown: string): string;
+
+    ///  <summary>Renders strongly formatted text.</summary>
+    ///  <param name="AMarkdown"><c>string</c> [in] Text to be formatted.
+    ///  May contain other inline Mardown formatting. Will not be escaped.
+    ///  </param>
+    ///  <returns><c>string</c>. The required Markdown formatted text.</returns>
+    ///  <remarks>Usually rendered in bold.</remarks>
+    class function StrongEmphasis(const AMarkdown: string): string;
+
+    ///  <summary>Renders a link.</summary>
+    ///  <param name="AMarkdown"><c>string</c> [in] The link's text, which may
+    ///  include other inline Markdown formatting.</param>
+    ///  <param name="AURL"><c>string</c> [in] The URL of the link. Must be
+    ///  valid and correctly URL encoded.</param>
+    ///  <returns><c>string</c>. The required Markdown formatted link.</returns>
+    class function Link(const AMarkdown, AURL: string): string;
+
+    ///  <summary>Renders a bare URL.</summary>
+    ///  <param name="AURL"><c>string</c> [in] The required URL. Must be valid
+    ///  and correctly URL encoded.</param>
+    ///  <returns><c>string</c>. The required Markdown formatted URL.</returns>
+    class function BareURL(const AURL: string): string;
+
+  end;
+
+implementation
+
+uses
+  // Delphi
+  SysUtils,
+  Classes,
+  Math,
+  // Project
+  UStrUtils;
+
+{ TMarkdown }
+
+class function TMarkdown.ApplyIndent(const AText: string;
+  const AIndentLevel: UInt8): string;
+var
+  Line: string;
+  InLines, OutLines: TStrings;
+begin
+  Result := '';
+  OutLines := nil;
+  InLines := TStringList.Create;
+  try
+    OutLines := TStringList.Create;
+    StrExplode(StrWindowsLineBreaks(AText), EOL, InLines);
+    for Line in InLines do
+      if Line <> '' then
+        OutLines.Add(StrOfChar(' ', IndentSize * AIndentLevel) + Line)
+      else
+        OutLines.Add('');
+    Result := StrJoin(OutLines, EOL);
+  finally
+    OutLines.Free;
+    InLines.Free;
+  end;
+end;
+
+class function TMarkdown.BareURL(const AURL: string): string;
+begin
+  Result := URLOpenerChar + AURL + URLCloserChar;
+end;
+
+class function TMarkdown.BlockQuote(const AMarkdown: string; const ANestLevel,
+  AIndentLevel: UInt8): string;
+begin
+  Result := ApplyIndent(
+    StrOfChar(BlockquoteOpenerChar, ANestLevel + 1) + ' ' + AMarkdown,
+    AIndentLevel
+  )
+end;
+
+class function TMarkdown.BulletListItem(const AMarkdown: string;
+  const AIndentLevel: UInt8): string;
+begin
+  Result := ApplyIndent(ListItemBullet + ' ' + AMarkdown, AIndentLevel);
+end;
+
+class function TMarkdown.CodeBlock(const ACode: string;
+  const AIndentLevel: UInt8): string;
+var
+  NormalisedCode: string;
+begin
+  if ACode = '' then
+    Exit('');
+  // Ensure code uses windows line breaks and is trimmed of trailing white space
+  NormalisedCode := StrTrimRight(StrWindowsLineBreaks(ACode));
+  // Indent each line by indent level + 1 since code blocks are identified by
+  // being indented from the normal flow
+  Result := ApplyIndent(NormalisedCode, AIndentLevel + 1);
+end;
+
+class function TMarkdown.EscapeText(const AText: string): string;
+var
+  MultipleSpaceLen: Cardinal;
+  Spaces: string;
+  EscapedSpaces: string;
+  Idx: Integer;
+begin
+  // Escape non-space characters
+  Result := StrBackslashEscape(AText, EscapeChars, EscapeChars);
+  // Escape sequences of >= 2 spaces, with \ before each space except 1st one
+  MultipleSpaceLen := StrMaxSequenceLength(' ', Result);
+  while MultipleSpaceLen > 1 do
+  begin
+    Spaces := StrOfChar(' ', MultipleSpaceLen);
+    EscapedSpaces := ' ';
+    for Idx := 1 to Pred(MultipleSpaceLen) do
+      EscapedSpaces := EscapedSpaces + NonBreakingSpace;
+    Result := StrReplace(Result, Spaces, EscapedSpaces);
+    MultipleSpaceLen := StrMaxSequenceLength(' ', Result);
+  end;
+  // Escape list starter chars if at start of line
+end;
+
+class function TMarkdown.FencedCode(const ACode, ALanguage: string;
+  const AIndentLevel: UInt8): string;
+var
+  FenceLength: Cardinal;
+  Fence: string;
+  FencedCode: string;
+  NormalisedCode: string;
+begin
+  if ACode = '' then
+    Exit('');
+  // Ensure code ends in at least one line break
+  NormalisedCode := StrUnixLineBreaks(ACode);
+  if NormalisedCode[Length(NormalisedCode)] <> LF then
+    NormalisedCode := NormalisedCode + LF;
+  NormalisedCode := StrWindowsLineBreaks(NormalisedCode);
+  // Create fence that has correct length
+  // TODO: only need to detect max fence length at start of line (excl spaces)
+  FenceLength := Max(
+    StrMaxSequenceLength(CodeDelim, ACode) + 1, MinCodeFenceLength
+  );
+  Fence := StrOfChar(CodeDelim, FenceLength);
+  // Build fenced code
+  FencedCode := Fence + ALanguage + EOL + NormalisedCode + Fence;
+  // Indent each line of fenced code
+  Result := ApplyIndent(FencedCode, AIndentLevel);
+end;
+
+class function TMarkdown.Heading(const AMarkdown: string;
+  const AHeadingLevel, AIndentLevel: UInt8): string;
+begin
+  Assert(AHeadingLevel in [1..6],
+    ClassName + '.Heading: AHeadingLevel must be in range 1..6');
+  Result := ApplyIndent(
+    StrOfChar(HeadingOpenerChar, AHeadingLevel) + ' ' + AMarkdown, AIndentLevel
+  );
+end;
+
+class function TMarkdown.InlineCode(const ACode: string): string;
+var
+  CodeDelimLength: Cardinal;
+  Delim: string;
+begin
+  CodeDelimLength := StrMaxSequenceLength(CodeDelim, ACode) + 1;
+  Delim := StrOfChar(CodeDelim, CodeDelimLength);
+  Result := Delim + ACode + Delim;
+end;
+
+class function TMarkdown.Link(const AMarkdown, AURL: string): string;
+begin
+  // TODO: make URL safe
+  Result := Format(LinkFmtStr, [AMarkdown, AURL]);
+end;
+
+class function TMarkdown.NumberListItem(const AMarkdown: string; const ANumber,
+  AIndentLevel: UInt8): string;
+begin
+  Assert(ANumber > 0, ClassName + 'NumberListItem: ANumber = 0');
+  Result := ApplyIndent(
+    Format(ListItemNumberFmt, [ANumber]) + ' ' + AMarkdown, AIndentLevel
+  );
+end;
+
+class function TMarkdown.Paragraph(const AMarkdown: string;
+  const AIndentLevel: UInt8): string;
+begin
+  Result := ApplyIndent(AMarkdown, AIndentLevel);
+end;
+
+class function TMarkdown.Rule(const AIndentLevel: UInt8): string;
+begin
+  Result := ApplyIndent(Ruling, AIndentLevel);
+end;
+
+class function TMarkdown.StrongEmphasis(const AMarkdown: string): string;
+begin
+  Result := StrongEmphasisDelim + AMarkdown + StrongEmphasisDelim;
+end;
+
+class function TMarkdown.TableHeading(const AHeadings: array of string;
+  const AIndentLevel: UInt8): string;
+var
+  Heading: string;
+  Ruling: string;
+  HeadingRow: string;
+begin
+  if Length(AHeadings) = 0 then
+    Exit('');
+  Ruling := TableColDelim;
+  HeadingRow := TableColDelim;
+  for Heading in AHeadings do
+  begin
+    Ruling := Ruling + StrOfChar(TableRulingChar, Length(Heading) + 2)
+      + TableColDelim;
+    HeadingRow := HeadingRow + ' ' + Heading + ' ' + TableColDelim;
+  end;
+  Result := ApplyIndent(HeadingRow + EOL + Ruling, AIndentLevel);
+end;
+
+class function TMarkdown.TableRow(const AEntries: array of string;
+  const AIndentLevel: UInt8): string;
+var
+  Entry: string;
+  Row: string;
+begin
+  if Length(AEntries) = 0 then
+    Exit('');
+  Row := TableColDelim;
+  for Entry in AEntries do
+    Row := Row + ' ' + Entry + ' ' + TableColDelim;
+  Result := ApplyIndent(Row, AIndentLevel);
+end;
+
+class function TMarkdown.WeakEmphasis(const AMarkdown: string): string;
+begin
+  Result := WeakEmphasisDelim + AMarkdown + WeakEmphasisDelim;
+end;
+
+end.

From 0618a5a71c7d5208c8140bc9c586acc95186895a Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 27 Apr 2025 17:39:13 +0100
Subject: [PATCH 234/264] Add new Markdown active text renderer to project

Added new ActiveText.UMarkdownRenderer unit to the project that converts
active text into Markdown format.
---
 Src/ActiveText.UMarkdownRenderer.pas | 927 +++++++++++++++++++++++++++
 Src/CodeSnip.dpr                     |   3 +-
 Src/CodeSnip.dproj                   |   1 +
 3 files changed, 930 insertions(+), 1 deletion(-)
 create mode 100644 Src/ActiveText.UMarkdownRenderer.pas

diff --git a/Src/ActiveText.UMarkdownRenderer.pas b/Src/ActiveText.UMarkdownRenderer.pas
new file mode 100644
index 000000000..d3678015b
--- /dev/null
+++ b/Src/ActiveText.UMarkdownRenderer.pas
@@ -0,0 +1,927 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2025, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Implements class that renders active text in Markdown format.
+}
+
+
+unit ActiveText.UMarkdownRenderer;
+
+interface
+
+uses
+  // Delphi
+  SysUtils,
+  Generics.Collections,
+  // Project
+  ActiveText.UMain,
+  UIStringList;
+
+
+type
+  ///  <summary>Renders active text in Markdown format.</summary>
+  TActiveTextMarkdown = class(TObject)
+  strict private
+    type
+
+      ///  <summary>Kinds of inline Markdown formatting.</summary>
+      TInlineElemKind = (
+        iekPlain,          // no formatting e.g. text => text
+        iekWeakEmphasis,   // weak emphasis (italic) e.g. text => *text*
+        iekStrongEmphasis, // strong emphasis (bold) e.g. text => **text**
+        iekLink,           // link e.g. text,url => [text](url)
+        iekInlineCode      // inline code e.g. text => `text`
+      );
+
+      ///  <summary>Representation of an inline Markdown element.</summary>
+      TInlineElem = record
+      strict private
+        var
+          fFormatterKind: TInlineElemKind;
+          fMarkdown: string;
+          fAttrs: IActiveTextAttrs;
+          fCanRenderElem: TPredicate<TInlineElemKind>;
+      public
+        constructor Create(const AFormatterKind: TInlineElemKind;
+          const ACanRenderElem: TPredicate<TInlineElemKind>;
+          const AAttrs: IActiveTextAttrs);
+        property Kind: TInlineElemKind read fFormatterKind;
+        property Markdown: string read fMarkdown write fMarkdown;
+        property Attrs: IActiveTextAttrs read fAttrs;
+        property CanRenderElem: TPredicate<TInlineElemKind> read fCanRenderElem;
+      end;
+
+      ///  <summary>Stack of inline Markdown elements.</summary>
+      ///  <remarks>Used in rendering all the inline elements within a block.
+      ///  </remarks>
+      TInlineElemStack = class (TStack<TInlineElem>)
+      strict private
+      public
+        procedure Push(const AFmtKind: TInlineElemKind;
+          const ACanRenderElem: TPredicate<TInlineElemKind>;
+          const AAttrs: IActiveTextAttrs); reintroduce;
+        function IsEmpty: Boolean;
+        function IsOpen(const AFmtKind: TInlineElemKind): Boolean;
+        function NestingDepthOf(const AFmtKind: TInlineElemKind): Integer;
+        procedure AppendMarkdown(const AMarkdown: string);
+        constructor Create;
+        destructor Destroy; override;
+      end;
+
+      ///  <summary>Kinds of Markdown containers.</summary>
+      TContainerKind = (
+        ckPlain,        // represents main document
+        ckBulleted,     // represents an unordered list item
+        ckNumbered      // represents an ordered list item
+      );
+
+      ///  <summary>Encapsulates the state of a list (ordered or unordered).
+      ///  </summary>
+      TListState = record
+      public
+        ListNumber: Cardinal;
+        ListKind: TContainerKind;
+        constructor Create(AListKind: TContainerKind);
+      end;
+
+      ///  <summary>A stack of currently open lists, with the current, most
+      ///  nested at the top of the stack.</summary>
+      ///  <remarks>Used to keep track of list nesting.</remarks>
+      TListStack = class(TStack<TListState>)
+      public
+        constructor Create;
+        destructor Destroy; override;
+        procedure IncTopListNumber;
+      end;
+
+      ///  <summary>Base class for classes that represent a chunk of a Markdown
+      ///  document. A Markdown document contains a sequence of chunks, each of
+      ///  which is either a block level element or a container of other chunks
+      ///  at a deeper level.</summary>
+      TContentChunk = class abstract
+      strict private
+        var
+          fDepth: UInt8;
+          fClosed: Boolean;
+      public
+        constructor Create(const ADepth: UInt8);
+        procedure Close;
+        function IsClosed: Boolean;
+        procedure Render(const ALines: IStringList); virtual; abstract;
+        property Depth: UInt8 read fDepth;
+      end;
+
+      ///  <summary>Base class for container chunks that hold a sequence of
+      ///  other chunks at a given depth within a Markdown document.</summary>
+      TContainer = class abstract (TContentChunk)
+      strict private
+        fContent: TObjectList<TContentChunk>;
+      public
+        constructor Create(const ADepth: UInt8);
+        destructor Destroy; override;
+        function IsEmpty: Boolean;
+        procedure Add(const AChunk: TContentChunk);
+        function LastChunk: TContentChunk;
+        function Content: TArray<TContentChunk>;
+        function TrimEmptyBlocks: TArray<TContentChunk>;
+        procedure Render(const ALines: IStringList); override; abstract;
+      end;
+
+      ///  <summary>Encapsulate the Markdown document. Contains a sequence of
+      ///  other chunks within the top level of the document.</summary>
+      TDocument = class sealed (TContainer)
+      public
+        procedure Render(const ALines: IStringList); override;
+      end;
+
+      ///  <summary>Encapsulates a generalised list item, that is a container
+      ///  for chunks at a deeper level within the document.</summary>
+      TListItem = class abstract (TContainer)
+      strict private
+        fNumber: UInt8;
+      public
+        constructor Create(const ADepth: UInt8; const ANumber: UInt8);
+        procedure Render(const ALines: IStringList); override; abstract;
+        property Number: UInt8 read fNumber;
+      end;
+
+      ///  <summary>Encapsulates a bullet list item that contains a sequence of
+      ///  chunks that belong to the list item.</summary>
+      TBulletListItem = class sealed (TListItem)
+      public
+        constructor Create(const ADepth: UInt8; const ANumber: UInt8);
+        procedure Render(const ALines: IStringList); override;
+      end;
+
+      ///  <summary>Encapsulates a numbered list item that contains a sequence
+      ///  of chunks that belong to the list item.</summary>
+      TNumberListItem = class sealed (TListItem)
+      public
+        constructor Create(const ADepth: UInt8; const ANumber: UInt8);
+        procedure Render(const ALines: IStringList); override;
+      end;
+
+      ///  <summary>Encapsulates a generalised Markdown block level item.
+      ///  </summary>
+      TBlock = class abstract (TContentChunk)
+      strict private
+        var
+          fMarkdownStack: TInlineElemStack;
+      public
+        constructor Create(const ADepth: UInt8);
+        destructor Destroy; override;
+        property MarkdownStack: TInlineElemStack read fMarkdownStack;
+        function IsEmpty: Boolean;
+        procedure Render(const ALines: IStringList); override; abstract;
+        function RenderStr: string; virtual; abstract;
+        function LookupElemKind(
+          const AActiveTextKind: TActiveTextActionElemKind): TInlineElemKind;
+      end;
+
+      ///  <summary>Encapsulates a &quot;fake&quot; Markdown block that is used
+      ///  to contain any active text that exists outside a block level tag or
+      ///  whose direct parent is a list item.</summary>
+      TSimpleBlock = class sealed (TBlock)
+      public
+        procedure Render(const ALines: IStringList); overload; override;
+        function RenderStr: string; override;
+      end;
+
+      ///  <summary>Encapsulates a Markdown paragraph.</summary>
+      TParaBlock = class sealed (TBlock)
+      public
+        procedure Render(const ALines: IStringList); overload; override;
+        function RenderStr: string; override;
+      end;
+
+      ///  <summary>Encapsulates a markdown heading (assumed to be at level 2).
+      ///  </summary>
+      THeadingBlock = class sealed (TBlock)
+      public
+        procedure Render(const ALines: IStringList); overload; override;
+        function RenderStr: string; override;
+      end;
+
+      ///  <summary>A stack of currently open containers.</summary>
+      ///  <remarks>Used to track the parentage of the currently open container.
+      ///  </remarks>
+      TContainerStack = class(TStack<TContainer>);
+
+  strict private
+    var
+      ///  <summary>Contains all the content chunks belonging to the top level
+      ///  Markdown document.</summary>
+      fDocument: TDocument;
+      ///  <summary>Stack that tracks the parentage of any currently open list.
+      ///  </summary>
+      fListStack: TListStack;
+      ///  <summary>Stack that tracks the parentage of the currently open
+      ///  container.</summary>
+      fContainerStack: TContainerStack;
+    ///  <summary>Closes and renders the Markdown for the currently open inline
+    ///  element in the given Markdown block.</summary>
+    procedure CloseInlineElem(const Block: TBlock);
+    procedure ParseTextElem(Elem: IActiveTextTextElem);
+    procedure ParseBlockActionElem(Elem: IActiveTextActionElem);
+    procedure ParseInlineActionElem(Elem: IActiveTextActionElem);
+    procedure Parse(ActiveText: IActiveText);
+  public
+    constructor Create;
+    destructor Destroy; override;
+    ///  <summary>Parses the given active text and returns a Markdown
+    ///  representation of it.</summary>
+    function Render(ActiveText: IActiveText): string;
+  end;
+
+
+implementation
+
+uses
+  // Project
+  UConsts,
+  UExceptions,
+  UMarkdownUtils,
+  UStrUtils;
+
+
+{ TActiveTextMarkdown }
+
+procedure TActiveTextMarkdown.CloseInlineElem(const Block: TBlock);
+var
+  MElem: TInlineElem;
+  Markdown: string;
+begin
+  MElem := Block.MarkdownStack.Peek;
+  // Render markdown
+  Markdown := '';
+  if MElem.CanRenderElem(MElem.Kind) then
+  begin
+    // Element should be output, wrapping its markdown
+    case MElem.Kind of
+      iekWeakEmphasis:
+        if not StrIsEmpty(MElem.Markdown) then
+          Markdown := TMarkdown.WeakEmphasis(MElem.Markdown);
+      iekStrongEmphasis:
+        if not StrIsEmpty(MElem.Markdown) then
+          Markdown := TMarkdown.StrongEmphasis(MElem.Markdown);
+      iekLink:
+        if StrIsEmpty(MElem.Attrs[TActiveTextAttrNames.Link_URL]) then
+        begin
+          Markdown := MElem.Markdown; // no URL: emit bare markdown
+        end
+        else
+        begin
+          // we have URL
+          if not StrIsEmpty(MElem.Markdown) then
+            // we have inner markdown: emit standard link
+            Markdown := TMarkdown.Link(
+              MElem.Markdown, MElem.Attrs[TActiveTextAttrNames.Link_URL]
+            )
+          else
+            // no inner text: emit bare URL
+            Markdown := TMarkdown.BareURL(
+              MElem.Attrs[TActiveTextAttrNames.Link_URL]
+            );
+        end;
+      iekInlineCode:
+        if not StrIsEmpty(MElem.Markdown) then
+        begin
+          // Note: <mono>`foo`</mono> should be rendered as `` `foo` ``, not
+          // ```foo```, but for any other leading or trailing character than `
+          // don't prefix with space.
+          // Also don't add space for other leading / trailing chars, so
+          // <mono>[foo]</mono> is rendered as `[foo]` and <mono>[`foo`]</mono>
+          // is rendered as ``[`foo`]``
+          Markdown := MElem.Markdown;
+          if Markdown[1] = '`' then
+            Markdown := ' ' + Markdown;
+          if Markdown[Length(Markdown)] = '`' then
+            Markdown := Markdown + ' ';
+          Markdown := TMarkdown.InlineCode(Markdown);
+        end;
+    end;
+  end
+  else
+    // Ingoring element: keep its inner markdown
+    Markdown := MElem.Markdown;
+  // Pop stack & add markdown to that of new stack top
+  Block.MarkdownStack.Pop;
+  // stack should contain at least a block element below all inline elements
+  Assert(not Block.MarkdownStack.IsEmpty);
+  Block.MarkdownStack.AppendMarkdown(Markdown);
+end;
+
+constructor TActiveTextMarkdown.Create;
+begin
+  fDocument := TDocument.Create(0);
+  fContainerStack := TContainerStack.Create;
+  fListStack := TListStack.Create;
+end;
+
+destructor TActiveTextMarkdown.Destroy;
+begin
+  fListStack.Free;
+  fContainerStack.Free;
+  fDocument.Free;
+  inherited;
+end;
+
+procedure TActiveTextMarkdown.Parse(ActiveText: IActiveText);
+var
+  Elem: IActiveTextElem;
+  TextElem: IActiveTextTextElem;
+  ActionElem: IActiveTextActionElem;
+begin
+  fContainerStack.Clear;
+  fContainerStack.Push(fDocument);
+
+  if ActiveText.IsEmpty then
+    Exit;
+
+  Assert(
+    Supports(ActiveText[0], IActiveTextActionElem, ActionElem)
+      and (ActionElem.Kind = ekDocument),
+    ClassName + '.Parse: Expected ekDocument at start of active text'
+  );
+
+  for Elem in ActiveText do
+  begin
+    if Supports(Elem, IActiveTextTextElem, TextElem) then
+      ParseTextElem(TextElem)
+    else if Supports(Elem, IActiveTextActionElem, ActionElem) then
+    begin
+      if TActiveTextElemCaps.DisplayStyleOf(ActionElem.Kind) = dsBlock then
+        ParseBlockActionElem(ActionElem)
+      else
+        ParseInlineActionElem(ActionElem);
+    end;
+  end;
+
+end;
+
+procedure TActiveTextMarkdown.ParseBlockActionElem(Elem: IActiveTextActionElem);
+var
+  CurContainer, NewContainer: TContainer;
+begin
+
+  CurContainer := fContainerStack.Peek;
+
+  case Elem.State of
+
+    fsOpen:
+    begin
+      case Elem.Kind of
+        ekDocument:
+          ; // do nothing
+        ekUnorderedList:
+          fListStack.Push(TListState.Create(ckBulleted));
+        ekOrderedList:
+          fListStack.Push(TListState.Create(ckNumbered));
+        ekListItem:
+        begin
+          fListStack.IncTopListNumber;
+          case fListStack.Peek.ListKind of
+            ckBulleted:
+              NewContainer := TBulletListItem.Create(
+                fContainerStack.Peek.Depth + 1, fListStack.Peek.ListNumber
+              );
+            ckNumbered:
+              NewContainer := TNumberListItem.Create(
+                fContainerStack.Peek.Depth + 1, fListStack.Peek.ListNumber
+              );
+            else
+              raise EBug.Create(
+                ClassName + '.ParseBlockActionElem: Unknown list item type'
+              );
+          end;
+          CurContainer.Add(NewContainer);
+          fContainerStack.Push(NewContainer);
+        end;
+        ekBlock:
+          CurContainer.Add(TSimpleBlock.Create(CurContainer.Depth));
+        ekPara:
+          CurContainer.Add(TParaBlock.Create(CurContainer.Depth));
+        ekHeading:
+          CurContainer.Add(THeadingBlock.Create(CurContainer.Depth));
+      end;
+    end;
+
+    fsClose:
+    begin
+      case Elem.Kind of
+        ekDocument:
+          ; // do nothing
+        ekUnorderedList, ekOrderedList:
+          fListStack.Pop;
+        ekListItem:
+        begin
+          fContainerStack.Pop;
+          CurContainer.Close;
+        end;
+        ekBlock, ekPara, ekHeading:
+          CurContainer.LastChunk.Close;
+      end;
+    end;
+  end;
+end;
+
+procedure TActiveTextMarkdown.ParseInlineActionElem(
+  Elem: IActiveTextActionElem);
+var
+  CurContainer: TContainer;
+  Block: TBlock;
+begin
+  // Find last open block: create one if necessary
+  CurContainer := fContainerStack.Peek;
+  if not CurContainer.IsEmpty and (CurContainer.LastChunk is TBlock)
+    and not CurContainer.LastChunk.IsClosed then
+    Block := CurContainer.LastChunk as TBlock
+  else
+  begin
+    Block := TSimpleBlock.Create(CurContainer.Depth);
+    CurContainer.Add(Block);
+  end;
+
+  case Elem.State of
+    fsOpen:
+    begin
+
+      CurContainer := fContainerStack.Peek;
+      if not CurContainer.IsEmpty and (CurContainer.LastChunk is TBlock)
+        and not CurContainer.LastChunk.IsClosed then
+        Block := CurContainer.LastChunk as TBlock
+      else
+      begin
+        Block := TSimpleBlock.Create(CurContainer.Depth);
+        CurContainer.Add(Block);
+      end;
+
+      case Elem.Kind of
+
+        ekLink, ekStrong, ekWarning, ekEm, ekVar:
+        begin
+          Block.MarkdownStack.Push(
+            Block.LookupElemKind(Elem.Kind),
+            function (AKind: TInlineElemKind): Boolean
+            begin
+              Assert(AKind in [iekWeakEmphasis, iekStrongEmphasis, iekLink]);
+              Result := (Block.MarkdownStack.NestingDepthOf(AKind) = 0)
+                and not Block.MarkdownStack.IsOpen(iekInlineCode);
+            end,
+            Elem.Attrs
+          );
+        end;
+
+        ekMono:
+          Block.MarkdownStack.Push(
+            Block.LookupElemKind(Elem.Kind),
+            function (AKind: TInlineElemKind): Boolean
+            begin
+              Assert(AKind = iekInlineCode);
+              Result := Block.MarkdownStack.NestingDepthOf(AKind) = 0;
+            end,
+            Elem.Attrs
+          );
+      end;
+    end;
+
+    fsClose:
+    begin
+      CurContainer := fContainerStack.Peek;
+      Assert(not CurContainer.IsEmpty or not (CurContainer.LastChunk is TBlock));
+      Block := CurContainer.LastChunk as TBlock;
+      CloseInlineElem(Block);
+    end;
+  end;
+end;
+
+procedure TActiveTextMarkdown.ParseTextElem(Elem: IActiveTextTextElem);
+var
+  CurContainer: TContainer;
+  Block: TBlock;
+begin
+  CurContainer := fContainerStack.Peek;
+  if not CurContainer.IsEmpty and (CurContainer.LastChunk is TBlock)
+    and not CurContainer.LastChunk.IsClosed then
+    Block := CurContainer.LastChunk as TBlock
+  else
+  begin
+    Block := TSimpleBlock.Create(CurContainer.Depth);
+    CurContainer.Add(Block);
+  end;
+  if not Block.MarkdownStack.IsOpen(iekInlineCode) then
+    Block.MarkdownStack.AppendMarkdown(TMarkdown.EscapeText(Elem.Text))
+  else
+    Block.MarkdownStack.AppendMarkdown(Elem.Text);
+end;
+
+function TActiveTextMarkdown.Render(ActiveText: IActiveText): string;
+var
+  Document: IStringList;
+begin
+  Parse(ActiveText);
+  Assert(fContainerStack.Count = 1);
+
+  Document := TIStringList.Create;
+  fContainerStack.Peek.Render(Document);
+  Result := Document.GetText(EOL, True);
+  while StrContainsStr(EOL2 + EOL, Result) do
+    Result := StrReplace(Result, EOL2 + EOL, EOL2);
+  Result := StrTrim(Result) + EOL;
+end;
+
+{ TActiveTextMarkdown.TInlineElem }
+
+constructor TActiveTextMarkdown.TInlineElem.Create(
+  const AFormatterKind: TInlineElemKind;
+  const ACanRenderElem: TPredicate<TInlineElemKind>;
+  const AAttrs: IActiveTextAttrs);
+begin
+  // Assign fields from parameters
+  fFormatterKind := AFormatterKind;
+  fMarkdown := '';
+  fAttrs := AAttrs;
+  fCanRenderElem := ACanRenderElem;
+
+  // Set defaults for nil fields
+  if not Assigned(AAttrs) then
+    fAttrs := TActiveTextFactory.CreateAttrs;
+
+  if not Assigned(ACanRenderElem) then
+    fCanRenderElem :=
+      function (AFmtKind: TInlineElemKind): Boolean
+      begin
+        Result := True;
+      end;
+end;
+
+{ TActiveTextMarkdown.TInlineElemStack }
+
+procedure TActiveTextMarkdown.TInlineElemStack.AppendMarkdown(
+  const AMarkdown: string);
+var
+  Elem: TInlineElem;
+begin
+  Elem := Pop;
+  Elem.Markdown := Elem.Markdown + AMarkdown;
+  inherited Push(Elem);
+end;
+
+constructor TActiveTextMarkdown.TInlineElemStack.Create;
+begin
+  inherited Create;
+  // Push root element onto stack that receives all rendered markdown
+  // This element can always be rendered, has no attributes and no special chars
+  Push(iekPlain, nil, {nil, }nil);
+end;
+
+destructor TActiveTextMarkdown.TInlineElemStack.Destroy;
+begin
+  inherited;
+end;
+
+function TActiveTextMarkdown.TInlineElemStack.IsEmpty: Boolean;
+begin
+  Result := Count = 0;
+end;
+
+function TActiveTextMarkdown.TInlineElemStack.IsOpen(
+  const AFmtKind: TInlineElemKind): Boolean;
+var
+  Elem: TInlineElem;
+begin
+  Result := False;
+  for Elem in Self do
+    if Elem.Kind = AFmtKind then
+      Exit(True);
+end;
+
+function TActiveTextMarkdown.TInlineElemStack.NestingDepthOf(
+  const AFmtKind: TInlineElemKind): Integer;
+var
+  Elem: TInlineElem;
+begin
+  Result := -1;
+  for Elem in Self do
+    if (Elem.Kind = AFmtKind) then
+      Inc(Result);
+end;
+
+procedure TActiveTextMarkdown.TInlineElemStack.Push(
+  const AFmtKind: TInlineElemKind;
+  const ACanRenderElem: TPredicate<TInlineElemKind>;
+  const AAttrs: IActiveTextAttrs);
+begin
+  inherited Push(
+    TInlineElem.Create(AFmtKind, ACanRenderElem, AAttrs)
+  );
+end;
+
+{ TActiveTextMarkdown.TListState }
+
+constructor TActiveTextMarkdown.TListState.Create(AListKind: TContainerKind);
+begin
+  ListKind := AListKind;
+  ListNumber := 0;
+end;
+
+{ TActiveTextMarkdown.TListStack }
+
+constructor TActiveTextMarkdown.TListStack.Create;
+begin
+  inherited Create;
+end;
+
+destructor TActiveTextMarkdown.TListStack.Destroy;
+begin
+  inherited;
+end;
+
+procedure TActiveTextMarkdown.TListStack.IncTopListNumber;
+var
+  State: TListState;
+begin
+  State := Pop;
+  Inc(State.ListNumber);
+  Push(State);
+end;
+
+{ TActiveTextMarkdown.TContentChunk }
+
+procedure TActiveTextMarkdown.TContentChunk.Close;
+begin
+  fClosed := True;
+end;
+
+constructor TActiveTextMarkdown.TContentChunk.Create(const ADepth: UInt8);
+begin
+  inherited Create;
+  fDepth := ADepth;
+  fClosed := False;
+end;
+
+function TActiveTextMarkdown.TContentChunk.IsClosed: Boolean;
+begin
+  Result := fClosed;
+end;
+
+{ TActiveTextMarkdown.TContainer }
+
+procedure TActiveTextMarkdown.TContainer.Add(const AChunk: TContentChunk);
+begin
+  fContent.Add(AChunk);
+end;
+
+function TActiveTextMarkdown.TContainer.Content: TArray<TContentChunk>;
+begin
+  Result := fContent.ToArray;
+end;
+
+constructor TActiveTextMarkdown.TContainer.Create(const ADepth: UInt8);
+begin
+  inherited Create(ADepth);
+  fContent := TObjectList<TContentChunk>.Create(True);
+end;
+
+destructor TActiveTextMarkdown.TContainer.Destroy;
+begin
+  fContent.Free;
+  inherited;
+end;
+
+function TActiveTextMarkdown.TContainer.IsEmpty: Boolean;
+begin
+  Result := fContent.Count = 0;
+end;
+
+function TActiveTextMarkdown.TContainer.LastChunk: TContentChunk;
+begin
+  Result := fContent.Last;
+end;
+
+function TActiveTextMarkdown.TContainer.TrimEmptyBlocks: TArray<TContentChunk>;
+var
+  TrimmedBlocks: TList<TContentChunk>;
+  Chunk: TContentChunk;
+begin
+  TrimmedBlocks := TList<TContentChunk>.Create;
+  try
+    for Chunk in fContent do
+    begin
+      if (Chunk is TBlock) then
+      begin
+        if not (Chunk as TBlock).IsEmpty then
+          TrimmedBlocks.Add(Chunk);
+      end
+      else
+        TrimmedBlocks.Add(Chunk);
+    end;
+    Result := TrimmedBlocks.ToArray;
+  finally
+    TrimmedBlocks.Free;
+  end;
+end;
+
+{ TActiveTextMarkdown.TDocument }
+
+procedure TActiveTextMarkdown.TDocument.Render(const ALines: IStringList);
+var
+  Chunk: TContentChunk;
+begin
+  for Chunk in Self.TrimEmptyBlocks do
+  begin
+    Chunk.Render(ALines);
+  end;
+end;
+
+{ TActiveTextMarkdown.TListItem }
+
+constructor TActiveTextMarkdown.TListItem.Create(const ADepth: UInt8; const ANumber: UInt8);
+begin
+  inherited Create(ADepth);
+  fNumber := ANumber;
+end;
+
+{ TActiveTextMarkdown.TBulletListItem }
+
+constructor TActiveTextMarkdown.TBulletListItem.Create(const ADepth: UInt8; const ANumber: UInt8);
+begin
+  inherited Create(ADepth, ANumber);
+end;
+
+procedure TActiveTextMarkdown.TBulletListItem.Render(const ALines: IStringList);
+var
+  Idx: Integer;
+  StartIdx: Integer;
+  Trimmed: TArray<TContentChunk>;
+  ItemText: string;
+
+  procedure AddBulletItem(const AMarkdown: string);
+  begin
+    ALines.Add(TMarkdown.BulletListItem(AMarkdown, Depth - 1));
+  end;
+
+begin
+  Trimmed := TrimEmptyBlocks;
+  StartIdx := 0;
+  if Length(Trimmed) > 0 then
+  begin
+    if (Trimmed[0] is TBlock) then
+    begin
+      ItemText := (Trimmed[0] as TBlock).RenderStr;
+      if StrStartsStr(EOL, ItemText) then
+        ALines.Add('');
+      AddBulletItem(StrTrimLeft(ItemText));
+      Inc(StartIdx);
+    end
+    else
+    begin
+      AddBulletItem('');
+    end;
+    for Idx := StartIdx to Pred(Length(Trimmed)) do
+      Trimmed[Idx].Render(ALines);
+  end
+  else
+  begin
+    AddBulletItem('');
+  end;
+end;
+
+{ TActiveTextMarkdown.TNumberListItem }
+
+constructor TActiveTextMarkdown.TNumberListItem.Create(const ADepth: UInt8; const ANumber: UInt8);
+begin
+  inherited Create(ADepth, ANumber);
+end;
+
+procedure TActiveTextMarkdown.TNumberListItem.Render(const ALines: IStringList);
+var
+  Idx: Integer;
+  StartIdx: Integer;
+  Trimmed: TArray<TContentChunk>;
+  ItemText: string;
+
+  procedure AddNumberItem(const AMarkdown: string);
+  begin
+    ALines.Add(TMarkdown.NumberListItem(AMarkdown, Number, Depth - 1));
+  end;
+
+begin
+  Trimmed := TrimEmptyBlocks;
+  StartIdx := 0;
+  if Length(Trimmed) > 0 then
+  begin
+    if (Trimmed[0] is TBlock) then
+    begin
+      ItemText := (Trimmed[0] as TBlock).RenderStr;
+      if StrStartsStr(EOL, ItemText) then
+        ALines.Add('');
+      AddNumberItem(StrTrimLeft(ItemText));
+      Inc(StartIdx);
+    end
+    else
+    begin
+      AddNumberItem('');
+    end;
+    for Idx := StartIdx to Pred(Length(Trimmed)) do
+      Trimmed[Idx].Render(ALines);
+  end
+  else
+  begin
+    AddNumberItem('');
+  end;
+end;
+
+{ TActiveTextMarkdown.TBlock }
+
+constructor TActiveTextMarkdown.TBlock.Create(const ADepth: UInt8);
+begin
+  inherited Create(ADepth);
+  fMarkdownStack := TInlineElemStack.Create;
+end;
+
+destructor TActiveTextMarkdown.TBlock.Destroy;
+begin
+  fMarkdownStack.Free;
+  inherited;
+end;
+
+function TActiveTextMarkdown.TBlock.IsEmpty: Boolean;
+var
+  MDElem: TInlineElem;
+begin
+  Result := True;
+  if fMarkdownStack.IsEmpty then
+    Exit;
+  for MDElem in fMarkdownStack do
+    if not StrIsEmpty(MDElem.Markdown, True) then
+      Exit(False);
+end;
+
+function TActiveTextMarkdown.TBlock.LookupElemKind(
+  const AActiveTextKind: TActiveTextActionElemKind): TInlineElemKind;
+begin
+  case AActiveTextKind of
+    ekLink: Result := iekLink;
+    ekStrong, ekWarning: Result := iekStrongEmphasis;
+    ekEm, ekVar: Result := iekWeakEmphasis;
+    ekMono: Result := iekInlineCode;
+    else
+      raise EBug.Create(
+        ClassName + '.LookupElemKind: Invalid inline active text element kind'
+      );
+  end;
+end;
+
+{ TActiveTextMarkdown.TSimpleBlock }
+
+procedure TActiveTextMarkdown.TSimpleBlock.Render(const ALines: IStringList);
+begin
+  Assert(not MarkdownStack.IsEmpty);
+  ALines.Add(RenderStr);
+  ALines.Add('');
+end;
+
+function TActiveTextMarkdown.TSimpleBlock.RenderStr: string;
+begin
+  Result := TMarkdown.Paragraph(
+    StrTrimLeft(MarkdownStack.Peek.Markdown), Depth
+  );
+end;
+
+{ TActiveTextMarkdown.TParaBlock }
+
+procedure TActiveTextMarkdown.TParaBlock.Render(const ALines: IStringList);
+begin
+  Assert(not MarkdownStack.IsEmpty);
+  ALines.Add(RenderStr);
+end;
+
+function TActiveTextMarkdown.TParaBlock.RenderStr: string;
+begin
+  Result := EOL + TMarkdown.Paragraph(
+    StrTrimLeft(MarkdownStack.Peek.Markdown), Depth
+  ) + EOL;
+end;
+
+{ TActiveTextMarkdown.THeadingBlock }
+
+procedure TActiveTextMarkdown.THeadingBlock.Render(const ALines: IStringList);
+begin
+  Assert(not MarkdownStack.IsEmpty);
+  ALines.Add(RenderStr);
+end;
+
+function TActiveTextMarkdown.THeadingBlock.RenderStr: string;
+begin
+  Result := EOL + TMarkdown.Heading(
+    StrTrimLeft(MarkdownStack.Peek.Markdown), 2, Depth
+  ) + EOL;
+end;
+
+end.
+
diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index e8f354285..3aa3d0f83 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -378,7 +378,8 @@ uses
   USaveInfoMgr in 'USaveInfoMgr.pas',
   ClassHelpers.RichEdit in 'ClassHelpers.RichEdit.pas',
   UHTMLSnippetDoc in 'UHTMLSnippetDoc.pas',
-  UMarkdownUtils in 'UMarkdownUtils.pas';
+  UMarkdownUtils in 'UMarkdownUtils.pas',
+  ActiveText.UMarkdownRenderer in 'ActiveText.UMarkdownRenderer.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index b8d02d11e..b7f2441bf 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -585,6 +585,7 @@
 			<DCCReference Include="ClassHelpers.RichEdit.pas"/>
 			<DCCReference Include="UHTMLSnippetDoc.pas"/>
 			<DCCReference Include="UMarkdownUtils.pas"/>
+			<DCCReference Include="ActiveText.UMarkdownRenderer.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>

From 69346450267d79bc56983140ba3b3dbac6d7a03a Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 27 Apr 2025 20:21:48 +0100
Subject: [PATCH 235/264] Add unit to render snippet info in Markdown format

Added new UMarkdownSnippetDoc to the project that descends from
TSnippetDoc and adds support for rendering snippet information as
Markdown.
---
 Src/CodeSnip.dpr            |   3 +-
 Src/CodeSnip.dproj          |   1 +
 Src/UMarkdownSnippetDoc.pas | 235 ++++++++++++++++++++++++++++++++++++
 3 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 Src/UMarkdownSnippetDoc.pas

diff --git a/Src/CodeSnip.dpr b/Src/CodeSnip.dpr
index 3aa3d0f83..fa718dacc 100644
--- a/Src/CodeSnip.dpr
+++ b/Src/CodeSnip.dpr
@@ -379,7 +379,8 @@ uses
   ClassHelpers.RichEdit in 'ClassHelpers.RichEdit.pas',
   UHTMLSnippetDoc in 'UHTMLSnippetDoc.pas',
   UMarkdownUtils in 'UMarkdownUtils.pas',
-  ActiveText.UMarkdownRenderer in 'ActiveText.UMarkdownRenderer.pas';
+  ActiveText.UMarkdownRenderer in 'ActiveText.UMarkdownRenderer.pas',
+  UMarkdownSnippetDoc in 'UMarkdownSnippetDoc.pas';
 
 // Include resources
 {$Resource ExternalObj.tlb}       // Type library file
diff --git a/Src/CodeSnip.dproj b/Src/CodeSnip.dproj
index b7f2441bf..5eaa734a3 100644
--- a/Src/CodeSnip.dproj
+++ b/Src/CodeSnip.dproj
@@ -586,6 +586,7 @@
 			<DCCReference Include="UHTMLSnippetDoc.pas"/>
 			<DCCReference Include="UMarkdownUtils.pas"/>
 			<DCCReference Include="ActiveText.UMarkdownRenderer.pas"/>
+			<DCCReference Include="UMarkdownSnippetDoc.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
diff --git a/Src/UMarkdownSnippetDoc.pas b/Src/UMarkdownSnippetDoc.pas
new file mode 100644
index 000000000..aa931d2de
--- /dev/null
+++ b/Src/UMarkdownSnippetDoc.pas
@@ -0,0 +1,235 @@
+{
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/
+ *
+ * Copyright (C) 2025, Peter Johnson (gravatar.com/delphidabbler).
+ *
+ * Implements a class that renders a document that describes a snippet in
+ * Markdown format.
+}
+
+
+unit UMarkdownSnippetDoc;
+
+interface
+
+uses
+  // Delphi
+  SysUtils,
+  // Project
+  ActiveText.UMain,
+  Hiliter.UGlobals,
+  UEncodings,
+  UIStringList,
+  USnippetDoc;
+
+type
+  ///  <summary>Renders a document that describes a snippet in Markdown format.
+  ///  </summary>
+  TMarkdownSnippetDoc = class sealed (TSnippetDoc)
+  strict private
+    var
+      ///  <summary>Object used to build Markdown source code document.
+      ///  </summary>
+      fDocument: TStringBuilder;
+      ///  <summary>Flag indicating if the snippet has Pascal code.</summary>
+      ///  <remarks>When <c>False</c> plain text is assumed.</remarks>
+      fIsPascal: Boolean;
+  strict private
+    ///  <summary>Renders a Markdown paragraph with all given text emboldened.
+    ///  </summary>
+    procedure RenderStrongPara(const AText: string);
+    ///  <summary>Renders the given active text as Markdown.</summary>
+    function ActiveTextToMarkdown(ActiveText: IActiveText): string;
+  strict protected
+    ///  <summary>Initialises the Markdown document.</summary>
+    procedure InitialiseDoc; override;
+    ///  <summary>Adds the given heading (i.e. snippet name) to the document.
+    ///  Can be user defined or from main database.</summary>
+    procedure RenderHeading(const Heading: string; const UserDefined: Boolean);
+      override;
+    ///  <summary>Adds the given snippet description to the document.</summary>
+    ///  <remarks>Active text formatting is observed and styled to suit the
+    ///  document.</remarks>
+    procedure RenderDescription(const Desc: IActiveText); override;
+    ///  <summary>Highlights the given source code and adds it to the document.
+    ///  </summary>
+    procedure RenderSourceCode(const SourceCode: string); override;
+    ///  <summary>Adds the given title, followed by the given text, to the
+    ///  document.</summary>
+    procedure RenderTitledText(const Title, Text: string); override;
+    ///  <summary>Adds a comma-separated list of text, preceded by the given
+    ///  title, to the document.</summary>
+    procedure RenderTitledList(const Title: string; List: IStringList);
+      override;
+    ///  <summary>Outputs the given compiler test info, preceded by the given
+    ///  heading.</summary>
+    procedure RenderCompilerInfo(const Heading: string;
+      const Info: TCompileDocInfoArray); override;
+    ///  <summary>Outputs the given message stating that there is no compiler
+    ///  test info, preceded by the given heading.</summary>
+    procedure RenderNoCompilerInfo(const Heading, NoCompileTests: string);
+      override;
+    ///  <summary>Adds the given extra information about the snippet to the
+    ///  document.</summary>
+    ///  <remarks>Active text formatting is observed and styled to suit the
+    ///  document.</remarks>
+    procedure RenderExtra(const ExtraText: IActiveText); override;
+    ///  <summary>Adds the given information about a code snippets database to
+    ///  the document.</summary>
+    procedure RenderDBInfo(const Text: string); override;
+    ///  <summary>Finalises the document and returns its content as encoded
+    ///  data.</summary>
+    function FinaliseDoc: TEncodedData; override;
+  public
+    ///  <summary>Constructs an object to render Markdown information.</summary>
+    ///  <param name="AIsPascal"><c>Boolean</c> [in] Flag indicating whether the
+    ///  snippet contains Pascal code.</param>
+    constructor Create(const AIsPascal: Boolean);
+    ///  <summary>Destroys the object.</summary>
+    destructor Destroy; override;
+  end;
+
+implementation
+
+uses
+  // Delphi
+  UStrUtils,
+  // Project
+  ActiveText.UMarkdownRenderer,
+  UMarkdownUtils;
+
+{ TMarkdownSnippetDoc }
+
+function TMarkdownSnippetDoc.ActiveTextToMarkdown(
+  ActiveText: IActiveText): string;
+var
+  Renderer: TActiveTextMarkdown;
+begin
+  Renderer := TActiveTextMarkdown.Create;
+  try
+    Result := Renderer.Render(ActiveText);
+  finally
+    Renderer.Free;
+  end;
+end;
+
+constructor TMarkdownSnippetDoc.Create(const AIsPascal: Boolean);
+begin
+  inherited Create;
+  fDocument := TStringBuilder.Create;
+  fIsPascal := AIsPascal;
+end;
+
+destructor TMarkdownSnippetDoc.Destroy;
+begin
+  fDocument.Free;
+  inherited;
+end;
+
+function TMarkdownSnippetDoc.FinaliseDoc: TEncodedData;
+begin
+  Result := TEncodedData.Create(fDocument.ToString, etUnicode);
+end;
+
+procedure TMarkdownSnippetDoc.InitialiseDoc;
+begin
+  // Do nowt
+end;
+
+procedure TMarkdownSnippetDoc.RenderCompilerInfo(const Heading: string;
+  const Info: TCompileDocInfoArray);
+resourcestring
+  sCompiler = 'Compiler';
+  sResults = 'Results';
+var
+  CompilerInfo: TCompileDocInfo;  // info about each compiler
+begin
+  RenderStrongPara(Heading);
+
+  fDocument.AppendLine(TMarkdown.TableHeading([sCompiler, sResults]));
+  for CompilerInfo in Info do
+    fDocument.AppendLine(
+      TMarkdown.TableRow([CompilerInfo.Compiler, CompilerInfo.Result])
+    );
+  fDocument.AppendLine;
+end;
+
+procedure TMarkdownSnippetDoc.RenderDBInfo(const Text: string);
+begin
+  fDocument
+    .AppendLine(TMarkdown.WeakEmphasis(TMarkdown.EscapeText(Text)))
+    .AppendLine;
+end;
+
+procedure TMarkdownSnippetDoc.RenderDescription(const Desc: IActiveText);
+var
+  DescStr: string;
+begin
+  DescStr := ActiveTextToMarkdown(Desc);
+  if not StrIsEmpty(DescStr, True) then
+    fDocument.AppendLine(DescStr);
+end;
+
+procedure TMarkdownSnippetDoc.RenderExtra(const ExtraText: IActiveText);
+var
+  ExtraStr: string;
+begin
+  ExtraStr := ActiveTextToMarkdown(ExtraText);
+  if not StrIsEmpty(ExtraStr, True) then
+    fDocument.AppendLine(ExtraStr);
+end;
+
+procedure TMarkdownSnippetDoc.RenderHeading(const Heading: string;
+  const UserDefined: Boolean);
+begin
+  fDocument
+    .AppendLine(TMarkdown.Heading(TMarkdown.EscapeText(Heading), 1))
+    .AppendLine;
+end;
+
+procedure TMarkdownSnippetDoc.RenderNoCompilerInfo(const Heading,
+  NoCompileTests: string);
+begin
+  RenderStrongPara(Heading);
+  fDocument
+    .AppendLine(TMarkdown.Paragraph(TMarkdown.EscapeText(NoCompileTests)))
+    .AppendLine;
+end;
+
+procedure TMarkdownSnippetDoc.RenderSourceCode(const SourceCode: string);
+begin
+  fDocument
+    .AppendLine(
+      TMarkdown.FencedCode(SourceCode, StrIf(fIsPascal, 'pascal', ''))
+    )
+    .AppendLine;
+end;
+
+procedure TMarkdownSnippetDoc.RenderStrongPara(const AText: string);
+begin
+  fDocument
+    .AppendLine(
+      TMarkdown.Paragraph(
+        TMarkdown.StrongEmphasis(TMarkdown.EscapeText(AText))
+      )
+    )
+    .AppendLine;
+end;
+
+procedure TMarkdownSnippetDoc.RenderTitledList(const Title: string;
+  List: IStringList);
+begin
+  RenderTitledText(Title, CommaList(List));
+end;
+
+procedure TMarkdownSnippetDoc.RenderTitledText(const Title, Text: string);
+begin
+  RenderStrongPara(Title);
+  fDocument
+    .AppendLine(TMarkdown.Paragraph(TMarkdown.EscapeText(Text)))
+    .AppendLine;
+end;
+
+end.

From 61d53b29802e5b5945f332471c8b79bab9344cf6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 27 Apr 2025 20:23:17 +0100
Subject: [PATCH 236/264] Add new Markdown source file type.

Added sfMarkdown element to TSourceFileType enumerated type.

The new sfMarkdown element broke TSaveSnippetMgr.GetFileTypeDesc and
TSaveUnitMgr.GetFileTypeDesc which assumed that all TSourceFileType
values were supported, and so don't check for any file type that may not
be supported. To enable such checks to be made a new
TSourceFileInfo.SupportsFileType method was added to check if a file
type is supported.

Updated the Code Formatting tab of the Preferences dialogue box with the
options to set Markdown as the default source file type.
---
 Src/FrSourcePrefs.pas   |  4 +++-
 Src/USaveSnippetMgr.pas |  5 ++++-
 Src/USaveSourceMgr.pas  | 16 ++++++++++------
 Src/USaveUnitMgr.pas    |  5 ++++-
 Src/USourceFileInfo.pas | 17 ++++++++++++++++-
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/Src/FrSourcePrefs.pas b/Src/FrSourcePrefs.pas
index da40b5e00..ab6cc70e9 100644
--- a/Src/FrSourcePrefs.pas
+++ b/Src/FrSourcePrefs.pas
@@ -127,12 +127,14 @@ implementation
   sRTFFileDesc = 'Rich text';
   sPascalFileDesc = 'Pascal';
   sTextFileDesc = 'Plain text';
+  sMarkdownFileDesc = 'Markdown';
 
 
 const
   // Maps source code file types to descriptions
   cFileDescs: array[TSourceFileType] of string = (
-    sTextFileDesc, sPascalFileDesc, sHTML5FileDesc, sXHTMLFileDesc, sRTFFileDesc
+    sTextFileDesc, sPascalFileDesc, sHTML5FileDesc, sXHTMLFileDesc,
+    sRTFFileDesc, sMarkdownFileDesc
   );
 
 
diff --git a/Src/USaveSnippetMgr.pas b/Src/USaveSnippetMgr.pas
index 9426baa94..25de4e1ba 100644
--- a/Src/USaveSnippetMgr.pas
+++ b/Src/USaveSnippetMgr.pas
@@ -171,9 +171,12 @@ function TSaveSnippetMgr.GetFileTypeDesc(
   const FileType: TSourceFileType): string;
 const
   Descriptions: array[TSourceFileType] of string = (
-    sTxtExtDesc, sIncExtDesc, sHtml5ExtDesc, sXHtmExtDesc, sRtfExtDesc
+    sTxtExtDesc, sIncExtDesc, sHtml5ExtDesc, sXHtmExtDesc, sRtfExtDesc,
+    '' {Markdown not supported}
   );
 begin
+  Assert(FileType <> sfMarkdown,
+    ClassName + '.GetFileTypeDesc: Markdown not supported');
   Result := Descriptions[FileType];
 end;
 
diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index 4be7c6fcc..41581bcfa 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -181,11 +181,14 @@ procedure TSaveSourceMgr.DoExecute;
 begin
   // Set up dialog box
   fSaveDlg.Filter := fSourceFileInfo.FilterString;
-  fSaveDlg.FilterIndex := FilterDescToIndex(
-    fSaveDlg.Filter,
-    fSourceFileInfo.FileTypeInfo[Preferences.SourceDefaultFileType].DisplayName,
-    1
-  );
+  if fSourceFileInfo.SupportsFileType(Preferences.SourceDefaultFileType) then
+    fSaveDlg.FilterIndex := FilterDescToIndex(
+      fSaveDlg.Filter,
+      fSourceFileInfo.FileTypeInfo[Preferences.SourceDefaultFileType].DisplayName,
+      1
+    )
+  else
+    fSaveDlg.FilterIndex := 1;
   fSaveDlg.FileName := fSourceFileInfo.DefaultFileName;
   // Display dialog box and save file if user OKs
   if fSaveDlg.Execute then
@@ -317,7 +320,8 @@ procedure TSaveSourceMgr.PreviewHandler(Sender: TObject);
     dtPlainText,  // sfPascal
     dtHTML,       // sfHTML5
     dtHTML,       // sfXHTML
-    dtRTF         // sfRTF
+    dtRTF,        // sfRTF
+    dtPlainText   // sfMarkdown
   );
   PreviewFileTypeMap: array[TPreviewDocType] of TSourceFileType = (
     sfText,       // dtPlainText
diff --git a/Src/USaveUnitMgr.pas b/Src/USaveUnitMgr.pas
index 7015767dc..1901952a4 100644
--- a/Src/USaveUnitMgr.pas
+++ b/Src/USaveUnitMgr.pas
@@ -242,9 +242,12 @@ function TSaveUnitMgr.GetDocTitle: string;
 function TSaveUnitMgr.GetFileTypeDesc(const FileType: TSourceFileType): string;
 const
   Descriptions: array[TSourceFileType] of string = (
-    sTextDesc, sPascalDesc, sHTML5Desc, sXHTMLDesc, sRTFDesc
+    sTextDesc, sPascalDesc, sHTML5Desc, sXHTMLDesc, sRTFDesc,
+    '' {Markdown not supported}
   );
 begin
+  Assert(FileType <> sfMarkdown,
+    ClassName + '.GetFileTypeDesc: Markdown not supported');
   Result := Descriptions[FileType];
 end;
 
diff --git a/Src/USourceFileInfo.pas b/Src/USourceFileInfo.pas
index d0e318f01..213f9041a 100644
--- a/Src/USourceFileInfo.pas
+++ b/Src/USourceFileInfo.pas
@@ -32,7 +32,8 @@ interface
     sfPascal,   // pascal files (either .pas for units or .inc for include files
     sfHTML5,    // HTML 5 files
     sfXHTML,    // XHTML files
-    sfRTF       // rich text files
+    sfRTF,      // rich text files
+    sfMarkdown  // Markdown files
   );
 
 type
@@ -132,6 +133,13 @@   TSourceFileInfo = class(TObject)
     ///  given one-based index within the current filter string.</summary>
     function FileTypeFromFilterIdx(const Idx: Integer): TSourceFileType;
 
+    ///  <summary>Checks if a file type is supported.</summary>
+    ///  <param name="FileType"><c>TSourceFileType</c> [in] File type to check.
+    ///  </param>
+    ///  <returns><c>Boolean</c>. <c>True</c> if file type is supported,
+    ///  <c>False</c> if not.</returns>
+    function SupportsFileType(const FileType: TSourceFileType): Boolean;
+
     ///  <summary>Information about each supported file type that is of use to
     ///  save source dialog boxes.</summary>
     ///  <exception>A <c>EListError</c> exception is raised if no information
@@ -139,6 +147,7 @@   TSourceFileInfo = class(TObject)
     ///  </exception>
     property FileTypeInfo[const FileType: TSourceFileType]: TSourceFileTypeInfo
       read GetFileTypeInfo write SetFileTypeInfo;
+
     ///  <summary>Default source code file name.</summary>
     ///  <remarks>Must be a valid Pascal identifier. Invalid characters are
     ///  replaced by underscores.</remarks>
@@ -243,6 +252,12 @@ procedure TSourceFileInfo.SetFileTypeInfo(const FileType: TSourceFileType;
   GenerateFilterInfo;
 end;
 
+function TSourceFileInfo.SupportsFileType(const FileType: TSourceFileType):
+  Boolean;
+begin
+  Result := fFileTypeInfo.ContainsKey(FileType);
+end;
+
 { TSourceFileTypeInfo }
 
 constructor TSourceFileTypeInfo.Create(const AExtension, ADisplayName: string;

From 9c67d384fdcf97be0439e49524301180013c51b2 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Sun, 27 Apr 2025 20:22:18 +0100
Subject: [PATCH 237/264] Add Markdown support to Save Snippet Information dlg

Updated TSaveInfoMgr in USaveInfoMgr to add support for rendering,
previewing and outputting snippet information in Markdown format.
---
 Src/USaveInfoMgr.pas | 48 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index 8f5e1f7c0..c62f5275c 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -5,8 +5,8 @@
  *
  * Copyright (C) 2025, Peter Johnson (gravatar.com/delphidabbler).
  *
- * Saves information about a snippet to disk in rich text format. Only routine
- * snippet kinds are supported.
+ * Saves information about a snippet to disk in various, user specifed, formats.
+ * Only routine snippet kinds are supported.
 }
 
 
@@ -55,6 +55,12 @@   TSaveInfoMgr = class(TNoPublicConstructObject)
     ///  information about the snippet represented by the given view.</summary>
     function GeneratePlainText: TEncodedData;
 
+    ///  <summary>Returns encoded data containing a Markdown representation of
+    ///  information about the snippet represented by the given view.</summary>
+    ///  <returns><c>TEncodedData</c>. Required Markdown document, encoded as
+    ///  UTF-16.</returns>
+    function GenerateMarkdown: TEncodedData;
+
     ///  <summary>Returns type of file selected in the associated save dialogue
     ///  box.</summary>
     function SelectedFileType: TSourceFileType;
@@ -127,11 +133,13 @@ implementation
   SysUtils,
   Dialogs,
   // Project
+  DB.USnippetKind,
   FmPreviewDlg,
   Hiliter.UAttrs,
   Hiliter.UFileHiliter,
   Hiliter.UGlobals,
   UIOUtils,
+  UMarkdownSnippetDoc,
   UOpenDialogHelper,
   UPreferences,
   URTFSnippetDoc,
@@ -171,7 +179,6 @@ procedure TSaveInfoMgr.DoExecute;
   if fSaveDlg.Execute then
   begin
     FileType := SelectedFileType;
-    FileContent := GenerateOutput(FileType).ToString;
     Encoding := TEncodingHelper.GetEncoding(fSaveDlg.SelectedEncoding);
     try
       FileContent := GenerateOutput(FileType).ToString;
@@ -221,6 +228,22 @@ function TSaveInfoMgr.GenerateHTML(const AUseHiliting: Boolean;
   end;
 end;
 
+function TSaveInfoMgr.GenerateMarkdown: TEncodedData;
+var
+  Doc: TMarkdownSnippetDoc;
+begin
+  Assert(Supports(fView, ISnippetView),
+    ClassName + '.GeneratePlainText: View is not a snippet view');
+  Doc := TMarkdownSnippetDoc.Create(
+    (fView as ISnippetView).Snippet.Kind <> skFreeform
+  );
+  try
+    Result := Doc.Generate((fView as ISnippetView).Snippet);
+  finally
+    Doc.Free;
+  end;
+end;
+
 function TSaveInfoMgr.GenerateOutput(const FileType: TSourceFileType):
   TEncodedData;
 var
@@ -233,6 +256,7 @@ function TSaveInfoMgr.GenerateOutput(const FileType: TSourceFileType):
     sfText: Result := GeneratePlainText;
     sfHTML5: Result := GenerateHTML(UseHiliting, THTML5SnippetDoc);
     sfXHTML: Result := GenerateHTML(UseHiliting, TXHTMLSnippetDoc);
+    sfMarkdown: Result := GenerateMarkdown;
   end;
 end;
 
@@ -298,6 +322,7 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
   sTextDesc = 'Plain text file';
   sHTML5Desc = 'HTML 5 file';
   sXHTMLDesc = 'XHTML file';
+  sMarkdownDesc = 'Markdown file';
 begin
   inherited InternalCreate;
   fView := AView;
@@ -336,6 +361,17 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
     ]
   );
   fSourceFileInfo.DefaultFileName := sDefFileName;
+  fSourceFileInfo.FileTypeInfo[sfMarkdown] := TSourceFileTypeInfo.Create(
+    '.md',
+    sMarkdownDesc,
+    [
+      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding),
+      TSourceFileEncoding.Create(etUTF16LE, sUTF16LEEncoding),
+      TSourceFileEncoding.Create(etUTF16BE, sUTF16BEEncoding),
+      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding)
+    ]
+  );
+  fSourceFileInfo.DefaultFileName := sDefFileName;
 
   fSaveDlg := TSaveSourceDlg.Create(nil);
   fSaveDlg.Title := sDlgCaption;
@@ -379,6 +415,12 @@ procedure TSaveInfoMgr.PreviewHandler(Sender: TObject);
       PreviewDocType := dtHTML;
       PreviewFileType := sfXHTML;
     end;
+    sfMarkdown:
+    begin
+      // Markdown is previewed as plain text
+      PreviewDocType := dtPlainText;
+      PreviewFileType := sfMarkdown;
+    end;
     else
       raise Exception.Create(
         ClassName + '.PreviewHandler: unsupported file type'

From 6e8e0f77aa2a2fb2110dfbf516c70777c37dee15 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 28 Apr 2025 15:22:27 +0100
Subject: [PATCH 238/264] Fix snippet info preview bug for ANSI encodings

When either the plain text or Markdown file types were selected in the
Save Snippet Information dialogue box and the ANSI encoding was also
selected, the snippet displayed when the output ws previewed could
differ from that written to file. This occured when the snippet
contained characters that couldn't be rendered correctly in ANSI: the
preview would show the correct snippet (rendered in Unicode) while the
snippet with incorrectly translated characters was written to file.

This bug was fixed so that the snippet previewed was also in ANSI
encoding, meaning that any encoding errors show up there exactly as they
will be written to file.

Fixes #164
---
 Src/USaveInfoMgr.pas | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index c62f5275c..ede347d7f 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -231,6 +231,7 @@ function TSaveInfoMgr.GenerateHTML(const AUseHiliting: Boolean;
 function TSaveInfoMgr.GenerateMarkdown: TEncodedData;
 var
   Doc: TMarkdownSnippetDoc;
+  GeneratedData: TEncodedData;
 begin
   Assert(Supports(fView, ISnippetView),
     ClassName + '.GeneratePlainText: View is not a snippet view');
@@ -238,7 +239,10 @@ function TSaveInfoMgr.GenerateMarkdown: TEncodedData;
     (fView as ISnippetView).Snippet.Kind <> skFreeform
   );
   try
-    Result := Doc.Generate((fView as ISnippetView).Snippet);
+    GeneratedData := Doc.Generate((fView as ISnippetView).Snippet);
+    Result := TEncodedData.Create(
+      GeneratedData.ToString, fSaveDlg.SelectedEncoding
+    );
   finally
     Doc.Free;
   end;
@@ -264,13 +268,17 @@ function TSaveInfoMgr.GeneratePlainText: TEncodedData;
 var
   Doc: TTextSnippetDoc;        // object that generates RTF document
   HiliteAttrs: IHiliteAttrs;  // syntax highlighter formatting attributes
+  GeneratedData: TEncodedData;
 begin
   Assert(Supports(fView, ISnippetView),
     ClassName + '.GeneratePlainText: View is not a snippet view');
   HiliteAttrs := THiliteAttrsFactory.CreateNulAttrs;
   Doc := TTextSnippetDoc.Create;
   try
-    Result := Doc.Generate((fView as ISnippetView).Snippet);
+    GeneratedData := Doc.Generate((fView as ISnippetView).Snippet);
+    Result := TEncodedData.Create(
+      GeneratedData.ToString, fSaveDlg.SelectedEncoding
+    );
   finally
     Doc.Free;
   end;

From 0c0403efa2262e13fe8d5b7cd6c6aca0060c8efc Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 28 Apr 2025 17:43:20 +0100
Subject: [PATCH 239/264] Add new TMessageBox.Warning method

---
 Src/UMessageBox.pas | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/Src/UMessageBox.pas b/Src/UMessageBox.pas
index 62108b1af..9f25b7260 100644
--- a/Src/UMessageBox.pas
+++ b/Src/UMessageBox.pas
@@ -142,6 +142,16 @@   TMessageBox = class sealed(TNoConstructObject)
     ///  breaks.</param>
     class procedure Error(const Parent: TComponent; const Msg: string);
 
+    ///  <summary>Displays a message in a warning dialogue box aligned over the
+    ///  parent control.</summary>
+    ///  <param name="Parent">TComponent [in] Dialogue box's parent control,
+    ///  over which dialogue box is aligned. May be nil, when active form is
+    ///  used for alignment.</param>
+    ///  <param name="Msg">string [in] Message displayed in dialogue box.
+    ///  Separate lines with LF or CRLF. Separate paragraphs with two line
+    ///  breaks.</param>
+    class procedure Warning(const Parent: TComponent; const Msg: string);
+
     ///  <summary>Displays a message in a confirmation dialogue box aligned over
     ///  the parent control.</summary>
     ///  <param name="Parent">TComponent [in] Dialogue box's parent control,
@@ -397,6 +407,21 @@ class procedure TMessageBox.Information(const Parent: TComponent;
   );
 end;
 
+class procedure TMessageBox.Warning(const Parent: TComponent;
+  const Msg: string);
+begin
+  MessageBeep(MB_ICONEXCLAMATION);
+  Display(
+    Parent,
+    Msg,
+    mtWarning,
+    [TMessageBoxButton.Create(sBtnOK, mrOK, True, True)],
+    DefaultTitle,
+    DefaultIcon,
+    False
+  );
+end;
+
 { TMessageBoxButton }
 
 constructor TMessageBoxButton.Create(const ACaption: TCaption;

From 4b77024c89dfe9e08b29019039e5b462f364de0e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 28 Apr 2025 20:28:56 +0100
Subject: [PATCH 240/264] Warn when saving snippet information looses data

When saving snippet information that contains characters not supported
in the selected output encoding a warning message now appears to inform
that the saved or previewed text differs from the original.

This usually happens when saving Markdown or plain text in the default
ANSI encoding.

Fixes #165
---
 Src/USaveInfoMgr.pas | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index ede347d7f..600f15830 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -35,6 +35,10 @@   TSaveInfoMgr = class(TNoPublicConstructObject)
       fSaveDlg: TSaveSourceDlg;
       fSourceFileInfo: TSourceFileInfo;
 
+    ///  <summary>Displays a warning message about data loss if
+    ///  <c>ExpectedStr</c> doesn't match <c>EncodedStr</c>.</summary>
+    class procedure WarnIfDataLoss(const ExpectedStr, EncodedStr: string);
+
     ///  <summary>Returns encoded data containing a RTF representation of
     ///  information about the snippet represented by the given view.</summary>
     class function GenerateRichText(View: IView; const AUseHiliting: Boolean):
@@ -140,6 +144,7 @@ implementation
   Hiliter.UGlobals,
   UIOUtils,
   UMarkdownSnippetDoc,
+  UMessageBox,
   UOpenDialogHelper,
   UPreferences,
   URTFSnippetDoc,
@@ -231,18 +236,20 @@ function TSaveInfoMgr.GenerateHTML(const AUseHiliting: Boolean;
 function TSaveInfoMgr.GenerateMarkdown: TEncodedData;
 var
   Doc: TMarkdownSnippetDoc;
-  GeneratedData: TEncodedData;
+  ExpectedMarkown: string;
 begin
   Assert(Supports(fView, ISnippetView),
-    ClassName + '.GeneratePlainText: View is not a snippet view');
+    ClassName + '.GenerateMarkdown: View is not a snippet view');
   Doc := TMarkdownSnippetDoc.Create(
     (fView as ISnippetView).Snippet.Kind <> skFreeform
   );
   try
-    GeneratedData := Doc.Generate((fView as ISnippetView).Snippet);
-    Result := TEncodedData.Create(
-      GeneratedData.ToString, fSaveDlg.SelectedEncoding
-    );
+    // Generate Markdown using default UTF-16 encoding
+    ExpectedMarkown := Doc.Generate((fView as ISnippetView).Snippet).ToString;
+    // Convert Markdown to encoding to that selected in save dialogue box
+    Result := TEncodedData.Create(ExpectedMarkown, fSaveDlg.SelectedEncoding);
+    // Check for data loss in required encoding
+    WarnIfDataLoss(ExpectedMarkown, Result.ToString);
   finally
     Doc.Free;
   end;
@@ -266,19 +273,23 @@ function TSaveInfoMgr.GenerateOutput(const FileType: TSourceFileType):
 
 function TSaveInfoMgr.GeneratePlainText: TEncodedData;
 var
-  Doc: TTextSnippetDoc;        // object that generates RTF document
-  HiliteAttrs: IHiliteAttrs;  // syntax highlighter formatting attributes
-  GeneratedData: TEncodedData;
+  Doc: TTextSnippetDoc;        // object that generates plain text document
+  HiliteAttrs: IHiliteAttrs;   // syntax highlighter formatting attributes
+  ExpectedText: string;        // expected plain text
 begin
   Assert(Supports(fView, ISnippetView),
     ClassName + '.GeneratePlainText: View is not a snippet view');
   HiliteAttrs := THiliteAttrsFactory.CreateNulAttrs;
   Doc := TTextSnippetDoc.Create;
   try
-    GeneratedData := Doc.Generate((fView as ISnippetView).Snippet);
+    // Generate text using default UTF-16 encoding
+    ExpectedText := Doc.Generate((fView as ISnippetView).Snippet).ToString;
+    // Convert encoding to that selected in save dialogue box
     Result := TEncodedData.Create(
-      GeneratedData.ToString, fSaveDlg.SelectedEncoding
+      ExpectedText, fSaveDlg.SelectedEncoding
     );
+    // Check for data loss in required encoding
+    WarnIfDataLoss(ExpectedText, Result.ToString);
   finally
     Doc.Free;
   end;
@@ -448,4 +459,15 @@ function TSaveInfoMgr.SelectedFileType: TSourceFileType;
   Result := fSourceFileInfo.FileTypeFromFilterIdx(fSaveDlg.FilterIndex);
 end;
 
+class procedure TSaveInfoMgr.WarnIfDataLoss(const ExpectedStr,
+  EncodedStr: string);
+resourcestring
+  sEncodingError = 'The selected snippet contains characters that can''t be '
+    + 'represented in the chosen file encoding.' + sLineBreak + sLineBreak
+    + 'Please compare the output to the snippet displayed in the Details pane.';
+begin
+  if ExpectedStr <> EncodedStr then
+    TMessageBox.Warning(nil, sEncodingError);
+end;
+
 end.

From 6cf961fa9181315e88c5fff42fd873fa273a88e6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 28 Apr 2025 21:22:59 +0100
Subject: [PATCH 241/264] Update Save Snippet Information Dialogue Help topic

Rewritten re the addition of HTML 5, XHTML, plain text and Markdown
format options to the original rich text.

Also revised re the change to using the more complex TSaveSourceDlg
dialogue box that enables syntax highliting, previewing, and choice of
file encodings.
---
 Src/Help/HTML/dlg_saveinfo.htm | 86 +++++++++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 7 deletions(-)

diff --git a/Src/Help/HTML/dlg_saveinfo.htm b/Src/Help/HTML/dlg_saveinfo.htm
index 53abcca9d..59cbda798 100644
--- a/Src/Help/HTML/dlg_saveinfo.htm
+++ b/Src/Help/HTML/dlg_saveinfo.htm
@@ -28,21 +28,93 @@ <h1>
     </h1>
     <p>
         This dialogue box is displayed when the <em>File | Save Snippet
-        Information</em> menu option is clicked. It is used to specify the
-        name of the file into which information about the currently selected
-        snippet is to be saved.
+        Information</em> menu option is clicked. It is used to specify the file
+        name, file type and encoding information for the snippet information 
+        that is to be saved.
     </p>
     <p>
-        The saved snippet information is written in rich text format.
+        The dialogue is a standard Windows save dialogue box with a few added
+        options.
     </p>
     <p>
-        This dialogue is a standard Windows save dialogue box. You specify the
-         name and folder for the file in the usual way.
+        You specify the name and folder for the file where the snippet information
+        is to be written in in the usual way.
     </p>
     <p>
-        Use the <em>Save</em> button to write the file to disk or press
+        Use the <em>Save as type</em> drop down list to specify the type of file
+        to be saved. Options are:
+    </p>
+    <ul>
+        <li>Plain text.</li>
+        <li>HTML</li>
+        <li>XHTML</li>
+        <li>Rich text format</li>
+        <li>Markdown</li>
+    </ul>
+    <p>
+        The HTML 5 and XHTML options are very similar and differ only in the
+        type of HTML that is written. For either type an embedded CSS style
+        sheet is used to style the document.
+    </p>
+    <p>
+        When any of the HTML 5, XHTML or rich text file types are selected source
+        code embedded in the snippet information will be syntax highlighted if
+        the <em>Use syntax highlighting</em> check box is checked.
+    </p>
+    <p>
+        The output file encoding can be be specified in the <em>File Encoding</em>
+        drop down list. Options vary depending on the file type. Some file types
+        support only a single encoding. The encodings are:
+    </p>
+    <ul>
+        <li>
+            <em>ANSI (Default)</em> &ndash; the system default ANSI encoding.
+            Available as an option for plain text and Markdown file formats.
+        </li>
+        <li>
+            <em>UTF-8</em> &ndash; UTF-8 encoding, with BOM<sup>&dagger;</sup>.
+            Available as an option for plain text and Markdown file formats and
+            as the only encoding available for HTML 5 and XHTML file formats.
+        </li>
+        <li>
+            <em>Unicode (Little Endian)</em> &ndash; UTF-16 LE encoding, with
+            BOM<sup>&dagger;</sup>. Available as an option for plain text files and Markdown
+            file formats.
+        </li>
+        <li>
+            <em>Unicode (Big Endian)</em> &ndash; UTF-16 BE encoding, with
+            BOM<sup>&dagger;</sup>. Available as an option for plain text files and Markdown
+            file formats.
+        </li>
+        <li>
+            <em>ASCII</em> &ndash; The only encoding available for the rich text file.
+        </li>
+    </ul>
+    <p>
+        The output can be previewed by clicking the <em>Preview</em> button. This
+        displays the snippet information in a dialogue box, formatted according to your
+        selections. Text in the preview can be selected and copied to the
+        clipboard if required.
+    </p>
+    <p>
+        Use the <em>Save</em> button to write the snippet information to disk or choose
         <em>Cancel</em> to abort.
     </p>
+    <p>
+        <strong class="warning">Warning:</strong> When plain text or Markdown formatted
+        snippet information is written in ANSI format it is possibe that the information
+        contains characters that can't be represented in the system default ANSI encoding.
+        If this happens a warning
+        dialogue box is displayed whenever the snippet information is written to file
+        or is previewed.
+    </p>
+    <h3>
+        Footnote
+    </h3>
+    <p>
+        &dagger; BOM = Byte Order Mark or Preamble: a sequence of bytes at the
+        start of a text file that identifies its encoding.
+    </p>
 </body>
 
 </html>
\ No newline at end of file

From 7d81f661d96ada94c51fcf9b662bb9d2ee5f8596 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Mon, 28 Apr 2025 21:27:54 +0100
Subject: [PATCH 242/264] Update file format documentation

Updated Docs/Design/FileFormats/saved.html re the addition of plain
text, HTML 5, XHTML and Markdown support when saving snippet
information, along with support for different file encodings.
---
 Docs/Design/FileFormats/saved.html | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/Docs/Design/FileFormats/saved.html b/Docs/Design/FileFormats/saved.html
index f464bd621..3353269a3 100644
--- a/Docs/Design/FileFormats/saved.html
+++ b/Docs/Design/FileFormats/saved.html
@@ -62,9 +62,27 @@ <h2>
 </ol>
 
 <p>
-  In the first case the snippet is always saved in rich text format.
+  In the first case the snippet information can be saved as one of the following file types:
 </p>
 
+<ul>
+  <li>
+    Plain text.
+  </li>
+  <li>
+    HTML 5 files.
+  </li>
+  <li>
+    XHTML files.
+  </li>
+  <li>
+    Rich text files.
+  </li>
+  <li>
+    Markdown files.
+  </li>
+</ul>
+
 <p>
   In the second two cases the following file types can be chosen by the user:
 </p>
@@ -88,7 +106,7 @@ <h2>
 </ul>
 
 <p>
-  There is no specific file format for these files, except that HTML 5, XHTML and RTF
+  There is no specific file format for these files, except that HTML 5, XHTML, RTF and Markdown
   files conform to published specifications.
 </p>
 
@@ -97,11 +115,7 @@ <h2>
 </h2>
 
 <p>
-  In the first case the RTF is always saved in ASCII format.
-</p>
-
-<p>
-  In the 2nd and 3rd cases the encodings used depend on the file type and user choice. Different file
+  The available encodings used depend on the file type and user choice. Different file
   types have different encoding choices, as follows:
 </p>
 
@@ -164,7 +178,7 @@ <h2>
   <dd>
     <ul class="squashed">
       <li>
-        ANSI (system default code page). ASCII format is actually used.
+        ASCII [for Snippet Information] or ANSI [otherwise]. Regardless of naming, ASCII format is always used.
       </li>
     </ul>
   </dd>

From 122df99dc59004704b19068f2c51fa8d2471d5a4 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 08:09:01 +0100
Subject: [PATCH 243/264] Refactor TSaveInfoMgr class

Removed much duplicated code & rationalised snippet information document
creation.
---
 Src/USaveInfoMgr.pas | 160 ++++++++++++++-----------------------------
 1 file changed, 50 insertions(+), 110 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index 600f15830..24aa24bec 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -20,6 +20,7 @@ interface
   UEncodings,
   UHTMLSnippetDoc,
   USaveSourceDlg,
+  USnippetDoc,
   USourceFileInfo,
   UView;
 
@@ -39,32 +40,6 @@   TSaveInfoMgr = class(TNoPublicConstructObject)
     ///  <c>ExpectedStr</c> doesn't match <c>EncodedStr</c>.</summary>
     class procedure WarnIfDataLoss(const ExpectedStr, EncodedStr: string);
 
-    ///  <summary>Returns encoded data containing a RTF representation of
-    ///  information about the snippet represented by the given view.</summary>
-    class function GenerateRichText(View: IView; const AUseHiliting: Boolean):
-      TEncodedData; static;
-
-    ///  <summary>Returns encoded data containing a HTML representation of the
-    ///  required snippet information.</summary>
-    ///  <param name="AUseHiliting"><c>Boolean</c> [in] Determines whether
-    ///  source code is syntax highlighted or not.</param>
-    ///  <param name="GeneratorClass"><c>THTMLSnippetDocClass</c> [in] Class of
-    ///  object used to generate the required flavour of HTML.</param>
-    ///  <returns><c>TEncodedData</c>. Required HTML document, encoded as UTF-8.
-    ///  </returns>
-    function GenerateHTML(const AUseHiliting: Boolean;
-      const GeneratorClass: THTMLSnippetDocClass): TEncodedData;
-
-    ///  <summary>Returns encoded data containing a plain text representation of
-    ///  information about the snippet represented by the given view.</summary>
-    function GeneratePlainText: TEncodedData;
-
-    ///  <summary>Returns encoded data containing a Markdown representation of
-    ///  information about the snippet represented by the given view.</summary>
-    ///  <returns><c>TEncodedData</c>. Required Markdown document, encoded as
-    ///  UTF-16.</returns>
-    function GenerateMarkdown: TEncodedData;
-
     ///  <summary>Returns type of file selected in the associated save dialogue
     ///  box.</summary>
     function SelectedFileType: TSourceFileType;
@@ -96,6 +71,14 @@   TSaveInfoMgr = class(TNoPublicConstructObject)
     procedure EncodingQueryHandler(Sender: TObject;
       var Encodings: TSourceFileEncodings);
 
+    ///  <summary>Returns an instance of the document generator object for the
+    ///  desired file type.</summary>
+    ///  <param name="FileType"><c>TSourceFileType</c> [in] The type of file to
+    ///  be generated.</param>
+    ///  <returns><c>TSnippetDoc</c>. The required document generator object.
+    ///  The caller MUST free this object.</returns>
+    function GetDocGenerator(const FileType: TSourceFileType): TSnippetDoc;
+
     ///  <summary>Generates the required snippet information in the requested
     ///  format.</summary>
     ///  <param name="FileType"><c>TSourceFileType</c> [in] Type of file to be
@@ -142,6 +125,7 @@ implementation
   Hiliter.UAttrs,
   Hiliter.UFileHiliter,
   Hiliter.UGlobals,
+  UExceptions,
   UIOUtils,
   UMarkdownSnippetDoc,
   UMessageBox,
@@ -215,106 +199,62 @@ class procedure TSaveInfoMgr.Execute(View: IView);
   end;
 end;
 
-function TSaveInfoMgr.GenerateHTML(const AUseHiliting: Boolean;
-  const GeneratorClass: THTMLSnippetDocClass): TEncodedData;
-var
-  Doc: THTMLSnippetDoc;      // object that generates RTF document
-  HiliteAttrs: IHiliteAttrs;  // syntax highlighter formatting attributes
-begin
-  if (fView as ISnippetView).Snippet.HiliteSource and AUseHiliting then
-    HiliteAttrs := THiliteAttrsFactory.CreateUserAttrs
-  else
-    HiliteAttrs := THiliteAttrsFactory.CreateNulAttrs;
-  Doc := GeneratorClass.Create(HiliteAttrs);
-  try
-    Result := Doc.Generate((fView as ISnippetView).Snippet);
-  finally
-    Doc.Free;
-  end;
-end;
-
-function TSaveInfoMgr.GenerateMarkdown: TEncodedData;
-var
-  Doc: TMarkdownSnippetDoc;
-  ExpectedMarkown: string;
-begin
-  Assert(Supports(fView, ISnippetView),
-    ClassName + '.GenerateMarkdown: View is not a snippet view');
-  Doc := TMarkdownSnippetDoc.Create(
-    (fView as ISnippetView).Snippet.Kind <> skFreeform
-  );
-  try
-    // Generate Markdown using default UTF-16 encoding
-    ExpectedMarkown := Doc.Generate((fView as ISnippetView).Snippet).ToString;
-    // Convert Markdown to encoding to that selected in save dialogue box
-    Result := TEncodedData.Create(ExpectedMarkown, fSaveDlg.SelectedEncoding);
-    // Check for data loss in required encoding
-    WarnIfDataLoss(ExpectedMarkown, Result.ToString);
-  finally
-    Doc.Free;
-  end;
-end;
-
 function TSaveInfoMgr.GenerateOutput(const FileType: TSourceFileType):
   TEncodedData;
 var
-  UseHiliting: Boolean;
+  Doc: TSnippetDoc;
+  DocData: TEncodedData;
+  ExpectedText: string;
 begin
-  UseHiliting := fSaveDlg.UseSyntaxHiliting and
-    TFileHiliter.IsHilitingSupported(FileType);
-  case FileType of
-    sfRTF: Result := GenerateRichText(fView, UseHiliting);
-    sfText: Result := GeneratePlainText;
-    sfHTML5: Result := GenerateHTML(UseHiliting, THTML5SnippetDoc);
-    sfXHTML: Result := GenerateHTML(UseHiliting, TXHTMLSnippetDoc);
-    sfMarkdown: Result := GenerateMarkdown;
-  end;
-end;
-
-function TSaveInfoMgr.GeneratePlainText: TEncodedData;
-var
-  Doc: TTextSnippetDoc;        // object that generates plain text document
-  HiliteAttrs: IHiliteAttrs;   // syntax highlighter formatting attributes
-  ExpectedText: string;        // expected plain text
-begin
-  Assert(Supports(fView, ISnippetView),
-    ClassName + '.GeneratePlainText: View is not a snippet view');
-  HiliteAttrs := THiliteAttrsFactory.CreateNulAttrs;
-  Doc := TTextSnippetDoc.Create;
+  // Create required type of document generator
+  Doc := GetDocGenerator(FileType);
   try
-    // Generate text using default UTF-16 encoding
-    ExpectedText := Doc.Generate((fView as ISnippetView).Snippet).ToString;
-    // Convert encoding to that selected in save dialogue box
-    Result := TEncodedData.Create(
-      ExpectedText, fSaveDlg.SelectedEncoding
-    );
-    // Check for data loss in required encoding
-    WarnIfDataLoss(ExpectedText, Result.ToString);
+    Assert(Assigned(Doc), ClassName + '.GenerateOutput: unknown file type');
+    // Generate text
+    DocData := Doc.Generate((fView as ISnippetView).Snippet);
+    if DocData.EncodingType <> fSaveDlg.SelectedEncoding then
+    begin
+      // Required encoding is different to that used to generate document, so
+      // we need to convert to the desired encoding
+      ExpectedText := DocData.ToString;
+      // Convert encoding to that selected in save dialogue box
+      Result := TEncodedData.Create(
+        ExpectedText, fSaveDlg.SelectedEncoding
+      );
+      // Check for data loss in desired encoding
+      WarnIfDataLoss(ExpectedText, Result.ToString);
+    end
+    else
+      // Required encoding is same as that used to generate the document
+      Result := DocData;
   finally
     Doc.Free;
   end;
 end;
 
-class function TSaveInfoMgr.GenerateRichText(View: IView;
-  const AUseHiliting: Boolean): TEncodedData;
+function TSaveInfoMgr.GetDocGenerator(const FileType: TSourceFileType):
+  TSnippetDoc;
 var
-  Doc: TRTFSnippetDoc;        // object that generates RTF document
+  UseHiliting: Boolean;
+  IsPascalSnippet: Boolean;
   HiliteAttrs: IHiliteAttrs;  // syntax highlighter formatting attributes
 begin
-  Assert(Supports(View, ISnippetView),
-    'TSaveInfoMgr.GenerateRichText: View is not a snippet view');
-  if (View as ISnippetView).Snippet.HiliteSource and AUseHiliting then
+  IsPascalSnippet := (fView as ISnippetView).Snippet.Kind <> skFreeform;
+  UseHiliting := fSaveDlg.UseSyntaxHiliting
+    and TFileHiliter.IsHilitingSupported(FileType)
+    and (fView as ISnippetView).Snippet.HiliteSource;
+  if UseHiliting then
     HiliteAttrs := THiliteAttrsFactory.CreateUserAttrs
   else
     HiliteAttrs := THiliteAttrsFactory.CreateNulAttrs;
-  Doc := TRTFSnippetDoc.Create(HiliteAttrs);
-  try
-    // TRTFSnippetDoc generates stream of ASCII bytes
-    Result := Doc.Generate((View as ISnippetView).Snippet);
-    Assert(Result.EncodingType = etASCII,
-      'TSaveInfoMgr.GenerateRichText: ASCII encoded data expected');
-  finally
-    Doc.Free;
+  // Create required type of document generator
+  case FileType of
+    sfRTF: Result := TRTFSnippetDoc.Create(HiliteAttrs);
+    sfText: Result := TTextSnippetDoc.Create;
+    sfHTML5: Result := THTML5SnippetDoc.Create(HiliteAttrs);
+    sfXHTML: Result := TXHTMLSnippetDoc.Create(HiliteAttrs);
+    sfMarkdown: Result := TMarkdownSnippetDoc.Create(IsPascalSnippet);
+    else Result := nil;
   end;
 end;
 

From 679ce0af78a92796218ef22793e2ea6cea0cb483 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 09:07:40 +0100
Subject: [PATCH 244/264] Improve display of file encodings in TSaveSourceDlg

The "File encoding" label and combo box in TSaveSourceDlg is now
disabled when it only contains one item.
---
 Src/USaveSourceDlg.pas | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Src/USaveSourceDlg.pas b/Src/USaveSourceDlg.pas
index 78b301487..aab88db3d 100644
--- a/Src/USaveSourceDlg.pas
+++ b/Src/USaveSourceDlg.pas
@@ -495,6 +495,8 @@ procedure TSaveSourceDlg.DoTypeChange;
   fCmbEncoding.ItemIndex := IndexOfEncodingType(fSelectedEncoding);
   if fCmbEncoding.ItemIndex = -1 then
     fCmbEncoding.ItemIndex := 0;
+  fCmbEncoding.Enabled := fCmbEncoding.Items.Count > 1;
+  fLblEncoding.Enabled := fCmbEncoding.Enabled;
   DoEncodingChange;
 
   inherited;

From 543170e5732e4ca07cc2133aa5e2d5d2a098c8fc Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 10:21:39 +0100
Subject: [PATCH 245/264] Standardise and improve file encoding names

File encoding names are now determined by the encoding type and are no
longer specified by the code that displays TSaveSourceDlg dialogue
boxes. This not only standardises the encoding names but removes quite a
bit of duplication and simplifies code that saves snippets, snippet
information and units.

The system default ANSI encoding was previously displayed as "ANSI
(Default)". This has been changed to "ANSI Code Page 999", where 999 is
the default system code page for the user's locale.
---
 Src/USaveInfoMgr.pas    | 33 +++++-------------------
 Src/USaveSourceDlg.pas  |  4 +--
 Src/USaveSourceMgr.pas  | 34 +++++-------------------
 Src/USourceFileInfo.pas | 57 +++++++++++++++++++++++++++++++++--------
 4 files changed, 60 insertions(+), 68 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index 24aa24bec..7b0c4dca9 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -270,18 +270,13 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
 resourcestring
   sDefFileName = 'SnippetInfo';
   sDlgCaption = 'Save Snippet Information';
-  // descriptions of supported encodings
-  sASCIIEncoding = 'ASCII';
-  sANSIDefaultEncoding = 'ANSI (Default)';
-  sUTF8Encoding = 'UTF-8';
-  sUTF16LEEncoding = 'Unicode (Little Endian)';
-  sUTF16BEEncoding = 'Unicode (Big Endian)';
   // descriptions of supported file filter strings
   sRTFDesc = 'Rich text file';
   sTextDesc = 'Plain text file';
   sHTML5Desc = 'HTML 5 file';
   sXHTMLDesc = 'XHTML file';
   sMarkdownDesc = 'Markdown file';
+
 begin
   inherited InternalCreate;
   fView := AView;
@@ -290,45 +285,29 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
   fSourceFileInfo.FileTypeInfo[sfRTF] := TSourceFileTypeInfo.Create(
     '.rtf',
     sRTFDesc,
-    [
-      TSourceFileEncoding.Create(etASCII, sASCIIEncoding)
-    ]
+    [etASCII]
   );
   fSourceFileInfo.FileTypeInfo[sfText] := TSourceFileTypeInfo.Create(
     '.txt',
     sTextDesc,
-    [
-      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding),
-      TSourceFileEncoding.Create(etUTF16LE, sUTF16LEEncoding),
-      TSourceFileEncoding.Create(etUTF16BE, sUTF16BEEncoding),
-      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding)
-    ]
+    [etUTF8, etUTF16LE, etUTF16BE, etSysDefault]
   );
   fSourceFileInfo.FileTypeInfo[sfHTML5] := TSourceFileTypeInfo.Create(
     '.html',
     sHTML5Desc,
-    [
-      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
-    ]
+    [etUTF8]
   );
   fSourceFileInfo.DefaultFileName := sDefFileName;
   fSourceFileInfo.FileTypeInfo[sfXHTML] := TSourceFileTypeInfo.Create(
     '.html',
     sXHTMLDesc,
-    [
-      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
-    ]
+    [etUTF8]
   );
   fSourceFileInfo.DefaultFileName := sDefFileName;
   fSourceFileInfo.FileTypeInfo[sfMarkdown] := TSourceFileTypeInfo.Create(
     '.md',
     sMarkdownDesc,
-    [
-      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding),
-      TSourceFileEncoding.Create(etUTF16LE, sUTF16LEEncoding),
-      TSourceFileEncoding.Create(etUTF16BE, sUTF16BEEncoding),
-      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding)
-    ]
+    [etUTF8, etUTF16LE, etUTF16BE, etSysDefault]
   );
   fSourceFileInfo.DefaultFileName := sDefFileName;
 
diff --git a/Src/USaveSourceDlg.pas b/Src/USaveSourceDlg.pas
index aab88db3d..21debca51 100644
--- a/Src/USaveSourceDlg.pas
+++ b/Src/USaveSourceDlg.pas
@@ -228,8 +228,6 @@ implementation
   sChkTruncateComment = 'Truncate comments to 1st paragraph';
   sBtnPreview = '&Preview...';
   sBtnHelp = '&Help';
-  // Default encoding name
-  sANSIEncoding = 'ANSI (Default)';
 
 
 const
@@ -483,7 +481,7 @@ procedure TSaveSourceDlg.DoTypeChange;
     fOnEncodingQuery(Self, Encodings);
   if Length(Encodings) = 0 then
     Encodings := TSourceFileEncodings.Create(
-      TSourceFileEncoding.Create(etSysDefault, sANSIEncoding)
+      TSourceFileEncoding.Create(etSysDefault)
     );
   fCmbEncoding.Clear;
   for Encoding in Encodings do
diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index 41581bcfa..9a43cdce2 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -134,8 +134,8 @@ implementation
   // Delphi
   SysUtils,
   // Project
-  FmPreviewDlg, Hiliter.UFileHiliter, UIOUtils, UMessageBox, UOpenDialogHelper,
-  UPreferences;
+  FmPreviewDlg, Hiliter.UFileHiliter, UIOUtils, UMessageBox,
+  UOpenDialogHelper, UPreferences;
 
 
 { TSaveSourceMgr }
@@ -244,53 +244,33 @@ procedure TSaveSourceMgr.HiliteQueryHandler(Sender: TObject;
 end;
 
 constructor TSaveSourceMgr.InternalCreate;
-resourcestring
-  // descriptions of supported encodings
-  sANSIDefaultEncoding = 'ANSI (Default)';
-  sUTF8Encoding = 'UTF-8';
-  sUTF16LEEncoding = 'Unicode (Little Endian)';
-  sUTF16BEEncoding = 'Unicode (Big Endian)';
 begin
   inherited InternalCreate;
   fSourceFileInfo := TSourceFileInfo.Create;
   fSourceFileInfo.FileTypeInfo[sfText] := TSourceFileTypeInfo.Create(
     '.txt',
     GetFileTypeDesc(sfText),
-    [
-      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding),
-      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding),
-      TSourceFileEncoding.Create(etUTF16LE, sUTF16LEEncoding),
-      TSourceFileEncoding.Create(etUTF16BE, sUTF16BEEncoding)
-    ]
+    [etSysDefault, etUTF8, etUTF16LE, etUTF16BE]
   );
   fSourceFileInfo.FileTypeInfo[sfPascal] := TSourceFileTypeInfo.Create(
     '.pas',
     GetFileTypeDesc(sfPascal),
-    [
-      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding),
-      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
-    ]
+    [etSysDefault, etUTF8]
   );
   fSourceFileInfo.FileTypeInfo[sfHTML5] := TSourceFileTypeInfo.Create(
     '.html',
     GetFileTypeDesc(sfHTML5),
-    [
-      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
-    ]
+    [etUTF8]
   );
   fSourceFileInfo.FileTypeInfo[sfXHTML] := TSourceFileTypeInfo.Create(
     '.html',
     GetFileTypeDesc(sfXHTML),
-    [
-      TSourceFileEncoding.Create(etUTF8, sUTF8Encoding)
-    ]
+    [etUTF8]
   );
   fSourceFileInfo.FileTypeInfo[sfRTF] := TSourceFileTypeInfo.Create(
     '.rtf',
     GetFileTypeDesc(sfRTF),
-    [
-      TSourceFileEncoding.Create(etSysDefault, sANSIDefaultEncoding)
-    ]
+    [etSysDefault]
  );
   fSourceFileInfo.DefaultFileName := GetDefaultFileName;
 
diff --git a/Src/USourceFileInfo.pas b/Src/USourceFileInfo.pas
index 213f9041a..2a9948b81 100644
--- a/Src/USourceFileInfo.pas
+++ b/Src/USourceFileInfo.pas
@@ -46,11 +46,15 @@   TSourceFileEncoding = record
     fEncodingType: TEncodingType; // Value of EncodingType property
     fDisplayName: string;         // Value of DisplayName property
   public
-    ///  <summary>Sets values of properties.</summary>
-    constructor Create(const AEncodingType: TEncodingType;
-      const ADisplayName: string);
+    ///  <summary>Sets the value of the <c>EncodingType</c> property.</summary>
+    ///  <remarks>The <c>DisplayName</c> property is dependent on the value of
+    ///  the <c>EncodingType</c> property and so can't be set explicitly.
+    ///  </remarks>
+    constructor Create(const AEncodingType: TEncodingType);
+
     ///  <summary>Type of this encoding.</summary>
     property EncodingType: TEncodingType read fEncodingType;
+
     ///  <summary>Description of encoding for display in dialog box.</summary>
     property DisplayName: string read fDisplayName;
   end;
@@ -72,7 +76,7 @@   TSourceFileTypeInfo = record
   public
     ///  <summary>Sets values of properties.</summary>
     constructor Create(const AExtension, ADisplayName: string;
-      const AEncodings: array of TSourceFileEncoding);
+      const AEncodingTypes: array of TEncodingType);
     ///  <summary>File extension associated with this file type.</summary>
     property Extension: string read fExtension;
     ///  <summary>Name of file extension to display in save dialog box.
@@ -163,6 +167,7 @@ implementation
   // Delphi
   SysUtils, Windows {for inlining}, Character,
   // Project
+  ULocales,
   UStrUtils;
 
 
@@ -261,24 +266,54 @@ function TSourceFileInfo.SupportsFileType(const FileType: TSourceFileType):
 { TSourceFileTypeInfo }
 
 constructor TSourceFileTypeInfo.Create(const AExtension, ADisplayName: string;
-  const AEncodings: array of TSourceFileEncoding);
+  const AEncodingTypes: array of TEncodingType);
 var
   I: Integer;
 begin
   fExtension := AExtension;
   fDisplayName := ADisplayName;
-  SetLength(fEncodings, Length(AEncodings));
-  for I := 0 to Pred(Length(AEncodings)) do
-    fEncodings[I] := AEncodings[I];
+  SetLength(fEncodings, Length(AEncodingTypes));
+  for I := 0 to Pred(Length(AEncodingTypes)) do
+    fEncodings[I] := TSourceFileEncoding.Create(AEncodingTypes[I]);
 end;
 
 { TSourceFileEncoding }
 
-constructor TSourceFileEncoding.Create(const AEncodingType: TEncodingType;
-  const ADisplayName: string);
+constructor TSourceFileEncoding.Create(const AEncodingType: TEncodingType);
+resourcestring
+  // Display names associated with each TEncodingType value
+  sASCIIEncodingName = 'ASCII';
+  sISO88591Name = 'ISO-8859-1';
+  sUTF8Name = 'UTF-8';
+  sUnicodeName = 'UTF-16';
+  sUTF16BEName = 'UTF-16 Big Endian';
+  sUTF16LEName = 'UTF-16 Little Endian';
+  sWindows1252Name = 'Windows-1252';
+  sSysDefaultName = 'ANSI Code Page %d';
 begin
   fEncodingType := AEncodingType;
-  fDisplayName := ADisplayName;
+  case fEncodingType of
+    etASCII:
+      fDisplayName := sASCIIEncodingName;
+    etISO88591:
+      fDisplayName := sISO88591Name;
+    etUTF8:
+      fDisplayName := sUTF8Name;
+    etUnicode:
+      fDisplayName := sUnicodeName;
+    etUTF16BE:
+      fDisplayName := sUTF16BEName;
+    etUTF16LE:
+      fDisplayName := sUTF16LEName;
+    etWindows1252:
+      fDisplayName := sWindows1252Name;
+    etSysDefault:
+      fDisplayName := Format(sSysDefaultName, [ULocales.DefaultAnsiCodePage]);
+    else
+      fDisplayName := '';
+  end;
+  Assert(fDisplayName <> '',
+    'TSourceFileEncoding.Create: Unrecognised encoding type');
 end;
 
 end.

From ea14d1fd129e3131c48d60b479e1b2350fed7928 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 10:43:11 +0100
Subject: [PATCH 246/264] Correct RTF encoding displayed in save dialogues

The file encoding presented as the only option for RTF files in the save
dialogue boxes displayed by the File | Save Unit and File | Save
Annotated Source dialogue boxes was changed from ANSI to ASCII. RTF
files are always saved in ASCII, regardless of the fact that the
encoding was presented as ANSI.

This now conforms with the ASCII encoding already presented by the File
| Save Snippet Information dialogue box.
---
 Src/USaveSourceMgr.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/USaveSourceMgr.pas b/Src/USaveSourceMgr.pas
index 9a43cdce2..995458c5d 100644
--- a/Src/USaveSourceMgr.pas
+++ b/Src/USaveSourceMgr.pas
@@ -270,7 +270,7 @@ constructor TSaveSourceMgr.InternalCreate;
   fSourceFileInfo.FileTypeInfo[sfRTF] := TSourceFileTypeInfo.Create(
     '.rtf',
     GetFileTypeDesc(sfRTF),
-    [etSysDefault]
+    [etASCII]
  );
   fSourceFileInfo.DefaultFileName := GetDefaultFileName;
 

From 485e0536cc43f22b939d31330ad0f0e63c6945f9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 11:03:38 +0100
Subject: [PATCH 247/264] Update title of Snippet Information dialogue box

The title of the dialogue box was changed to display the name of the
snippet for which information is being displayed.
---
 Src/USaveInfoMgr.pas | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index 7b0c4dca9..16cb5b344 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -151,6 +151,8 @@ destructor TSaveInfoMgr.Destroy;
 end;
 
 procedure TSaveInfoMgr.DoExecute;
+resourcestring
+  sDlgCaption = 'Save Snippet Information for %s';
 var
   Encoding: TEncoding;        // encoding to use for output file
   FileContent: string;        // output file content before encoding
@@ -164,6 +166,9 @@ procedure TSaveInfoMgr.DoExecute;
     1
   );
   fSaveDlg.FileName := fSourceFileInfo.DefaultFileName;
+  fSaveDlg.Title := Format(sDlgCaption, [
+    (fView as ISnippetView).Snippet.DisplayName]
+  );
   // Display dialog box and save file if user OKs
   if fSaveDlg.Execute then
   begin
@@ -269,7 +274,6 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
   DlgHelpKeyword = 'SnippetInfoFileDlg';
 resourcestring
   sDefFileName = 'SnippetInfo';
-  sDlgCaption = 'Save Snippet Information';
   // descriptions of supported file filter strings
   sRTFDesc = 'Rich text file';
   sTextDesc = 'Plain text file';
@@ -312,7 +316,6 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
   fSourceFileInfo.DefaultFileName := sDefFileName;
 
   fSaveDlg := TSaveSourceDlg.Create(nil);
-  fSaveDlg.Title := sDlgCaption;
   fSaveDlg.HelpKeyword := DlgHelpKeyword;
   fSaveDlg.CommentStyle := TCommentStyle.csNone;
   fSaveDlg.EnableCommentStyles := False;

From 82e5748fa55aee83cd1d75f1c26f106343c3b7b6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 11:10:06 +0100
Subject: [PATCH 248/264] Update title of Save Annotated Source dialogue box

This dialogue's title did not reflect the name of the menu option that
displays it, so it was updated to included "Save Annotated Source".

When a snippet is being displayed the word "Snippet" was removed from
the title. Conversely the word "Category" was retained when displaying
a category.
---
 Src/USaveSnippetMgr.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/USaveSnippetMgr.pas b/Src/USaveSnippetMgr.pas
index 25de4e1ba..cb08bd8c6 100644
--- a/Src/USaveSnippetMgr.pas
+++ b/Src/USaveSnippetMgr.pas
@@ -92,8 +92,8 @@ implementation
 
 resourcestring
   // Dialog box title
-  sSaveSnippetDlgTitle = 'Save %0:s Snippet';
-  sSaveCategoryDlgTitle = 'Save %0:s Category';
+  sSaveSnippetDlgTitle = 'Save Annotated Source of %0:s';
+  sSaveCategoryDlgTitle = 'Save Annotated Source of %0:s Category';
   // Output document title for snippets and categories
   sDocTitle = '"%0:s" %1:s';
   sCategory = 'category';

From 011629b86cb5d8fd0230216b97dc0459a09b90f7 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 11:21:54 +0100
Subject: [PATCH 249/264] Change default filename in Save Snippet Info dlg

The default file name was always "SnippetInfo", which could lead to
accidental overwrites of previously save information. The default was
changed to be a name based on the snippet display name.

Modified TSourceFileInfo with new property to prevent default file names
from being converted as necessary to make them safe Pascal identifiers:
we don't want this to happen in the Save Snippet Information dialogue.
---
 Src/USaveInfoMgr.pas    |  8 +++----
 Src/USourceFileInfo.pas | 46 +++++++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/Src/USaveInfoMgr.pas b/Src/USaveInfoMgr.pas
index 16cb5b344..6f71937d1 100644
--- a/Src/USaveInfoMgr.pas
+++ b/Src/USaveInfoMgr.pas
@@ -273,7 +273,6 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
 const
   DlgHelpKeyword = 'SnippetInfoFileDlg';
 resourcestring
-  sDefFileName = 'SnippetInfo';
   // descriptions of supported file filter strings
   sRTFDesc = 'Rich text file';
   sTextDesc = 'Plain text file';
@@ -301,19 +300,20 @@ constructor TSaveInfoMgr.InternalCreate(AView: IView);
     sHTML5Desc,
     [etUTF8]
   );
-  fSourceFileInfo.DefaultFileName := sDefFileName;
   fSourceFileInfo.FileTypeInfo[sfXHTML] := TSourceFileTypeInfo.Create(
     '.html',
     sXHTMLDesc,
     [etUTF8]
   );
-  fSourceFileInfo.DefaultFileName := sDefFileName;
   fSourceFileInfo.FileTypeInfo[sfMarkdown] := TSourceFileTypeInfo.Create(
     '.md',
     sMarkdownDesc,
     [etUTF8, etUTF16LE, etUTF16BE, etSysDefault]
   );
-  fSourceFileInfo.DefaultFileName := sDefFileName;
+
+  // set default file name without converting to valid Pascal identifier
+  fSourceFileInfo.RequirePascalDefFileName := False;
+  fSourceFileInfo.DefaultFileName := fView.Description;
 
   fSaveDlg := TSaveSourceDlg.Create(nil);
   fSaveDlg.HelpKeyword := DlgHelpKeyword;
diff --git a/Src/USourceFileInfo.pas b/Src/USourceFileInfo.pas
index 2a9948b81..863c19e12 100644
--- a/Src/USourceFileInfo.pas
+++ b/Src/USourceFileInfo.pas
@@ -103,6 +103,8 @@   TSourceFileInfo = class(TObject)
       fFilterIdxToFileTypeMap: TDictionary<Integer,TSourceFileType>;
       ///  <summary>Value of DefaultFileName property.</summary>
       fDefaultFileName: string;
+      ///  <summary>Value of <c>RequirePascalDefFileName</c> property.</summary>
+      fRequirePascalDefFileName: Boolean;
       ///  <summary>Filter string for use in open / save dialog boxes from
       ///  descriptions and file extensions of each supported file type.
       ///  </summary>
@@ -153,10 +155,18 @@   TSourceFileInfo = class(TObject)
       read GetFileTypeInfo write SetFileTypeInfo;
 
     ///  <summary>Default source code file name.</summary>
-    ///  <remarks>Must be a valid Pascal identifier. Invalid characters are
-    ///  replaced by underscores.</remarks>
+    ///  <remarks>If, and only if, <c>RequirePascalDefFileName</c> is
+    ///  <c>True</c> the default file name is modified so that name is a valid
+    ///  Pascal identifier.</remarks>
     property DefaultFileName: string
       read fDefaultFileName write SetDefaultFileName;
+
+    ///  <summary>Determines whether any value assigned to
+    ///  <c>DefaultFileName</c> is converted to a valid Pascal identifier or
+    ///  not.</summary>
+    property RequirePascalDefFileName: Boolean
+      read fRequirePascalDefFileName write fRequirePascalDefFileName
+      default True;
   end;
 
 
@@ -178,6 +188,7 @@ constructor TSourceFileInfo.Create;
   inherited Create;
   fFileTypeInfo := TDictionary<TSourceFileType,TSourceFileTypeInfo>.Create;
   fFilterIdxToFileTypeMap := TDictionary<Integer,TSourceFileType>.Create;
+  fRequirePascalDefFileName := True;
 end;
 
 destructor TSourceFileInfo.Destroy;
@@ -232,19 +243,24 @@ procedure TSourceFileInfo.SetDefaultFileName(const Value: string);
 var
   Idx: Integer; // loops through characters of filename
 begin
-  // convert to "camel" case
-  fDefaultFileName := StrStripWhiteSpace(StrCapitaliseWords(Value));
-  // replaces invalid Pascal identifier characters with underscore
-  if (fDefaultFileName <> '')
-    and not TCharacter.IsLetter(fDefaultFileName[1])
-    and (fDefaultFileName[1] <> '_') then
-    fDefaultFileName[1] := '_';
-  for Idx := 2 to Length(fDefaultFileName) do
-    if not TCharacter.IsLetterOrDigit(fDefaultFileName[Idx])
-      and (fDefaultFileName[Idx] <> '_') then
-      fDefaultFileName[Idx] := '_';
-  Assert((fDefaultFileName <> '') and IsValidIdent(fDefaultFileName),
-    ClassName + '.SetFileName: Not a valid identifier');
+  if fRequirePascalDefFileName then
+  begin
+    // convert to "camel" case
+    fDefaultFileName := StrStripWhiteSpace(StrCapitaliseWords(Value));
+    // replaces invalid Pascal identifier characters with underscore
+    if (fDefaultFileName <> '')
+      and not TCharacter.IsLetter(fDefaultFileName[1])
+      and (fDefaultFileName[1] <> '_') then
+      fDefaultFileName[1] := '_';
+    for Idx := 2 to Length(fDefaultFileName) do
+      if not TCharacter.IsLetterOrDigit(fDefaultFileName[Idx])
+        and (fDefaultFileName[Idx] <> '_') then
+        fDefaultFileName[Idx] := '_';
+    Assert((fDefaultFileName <> '') and IsValidIdent(fDefaultFileName),
+      ClassName + '.SetFileName: Not a valid identifier');
+  end
+  else
+    fDefaultFileName := Value;
 end;
 
 procedure TSourceFileInfo.SetFileTypeInfo(const FileType: TSourceFileType;

From 1eb2d60298c9ce9a9d74800528d555730eb09186 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 10:51:04 +0100
Subject: [PATCH 250/264] Update help and file format docs for snippet files.

The help topics for the dialogue boxes displayed by the File menu
options Save Annotated Source, Save Unit and Save Snippet Information
were updated to reflect the changes made in issue 166.

The documentation of saved file formats in
Docs/Design/FileFormats/saved.html was similarly updated.
---
 Docs/Design/FileFormats/saved.html | 33 +++++++++++++++++++++++-------
 Src/Help/HTML/dlg_saveinfo.htm     | 13 ++++++------
 Src/Help/HTML/dlg_savesnippet.htm  | 19 ++++++++++-------
 Src/Help/HTML/dlg_saveunit.htm     | 19 ++++++++++-------
 4 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/Docs/Design/FileFormats/saved.html b/Docs/Design/FileFormats/saved.html
index 3353269a3..7f9e6b571 100644
--- a/Docs/Design/FileFormats/saved.html
+++ b/Docs/Design/FileFormats/saved.html
@@ -51,13 +51,13 @@ <h2>
 
 <ol>
   <li>
-    By saving snippet information to file from the <em>File | Save Snippet Information</em> menu option.
+    By saving snippet information using the <em>File | Save Snippet Information</em> menu option.
   </li>
   <li>
-    By saving snippets to file from the <em>File | Save Snippet</em> menu option.
+    By saving snippets using the <em>File | Save Snippet</em> menu option.
   </li>
   <li>
-    By saving units to file from the <em>File | Save Unit</em> menu option.
+    By saving units using the <em>File | Save Unit</em> menu option.
   </li>
 </ol>
 
@@ -115,7 +115,7 @@ <h2>
 </h2>
 
 <p>
-  The available encodings used depend on the file type and user choice. Different file
+  The available encodings depend on the file type and user choice. Different file
   types have different encoding choices, as follows:
 </p>
 
@@ -132,10 +132,10 @@ <h2>
         UTF-8
       </li>
       <li>
-        Unicode little endian (UTF16-LE)
+        UTF-16LE
       </li>
       <li>
-        Unicode big endian (UTF16-BE)
+        UTF-16BE
       </li>
     </ul>
   </dd>
@@ -178,7 +178,26 @@ <h2>
   <dd>
     <ul class="squashed">
       <li>
-        ASCII [for Snippet Information] or ANSI [otherwise]. Regardless of naming, ASCII format is always used.
+        ASCII
+      </li>
+    </ul>
+  </dd>
+  <dt>
+    Markdown
+  </dt>
+  <dd>
+    <ul class="squashed">
+      <li>
+        ANSI (system default code page)
+      </li>
+      <li>
+        UTF-8
+      </li>
+      <li>
+        UTF-16LE
+      </li>
+      <li>
+        UTF-16BE
       </li>
     </ul>
   </dd>
diff --git a/Src/Help/HTML/dlg_saveinfo.htm b/Src/Help/HTML/dlg_saveinfo.htm
index 59cbda798..e35745cdb 100644
--- a/Src/Help/HTML/dlg_saveinfo.htm
+++ b/Src/Help/HTML/dlg_saveinfo.htm
@@ -68,7 +68,8 @@ <h1>
     </p>
     <ul>
         <li>
-            <em>ANSI (Default)</em> &ndash; the system default ANSI encoding.
+            <em>ANSI Code Page <code>nnn</code></em> &ndash; ANSI encoding for the system default code page,
+            where <code>nnn</code> is the code page for the user's locale.
             Available as an option for plain text and Markdown file formats.
         </li>
         <li>
@@ -77,14 +78,12 @@ <h1>
             as the only encoding available for HTML 5 and XHTML file formats.
         </li>
         <li>
-            <em>Unicode (Little Endian)</em> &ndash; UTF-16 LE encoding, with
-            BOM<sup>&dagger;</sup>. Available as an option for plain text files and Markdown
-            file formats.
+            <em>UTF-16 Little Endian</em> &ndash; UTF-16 LE encoding, with
+            BOM<sup>&dagger;</sup>. Available as an option for plain text and Markdown file formats.
         </li>
         <li>
-            <em>Unicode (Big Endian)</em> &ndash; UTF-16 BE encoding, with
-            BOM<sup>&dagger;</sup>. Available as an option for plain text files and Markdown
-            file formats.
+            <em>UTF-18 Big Endian</em> &ndash; UTF-16 BE encoding, with
+            BOM<sup>&dagger;</sup>. Available as an option for plain text and Markdown file formats.
         </li>
         <li>
             <em>ASCII</em> &ndash; The only encoding available for the rich text file.
diff --git a/Src/Help/HTML/dlg_savesnippet.htm b/Src/Help/HTML/dlg_savesnippet.htm
index 7ef34cb1b..3e8eba30a 100644
--- a/Src/Help/HTML/dlg_savesnippet.htm
+++ b/Src/Help/HTML/dlg_savesnippet.htm
@@ -104,29 +104,34 @@ <h1>
     <p>
       The output file encoding can be be specified in the <em>File Encoding</em>
       drop down list. Options vary depending on the file type. Some file types
-      support only a single encoding. The encodings are:
+      support only a single encoding, in which case the drop down list will be
+      disabled. The encodings are:
     </p>
     <ul>
       <li>
-        <em>ANSI (Default)</em> &ndash; the system default ANSI encoding.
-        Available for both plain text and Pascal include files and as the only
-        option for rich text files.
+        <em>ANSI Code Page <code>nnn</code></em> &ndash; ANSI encoding for the system default code page,
+        where <code>nnn</code> is the code page for the user's locale.
+        Available for both plain text and Pascal include files.
       </li>
       <li>
         <em>UTF-8</em> &ndash; UTF-8 encoding, with BOM<sup>&dagger;</sup>.
         Available for both plain text and Pascal include files and as the only
-        option for XHTML files. If used for Pascal include files be warned that
+        option for HTML5 and XHTML files. If used for Pascal include files be warned that
         the files will only compile with compilers that support Unicode source
         files.
       </li>
       <li>
-        <em>Unicode (Little Endian)</em> &ndash; UTF-16 LE encoding, with
+        <em>UTF-16 Little Endian</em> &ndash; UTF-16 LE encoding, with
         BOM<sup>&dagger;</sup>. Available for plain text files only.
       </li>
       <li>
-        <em>Unicode (Big Endian)</em> &ndash; UTF-16 BE encoding, with
+        <em>UTF-18 Big Endian</em> &ndash; UTF-16 BE encoding, with
         BOM<sup>&dagger;</sup>. Available for plain text files only.
       </li>
+      <li>
+        <em>ASCII</em> &ndash; ASCII encoding. Available as the only option for
+        rich text files.
+      </li>
     </ul>
     <p>
       The output can be previewed by clicking the <em>Preview</em> button. This
diff --git a/Src/Help/HTML/dlg_saveunit.htm b/Src/Help/HTML/dlg_saveunit.htm
index 3691a8e44..22c3c7253 100644
--- a/Src/Help/HTML/dlg_saveunit.htm
+++ b/Src/Help/HTML/dlg_saveunit.htm
@@ -89,29 +89,34 @@ <h1>
     <p>
       The output file encoding can be be specified in the <em>File Encoding</em>
       drop down list. Options vary depending on the file type. Some file types
-      support only a single encoding. The encodings are:
+      support only a single encoding, in which case the drop down list will be
+      disabled. The encodings are:
     </p>
     <ul>
       <li>
-        <em>ANSI (Default)</em> &ndash; the system default ANSI encoding.
-        Available for both plain text and Pascal unit files and as the only
-        option for rich text files.
+        <em>ANSI Code Page <code>nnn</code></em> &ndash; ANSI encoding for the system default code page,
+        where <code>nnn</code> is the code page for the user's locale.
+        Available for both plain text and Pascal unit files.
       </li>
       <li>
         <em>UTF-8</em> &ndash; UTF-8 encoding, with BOM<sup>&dagger;</sup>.
         Available for both plain text and Pascal unit files and as the only
-        option for XHTML files. If used for Pascal units be warned that the
+        option for HTML 5 and XHTML files. If used for Pascal units be warned that the
         unit will only compile with compilers that support Unicode source
         files.
       </li>
       <li>
-        <em>Unicode (Little Endian)</em> &ndash; UTF-16 LE encoding, with
+        <em>UTF-16 Little Endian</em> &ndash; UTF-16 LE encoding, with
         BOM<sup>&dagger;</sup>. Available for plain text files only.
       </li>
       <li>
-        <em>Unicode (Big Endian)</em> &ndash; UTF-16 BE encoding, with
+        <em>UTF-18 Big Endian</em> &ndash; UTF-16 BE encoding, with
         BOM<sup>&dagger;</sup>. Available for plain text files only.
       </li>
+      <li>
+        <em>ASCII</em> &ndash; ASCII encoding. Available as the only option for
+        rich text files.
+      </li>
     </ul>
     <p>
       The output can be previewed by clicking the <em>Preview</em> button. This

From 8c5a17dc674eb42d59bd5dde083a6703a99d4bf9 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 20:09:18 +0100
Subject: [PATCH 251/264] Change CodeSnip blog URL to DelphiDabbler blog

Changed URL that used to address the CodeSnip Blog to address the
DelphiDabbler blog instead.
---
 Src/UUrl.pas | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Src/UUrl.pas b/Src/UUrl.pas
index 17c1eb90b..aca0b4400 100644
--- a/Src/UUrl.pas
+++ b/Src/UUrl.pas
@@ -53,8 +53,9 @@   TURL = record
       ///  hosted.</summary>
       SWAGReleases = SWAGRepo + '/releases';
 
-      /// <summary>URL of the the CodeSnip blog.</summary>
-      CodeSnipBlog = 'https://codesnip-app.blogspot.com/';
+      /// <summary>URL of the DelphiDabbler blog containing CodeSnip news.
+      /// </summary>
+      CodeSnipBlog = 'https://delphidabbler.blogspot.com/';
 
   end;
 

From aa76c4a218ffe56b84f92162f9b4bebd363ac10e Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 20:10:50 +0100
Subject: [PATCH 252/264] Change reference to CodeSnip blog in UI

Changed Welcome page, Help menu and What's New dialogue box content to
now link to the DelphiDabbler blog instead of the CodeSnip blog. Th
text displayed was changed to suit.
---
 Src/FmMain.dfm                 | 6 +++---
 Src/Res/HTML/dlg-whatsnew.html | 6 +++---
 Src/Res/HTML/welcome-tplt.html | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Src/FmMain.dfm b/Src/FmMain.dfm
index 6f460ff96..5b2eab657 100644
--- a/Src/FmMain.dfm
+++ b/Src/FmMain.dfm
@@ -862,10 +862,10 @@ inherited MainForm: TMainForm
     end
     object actBlog: TBrowseURL
       Category = 'Help'
-      Caption = 'CodeSnip News Blog'
+      Caption = 'CodeSnip News On DelphiDabbler Blog'
       Hint = 
-        'Display CodeSnip news blog|Display the CodeSnip News Blog in the' +
-        ' default web browser'
+        'Display CodeSnip news|Display the DelphiDabbler blog, containing' +
+        ' CodeSnip news, in the default web browser'
       ImageIndex = 6
     end
     object actDeleteUserDatabase: TAction
diff --git a/Src/Res/HTML/dlg-whatsnew.html b/Src/Res/HTML/dlg-whatsnew.html
index 9b06c251c..3667ce009 100644
--- a/Src/Res/HTML/dlg-whatsnew.html
+++ b/Src/Res/HTML/dlg-whatsnew.html
@@ -63,11 +63,11 @@
 				You can no longer submit snippets for inclusion in the DelphiDabbler Code Snippets Database.
 			</li>
 			<li>
-				The news feed has gone away. News will now be posted to the
+				The news feed has gone away. News will now be posted to the <strike>CodeSnip blog</strike>
 				<a
-					href="https://codesnip-app.blogspot.com/"
+					href="https://delphidabbler.blogspot.com/"
 					class="external-link"
-				>CodeSnip blog</a>. You can display the blog in your web browser from the <em>Help</em> menu.
+				>DelphiDabbler blog</a>. You can display the blog in your web browser from the <em>Help</em> menu.
 			</li>
 		</ul>
 		<p>
diff --git a/Src/Res/HTML/welcome-tplt.html b/Src/Res/HTML/welcome-tplt.html
index 189d82951..55a23c116 100644
--- a/Src/Res/HTML/welcome-tplt.html
+++ b/Src/Res/HTML/welcome-tplt.html
@@ -189,7 +189,7 @@ <h1>
           href="#"
           class="command-link"
           onclick="showNews();return false;"
-        >News Blog</a>
+        >News On DelphiDabbler Blog</a>
         |
         <a
           href="#"

From 41f0a54d69d80d8cef139057c37428473813d0e3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 20:21:50 +0100
Subject: [PATCH 253/264] Update help file re change of linked blog

Changed the Help menu topic re the change of name and function of the
menu's blog link.
---
 Src/Help/HTML/menu_help.htm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/Help/HTML/menu_help.htm b/Src/Help/HTML/menu_help.htm
index d67348647..8ecd783f0 100644
--- a/Src/Help/HTML/menu_help.htm
+++ b/Src/Help/HTML/menu_help.htm
@@ -97,14 +97,14 @@ <h1>
           <img alt="Menu icon" src="../images/WebLink.png" class="glyph">
         </td>
         <td class="item">
-          CodeSnip News Blog
+          CodeSnip News On DelphiDabbler Blog
         </td>
         <td class="desc">
           Displays the <a
             class="weblink"
             href="https://codesnip-app.blogspot.com/"
             target="_blank"
-          >CodeSnip Blog</a> in the default web browser. The latest news about <em>CodeSnip</em> is posted in the blog.
+          >DelphiDabbler Blog</a> in the default web browser. The latest news about <em>CodeSnip</em> is posted in this blog.
         </td>
       </tr>
       <tr>

From 1b1f1b0fc29e18cf56f88562886e98756640c937 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Tue, 29 Apr 2025 20:23:17 +0100
Subject: [PATCH 254/264] Update docs re change of linked blog

The main README.md along with Docs/ReadMe-portable.txt and
Docs/ReadMe-standard.txt were updated re the change of the linked blog
from the CodeSnip blog to the DelphiDabbler blog.
---
 Docs/ReadMe-portable.txt | 4 ++--
 Docs/ReadMe-standard.txt | 4 ++--
 README.md                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Docs/ReadMe-portable.txt b/Docs/ReadMe-portable.txt
index e0883fa5c..de9019283 100644
--- a/Docs/ReadMe-portable.txt
+++ b/Docs/ReadMe-portable.txt
@@ -144,8 +144,8 @@ Updating the Program
 Updates are published on GitHub. See
 https://github.com/delphidabbler/codesnip/releases
 
-News of new updates is published on the CodeSnip Blog:
-https://codesnip-app.blogspot.com/.
+News of new updates is published on the DelphiDabbler Blog:
+https://delphidabbler.blogspot.com/.
 
 
 Known Installation and Upgrading Issues
diff --git a/Docs/ReadMe-standard.txt b/Docs/ReadMe-standard.txt
index 5f5ea703f..f1ec09250 100644
--- a/Docs/ReadMe-standard.txt
+++ b/Docs/ReadMe-standard.txt
@@ -179,8 +179,8 @@ Updating the Program
 Updates are published on GitHub. See
 https://github.com/delphidabbler/codesnip/releases
 
-News of new updates is published on the CodeSnip Blog:
-https://codesnip-app.blogspot.com/.
+News of new updates is published on the DelphiDabbler Blog:
+https://delphidabbler.blogspot.com/.
 
 
 Known Installation and Upgrading Issues
diff --git a/README.md b/README.md
index 3787b2439..4110004a2 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ The following support is available to CodeSnip users:
 * A comprehensive help file.
 * A read-me file that discusses installation, configuration, updating and known issues. There are different versions of this file for each edition of CodeSnip: one for the [standard edition](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe-standard.txt) and another for the [portable edition](https://raw.githubusercontent.com/delphidabbler/codesnip/master/Docs/ReadMe-portable.txt). [^1]
 * The [Using CodeSnip FAQ](https://github.com/delphidabbler/codesnip-faq/blob/master/UsingCodeSnip.md).
-* The [CodeSnip Blog](https://codesnip-app.blogspot.co.uk/).
+* The [DelphiDabbler Blog](https://delphidabbler.blogspot.co.uk/) that provides CodeSnip news.
 * CodeSnip's own [Web Page](https://delphidabbler.com/software/codesnip).
 
 There's also plenty of info available on how to compile CodeSnip from source - see below.

From 67fe88c23b904ca2794cf38cb6b483b3b2c4beb8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 30 Apr 2025 10:00:02 +0100
Subject: [PATCH 255/264] Add new CommentsInUnitImpl preferences property

Added CommentsInUnitImpl property to IPreferences and its implementation
in TPreferences.

This preference determines whether descriptive comments are included in
the implementation section of generated units.
---
 Src/UPreferences.pas | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/Src/UPreferences.pas b/Src/UPreferences.pas
index 26a412804..8bb265ec7 100644
--- a/Src/UPreferences.pas
+++ b/Src/UPreferences.pas
@@ -76,6 +76,17 @@ interface
     property TruncateSourceComments: Boolean
       read GetTruncateSourceComments write SetTruncateSourceComments;
 
+    ///  <summary>Gets flag that determines whether source code comments are
+    ///  repeated in a generated unit's implementation section.</summary>
+    function GetCommentsInUnitImpl: Boolean;
+    ///  <summary>Sets flag that determines whether source code comments are
+    ///  repeated in a generated unit's implementation section.</summary>
+    procedure SetCommentsInUnitImpl(const Value: Boolean);
+    ///  <summary>Flag deteminining whether source code comments are repeated in
+    ///  a generated unit's implementation section.</summary>
+    property CommentsInUnitImpl: Boolean
+      read GetCommentsInUnitImpl write SetCommentsInUnitImpl;
+
     ///  <summary>Gets current default file extension / type used when writing
     ///  code snippets to file.</summary>
     function GetSourceDefaultFileType: TSourceFileType;
@@ -326,6 +337,9 @@   TPreferences = class(TInterfacedObject,
       ///  <summary>Flag determining whether multi-paragraph source code is
       ///  truncated to first paragraph in source code comments.</summary>
       fTruncateSourceComments: Boolean;
+      ///  <summary>Flag deteminining whether source code comments are repeated
+      ///  in a generated unit's implementation section.</summary>
+      fCommentsInUnitImpl: Boolean;
       ///  <summary>Indicates whether generated source is highlighted by
       ///  default.</summary>
       fSourceSyntaxHilited: Boolean;
@@ -426,6 +440,16 @@   TPreferences = class(TInterfacedObject,
     ///  <remarks>Method of IPreferences.</remarks>
     procedure SetTruncateSourceComments(const Value: Boolean);
 
+    ///  <summary>Gets flag that determines whether source code comments are
+    ///  repeated in a generated unit's implementation section.</summary>
+    ///  <remarks>Method of IPreferences.</remarks>
+    function GetCommentsInUnitImpl: Boolean;
+
+    ///  <summary>Sets flag that determines whether source code comments are
+    ///  repeated in a generated unit's implementation section.</summary>
+    ///  <remarks>Method of IPreferences.</remarks>
+    procedure SetCommentsInUnitImpl(const Value: Boolean);
+
     ///  <summary>Gets current default file extension / type used when writing
     ///  code snippets to file.</summary>
     ///  <remarks>Method of IPreferences.</remarks>
@@ -690,6 +714,7 @@ procedure TPreferences.Assign(const Src: IInterface);
   Self.fSourceDefaultFileType := SrcPref.SourceDefaultFileType;
   Self.fSourceCommentStyle := SrcPref.SourceCommentStyle;
   Self.fTruncateSourceComments := SrcPref.TruncateSourceComments;
+  Self.fCommentsInUnitImpl := SrcPref.CommentsInUnitImpl;
   Self.fSourceSyntaxHilited := SrcPref.SourceSyntaxHilited;
   Self.fMeasurementUnits := SrcPref.MeasurementUnits;
   Self.fOverviewStartState := SrcPref.OverviewStartState;
@@ -741,6 +766,11 @@ destructor TPreferences.Destroy;
   inherited;
 end;
 
+function TPreferences.GetCommentsInUnitImpl: Boolean;
+begin
+  Result := fCommentsInUnitImpl;
+end;
+
 function TPreferences.GetCustomHiliteColours: IStringList;
 begin
   Result := fHiliteCustomColours;
@@ -852,6 +882,11 @@ function TPreferences.GetWarnings: IWarnings;
   Result := fWarnings;
 end;
 
+procedure TPreferences.SetCommentsInUnitImpl(const Value: Boolean);
+begin
+  fCommentsInUnitImpl := Value;
+end;
+
 procedure TPreferences.SetCustomHiliteColours(const Colours: IStringList);
 begin
   fHiliteCustomColours := Colours;
@@ -985,6 +1020,7 @@ function TPreferencesPersist.Clone: IInterface;
   NewPref.SourceDefaultFileType := Self.fSourceDefaultFileType;
   NewPref.SourceCommentStyle := Self.fSourceCommentStyle;
   NewPref.TruncateSourceComments := Self.fTruncateSourceComments;
+  NewPref.CommentsInUnitImpl := Self.fCommentsInUnitImpl;
   NewPref.SourceSyntaxHilited := Self.fSourceSyntaxHilited;
   NewPref.MeasurementUnits := Self.fMeasurementUnits;
   NewPref.OverviewStartState := Self.fOverviewStartState;
@@ -1069,6 +1105,7 @@ constructor TPreferencesPersist.Create;
     Storage.GetInteger('CommentStyle', Ord(csAfter))
   );
   fTruncateSourceComments := Storage.GetBoolean('TruncateComments', False);
+  fCommentsInUnitImpl := Storage.GetBoolean('UseCommentsInUnitImpl', True);
   fSourceSyntaxHilited := Storage.GetBoolean('UseSyntaxHiliting', False);
 
   // Read printing section
@@ -1151,6 +1188,7 @@ destructor TPreferencesPersist.Destroy;
   Storage.SetInteger('FileType', Ord(fSourceDefaultFileType));
   Storage.SetInteger('CommentStyle', Ord(fSourceCommentStyle));
   Storage.SetBoolean('TruncateComments', fTruncateSourceComments);
+  Storage.SetBoolean('UseCommentsInUnitImpl', fCommentsInUnitImpl);
   Storage.SetBoolean('UseSyntaxHiliting', fSourceSyntaxHilited);
   Storage.Save;
 

From 7ff032740b02126d54f9c5b78c502ba819f66a23 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 30 Apr 2025 10:00:30 +0100
Subject: [PATCH 256/264] Add option to omit comments from unit impl sections

TSourceGen.UnitAsString was given an additional Boolean parameter that
determines whether or not descriptive comments (that are written to the
unit interface) are repeated in the implementation section.

Modified TSaveUnitMgr.GenerateSource to add the required additional
parameters, the value of which is obtained from preferences.
---
 Src/USaveUnitMgr.pas |  7 ++++++-
 Src/USourceGen.pas   | 43 ++++++++++++++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/Src/USaveUnitMgr.pas b/Src/USaveUnitMgr.pas
index 1901952a4..930efb9ea 100644
--- a/Src/USaveUnitMgr.pas
+++ b/Src/USaveUnitMgr.pas
@@ -99,6 +99,7 @@ implementation
   DB.UMetaData,
   UAppInfo,
   UConsts,
+  UPreferences,
   UUrl,
   UUtils;
 
@@ -215,7 +216,11 @@ function TSaveUnitMgr.GenerateSource(const CommentStyle: TCommentStyle;
   const TruncateComments: Boolean): string;
 begin
   Result := fSourceGen.UnitAsString(
-    UnitName, CommentStyle, TruncateComments, CreateHeaderComments
+    UnitName,
+    CommentStyle,
+    TruncateComments,
+    Preferences.TruncateSourceComments,
+    CreateHeaderComments
   );
 end;
 
diff --git a/Src/USourceGen.pas b/Src/USourceGen.pas
index 3d9edf2a7..23093fc7a 100644
--- a/Src/USourceGen.pas
+++ b/Src/USourceGen.pas
@@ -198,18 +198,23 @@   TSourceGen = class(TObject)
     ///  <summary>Generates source code of a Pascal unit containing all the
     ///  specified snippets along with any other snippets that are required to
     ///  compile the code.</summary>
-    ///  <param name="UnitName">string [in] Name of unit.</param>
-    ///  <param name="CommentStyle">TCommentStyle [in] Style of commenting used
-    ///  in documenting snippets.</param>
-    ///  <param name="TruncateComments">Boolean [in] Flag indicating whether or
-    ///  not documentation comments are to be truncated at the end of the first
-    ///  paragraph of multi-paragraph text.</param>
-    ///  <param name="HeaderComments">IStringList [in] List of comments to be
-    ///  included at top of unit.</param>
-    ///  <returns>string. Unit source code.</returns>
+    ///  <param name="UnitName"><c>string</c> [in] Name of unit.</param>
+    ///  <param name="CommentStyle"><c>TCommentStyle</c> [in] Style of
+    ///  commenting used in documenting snippets.</param>
+    ///  <param name="TruncateComments"><c>Boolean</c> [in] Flag indicating
+    ///  whether or not documentation comments are to be truncated at the end of
+    ///  the first paragraph of multi-paragraph text.</param>
+    ///  <param name="UseCommentsInImplmentation"><c>Boolean</c> [in] Flag
+    ///  indicating whether or not comments are to be included in the
+    ///  implementation section. Has no effect when <c>CommentStyle</c> =
+    ///  <c>csNone</c>.</param>
+    ///  <param name="HeaderComments"><c>IStringList</c> [in] List of comments
+    ///  to be included at top of unit.</param>
+    ///  <returns><c>string</c>. Unit source code.</returns>
     function UnitAsString(const UnitName: string;
       const CommentStyle: TCommentStyle = csNone;
       const TruncateComments: Boolean = False;
+      const UseCommentsInImplementation: Boolean = False;
       const HeaderComments: IStringList = nil): string;
 
     ///  <summary>Generates source code of a Pascal include file containing all
@@ -585,14 +590,23 @@ class function TSourceGen.IsFileNameValidUnitName(const FileName: string):
 function TSourceGen.UnitAsString(const UnitName: string;
   const CommentStyle: TCommentStyle = csNone;
   const TruncateComments: Boolean = False;
+  const UseCommentsInImplementation: Boolean = False;
   const HeaderComments: IStringList = nil): string;
 var
-  Writer: TStringBuilder;   // used to build source code string
-  Snippet: TSnippet;        // reference to a snippet object
-  Warnings: IWarnings;      // object giving info about any inhibited warnings
+  Writer: TStringBuilder;                    // used to build source code string
+  Snippet: TSnippet;                            // reference to a snippet object
+  Warnings: IWarnings;        // object giving info about any inhibited warnings
+  ImplCommentStyle: TCommentStyle;        // style of comments in implementation
 begin
+  // Set comment style for implementation section
+  if UseCommentsInImplementation then
+    ImplCommentStyle := CommentStyle
+  else
+    ImplCommentStyle := csNone;
+
   // Generate the unit data
   fSourceAnalyser.Generate;
+
   // Create writer object onto string stream that receives output
   Writer := TStringBuilder.Create;
   try
@@ -681,11 +695,14 @@ function TSourceGen.UnitAsString(const UnitName: string;
     for Snippet in fSourceAnalyser.AllRoutines do
     begin
       Writer.AppendLine(
-        TRoutineFormatter.FormatRoutine(CommentStyle, TruncateComments, Snippet)
+        TRoutineFormatter.FormatRoutine(
+          ImplCommentStyle, TruncateComments, Snippet
+        )
       );
       Writer.AppendLine;
     end;
 
+    // class & records-with-methods implementation source code
     for Snippet in fSourceAnalyser.TypesAndConsts do
     begin
       if Snippet.Kind = skClass then

From c2556d91d848d9d2d9ffcee8b8edbeeec9c05832 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 30 Apr 2025 10:15:55 +0100
Subject: [PATCH 257/264] Document new UseCommentsInUnitImpl config file value

This new value has been added to the [Prefs:SourceCode] section and
stores the value of the new Preferences.CommentsInUnitImpl property.
---
 Docs/Design/FileFormats/config.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
index d6a57c49a..57d636db5 100644
--- a/Docs/Design/FileFormats/config.html
+++ b/Docs/Design/FileFormats/config.html
@@ -1262,6 +1262,12 @@ <h4>
   <dd>
     Flag indicating whether multi-paragraph snippet descriptions are to be truncated to the first paragraph only in documentation comments. <code class="value">True</code> &rArr; truncate the description; <code class="value">False</code> &rArr; use the full description.
   </dd>
+  <dt>
+    <code class="key">UseCommentsInUnitImpl</code> (Boolean)
+  </dt>
+  <dd>
+    Flag indicating whether source code comments are repeated in a generated unit's implementation section. <code class="value">True</code> &rArr; emit comments in both the interface and implementation sections; <code class="value">False</code> &rArr; emit comments in the interface section only.
+  </dd>
   <dt>
     <code class="key">UseSyntaxHiliting</code> (Boolean)
   </dt>

From b67c1fab90bc408651eca2ee7ce1eac8d93c2bee Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 30 Apr 2025 10:20:08 +0100
Subject: [PATCH 258/264] Update Code Formatting tab of Preferences dialogue

Added new "Repeat comments in unit implementation section" check box to
the FrSourcePrefs frame. This check box sets the value of the
IPreferences.CommentsInUnitImpl property.

Expanded the size of the preferences dialogue box to accommodate the
increased size of the FrSourcePrefs frame.
---
 Src/FmPreferencesDlg.dfm | 13 ++++++-------
 Src/FrSourcePrefs.dfm    | 18 +++++++++++++-----
 Src/FrSourcePrefs.pas    | 12 +++++++++---
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Src/FmPreferencesDlg.dfm b/Src/FmPreferencesDlg.dfm
index 02c3a5c19..d39f3b146 100644
--- a/Src/FmPreferencesDlg.dfm
+++ b/Src/FmPreferencesDlg.dfm
@@ -10,30 +10,29 @@ inherited PreferencesDlg: TPreferencesDlg
   TextHeight = 13
   inherited pnlBody: TPanel
     Width = 609
-    Height = 329
+    Height = 353
     ExplicitWidth = 609
-    ExplicitHeight = 329
+    ExplicitHeight = 353
     object pcMain: TPageControl
       Left = 163
       Top = 0
       Width = 446
-      Height = 329
+      Height = 353
       Align = alRight
       MultiLine = True
       TabOrder = 1
-      ExplicitLeft = 159
-      ExplicitHeight = 377
+      ExplicitHeight = 329
     end
     object lbPages: TListBox
       Left = 0
       Top = 0
       Width = 153
-      Height = 329
+      Height = 353
       Align = alLeft
       ItemHeight = 13
       TabOrder = 0
       OnClick = lbPagesClick
-      ExplicitHeight = 377
+      ExplicitHeight = 329
     end
   end
   inherited btnOK: TButton
diff --git a/Src/FrSourcePrefs.dfm b/Src/FrSourcePrefs.dfm
index f59527039..4900f194a 100644
--- a/Src/FrSourcePrefs.dfm
+++ b/Src/FrSourcePrefs.dfm
@@ -1,16 +1,16 @@
 inherited SourcePrefsFrame: TSourcePrefsFrame
   Width = 393
-  Height = 327
+  Height = 323
   ExplicitWidth = 393
-  ExplicitHeight = 327
+  ExplicitHeight = 323
   DesignSize = (
     393
-    327)
+    323)
   object gbSourceCode: TGroupBox
     Left = 0
     Top = 0
     Width = 393
-    Height = 201
+    Height = 219
     Anchors = [akLeft, akTop, akRight]
     Caption = ' Source code formatting '
     TabOrder = 0
@@ -56,10 +56,18 @@ inherited SourcePrefsFrame: TSourcePrefsFrame
       Caption = '&Truncate comments to one paragraph'
       TabOrder = 2
     end
+    object chkUnitImplComments: TCheckBox
+      Left = 8
+      Top = 195
+      Width = 345
+      Height = 17
+      Caption = 'Repeat comments in &unit implemenation section'
+      TabOrder = 3
+    end
   end
   object gbFileFormat: TGroupBox
     Left = 0
-    Top = 207
+    Top = 229
     Width = 393
     Height = 81
     Anchors = [akLeft, akTop, akRight]
diff --git a/Src/FrSourcePrefs.pas b/Src/FrSourcePrefs.pas
index ab6cc70e9..c27caf5fa 100644
--- a/Src/FrSourcePrefs.pas
+++ b/Src/FrSourcePrefs.pas
@@ -43,6 +43,7 @@   TSourcePrefsFrame = class(TPrefsBaseFrame)
     lblCommentStyle: TLabel;
     lblSnippetFileType: TLabel;
     chkTruncateComments: TCheckBox;
+    chkUnitImplComments: TCheckBox;
     procedure cbCommentStyleChange(Sender: TObject);
     procedure cbSnippetFileTypeChange(Sender: TObject);
   strict private
@@ -181,6 +182,7 @@ procedure TSourcePrefsFrame.Activate(const Prefs: IPreferences;
   SelectSourceFileType(Prefs.SourceDefaultFileType);
   SelectCommentStyle(Prefs.SourceCommentStyle);
   chkTruncateComments.Checked := Prefs.TruncateSourceComments;
+  chkUnitImplComments.Checked := Prefs.CommentsInUnitImpl;
   chkSyntaxHighlighting.Checked := Prefs.SourceSyntaxHilited;
   (fHiliteAttrs as IAssignable).Assign(Prefs.HiliteAttrs);
   fHiliteAttrs.ResetDefaultFont;
@@ -198,13 +200,15 @@ procedure TSourcePrefsFrame.ArrangeControls;
   TCtrlArranger.AlignVCentres(20, [lblCommentStyle, cbCommentStyle]);
   TCtrlArranger.MoveBelow([lblCommentStyle, cbCommentStyle], frmPreview, 8);
   TCtrlArranger.MoveBelow(frmPreview, chkTruncateComments, 8);
-  gbSourceCode.ClientHeight := TCtrlArranger.TotalControlHeight(gbSourceCode)
-    + 10;
 
   TCtrlArranger.AlignVCentres(20, [lblSnippetFileType, cbSnippetFileType]);
   TCtrlArranger.MoveBelow(
     [lblSnippetFileType, cbSnippetFileType], chkSyntaxHighlighting, 8
   );
+  TCtrlArranger.MoveBelow(chkTruncateComments, chkUnitImplComments, 8);
+
+  gbSourceCode.ClientHeight := TCtrlArranger.TotalControlHeight(gbSourceCode)
+    + 10;
   gbFileFormat.ClientHeight := TCtrlArranger.TotalControlHeight(gbFileFormat)
     + 10;
 
@@ -218,7 +222,7 @@ procedure TSourcePrefsFrame.ArrangeControls;
   TCtrlArranger.AlignLefts(
     [
       cbCommentStyle, frmPreview, cbSnippetFileType, chkSyntaxHighlighting,
-      chkTruncateComments
+      chkTruncateComments, chkUnitImplComments
     ],
     Col2Left
   );
@@ -271,6 +275,7 @@ procedure TSourcePrefsFrame.Deactivate(const Prefs: IPreferences);
 begin
   Prefs.SourceCommentStyle := GetCommentStyle;
   Prefs.TruncateSourceComments := chkTruncateComments.Checked;
+  Prefs.CommentsInUnitImpl := chkUnitImplComments.Checked;
   Prefs.SourceDefaultFileType := GetSourceFileType;
   Prefs.SourceSyntaxHilited := chkSyntaxHighlighting.Checked;
 end;
@@ -348,6 +353,7 @@ procedure TSourcePrefsFrame.UpdateControlState;
   chkSyntaxHighlighting.Enabled :=
     TFileHiliter.IsHilitingSupported(GetSourceFileType);
   chkTruncateComments.Enabled := GetCommentStyle <> csNone;
+  chkUnitImplComments.Enabled := GetCommentStyle <> csNone;
 end;
 
 procedure TSourcePrefsFrame.UpdatePreview;

From 46156b31c03aa99a7d992fc28257905fc34a2cf1 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 30 Apr 2025 10:24:18 +0100
Subject: [PATCH 259/264] Update help topic for Prefs Code Formatting tab

Added info about the new "Repeat comments in unit implementation
section" check box on the Code Formatting tab of the Preferences
dialogue box.
---
 Src/Help/HTML/dlg_prefs_sourcecode.htm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Src/Help/HTML/dlg_prefs_sourcecode.htm b/Src/Help/HTML/dlg_prefs_sourcecode.htm
index 199e3773c..b0ed0fef4 100644
--- a/Src/Help/HTML/dlg_prefs_sourcecode.htm
+++ b/Src/Help/HTML/dlg_prefs_sourcecode.htm
@@ -69,6 +69,12 @@ <h2>
       comment to use just the first paragraph of the snippet's description by
       ticking the <em>Truncate comments to one paragraph</em> check box.
     </p>
+    <p>
+      When descriptive comments are enabled, they are included in the interface
+      section of generated units. You can choose whether or not such comments 
+      are repeated in the unit's implementation section using the <em>Repeat
+      comments in unit implementation section</em> check box.
+    </p>
     <p>
       <strong>Note:</strong> Descriptive comments are not applicable to
       <a href="snippet_freeform.htm">freeform</a> or

From 220b6efc8bb870df93b2dc48f6753c47dbc74bf8 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 30 Apr 2025 10:40:06 +0100
Subject: [PATCH 260/264] Remove preferences dependency from USourceGen unit

Modified TSourceGen.UnitAsString to get information aboute compiler
warnings via a new parameters instead of from the Preferences object.
This was the only dependency on the Preferences object in the unit.

Calling code was modified to pass the required warnings to
TSourceGen.UnitAsString as a parameter. This calling code now gets the
value from the preferences object.

Fixes #167
---
 Src/USaveUnitMgr.pas |  1 +
 Src/USourceGen.pas   | 26 ++++++++++++++++++--------
 Src/UTestUnit.pas    | 10 ++++++++--
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Src/USaveUnitMgr.pas b/Src/USaveUnitMgr.pas
index 930efb9ea..e94a17757 100644
--- a/Src/USaveUnitMgr.pas
+++ b/Src/USaveUnitMgr.pas
@@ -217,6 +217,7 @@ function TSaveUnitMgr.GenerateSource(const CommentStyle: TCommentStyle;
 begin
   Result := fSourceGen.UnitAsString(
     UnitName,
+    Preferences.Warnings,
     CommentStyle,
     TruncateComments,
     Preferences.TruncateSourceComments,
diff --git a/Src/USourceGen.pas b/Src/USourceGen.pas
index 23093fc7a..32597cf6e 100644
--- a/Src/USourceGen.pas
+++ b/Src/USourceGen.pas
@@ -18,9 +18,14 @@ interface
 
 uses
   // Delphi
-  Classes, Generics.Collections,
+  Classes,
+  Generics.Collections,
   // Project
-  ActiveText.UMain, DB.USnippet, UBaseObjects, UIStringList;
+  ActiveText.UMain,
+  DB.USnippet,
+  UBaseObjects,
+  UIStringList,
+  UWarnings;
 
 
 type
@@ -211,7 +216,7 @@   TSourceGen = class(TObject)
     ///  <param name="HeaderComments"><c>IStringList</c> [in] List of comments
     ///  to be included at top of unit.</param>
     ///  <returns><c>string</c>. Unit source code.</returns>
-    function UnitAsString(const UnitName: string;
+    function UnitAsString(const UnitName: string; const Warnings: IWarnings;
       const CommentStyle: TCommentStyle = csNone;
       const TruncateComments: Boolean = False;
       const UseCommentsInImplementation: Boolean = False;
@@ -255,10 +260,16 @@ implementation
 
 uses
   // Delphi
-  SysUtils, Character,
+  SysUtils,
+  Character,
   // Project
-  ActiveText.UTextRenderer, DB.USnippetKind, UConsts, UExceptions, UPreferences,
-  USnippetValidator, UStrUtils, UWarnings, Hiliter.UPasLexer;
+  ActiveText.UTextRenderer,
+  DB.USnippetKind,
+  UConsts,
+  UExceptions,
+  USnippetValidator,
+  UStrUtils,
+  Hiliter.UPasLexer;
 
 
 const
@@ -588,6 +599,7 @@ class function TSourceGen.IsFileNameValidUnitName(const FileName: string):
 end;
 
 function TSourceGen.UnitAsString(const UnitName: string;
+  const Warnings: IWarnings;
   const CommentStyle: TCommentStyle = csNone;
   const TruncateComments: Boolean = False;
   const UseCommentsInImplementation: Boolean = False;
@@ -595,7 +607,6 @@ function TSourceGen.UnitAsString(const UnitName: string;
 var
   Writer: TStringBuilder;                    // used to build source code string
   Snippet: TSnippet;                            // reference to a snippet object
-  Warnings: IWarnings;        // object giving info about any inhibited warnings
   ImplCommentStyle: TCommentStyle;        // style of comments in implementation
 begin
   // Set comment style for implementation section
@@ -620,7 +631,6 @@ function TSourceGen.UnitAsString(const UnitName: string;
     Writer.AppendLine;
 
     // any conditional compilation symbols
-    Warnings := Preferences.Warnings;
     if Warnings.Enabled and not Warnings.IsEmpty then
     begin
       Writer.Append(Warnings.Render);
diff --git a/Src/UTestUnit.pas b/Src/UTestUnit.pas
index eef7d44c5..c34262c8f 100644
--- a/Src/UTestUnit.pas
+++ b/Src/UTestUnit.pas
@@ -65,7 +65,13 @@ implementation
   // Delphi
   SysUtils,
   // Project
-  DB.USnippetKind, UEncodings, UIOUtils, USourceGen, USystemInfo, UUnitAnalyser,
+  DB.USnippetKind,
+  UEncodings,
+  UIOUtils,
+  UPreferences,
+  USourceGen,
+  USystemInfo,
+  UUnitAnalyser,
   UUtils;
 
 
@@ -89,7 +95,7 @@ function TTestUnit.GenerateUnitSource: string;
       Generator.IncludeSnippet(fSnippet);
       // Must use Self.UnitName below for Delphis that defined TObject.UnitName
       // otherwise the TObject version is used.
-      Result := Generator.UnitAsString(Self.UnitName);
+      Result := Generator.UnitAsString(Self.UnitName, Preferences.Warnings);
     finally
       Generator.Free;
     end;

From 2019c809129c01e8107a8d85173b79065124477d Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 30 Apr 2025 19:48:43 +0100
Subject: [PATCH 261/264] Bump per-user config file version to 20

Incremented version number in FirstRun.UConfigFile unit so that first
run of CodeSnip v 4.26.0 will record version 20 in the config file.

Also updated config file docs to refer to version 20.
---
 Docs/Design/FileFormats/config.html | 4 ++--
 Src/FirstRun.UConfigFile.pas        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Docs/Design/FileFormats/config.html b/Docs/Design/FileFormats/config.html
index 57d636db5..915d7098f 100644
--- a/Docs/Design/FileFormats/config.html
+++ b/Docs/Design/FileFormats/config.html
@@ -167,7 +167,7 @@ <h3>
 </p>
 
 <p>
-  There have been several versions of this file. The current one is version 19. The change to version 19 came with CodeSnip v4.21.0 and the addition of the [Compilers] section and the <code class="key">CanAutoInstall</code> key in the [Cmp:XXX] sections.
+  There have been several versions of this file. The current one is version 20. The change to version 20 came with CodeSnip v4.26.0 and the addition of the <code class="key">UseCommentsInUnitImpl</code> key in the <code>[Prefs:SourceCode]</code> section.
 </p>
 
 <p>
@@ -771,7 +771,7 @@ <h4>
       The version number of the config file. Incremented whenever the file format changes. If this section or this value is missing then the default value is <code class="value">1</code>.
     </div>
     <div class="half-spaced">
-      The current value is <code class="value">19</code>.
+      The current value is <code class="value">20</code>.
     </div>
   </dd>
   <dt>
diff --git a/Src/FirstRun.UConfigFile.pas b/Src/FirstRun.UConfigFile.pas
index 50bba121b..314eaaf62 100644
--- a/Src/FirstRun.UConfigFile.pas
+++ b/Src/FirstRun.UConfigFile.pas
@@ -82,7 +82,7 @@   TUserConfigFileUpdater = class(TConfigFileUpdater)
   strict private
     const
       ///  <summary>Current user config file version.</summary>
-      FileVersion = 19;
+      FileVersion = 20;
   strict protected
     ///  <summary>Returns current user config file version.</summary>
     class function GetFileVersion: Integer; override;

From fd5f8c3944a8cc89b953ad0c8c7fc82310229319 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Wed, 30 Apr 2025 20:01:18 +0100
Subject: [PATCH 262/264] Added entry to Thanks section of readme text files

Added thanks to SirRufo for the fix contributed to v4.25.0
---
 Docs/ReadMe-portable.txt | 3 +++
 Docs/ReadMe-standard.txt | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Docs/ReadMe-portable.txt b/Docs/ReadMe-portable.txt
index de9019283..c22134c23 100644
--- a/Docs/ReadMe-portable.txt
+++ b/Docs/ReadMe-portable.txt
@@ -248,6 +248,9 @@ Thanks to:
 + The authors of the third party source code and images used by the program. See
   the program's about box or License.html for details.
 
++ SirRufo for helping to fix a long standing bug where CodeSnip would crash on
+  resuming from hibernation.
+
 + Various contributors to the DelphiDabbler Code Snippets database. Names of
   contributors are listed in the program's About Box (use the "Help | About"
   menu option then select the "About the Database" tab). The list will be empty
diff --git a/Docs/ReadMe-standard.txt b/Docs/ReadMe-standard.txt
index f1ec09250..97ac0577b 100644
--- a/Docs/ReadMe-standard.txt
+++ b/Docs/ReadMe-standard.txt
@@ -293,6 +293,9 @@ Thanks to:
 + geoffsmith82 and an anonymous contributor for information about getting
   CodeSnip to work with Delphi XE2.
 
++ SirRufo for helping to fix a long standing bug where CodeSnip would crash on
+  resuming from hibernation.
+
 + The authors of the third party source code and images used by the program. See
   the program's about box or License.html for details.
 

From 4fe44cda599dfbb43146c9d814e26c37dfff4ab6 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Thu, 1 May 2025 08:33:53 +0100
Subject: [PATCH 263/264] Bump version number to v4.26.0 build 276

---
 Src/VersionInfo.vi-inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/VersionInfo.vi-inc b/Src/VersionInfo.vi-inc
index e23088aa2..82a6dfe24 100644
--- a/Src/VersionInfo.vi-inc
+++ b/Src/VersionInfo.vi-inc
@@ -1,8 +1,8 @@
 # CodeSnip Version Information Macros for Including in .vi files
 
 # Version & build numbers
-version=4.25.0
-build=275
+version=4.26.0
+build=276
 
 # String file information
 copyright=Copyright © P.D.Johnson, 2005-<YEAR>.

From 9dde2c64465c68e74e088fc8348e5b939ed2d4a3 Mon Sep 17 00:00:00 2001
From: delphidabbler <5164283+delphidabbler@users.noreply.github.com>
Date: Fri, 2 May 2025 19:49:06 +0100
Subject: [PATCH 264/264] Update change log with details of release v4.26.0

---
 CHANGELOG.md | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15b4636c7..d3fbdcf23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,40 @@ Releases are listed in reverse version number order.
 
 > Note that _CodeSnip_ v4 was developed in parallel with v3 for a while. As a consequence some v3 releases have later release dates than early v4 releases.
 
+## Release v4.26.0 of 02 May 2025
+
+* Updated the dialogue box displayed when saving units and annotated source code [issue #166]:
+  * The _File Encoding_ drop down list control is disabled if there is only one encoding option.
+  * Updated and clarified the naming of encodings in the _File Encoding_ drop down list.
+  * The sole encoding option displayed for the _Rich text file_ file type was changed from the erroneous ANSI to the correct ASCII.
+* Fixed bug where, when ANSI encoding was selected in the _Save Unit_ and _Save Annotated Source_ dialogue boxes, snippets containing characters not supported in the default locale's code page were being rendered diffently in the Preview dialogue box to when saved to file [issue #164]. The previewed code is now the same as that of the saved source code.
+* Updated file formats available when the _File | Save Snippet Information_ menu option is selected:
+  * Syntax highlighting of the existing RTF format output is now optional.
+  * Added the option to save snippet information in the following new formats:
+    * Plain text, in UTF-8, UTF-16LE, UTF-16BE and the system locale's default ANSI code page. [issue #162]
+    * HMTL 5 with optional syntax highlighting, in UTF-8 format [issue #153].
+    * XHTML with optional syntax highlighting, in UTF-8 format [issue #153].
+    * Markdown, in UTF-8, UTF-16LE, UTF-16BE and the system locale's default ANSI code page [issue #155].
+  * Changed the _Save Snippet Information_ dialogue box: 
+    * It is now based on that used for saving unit and annotated source code in that file encoding and snippet highlighting can be customised where relevant, although the _Comment style_ controls are disabled since they are not relevant.
+    * The suggested file name was changed from &quot;SnippetInfo&quot; to the display name of the selected snippet.
+    * The dialogue box caption now contains the display name of the selected snippet.
+* Changed the title of the _Save Annotated Source_ dialogue box when displaying snippets.
+* Added option to prevent descriptive comments from appearing in the implementation section of generated units. A check box for this option has been added to the _Code Formatting_ tab of the _Preferences_ dialogue box [issue #85].
+* The _Help | CodeSnip News Blog_ menu item was changed to link to the [DelphiDabbler Blog](https://delphidabbler.blogspot.com/) instead of the CodeSnip Blog, because the latter is to be closed down. The menu item was renamed to _Help | CodeSnip News On DelphiDabbler Blog_ [issue #161].
+* Improved how the CSS used in generated HTML 5 and XHTML files is generated:
+  * The ordering of CSS selectors can now be pre-determined.
+  * CSS lengths and sizes can now be specified in units, such as `em`, instead of just pixels.
+* Refactored the `USourceGen` unit to remove an unnecessary dependency on user preferences [issue #167].
+* Updated the help file: 
+  * Re changes when saving snippet information [issue #163].
+  * Re changes to the _Save Unit_ and _Save Annotated Source_ dialogue boxes.
+  * Re changes to the blog linked from the _Help_ menu.
+  * Re the new option to inhibit comments in the implementation sections of generated units.
+* Updated documentation: 
+  * File format documentation was changed re the addition of the Markdown file format and the changes to the encodings used in saved files.
+  * Read-me files were updated re the change of news blog.
+
 ## Release v4.25.0 of 19 April 2025
 
 * Added new feature to save snippet information to file in RTF format using the new _File | Save Snippet Information_ menu option [issue #140].
@@ -15,7 +49,7 @@ Releases are listed in reverse version number order.
 * Overhauled rich text format processing:
   * Fixed bug where Unicode characters that don't exist in the system code page were not being displayed correctly [issue #157].
   * Fixed potential bug where some reserved ASCII characters may not be escaped properly [issue #159].
-  * Refactored and improved the rich text handling code [issue #100].
+  * Refactored and improved the rich text handling code [issue #100]. 
 * Corrected the copyright date displayed in the About Box to include 2025 [issue #149].
 * Documentation changes:
   * Fixed error in the export file formation documentation and related help topic [issue #151].
