--- Merging r39707 into '.':

U    packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r39707 into '.':
 U   .
--- Merging r39708 into '.':
U    packages/chm/src/chmwriter.pas
U    packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r39708 into '.':
 G   .
--- Merging r39743 into '.':
U    rtl/objpas/sysutils/finah.inc
--- Recording mergeinfo for merge of r39743 into '.':
 G   .
--- Merging r39744 into '.':
U    packages/fcl-image/src/fpimage.pp
--- Recording mergeinfo for merge of r39744 into '.':
 G   .
--- Merging r39784 into '.':
 U   utils/data2inc.exm
--- Recording mergeinfo for merge of r39784 into '.':
 G   .

# revisions: 39707,39708,39743,39744,39784

git-svn-id: branches/fixes_3_2@39790 -

.gitattributes

@@ -16880,7 +16880,7 @@ utils/Makefile.fpc.fpcmake svneol=native#text/plain
 utils/README.txt svneol=native#text/plain
 utils/bin2obj.pp svneol=native#text/plain
 utils/creumap.pp svneol=native#text/plain
-utils/data2inc.exm -text
+utils/data2inc.exm svneol=native#text/plain
 utils/data2inc.pp svneol=native#text/plain
 utils/debugsvr/Makefile svneol=native#text/plain
 utils/debugsvr/Makefile.fpc svneol=native#text/plain

packages/chm/src/chmfilewriter.pas

@@ -180,9 +180,7 @@ begin
     Writer.AppendIndex(FIndexStream);
     if MakeBinaryIndex then
     begin
-      {$ifdef chmindex}
-        Writeln('into binindex ');
-      {$endif}
+      Error(chmnote,'CHM has binary index');      
       Writer.AppendBinaryIndexFromSiteMap(FIndex,False);
     end;
   end;
@@ -191,6 +189,7 @@ begin
     Writer.AppendTOC(FTOCStream);
     if MakeBinaryTOC then
     begin
+      Error(chmnote,'CHM has binary toc');
       Writer.AppendBinaryTOCFromSiteMap(FToc);
     end;
   end;
@@ -1213,6 +1212,7 @@ begin
           FreeAndNil(FIndex);
           FIndex:=TChmSiteMap.Create(stindex);
           FIndex.loadfromfile(FIndexFileName);
+          Error(chmnote,'Index items:'+inttostr(findex.Items.count));
         except
           on e: Exception do
             begin

packages/chm/src/chmreader.pas

@@ -1012,6 +1012,7 @@ begin
   result:=head<tail;
 
   n:=head-oldhead;
+  if (n>0) and (oldhead[n-1]=0) then dec(n); // remove trailing #0
   setlength(ws,n div sizeof(widechar));
   move(oldhead^,ws[1],n);
   for n:=1 to length(ws) do
@@ -1077,6 +1078,15 @@ begin
    end;
 end;
 
+procedure createentryseealso(Name:ansistring;CharIndex:integer;seealso:ansistring);
+var litem : TChmSiteMapItem;
+begin
+     item:=sitemap.items.NewItem;
+     item.KeyWord:=name;
+     item.SeeAlso:=seealso;
+end;
+
+
 procedure parselistingblock(p:pbyte);
 var
     itemstack:TObjectStack;
@@ -1189,8 +1199,11 @@ begin
               end;
           end;
          end;
-      if nrpairs<>0 Then
-        createentry(Name,CharIndex,Topic,Title);
+      if isseealso>0 then
+         createentryseealso(name,charindex,seealsostr)
+      else
+        if nrpairs<>0 Then
+          createentry(Name,CharIndex,Topic,Title);
       inc(head,4); // always 1
       {$ifdef binindex}
         if head<tail then

packages/chm/src/chmwriter.pas

@@ -2362,7 +2362,7 @@ begin
   IndexStream.Position:=0;
   IndexStream.write(hdr,sizeof(hdr));
   {$ifdef binindex}
-    logentry('before append');
+    logentry('before append '+inttostr(indexstream.size));
   {$endif}
 
   AppendBinaryIndexStream(IndexStream,datastream,MapStream,PropertyStream,chw);

packages/fcl-image/src/fpimage.pp

@@ -31,7 +31,7 @@ type
   FPImageException = class (exception);
 
   TFPColor = record
-    red,green,blue,alpha : word;
+    Red,Green,Blue,Alpha : word;
   end;
   PFPColor = ^TFPColor;
 
@@ -125,8 +125,8 @@ type
                          PercentDone: Byte;  RedrawNow: Boolean; const R: TRect;
                          const Msg: AnsiString; var Continue: Boolean); Virtual;
     public
-      constructor create (AWidth,AHeight:integer); virtual;
-      destructor destroy; override;
+      constructor Create (AWidth,AHeight:integer); virtual;
+      destructor Destroy; override;
       procedure Assign(Source: TPersistent); override;
       // Image handlers
       class function FindHandlerFromStream(Str:TStream): TIHData;
@@ -184,8 +184,8 @@ type
       procedure SetInternalPixel (x,y:integer; Value:integer); override;
       function GetInternalPixel (x,y:integer) : integer; override;
     public
-      constructor create (AWidth,AHeight:integer); override;
-      destructor destroy; override;
+      constructor Create (AWidth,AHeight:integer); override;
+      destructor Destroy; override;
       procedure SetSize (AWidth, AHeight : integer); override;
   end;
 
@@ -397,7 +397,7 @@ Type
   end;
 
   TFPCompactImgGrayAlpha16BitValue = packed record
-    g,a: word;
+    G,A: word;
   end;
   PFPCompactImgGrayAlpha16BitValue = ^TFPCompactImgGrayAlpha16BitValue;
 
@@ -432,7 +432,7 @@ Type
   end;
 
   TFPCompactImgGrayAlpha8BitValue = packed record
-    g,a: byte;
+    G,A: byte;
   end;
   PFPCompactImgGrayAlpha8BitValue = ^TFPCompactImgGrayAlpha8BitValue;
 
@@ -452,7 +452,7 @@ Type
   end;
 
   TFPCompactImgRGBA8BitValue = packed record
-    r,g,b,a: byte;
+    R,G,B,A: byte;
   end;
   PFPCompactImgRGBA8BitValue = ^TFPCompactImgRGBA8BitValue;
 
@@ -472,7 +472,7 @@ Type
   end;
 
   TFPCompactImgRGB8BitValue = packed record
-    r,g,b: byte;
+    R,G,B: byte;
   end;
   PFPCompactImgRGB8BitValue = ^TFPCompactImgRGB8BitValue;
 
@@ -492,7 +492,7 @@ Type
   end;
 
   TFPCompactImgRGB16BitValue = packed record
-    r,g,b: word;
+    R,G,B: word;
   end;
   PFPCompactImgRGB16BitValue = ^TFPCompactImgRGB16BitValue;
 
@@ -562,7 +562,7 @@ FuzzyDepth: word = 4): TFPCustomImage;
 
 function TryHtmlToFPColor(const S: String; out FPColor: TFPColor): Boolean;
 function HtmlToFPColorDef(const S: String; out FPColor: TFpColor; Def: TFPColor): TFPColor;
-function HtmlToFpColor(const S: String): TFPColor;
+function HtmlToFPColor(const S: String): TFPColor;
 
 
 implementation

rtl/objpas/sysutils/finah.inc

@@ -29,7 +29,7 @@ function ExtractShortPathName(Const FileName : PathStr) : PathStr;
 function ExpandFileName (Const FileName : PathStr): PathStr;
 function ExpandFileNameCase (const FileName: PathStr; out MatchFound: TFilenameCaseMatch): PathStr;
 function ExpandUNCFileName (Const FileName : PathStr): PathStr;
-function ExtractRelativepath (Const BaseName,DestNAme : PathStr): PathStr;
+function ExtractRelativePath (Const BaseName,DestNAme : PathStr): PathStr;
 function IncludeTrailingPathDelimiter(Const Path : PathStr) : PathStr;
 function IncludeTrailingBackslash(Const Path : PathStr) : PathStr;
 function ExcludeTrailingBackslash(Const Path: PathStr): PathStr;