Merge branch 'feature/issue#17-fix-html-safe-chars' into develop

Author: delphidabbler

Src/UConsts.pas

@@ -29,8 +29,12 @@ interface
   CR          = #13;    // carriage return character
   SUB         = #26;    // ASCII SUB character
   ESC         = #27;    // escape character
+
   SINGLEQUOTE = '''';   // single quote character
   DOUBLEQUOTE = '"';    // double quote character
+  AMPERSAND   = '&';    // ampersand character
+  GT          = '>';    // greater-than / closing angle bracket character
+  LT          = '<';    // less-than / opening angle bracket character
 
   CRLF  = CR + LF;      // carriage return followed by line feed
   EOL   = CRLF;         // end of line character sequence for Windows systems

Src/UHTMLUtils.pas

@@ -227,18 +227,12 @@ class function THTML.Entities(const Text: string): string;
     for Ch in Text do
     begin
       case Ch of
-        '<':
-          SB.Append('&lt;');
-        '>':
-          SB.Append('&gt;');
-        '&':
-          SB.Append('&amp;');
-        DOUBLEQUOTE:
-          SB.Append('&quot;');
-        #0..#9, #11, #12, #14..#31:
-          SB.Append('&#' + IntToStr(Ord(Ch)) + ';')
-        else
-          SB.Append(Ch);
+        LT:           SB.Append('&lt;');
+        GT:           SB.Append('&gt;');
+        SINGLEQUOTE:  SB.Append('&apos;');
+        DOUBLEQUOTE:  SB.Append('&quot;');
+        AMPERSAND:    SB.Append('&amp;');
+        else          SB.Append(Ch);
       end;
     end;
     Result := SB.ToString;