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.

Author: delphidabbler

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 }

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

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(

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.

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):

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;

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.

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.