Missing text at end of detail pane list items fixed

delphidabbler · delphidabbler · commit 36bc98384821 · 2023-04-07T23:52:27.000+01:00
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
diff --git 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,18 +85,14 @@       TCSSStyles = class(TObject)
 implementation
 
 
-uses
-  // Project
-  UColours, UCSSUtils, UFontHelper, UIStringList;
-
-
 { TActiveTextHTML }
 
 constructor TActiveTextHTML.Create;
 begin
   inherited Create;
   fCSSStyles := TCSSStyles.Create;
   fBuilder := TStringBuilder.Create;
+  fLINestingDepth := 0;
   InitialiseTagInfoMap;
 end;
 
@@ -209,20 +206,24 @@ 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;
     fsClose:
     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;
