Turbopower_ipro: Cleanup

components/turbopower_ipro/iphtmlparser.pas

@@ -11,11 +11,9 @@ uses
 type  
   TIpHtmlParser = class(TIpHtmlBasicParser)
   private
-//    FBody: TIpHtmlNodeBODY;
     FCharSP: Integer;
     FCharStack: array [0..7] of AnsiChar;
     FCharStream: TStream;
-//    FCSS: TCSSGlobalProps;
     FCurFrameSet: TIpHtmlNodeFRAMESET;
     FCurToken: TIpHtmlToken;
     FCurURL: string;
@@ -24,7 +22,6 @@ type
     FHasBOM: Boolean;
     FHasFrames: Boolean;
     FHaveToken: Boolean;
-//    FHtml: TIpHtmlNodeHtml;
     FInBlock: Integer;
     FIndexPhrase: string;
     FInPre: Integer;
@@ -37,7 +34,6 @@ type
     FParmBuf: PChar;
     FParmBufSize: Integer;
     FParmValueArray: array[TIpHtmlAttributesSet] of string;
-//    FStartPos: Integer;
     FTitleNode : TIpHtmlNodeTITLE;
     FTokenBuffer: TIpHtmlToken;
     FTokenStringBuf: PChar; {array[16383] of AnsiChar;}
@@ -952,9 +948,6 @@ end;
 
 procedure TIpHtmlParser.ParseBody(AParent: TIpHtmlNode;
   const EndTokens: TIpHtmlTokenSet);
-var
-  i: Integer;
-  Node: TIpHtmlNode;
 begin
   if FCurToken = IpHtmlTagFRAMESET then begin
     ParseFrameSet(AParent, EndTokens);

components/turbopower_ipro/iphtmlutils.pas

@@ -21,8 +21,9 @@ function TryColorFromString(S: String; out AColor: TColor; out AErrMsg: String):
 
 function GetAlignmentForStr(S: string; ADefault: TIpHtmlAlign = haDefault): TIpHtmlAlign;
 
+function AnsiToEscape(const S: string): string;
 function EscapeToAnsi(const S: string): string;
-//procedure TrimFormatting(const S: string; Target: PAnsiChar; PreFormatted: Boolean = False);
+function NoBreakToSpace(const S: string): string;
 
 implementation
 
@@ -544,49 +545,55 @@ begin
   if P <> 0 then
     ExpandEscapes(Result);
 end;
-                     (*
-procedure TrimFormatting(const S: string; Target: PAnsiChar; PreFormatted: Boolean = False);
-var
-  r, w: Integer;
 
-  procedure CopyChar(ch: AnsiChar);
+{ Returns the string with & escapes}
+function AnsiToEscape(const S: string): string;
+var
+  i : Integer;
+  procedure replaceCharBy(newStr: string);
   begin
-    Target[w] := ch;
-    Inc(w);
+    Result[i] := '&';
+    Insert(newStr, Result, i + 1);
   end;
 
 begin
-  r := 1;
-  w := 0;
-  while r <= Length(S) do begin
-    case S[r] of
-      #0..#8, #11..#12, #14..#31 :
-        ;
-      #9 :
-        if PreFormatted then
-          CopyChar(' ');
-      #13 :
-        if PreFormatted then
-          CopyChar(LF);
-      #10 :
-        if PreFormatted then begin
-          if (w = 0) or (Target[w-1] <> LF) then
-            CopyChar(LF);
-        end
-        else begin
-          if w > 1 then
-            CopyChar(' ');
-        end;
-      ' ' :
-        if PreFormatted or (w = 0) or (Target[w-1] <> ' ') then
-          CopyChar(' ');
-      else
-        CopyChar(S[r]);
+  Result := S;
+  i := length(Result);
+  while i > 0 do begin
+    case Result[i] of
+    ShyChar : replaceCharBy('shy;');
+    NbspChar : replaceCharBy('nbsp;');
+    '"' : replaceCharBy('quot;');
+    '&' : replaceCharBy('amp;');
+    '<' : replaceCharBy('lt;');
+    '>' : replaceCharBy('gt;');
     end;
-    Inc(r);
+    Dec(i);
   end;
-  Target[w] := #0;
-end;    *)
+end;
+
+function NoBreakToSpace(const S: string): string;
+var
+  P, n : Integer;
+begin
+  SetLength(Result, Length(S));
+  n := 0;
+  P := 1;
+  while P <= Length(S) do
+  begin
+    inc(n);
+    if S[P] = NbspChar then
+      Result[n] := ' '
+    else if (P < Length(S)) and (S[P] = NbspUtf8[1]) and (S[P+1] = NbspUtf8[2]) then
+    begin
+      Result[n] := ' ';
+      inc(P);
+    end else
+      Result[n] := S[P];
+    inc(P);
+  end;
+  SetLength(Result, n);
+end;
 
 end.
 

components/turbopower_ipro/ipstrms.pas

@@ -32,7 +32,7 @@
  * ***** END LICENSE BLOCK ***** *)
 
 { Global defines potentially affecting this unit }
-
+{$WARN 6058 off : Call to subroutine "$1" marked as inline is not inlined}
 {$I IPDEFINE.INC}
 
 unit IpStrms;