tvplanit: Less hints and warnings (mostly UTF8-UTF16 related). Cosmetic changes.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4983 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/tvplanit/examples/fulldemo/demomain.lfm

@@ -1,7 +1,7 @@
 object MainForm: TMainForm
-  Left = 307
+  Left = 301
   Height = 600
-  Top = 312
+  Top = 177
   Width = 900
   Caption = 'Turbo Power VisualPlanIt Demo'
   ClientHeight = 580

components/tvplanit/source/laz_visualplanit.lpk

@@ -8,8 +8,6 @@
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
-        <IncludeFiles Value="../source"/>
-        <OtherUnitFiles Value="../source"/>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
       <Parsing>

components/tvplanit/source/vpbase.pas

@@ -105,7 +105,10 @@ type
   private
     seFilePos : Longint;
   public
-    constructor CreateError(const FilePos: Longint; const Reason: string);
+    constructor CreateError(const FilePos: Longint; const Reason: DOMString); overload;
+   {$IFDEF FPC}
+    constructor CreateError(const FilePos: Longint; const Reason: String); overload;
+    {$ENDIF}
     property FilePos: Longint read seFilePos;
   end;
 
@@ -115,7 +118,10 @@ type
     feLine: Longint;
     feLinePos: Longint;
   public
-    constructor CreateError(const FilePos, Line, LinePos: Longint; const Reason: string);
+    constructor CreateError(const FilePos, Line, LinePos: Longint; const Reason: DOMstring); overload;
+    {$IFDEF FPC}
+    constructor CreateError(const FilePos, Line, LinePos: Longint; const Reason: string); overload;
+    {$ENDIF}
     property Reason : DOMString read feReason;
     property Line: Longint read feLine;
     property LinePos: Longint read feLinePos;
@@ -123,7 +129,10 @@ type
 
   EVpParserError = class(EVpFilterError)
   public
-    constructor CreateError(Line, LinePos: Longint; const Reason: String);
+    constructor CreateError(Line, LinePos: Longint; const Reason: DOMString); overload;
+   {$IFDEF FPC}
+    constructor CreateError(Line, LinePos: Longint; const Reason: String); overload;
+   {$ENDIF}
   end;
 
   { implements the Version property with its associated design time About box }
@@ -366,17 +375,30 @@ uses
 
 { EAdStreamError }
 
+constructor EVpStreamError.CreateError(const FilePos: Integer;
+  const Reason: DOMString);
+begin
+  {$IFDEF FPC}
+  inherited Create(UTF8Encode(Reason));
+  {$ELSE}
+  inherited Create(Reason);
+  {$ENDIF}
+  seFilePos := FilePos;
+end;
+
+{$IFDEF FPC}
 constructor EVpStreamError.CreateError(const FilePos: Integer;
   const Reason: String);
 begin
   inherited Create(Reason);
   seFilePos := FilePos;
 end;
+{$ENDIF}
 
 { EAdFilterError }
 
 constructor EVpFilterError.CreateError(const FilePos, Line, LinePos: Integer;
-  const Reason: string);
+  const Reason: DOMString);
 begin
   inherited CreateError(FilePos, Reason);
   feLine := Line;
@@ -384,13 +406,32 @@ begin
   feReason := Reason;
 end;
 
+{$IFDEF FPC}
+constructor EVpFilterError.CreateError(const FilePos, Line, LinePos: Integer;
+  const Reason: String);
+begin
+  feReason := UTF8DEcode(Reason);
+  inherited CreateError(FilePos, feReason);
+  feLine := Line;
+  feLinePos := LinePos;
+end;
+{$ENDIF}
+
 { EAdParserError }
 
+constructor EVpParserError.CreateError(Line, LinePos: Integer;
+  const Reason: DOMString);
+begin
+  inherited CreateError(FilePos, Line, LinePos, Reason);
+end;
+
+{$IFDEF FPC}
 constructor EVpParserError.CreateError(Line, LinePos: Integer;
   const Reason: String);
 begin
   inherited CreateError(FilePos, Line, LinePos, Reason);
 end;
+{$ENDIF}
 
 (*****************************************************************************)
 { TVpCustomControl }

components/tvplanit/source/vpcanvasutils.pas

@@ -149,10 +149,12 @@ type
       function RGBToTColor(Red, Green, Blue: Byte): TColor;
       procedure TColorToRGB(Color: TColor; var Red, Green, Blue: Byte);
       procedure CachePalette(ABitmap: TBitmap; var PaletteEntries: TVpPaletteArray);
+      {
       function GetBmpPixel(ABitmap: TBitmap; PaletteCache: TVpPaletteArray;
         x, y: Integer): TColor;
       procedure SetBmpPixel(ABitmap: TBitmap; PaletteCache: TVpPaletteArray;
         x, y: Integer; AColor: TColor);
+      }
       property Viewport: TRect read FViewport write FViewport;
 
     published
@@ -307,12 +309,13 @@ procedure TColorToRGB(Color: TColor; var Red, Green, Blue: Byte);
 
 procedure TPSCachePalette(ABitmap: TBitmap; var PaletteEntries: TVpPaletteArray);
 
+{
 function TPSGetBmpPixel(ABitmap: TBitmap; PaletteCache: TVpPaletteArray;
   x, y: Integer): TColor;
 
 procedure TPSSetBmpPixel(ABitmap: TBitmap; PaletteCache: TVpPaletteArray;
   x, y: Integer; AColor: TColor);
-
+}
 function RenderTextToRect(ACanvas: TCanvas; const Angle: TVpRotationAngle;
   const Viewport: TRect; ARect: TRect; AString: string): Integer;
 
@@ -625,7 +628,7 @@ procedure TPSCachePalette(ABitmap: TBitmap; var PaletteEntries: TVpPaletteArray)
 begin
   VpRotatedCanvas.CachePalette(ABitmap, PaletteEntries);
 end;
-
+{
 function TPSGetBmpPixel(ABitmap: TBitmap; PaletteCache: TVpPaletteArray;
   x, y: Integer): TColor;
 begin
@@ -637,7 +640,7 @@ procedure TPSSetBmpPixel(ABitmap: TBitmap; PaletteCache: TVpPaletteArray;
 begin
   VpRotatedCanvas.SetBmpPixel(ABitmap, PaletteCache, x, y, AColor);
 end;
-
+}
 function RenderTextToRect(ACanvas: TCanvas; const Angle: TVpRotationAngle;
   const Viewport: TRect; ARect: TRect; AString: string): Integer;
 begin
@@ -1257,6 +1260,7 @@ begin
     GetPaletteEntries(ABitmap.Palette, 0, PaletteSize, PaletteEntries);
 end;
 
+(*
 // Fast scanline based pixel access
 function TVpExCanvas.GetBmpPixel(ABitmap: TBitmap;
   PaletteCache: TVpPaletteArray; x, y: Integer): TColor;
@@ -1437,7 +1441,7 @@ begin
   end;
   }
 end;
-
+*)
 
 { TVpLineWrapper ************************************************************ }
 

components/tvplanit/source/vpcontactgridpainter.pas

@@ -220,13 +220,22 @@ var
   TmpBmp: TBitmap;
   TmpCon: TVpContact;
   Col, RecsInCol: Integer;
-  HeadRect, AddrRect, CSZRect, Phone1Rect, Phone2Rect, Phone3Rect: TRect;
+  HeadRect: TRect;
-  Phone4Rect, Phone5Rect, WholeRect, CompanyRect, EMailRect: TRect;
+  WholeRect: TRect;
   TmpBmpRect: TRect;
   TextColWidth: Integer;
   TextXOffset: Integer;
   TextYOffset: Integer;
   oldCol1RecCount: Integer;
+  AddrRect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
+  CSZRect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
+  CompanyRect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
+  EMailRect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
+  Phone1Rect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
+  Phone2Rect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
+  Phone3Rect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
+  Phone4Rect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
+  Phone5Rect: TRect = (Left:0; Top:0; Right:0; Bottom:0);
 begin
   oldCol1RecCount := TVpContactGridOpener(FContactGrid).cgCol1RecCount;
   TVpContactGridOpener(FContactGrid).FVisibleContacts := 0;

components/tvplanit/source/vplocalize.pas

@@ -637,8 +637,13 @@ var
 begin
   Unused(oOwner, bSpecified);
   Item := TVpAttributeItem(FAttributes.Add);
+ {$IFDEF DELPHI}
   Item.Name := sName;
   Item.Value := sValue;
+ {$ELSE}
+  Item.Name := UTF8Encode(sName);
+  Item.Value := UTF8Encode(sValue);
+ {$ENDIF}
 end;
 
 procedure TVpLocalization.xmlLocalizeEndElement (oOwner : TObject;

components/tvplanit/source/vpmisc.pas

@@ -602,14 +602,14 @@ end;
 
 function GetButtonWidth(AButton: TButton): Integer;
 const
-  MARGIN = 16;
+  MARGIN = 24;
 var
   canvas: TControlCanvas;
 begin
   canvas := TControlCanvas.Create;
   canvas.Control := AButton;
   canvas.Font.Assign(AButton.Font);
-  Result := canvas.TextWidth(AButton.Caption) + 24 * Screen.PixelsPerInch div DesignTimeDPI;
+  Result := canvas.TextWidth(AButton.Caption) + MARGIN * Screen.PixelsPerInch div DesignTimeDPI;
 end;
 
 function GetRealFontHeight(AFont: TFont): Integer;

components/tvplanit/source/vpprtprv.pas

@@ -343,9 +343,9 @@ begin
   with Params do begin
     Style := Style or WS_TABSTOP;
     if FNeedHScroll then
-      Style := Longint (Style) or WS_HSCROLL;
+      Style := Style or WS_HSCROLL;
     if FNeedVScroll then
-      Style := Longint (Style) or WS_VSCROLL;
+      Style := Style or WS_VSCROLL;
   end;
 end;
 

components/tvplanit/source/vpxbase.pas

@@ -66,7 +66,6 @@ type
     FFileName: string;
   public
     constructor CreateEx(Mode: Word; const FileName: string);
-
     property Filename: string read FFileName;
   end;
 
@@ -83,7 +82,7 @@ function VpUcs4ToWideChar(const aInChar : TVpUcs4Char;
 function VpUtf16ToUcs4(aInChI,
                        aInChII   : DOMChar;
                    var aOutCh    : TVpUcs4Char;
-                   var aBothUsed : Boolean) : Boolean;
+                   out aBothUsed : Boolean) : Boolean;
 function VpUcs4ToUtf8(aInCh  : TVpUcs4Char;
                   var aOutCh : TVpUtf8Char) : Boolean;
 function VpUtf8ToUcs4(const aInCh  : TVpUtf8Char;
@@ -120,7 +119,11 @@ uses
 {== Utility methods ==================================================}
 function VpPos(const aSubStr, aString : DOMString) : Integer;
 begin
+ {$IFDEF DELPHI}
   Result := AnsiPos(aSubStr, aString);
+ {$ELSE}
+  Result := Pos(aSubStr, aString);
+ {$ENDIF}
 end;
 {--------}
 function VpRPos(const sSubStr, sTerm : DOMString) : Integer;
@@ -190,7 +193,7 @@ end;
 function VpUtf16ToUcs4(aInChI,
                        aInChII   : DOMChar;
                    var aOutCh    : TVpUcs4Char;
-                   var aBothUsed : Boolean) : Boolean;
+                   out aBothUsed : Boolean) : Boolean;
 begin
   aBothUsed := False;
   if (aInChI < #$D800) or (aInChI > #$DFFF) then begin

components/tvplanit/source/vpxchrflt.pas

@@ -131,20 +131,13 @@ type
       destructor Destroy; override;
 
       procedure PutUCS4Char(aCh: TVpUcs4Char);
-      function  PutChar(aCh1, aCh2 : DOMChar;
+      function PutChar(aCh1, aCh2: DOMChar; out aBothUsed: Boolean): Boolean;
-                    var aBothUsed  : Boolean) : Boolean;
       function PutString(const aText: DOMString): Boolean;
       function Position : integer;
 
-      property Format : TVpStreamFormat
+      property Format: TVpStreamFormat read FFormat write csSetFormat;
-         read FFormat
+      property WriteUTF8Signature: Boolean read FSetUTF8Sig write FSetUTF8Sig;
-         write csSetFormat;
+      property Size: LongInt read csGetSize;
-      property WriteUTF8Signature : Boolean
-         read FSetUTF8Sig
-         write FSetUTF8Sig;
-      property Size : LongInt
-         read csGetSize;
-
   end;
 
 
@@ -372,12 +365,13 @@ begin
     if (FBuffer[0] = #$FE) and (FBuffer[1] = #$FF) then begin
       FFormat := sfUTF16BE;
       FBufPos := 2;
-    end else if (FBuffer[0] = #$FF) and (FBuffer[1] = #$FE) then begin
+    end else
+    if (FBuffer[0] = #$FF) and (FBuffer[1] = #$FE) then begin
       FFormat := sfUTF16LE;
       FBufPos := 2;
-    end else if (FBuffer[0] = #$EF) and
+    end else
-                (FBuffer[1] = #$BB) and
+    if (FBuffer[0] = #$EF) and (FBuffer[1] = #$BB) and (FBuffer[2] = #$BF) then
-                (FBuffer[2] = #$BF) then begin
+    begin
       FFormat := sfUTF8;
       FBufPos := 3;
     end else
@@ -404,8 +398,7 @@ begin
     FFormat := aValue;
 end;
 {--------}
-procedure TVpInCharFilter.csGetChar(var aCh        : TVpUcs4Char;
+procedure TVpInCharFilter.csGetChar(var aCh: TVpUcs4Char; var aIsLiteral: Boolean);
-                                    var aIsLiteral : Boolean);
 begin
   {get the next character; for an EOF raise an exception}
   csGetCharPrim(aCh, aIsLiteral);
@@ -491,8 +484,8 @@ end;
 {--------}
 function TVpInCharFilter.ReadChar: DOMChar;
 var
-  Ch     : TVpUCS4Char;
+  Ch: TVpUCS4Char = 0;  // to silence the compiler
-  IL     : Boolean;
+  IL: Boolean = false;  // dto.
 begin
   if (FLastChar = '') or (FLastChar = #0) then begin  // wp: added #0
     csGetChar(Ch, IL);
@@ -500,8 +493,7 @@ begin
     Dec(FLinePos);
     FLastChar := Result;
     if (FUCS4Char <> TVpUCS4Char(VpNullChar)) then
-      if (Format = sfUTF16LE) or
+      if (Format = sfUTF16LE) or (Format = sfUTF16BE) then
-         (Format = sfUTF16BE) then
         Dec(FBufPos, 2)
       else if FBufPos > 0 then
         Dec(FBufPos, 1);
@@ -551,14 +543,18 @@ var
   TooLate: Boolean;
 begin
   case Format of
-      sfUTF8     : TooLate := (FSetUTF8Sig and (Position > 3)) or
+    sfUTF8:
-                              ((not FSetUTF8Sig) and (Position > 0));
+      TooLate := (FSetUTF8Sig and (Position > 3)) or ((not FSetUTF8Sig) and (Position > 0));
-      sfUTF16LE  : TooLate := (Position > 2);
+    sfUTF16LE:
-      sfUTF16BE  : TooLate := (Position > 2);
+      TooLate := (Position > 2);
-      sfISO88591 : TooLate := (Position > 0);
+    sfUTF16BE:
+      TooLate := (Position > 2);
+    sfISO88591:
+      TooLate := (Position > 0);
   else
     TooLate := true;
   end;
+
   if not TooLate then begin
     FBufPos := 0;
     FFormat := aValue;
@@ -570,12 +566,14 @@ begin
           FBuffer[2] := #$BF;
           FBufPos := 3;
         end;
-        sfUTF16LE : begin
+      sfUTF16LE :
+        begin
           FBuffer[0] := #$FF;
           FBuffer[1] := #$FE;
           FBufPos := 2;
         end;
-        sfUTF16BE : begin
+      sfUTF16BE :
+        begin
           FBuffer[0] := #$FE;
           FBuffer[1] := #$FF;
           FBufPos := 2;
@@ -600,7 +598,7 @@ begin
 end;
 {--------}
 function TVpOutCharFilter.PutChar(aCh1, aCh2: DOMChar;
-                              var aBothUsed  : Boolean) : Boolean;
+  out aBothUsed: Boolean): Boolean;
 var
   OutCh: TVpUCS4Char;
 begin
@@ -630,7 +628,7 @@ begin
   end;
 end;
 {--------}
-function TVpOutCharFilter.Position : integer;
+function TVpOutCharFilter.Position: Integer;
 begin
   Result := FStreamPos + FBufPos;
 end;

components/tvplanit/source/vpxmlds.pas

@@ -231,9 +231,8 @@ end;
 function TVpXmlDatastore.CreateStoreNode(ADoc: TDOMDocument): TDOMNode;
 var
   L: TStrings;
-  i, j: Integer;
+  i: Integer;
-  node, prevnode: TDOMNode;
+  node: TDOMNode;
-  rootnode: TDOMNode;
   appending: Boolean;
   {%H-}nodename: String;
 begin

components/tvplanit/source/vpxparsr.pas

@@ -380,14 +380,10 @@ type
     FPublicId: DOMString;
     FSystemId: DOMString;
   public
-    property PublicId : DOMString
+    property PublicId: DOMString read FPublicId write FPublicId;
-      read FPublicId
+    property SystemId: DOMString read FSystemId write FSystemId;
-      write FPublicId;
-
-    property SystemId : DOMString
-      read FSystemId
-      write FSystemId;
   end;
+
 {== TVpAttributeInfo =================================================}
   TVpAttributeInfo = class(TObject)
   private
@@ -397,26 +393,13 @@ type
     FEnum: DOMString;
     FLookup: DOMString;
   public
-    property AttrType : Integer
+    property AttrType: Integer read FType write FType;
-      read FType
+    property Enum: DOMString read FEnum write FEnum;
-      write FType;
+    property Lookup: DOMString read FLookup write FLookup;
-
+    property Value: DOMString read FValue write FValue;
-    property Enum : DOMString
+    property ValueType: Integer read FValueType write FValueType;
-      read FEnum
-      write FEnum;
-
-    property Lookup : DOMString
-      read FLookup
-      write FLookup;
-
-    property Value : DOMString
-      read FValue
-      write FValue;
-
-    property ValueType : Integer
-      read FValueType
-      write FValueType;
   end;
+
 {== TVpElementInfo ===================================================}
   TVpElementInfo = class(TObject)
   private
@@ -426,21 +409,13 @@ type
   public
     constructor Create;
     destructor Destroy; override;
+    procedure SetAttribute(const sName: DOMString; oAttrInfo: TVpAttributeInfo);
 
-    procedure SetAttribute(const sName     : DOMString;
+    property AttributeList: TStringList read FAttributeList;
-                                 oAttrInfo : TVpAttributeInfo);
+    property ContentModel: DOMString read FContentModel write FContentModel;
-
+    property ContentType: Integer read FContentType write FContentType;
-    property AttributeList : TStringList
-      read FAttributeList;
-
-    property ContentModel : DOMString
-      read FContentModel
-      write FContentModel;
-
-    property ContentType : Integer
-      read FContentType
-      write FContentType;
   end;
+
 {=== TVpElementInfo ==================================================}
 constructor TVpElementInfo.Create;
 begin
@@ -472,10 +447,18 @@ begin
     FAttributeList.Sorted := True;
     wIdx := -1
   end else
+   {$IFDEF DELPHI}
     wIdx := FAttributeList.IndexOf(sName);
+   {$ELSE}
+    wIdx := FAttributeList.IndexOf(UTF8Encode(sName));
+   {$ENDIF}
 
   if wIdx < 0 then
+   {$IFDEF DELPHI}
     FAttributeList.AddObject(sName, oAttrInfo)
+   {$ELSE}
+    FAttributeList.AddObject(UTF8Encode(sName), oAttrInfo)
+   {$ENDIF}
   else begin
     TVpAttributeInfo(FAttributeList.Objects[wIdx]).Free;
     FAttributeList.Objects[wIdx] := oAttrInfo;
@@ -555,17 +538,20 @@ procedure TVpParser.CheckParamEntityNesting(const aString : DOMString);
 var
   OpenPos: Integer;
   ClosePos: Integer;
+  errMsg: DOMString;
 begin
   OpenPos := VpPos('(', aString);
   ClosePos := VpPos(')', aString);
-  if (((OpenPos <> 0) and
+  if ((OpenPos <> 0) and (ClosePos = 0)) or
-       (ClosePos = 0)) or
+     ((ClosePos <> 0) and (OpenPos = 0)) then
-      ((ClosePos <> 0) and
+  begin
-       (OpenPos = 0))) then
+   {$IFDEF DELPHI}
-     raise EVpParserError.CreateError (FFilter.Line,
+    errMsg := sBadParamEntNesting + aString;
-                                        FFilter.LinePos,
+   {$ELSE}
-                                        sBadParamEntNesting +
+    errMsg := UTF8Decode(sBadParamEntNesting) + aString;
-                                        aString);
+   {$ENDIF}
+    raise EVpParserError.CreateError(FFilter.Line, FFilter.LinePos, errMsg);
+   end;
 end;
 {--------}
 procedure TVpParser.Cleanup;
@@ -671,27 +657,29 @@ end;
 {--------}
 function TVpParser.GetErrorMsg(wIdx: Integer): DOMString;
 begin
+ {$IFDEF DELPHI}
   Result := sIndexOutOfBounds;
-  if (wIdx >= 0) and
+  if (wIdx >= 0) and (wIdx < FErrors.Count) then
-     (wIdx < FErrors.Count) then
     Result := FErrors[wIdx];
+ {$ELSE}
+  Result := UTF8Decode(sIndexOutOfBounds);
+  if (wIdx >= 0) and (wIdx < FErrors.Count) then
+    Result := UTF8Decode(FErrors[wIdx]);
+ {$ENDIF}
 end;
 {--------}
 function TVpParser.DeclaredAttributes(const sName: DOMString;
-                                            aIdx  : Integer)
+  aIdx: Integer): TStringList;
-                                                  : TStringList;
 begin
   Unused(sName);
-
   if aIdx < 0 then
     Result := nil
   else
     Result := TVpElementInfo(FElementInfo.Objects[aIdx]).AttributeList;
 end;
 {--------}
-function TVpParser.GetAttributeDefaultValueType(const sElemName,
+function TVpParser.GetAttributeDefaultValueType(
-                                                      sAttrName : DOMString)
+  const sElemName, sAttrName: DOMString): Integer;
-                                                                : Integer;
 var
   wIdx: Integer;
   oAttrList: TStringList;
@@ -702,7 +690,11 @@ begin
   if wIdx >= 0 then begin
     oAttrList := TVpElementInfo(FElementInfo.Objects[wIdx]).AttributeList;
     if oAttrList <> nil then begin
+     {$IFDEF DELPHI}
       wIdx := oAttrList.IndexOf(sAttrName);
+     {$ELSE}
+      wIdx := oAttrList.IndexOf(UTF8Encode(sAttrName));
+     {$ENDIF}
       if wIdx >= 0 then begin
         oAttr := TVpAttributeInfo(oAttrList.Objects[wIdx]);
         Result := oAttr.AttrType;
@@ -711,10 +703,8 @@ begin
   end;
 end;
 {--------}
-function TVpParser.GetAttributeExpandedValue(const sElemName,
+function TVpParser.GetAttributeExpandedValue(const sElemName, sAttrName: DOMString;
-                                                   sAttrName : DOMString;
+  aIdx: Integer): DOMString;
-                                                   aIdx      : Integer)
-                                                             : DOMString;
 var
   wIdx: Integer;
   oAttrList: TStringList;
@@ -728,16 +718,17 @@ begin
   if aIdx >= 0 then begin
     oAttrList := TVpElementInfo(FElementInfo.Objects[aIdx]).AttributeList;
     if oAttrList <> nil then begin
+     {$IFDEF DELPHI}
       wIdx := oAttrList.IndexOf(sAttrName);
+     {$ELSE}
+      wIdx := oAttrList.IndexOf(UTF8Encode(sAttrName));
+     {$ENDIF}
       if wIdx >= 0 then begin
         oAttr := TVpAttributeInfo(oAttrList.Objects[wIdx]);
-        if (oAttr.Lookup = '') and
+        if (oAttr.Lookup = '') and (oAttr.Value <> '') then
-           (oAttr.Value <> '') then begin
+        begin
           PushString('"' + oAttr.Value + '"');
-          oAttr.Lookup := ReadLiteral(LIT_NORMALIZE or
+          oAttr.Lookup := ReadLiteral(LIT_NORMALIZE or LIT_CHAR_REF or LIT_ENTITY_REF, HasEntRef);
-                                      LIT_CHAR_REF or
-                                      LIT_ENTITY_REF,
-                                      HasEntRef);
           SkipWhitespace(True);
         end;
         Result := oAttr.Lookup;
@@ -747,8 +738,7 @@ begin
 end;
 {--------}
 function TVpParser.GetElementContentType(const sName: DOMString;
-                                               aIdx  : Integer)
+  aIdx: Integer): Integer;
-                                                     : Integer;
 begin
   Unused(sName);
   if aIdx < 0 then
@@ -757,18 +747,21 @@ begin
     Result := TVpElementInfo(FElementInfo.Objects[aIdx]).ContentType;
 end;
 {--------}
-function TVpParser.GetElementIndexOf(const sElemName : DOMString)
+function TVpParser.GetElementIndexOf(const sElemName: DOMString): Integer;
-                                                     : Integer;
 begin
+ {$IFDEF DELPHI}
   Result := FElementInfo.IndexOf(sElemName);
+ {$ELSE}
+  Result := FElementInfo.IndexOf(UTF8Encode(sElemName));
+ {$ENDIF}
 end;
 {--------}
 function TVpParser.GetEntityIndexOf(const sEntityName: DOMString;
-                                          aPEAllowed  : Boolean)
+  aPEAllowed: Boolean): Integer;
-                                                      : Integer;
 begin
   for Result := 0 to FEntityInfo.Count - 1 do
-    if FEntityInfo[Result] = sEntityName then begin
+    if FEntityInfo[Result] = {$IFDEF DELPHI}sEntityName{$ELSE}UTF8Encode(sEntityName){$ENDIF}
+    then begin
       if (not aPEAllowed) then begin
         if (not TVpEntityInfo(FEntityInfo.Objects[Result]).IsParameterEntity) then
           Exit;
@@ -850,10 +843,8 @@ begin
   end;
 end;
 {--------}
-function TVpParser.GetExternalTextEntityValue(const sName,
+function TVpParser.GetExternalTextEntityValue(const sName, sPublicId: DOMString;
-                                                    sPublicId : DOMString;
+  sSystemId: DOMString): DOMString;
-                                                    sSystemId : DOMString)
-                                                              : DOMString;
 var
   CompletePath: string;
 begin
@@ -869,8 +860,7 @@ begin
     exit;
 
   PushDocument;
-  if (VpPos('/', sSystemID) = 0) and
+  if (VpPos('/', sSystemID) = 0) and (VpPos('\', sSystemID) = 0) then
-     (VpPos('\', sSystemID) = 0) then
     CompletePath := FCurrentPath + sSystemID
   else
     CompletePath := sSystemID;
@@ -931,8 +921,7 @@ begin
             (cVal = #$0D) or (cVal = #$0A);
 end;
 {--------}
-function TVpParser.LoadDataSource(sSrcName  : string;
+function TVpParser.LoadDataSource(sSrcName: string; oErrors: TStringList): Boolean;
-                                  oErrors   : TStringList) : Boolean;
 var
   aFileStream: TVpFileStream;
 begin
@@ -1209,7 +1198,11 @@ begin
   FErrors.Clear;
   FIsStandAlone := False;
   FHasExternals := False;
+ {$IFDEF DELPHI}
   FUrl := sSource;
+ {$ELSE}
+  FUrl := UTF8Decode(sSource);
+ {$ENDIF}
   Result := LoadDataSource(sSource, FErrors);
   if Result then begin
     FFilter.FreeStream := True;
@@ -1379,14 +1372,17 @@ end;
 procedure TVpParser.ParseEndTag;
 var
   sName : DOMString;
+  msg: DOMString;
 begin
   sName := ReadNameToken(True);
-  if sName <> FCurrentElement then
+  if sName <> FCurrentElement then begin
-    raise EVpParserError.CreateError (FFilter.Line,
+    {$IFDEF DELPHI}
-                                       FFilter.LinePos,
+    msg := sMismatchEndTag + 'Start tag = "' + FCurrentElement + '" End tag = "' + sName + '"';
-                                       sMismatchEndTag +
+    {$ELSE}
-                                       'Start tag = "' + FCurrentElement +
+    msg := UTF8Decode(sMismatchEndTag) + 'Start tag = "' + FCurrentElement + '" End tag = "' + sName + '"';
-                                       '" End tag = "' + sName + '"');
+    {$ENDIF}
+    raise EVpParserError.CreateError(FFilter.Line, FFilter.LinePos, msg);
+  end;
   SkipWhitespace(True);
   Require(Xpc_BracketAngleRight);
   if Assigned(FOnEndElement) then
@@ -1657,9 +1653,8 @@ var
   HasEntRef : Boolean;
 begin
   if FXMLDecParsed then
-    raise EVpParserError.CreateError (FFilter.Line,
+    raise EVpParserError.CreateError(FFilter.Line, FFilter.LinePos, sXMLDecNotAtBeg);
-                                       FFilter.LinePos,
+
-                                       sXMLDecNotAtBeg);
   HasEntRef := False;
   SkipWhitespace(True);
   Require(Xpc_Version);
@@ -1681,9 +1676,7 @@ begin
     ParseEq;
     DataBufferAppend('="');
     Buffer := Buffer + ' ' + DataBufferToString;
-      sValue := ReadLiteral(LIT_CHAR_REF or
+    sValue := ReadLiteral(LIT_CHAR_REF or LIT_ENTITY_REF, HasEntRef);
-                            LIT_ENTITY_REF,
-                            HasEntRef);
     ValidateEncName(sValue);
     Buffer := Buffer + sValue + '"';
     if CompareText(sValue, 'ISO-8859-1') = 0 then
@@ -1696,14 +1689,9 @@ begin
     ParseEq;
     DatabufferAppend('="');
     Buffer := Buffer + ' ' + DataBufferToString;
-      sValue := ReadLiteral(LIT_CHAR_REF or
+    sValue := ReadLiteral(LIT_CHAR_REF or LIT_ENTITY_REF, HasEntRef);
-                            LIT_ENTITY_REF,
+    if (not ((sValue = 'yes') or (sValue = 'no'))) then
-                            HasEntRef);
+      raise EVpParserError.CreateError(FFilter.Line, FFilter.LinePos, sInvStandAloneVal);
-      if (not ((sValue = 'yes') or
-               (sValue = 'no'))) then
-        raise EVpParserError.CreateError (FFilter.Line,
-                                           FFilter.LinePos,
-                                           sInvStandAloneVal);
     Buffer := Buffer + sValue + '"';
     FIsStandalone := sValue = 'yes';
     SkipWhitespace(True)
@@ -1750,10 +1738,9 @@ end;
 function TVpParser.ReadChar(const UpdatePos: Boolean) : DOMChar;
 begin
   Result := FFilter.ReadChar;
-  if ((Result = VpEndOfStream) and
+  if (Result = VpEndOfStream) and (not IsEndDocument) then
-      (not IsEndDocument)) then
     Result := FFilter.ReadChar;
-  if (UpdatePos) then
+  if UpdatePos then
     FFilter.SkipChar;
 end;
 {--------}
@@ -1784,15 +1771,14 @@ begin
   end;
 end;
 {--------}
-function TVpParser.ReadLiteral(wFlags    : Integer;
+function TVpParser.ReadLiteral(wFlags: Integer; var HasEntRef: Boolean): DOMString;
-                           var HasEntRef : Boolean) : DOMString;
 var
   TempStr: DOMString;
-  cDelim,
+  cDelim, TempChar: DOMChar;
-  TempChar    : DOMChar;
   EntRefs: TStringList;
   StackLevel: Integer;
   CurrCharRef: Boolean;
+  msg: DOMString;
 begin
   StackLevel := 0;
   CurrCharRef := False;
@@ -1802,14 +1788,11 @@ begin
   if (cDelim <> '"') and
      (cDelim <> #39) and
      (cDelim <> #126) and
-     (cDelim <> #0) then
+     (cDelim <> #0)
-    raise EVpParserError.CreateError (FFilter.Line,
+  then
-                                       FFilter.LinePos,
+    raise EVpParserError.CreateError(FFilter.Line, FFilter.LinePos, sQuoteExpected);
-                                       sQuoteExpected);
   TempChar := ReadChar(False);
-  while (not IsEndDocument) and
+  while (not IsEndDocument) and ((CurrCharRef) or (TempChar <> cDelim)) do begin
-        ((CurrCharRef) or
-         (TempChar <> cDelim)) do begin
     if (TempChar = #$0A) then begin
       TempChar := ' ';
     end else if (TempChar = #$0D) then
@@ -1833,7 +1816,8 @@ begin
              (TempStr <> 'gt') and
              (TempStr <> 'amp') and
              (TempStr <> 'apos') and
-             (TempStr <> 'quot') then begin
+             (TempStr <> 'quot') then
+          begin
             if (not Assigned(EntRefs)) then begin
               EntRefs := TStringList.Create;
               EntRefs.Sorted := True;
@@ -1850,10 +1834,12 @@ begin
             except
               on E:EStringListError do begin
                 EntRefs.Free;
-                raise EVpParserError.CreateError (FFilter.Line,
+               {$IFDEF DELPHI}
-                                                   FFilter.LinePos,
+                msg := sCircularEntRef + TempChar;
-                                                   sCircularEntRef +
+               {$ELSE}
-                                                   TempChar);
+                msg := UTF8Decode(sCircularEntRef) + TempChar;
+               {$ENDIF}
+                raise EVpParserError.CreateError(FFilter.Line, FFilter.LinePos, msg);
               end;
               on E:EVpParserError do
                 raise;
@@ -1882,9 +1868,12 @@ begin
           except
             on E:EStringListError do begin
               EntRefs.Free;
-              raise EVpParserError.CreateError (FFilter.Line,
+             {$IFDEF DELPHI}
-                                                FFilter.LinePos,
+              msg := sCircularEntRef + TempChar;
-                                                sCircularEntRef + TempChar);
+             {$ELSE}
+              msg := UTF8Decode(sCircularEntRef) + TempChar;
+             {$ENDIF}
+              raise EVpParserError.CreateError(FFilter.Line, FFilter.LinePos, msg);
             end;
             on E:EVpParserError do
               raise;
@@ -1897,9 +1886,7 @@ begin
     CurrCharRef := False;
   end;
   if TempChar <> cDelim then
-    raise EVpParserError.CreateError (FFilter.Line,
+    raise EVpParserError.CreateError(FFilter.Line, FFilter.LinePos, 'Expected: ' + cDelim);
-                                       FFilter.LinePos,
-                                       'Expected: ' + cDelim);
 
   SkipChar;
 
@@ -2074,18 +2061,24 @@ begin
   SetEntity(sName, ENTITY_INTERNAL, '', '', sValue, '', aIsPE);
 end;
 {--------}
-procedure TVpParser.SetNotation(const sNotationName,
+procedure TVpParser.SetNotation(const sNotationName, sPublicId, sSystemId: DOMString);
-                                      sPublicId,
-                                      sSystemId     : DOMString);
 var
   oNot : TVpNotationInfo;
   wIdx : Integer;
 begin
+ {$IFDEF DELPHI}
   if not FNotationInfo.Find(sNotationName, wIdx) then begin
+ {$ELSE}
+  if not FNotationInfo.Find(UTF8Encode(sNotationName), wIdx) then begin
+ {$ENDIF}
     oNot := TVpNotationInfo.Create;
     oNot.PublicId := sPublicId;
     oNot.SystemId := sSystemId;
+   {$IFDEF DELPHI}
     FNotationInfo.AddObject(sNotationName, oNot);
+   {$ELSE}
+    FNotationInfo.AddObject(UTF8Encode(sNotationName), oNot);
+   {$ENDIF}
   end;
 end;
 {--------}
@@ -2184,21 +2177,22 @@ begin
   end;
 end;
 {--------}
-procedure TVpParser.ValidateEntityValue(const aValue   : DOMString;
+procedure TVpParser.ValidateEntityValue(const aValue: DOMString; aQuoteCh: DOMChar);
-                                              aQuoteCh : DOMChar);
 var
   TempChr: DOMChar;
   i: Integer;
+  msg: String;
 begin
   for i := 1 to Length(aValue) do begin
     TempChr := aValue[i];
-    if (TempChr = '%') or
+    if (TempChr = '%') or (TempChr = '&') or (TempChr = aQuoteCh) then begin
-       (TempChr = '&') or
+     {$IFDEF DELPHI}
-       (TempChr = aQuoteCh) then
+      msg := sInvEntityValue + QuotedStr(TempChr));
-      raise EVpParserError.CreateError (FFilter.Line,
+     {$ELSE}
-                                         FFilter.LinePos,
+      msg := sInvEntityValue + QuotedStr(UTF8Encode(TempChr));
-                                         sInvEntityValue +
+     {$ENDIF}
-                                         QuotedStr(TempChr));
+      raise EVpParserError.CreateError(FFilter.Line, FFilter.LinePos, msg);
+    end;
   end;
 end;
 {--------}