Delphi 7 and lower do not support UTF-8 source code, especially when …

…there is a BOM at the beginning
project-jedi · Apr 30, 2019 · 90cba05 · 90cba05
1 parent bcb1959
commit 90cba05
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/jvcl/run/JvHtmlParser.pas b/jvcl/run/JvHtmlParser.pas
@@ -231,7 +231,7 @@ procedure TJvHTMLParser.AnalyseString(const Str: string);
 var
   Str2, Str3: string;
   StartTag1, StartTag2: string;
-  I, J, K, Index: Integer;
+  I, J, J1, K, Index: Integer;
   TagInfo: TTagInfo;
   AttributesList: TStringList;
 
@@ -334,7 +334,17 @@ procedure TJvHTMLParser.AnalyseString(const Str: string);
         while J <> 0 do
         begin
           // changed from StrSearch(case sensitive) to StrFind (case insensitive)
-          J := StrFind(StartTag1, Str, J);
+          if trim(StartTag2) = '' then
+          begin
+            J := StrFind(StartTag1, Str, J)
+          end
+          else
+          begin
+            J1 := J;
+            J := StrFind(StartTag1 + ' ', Str, J);
+            if J = 0 then
+             J := StrFind(StartTag1 + '>', Str, J1);
+          end;
           if J > 0 then
           begin
             // changed from StrSearch(case sensitive) to StrFind (case insensitive)