* updated copyright to 2000

fcl/db/createds.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 by Michael Van Canneyt, member of the 
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the 
     Free Pascal development team
 
     Creates a flat datafile for use with testds.
@@ -66,7 +66,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.5  2000-01-06 01:20:32  peter
+  Revision 1.6  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.5  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:05  peter

fcl/db/database.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 by Michael Van Canneyt, member of the 
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the 
     Free Pascal development team
 
     TDatabase and related objects implementation
@@ -175,7 +175,10 @@ end;
 
 {
   $Log$
-  Revision 1.4  2000-01-06 01:20:32  peter
+  Revision 1.5  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.4  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:05  peter

fcl/db/dataset.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 by Michael Van Canneyt, member of the
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the
     Free Pascal development team
 
     Dataset implementation
@@ -1475,7 +1475,10 @@ end;
 
 {
   $Log$
-  Revision 1.8  2000-01-06 01:20:32  peter
+  Revision 1.9  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.8  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:05  peter

fcl/db/db.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 by Michael Van Canneyt, member of the
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the
     Free Pascal development team
 
 
@@ -1260,7 +1260,10 @@ end.
 
 {
   $Log$
-  Revision 1.7  2000-01-06 01:20:32  peter
+  Revision 1.8  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.7  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:05  peter

fcl/db/dbs.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 by Michael Van Canneyt, member of the
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the
     Free Pascal development team
 
     Constants used for displaying messages in DB unit
@@ -45,7 +45,10 @@ Const
   
 {
   $Log$
-  Revision 1.6  2000-01-06 01:20:32  peter
+  Revision 1.7  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.6  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:06  peter

fcl/db/fields.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 by Michael Van Canneyt, member of the 
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the 
     Free Pascal development team
 
     TFields and related components implementations.
@@ -1752,7 +1752,10 @@ end;
 
 {
   $Log$
-  Revision 1.6  2000-01-06 01:20:32  peter
+  Revision 1.7  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.6  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:06  peter

fcl/db/mtest.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     <What does this file>
     
@@ -182,7 +182,10 @@ end.
 
 {
    $Log$
-   Revision 1.4  2000-01-06 01:20:32  peter
+   Revision 1.5  2000-01-07 01:24:32  peter
+     * updated copyright to 2000
+
+   Revision 1.4  2000/01/06 01:20:32  peter
      * moved out of packages/ back to topdir
 
    Revision 1.1  2000/01/03 19:33:06  peter

fcl/db/testds.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 by Michael Van Canneyt, member of the 
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the 
     Free Pascal development team
 
     Tests the TDDGDataset component.
@@ -178,7 +178,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.5  2000-01-06 01:20:32  peter
+  Revision 1.6  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.5  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:06  peter

fcl/db/tested.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 by Michael Van Canneyt, member of the 
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the 
     Free Pascal development team
 
     Tests the TDDGDataset component.
@@ -236,7 +236,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.5  2000-01-06 01:20:32  peter
+  Revision 1.6  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.5  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:06  peter

fcl/go32v2/classes.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by Michael Van Canneyt and Florian Klaempfl
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
 
     Classes unit for win32
 
@@ -37,7 +37,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.7  2000-01-07 00:01:33  peter
+  Revision 1.8  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.7  2000/01/07 00:01:33  peter
     * uses typinfo moved to interface
 
   Revision 1.6  2000/01/06 01:20:32  peter

fcl/go32v2/ezcgi.inc

@@ -5,5 +5,5 @@ Uses Dos;
 Function Getenv (Var EnvVar  : AnsiString): AnsiString;
 
 begin
-  Result:=Dos.Getenv(EnvVar); 
+  Result:=Dos.Getenv(EnvVar);
 end;

fcl/go32v2/pipes.inc

@@ -1,10 +1,10 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by Michael Van Canneyt
+    Copyright (c) 1999-2000 by Michael Van Canneyt
 
     DOS/go32v2 specific part of pipe stream.
-    
+
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 

fcl/go32v2/thread.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -92,7 +92,10 @@ end;
 
 {
   $Log$
-  Revision 1.3  2000-01-06 01:20:32  peter
+  Revision 1.4  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.3  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:06  peter

fcl/inc/base64.pp

@@ -1,4 +1,16 @@
-// $Id$
+{
+    $Id$
+    This file is part of the Free Component Library (FCL)
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
 
 // Encoding and decoding streams for base64 data as described in RFC2045
 
@@ -89,16 +101,16 @@ begin
     1: begin
         WriteBuf[0] := EncodingTable[Buf[0] shr 2];
         WriteBuf[1] := EncodingTable[(Buf[0] and 3) shl 4];
-	WriteBuf[2] := '=';
-	WriteBuf[3] := '=';
+        WriteBuf[2] := '=';
+        WriteBuf[3] := '=';
         OutputStream.Write(WriteBuf, 4);
       end;
     2: begin
         WriteBuf[0] := EncodingTable[Buf[0] shr 2];
-	WriteBuf[1] := EncodingTable[(Buf[0] and 3) shl 4 or (Buf[1] shr 4)];
-	WriteBuf[2] := EncodingTable[(Buf[1] and 15) shl 2];
-	WriteBuf[3] := '=';
-	OutputStream.Write(WriteBuf, 4);
+        WriteBuf[1] := EncodingTable[(Buf[0] and 3) shl 4 or (Buf[1] shr 4)];
+        WriteBuf[2] := EncodingTable[(Buf[1] and 15) shl 2];
+        WriteBuf[3] := '=';
+        OutputStream.Write(WriteBuf, 4);
       end;
   end;
   inherited Destroy;
@@ -194,39 +206,39 @@ begin
       while ToRead > 0 do begin
         OrgToRead := ToRead;
         HaveRead := InputStream.Read(ReadBuf[ReadOK], ToRead);
-	//WriteLn('ToRead = ', ToRead, ', HaveRead = ', HaveRead, ', ReadOK=', ReadOk);
-	if HaveRead > 0 then begin
-	  i := ReadOk;
-	  while i <= HaveRead do begin
-	    ReadBuf[i] := DecTable[ReadBuf[i]];
-	    if ReadBuf[i] = 99 then
-	      for j := i to 3 do
-	        ReadBuf[i] := ReadBuf[i + 1]
-	    else begin
-	      Inc(i);
-	      Inc(ReadOK);
-	      Dec(ToRead);
-	    end;
-	  end;
-	end;
-	if HaveRead <> OrgToRead then begin
-	  //WriteLn('Ende? ReadOK=', ReadOK, ', count=', Count);
-	  for i := ReadOK to 3 do
-	    ReadBuf[i] := Ord('=');
-	  fEOF := True;
-	  if ReadOK < 2 then exit;    // Not enough data available in input stream
-	  break;
-	end;
+        //WriteLn('ToRead = ', ToRead, ', HaveRead = ', HaveRead, ', ReadOK=', ReadOk);
+        if HaveRead > 0 then begin
+          i := ReadOk;
+          while i <= HaveRead do begin
+            ReadBuf[i] := DecTable[ReadBuf[i]];
+            if ReadBuf[i] = 99 then
+              for j := i to 3 do
+                ReadBuf[i] := ReadBuf[i + 1]
+            else begin
+              Inc(i);
+              Inc(ReadOK);
+              Dec(ToRead);
+            end;
+          end;
+        end;
+        if HaveRead <> OrgToRead then begin
+          //WriteLn('Ende? ReadOK=', ReadOK, ', count=', Count);
+          for i := ReadOK to 3 do
+            ReadBuf[i] := Ord('=');
+          fEOF := True;
+          if ReadOK < 2 then exit;    // Not enough data available in input stream
+          break;
+        end;
       end;
 
       // Check for fill bytes
       if (Count >= 2) and (ReadBuf[3] = Ord('=')) then begin
         //WriteLn('Endemarkierung!');
-	fEOF := True;
-	if ReadBuf[2] = Ord('=') then
-	  Count := 1
-	else
-	  Count := 2;
+        fEOF := True;
+        if ReadBuf[2] = Ord('=') then
+          Count := 1
+        else
+          Count := 2;
       end;
 
       // Decode the 4 bytes in the buffer to 3 undecoded bytes
@@ -287,7 +299,10 @@ end.
 
 {
   $Log$
-  Revision 1.6  2000-01-06 01:20:32  peter
+  Revision 1.7  2000-01-07 01:24:32  peter
+    * updated copyright to 2000
+
+  Revision 1.6  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:06  peter

fcl/inc/bits.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -353,7 +353,10 @@ end;
 
 {
   $Log$
-  Revision 1.7  2000-01-06 01:20:32  peter
+  Revision 1.8  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.7  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:06  peter

fcl/inc/classes.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by Michael Van Canneyt and Florian Klaempfl
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -294,18 +294,18 @@ procedure ObjectBinaryToText(Input, Output: TStream);
       NewInString := InString;
       case s[i] of
         #0..#31: begin
-	    if InString then
-	      NewInString := False;
-	    NewStr := '#' + IntToStr(Ord(s[i]));
-	  end;
+            if InString then
+              NewInString := False;
+            NewStr := '#' + IntToStr(Ord(s[i]));
+          end;
         '''':
-	    if InString then NewStr := ''''''
-	    else NewStr := '''''''';
-	else begin
-	  if not InString then
-	    NewInString := True;
-	  NewStr := s[i];
-	end;
+            if InString then NewStr := ''''''
+            else NewStr := '''''''';
+        else begin
+          if not InString then
+            NewInString := True;
+          NewStr := s[i];
+        end;
       end;
       if NewInString <> InString then begin
         NewStr := '''' + NewStr;
@@ -361,11 +361,11 @@ procedure ObjectBinaryToText(Input, Output: TStream);
         while ToDo > 0 do begin
           DoNow := ToDo;
           if DoNow > 32 then DoNow := 32;
-  	  Dec(ToDo, DoNow);
- 	  s := Indent + '  ';
-	  Input.Read(lbuf, DoNow);
-	  for i := 0 to DoNow - 1 do
-	    s := s + IntToHex(lbuf[i], 2);
+          Dec(ToDo, DoNow);
+          s := Indent + '  ';
+          Input.Read(lbuf, DoNow);
+          for i := 0 to DoNow - 1 do
+            s := s + IntToHex(lbuf[i], 2);
           OutLn(s);
         end;
         OutLn(indent + '}');
@@ -381,19 +381,19 @@ procedure ObjectBinaryToText(Input, Output: TStream);
       OutStr('(' + IntToStr(Ord(Valuetype)) + ') ');
       case ValueType of
         vaList: begin
-	    OutStr('(');
-	    IsFirst := True;
-	    while True do begin
-	      ValueType := TValueType(Input.ReadByte);
-	      if ValueType = vaNull then break;
-	      if IsFirst then begin
-	        OutLn('');
-	        IsFirst := False;
-	      end;
-	      OutStr(Indent + '  ');
-	      ProcessValue(ValueType, Indent + '  ');
-	    end;
-	    OutLn(Indent + ')');
+            OutStr('(');
+            IsFirst := True;
+            while True do begin
+              ValueType := TValueType(Input.ReadByte);
+              if ValueType = vaNull then break;
+              if IsFirst then begin
+                OutLn('');
+                IsFirst := False;
+              end;
+              OutStr(Indent + '  ');
+              ProcessValue(ValueType, Indent + '  ');
+            end;
+            OutLn(Indent + ')');
           end;
         vaInt8: OutLn(IntToStr(ShortInt(Input.ReadByte)));
         vaInt16: OutLn( IntToStr(SmallInt(Input.ReadWord)));
@@ -412,33 +412,33 @@ procedure ObjectBinaryToText(Input, Output: TStream);
         vaBinary: ProcessBinary;
         vaSet: begin
             OutStr('[');
-  	    IsFirst := True;
-	    while True do begin
-	      s := ReadSStr;
-	      if Length(s) = 0 then break;
-	      if not IsFirst then OutStr(', ');
-	      IsFirst := False;
-	      OutStr(s);
-	    end;
-	    OutLn(']');
+            IsFirst := True;
+            while True do begin
+              s := ReadSStr;
+              if Length(s) = 0 then break;
+              if not IsFirst then OutStr(', ');
+              IsFirst := False;
+              OutStr(s);
+            end;
+            OutLn(']');
           end;
         vaLString: Stop('!!LString!!');
         vaNil: Stop('nil');
         vaCollection: begin
             OutStr('<');
             while Input.ReadByte <> 0 do begin
-	      OutLn(Indent);
+              OutLn(Indent);
               Input.Seek(-1, soFromCurrent);
-	      OutStr(indent + '  item');
-	      ValueType := TValueType(Input.ReadByte);
-	      if ValueType <> vaList then
-	        OutStr('[' + IntToStr(ReadInt(ValueType)) + ']');
-	      OutLn('');
-	      ReadPropList(indent + '    ');
-	      OutStr(indent + '  end');
+              OutStr(indent + '  item');
+              ValueType := TValueType(Input.ReadByte);
+              if ValueType <> vaList then
+                OutStr('[' + IntToStr(ReadInt(ValueType)) + ']');
+              OutLn('');
+              ReadPropList(indent + '    ');
+              OutStr(indent + '  end');
             end;
-	    OutLn('>');
-	  end;
+            OutLn('>');
+          end;
         {vaSingle: begin OutLn('!!Single!!'); exit end;
         vaCurrency: begin OutLn('!!Currency!!'); exit end;
         vaDate: begin OutLn('!!Date!!'); exit end;
@@ -540,78 +540,78 @@ var
       toInteger: WriteInteger(parser.TokenInt);
       toFloat: begin
           Output.WriteByte(Ord(vaExtended));
-	  flt := Parser.TokenFloat;
+          flt := Parser.TokenFloat;
           Output.Write(flt, SizeOf(flt));
         end;
       toString: begin
           s := parser.TokenString;
-	  while parser.NextToken = '+' do begin
-	    parser.NextToken;	// Get next string fragment
-	    parser.CheckToken(toString);
-	    s := s + parser.TokenString;
-	  end;
+          while parser.NextToken = '+' do begin
+            parser.NextToken;   // Get next string fragment
+            parser.CheckToken(toString);
+            s := s + parser.TokenString;
+          end;
           Output.WriteByte(Ord(vaString));
           WriteString(s);
         end;
       toSymbol:
           if CompareText(parser.TokenString, 'True') = 0 then
-	    Output.WriteByte(Ord(vaTrue))
-	  else if CompareText(parser.TokenString, 'False') = 0 then
-	    Output.WriteByte(Ord(vaFalse))
-	  else if CompareText(parser.TokenString, 'nil') = 0 then
-	    Output.WriteByte(Ord(vaNil))
-	  else begin
+            Output.WriteByte(Ord(vaTrue))
+          else if CompareText(parser.TokenString, 'False') = 0 then
+            Output.WriteByte(Ord(vaFalse))
+          else if CompareText(parser.TokenString, 'nil') = 0 then
+            Output.WriteByte(Ord(vaNil))
+          else begin
             Output.WriteByte(Ord(vaIdent));
-	    WriteString(parser.TokenString);
+            WriteString(parser.TokenString);
           end;
       // Set
       '[': begin
           parser.NextToken;
-	  Output.WriteByte(Ord(vaSet));
-	  if parser.Token <> ']' then
-	    while True do begin
-	      parser.CheckToken(toSymbol);
-	      WriteString(parser.TokenString);
-	      parser.NextToken;
-	      if parser.Token = ']' then break;
-	      parser.CheckToken(',');
-	      parser.NextToken;
-	    end;
-	  Output.WriteByte(0);
+          Output.WriteByte(Ord(vaSet));
+          if parser.Token <> ']' then
+            while True do begin
+              parser.CheckToken(toSymbol);
+              WriteString(parser.TokenString);
+              parser.NextToken;
+              if parser.Token = ']' then break;
+              parser.CheckToken(',');
+              parser.NextToken;
+            end;
+          Output.WriteByte(0);
         end;
       // List
       '(': begin
           parser.NextToken;
-	  Output.WriteByte(Ord(vaList));
-	  while parser.Token <> ')' do ProcessValue;
-	  Output.WriteByte(0);
+          Output.WriteByte(Ord(vaList));
+          while parser.Token <> ')' do ProcessValue;
+          Output.WriteByte(0);
         end;
       // Collection
       '<': begin
           parser.NextToken;
-	  Output.WriteByte(Ord(vaCollection));
+          Output.WriteByte(Ord(vaCollection));
           while parser.Token <> '>' do begin
-	    parser.CheckTokenSymbol('item');
-	    parser.NextToken;
-	    // ConvertOrder
-	    Output.WriteByte(Ord(vaList));
-	    while not parser.TokenSymbolIs('end') do ProcessProperty;
-	    parser.NextToken;	// Skip 'end'
-	    Output.WriteByte(0);
-	  end;
-	  Output.WriteByte(0);
+            parser.CheckTokenSymbol('item');
+            parser.NextToken;
+            // ConvertOrder
+            Output.WriteByte(Ord(vaList));
+            while not parser.TokenSymbolIs('end') do ProcessProperty;
+            parser.NextToken;   // Skip 'end'
+            Output.WriteByte(0);
+          end;
+          Output.WriteByte(0);
         end;
       // Binary data
       '{': begin
           Output.WriteByte(Ord(vaBinary));
-	  stream := TMemoryStream.Create;
-	  try
-	    parser.HexToBinary(stream);
-	    Output.WriteDWord(stream.Size);
-	    Output.Write(Stream.Memory^, stream.Size);
-	  finally
-	    stream.Free;
-	  end;
+          stream := TMemoryStream.Create;
+          try
+            parser.HexToBinary(stream);
+            Output.WriteDWord(stream.Size);
+            Output.Write(Stream.Memory^, stream.Size);
+          finally
+            stream.Free;
+          end;
         end;
     else WriteLn('Token: "', parser.Token, '" ', Ord(parser.Token));
     end;
@@ -670,12 +670,12 @@ var
       parser.TokenSymbolIs('OBJECT') or
       parser.TokenSymbolIs('INHERITED')) do
       ProcessProperty;
-    Output.WriteByte(0);	// Terminate property list
+    Output.WriteByte(0);        // Terminate property list
 
     // Convert child objects
     while not parser.TokenSymbolIs('END') do ProcessObject;
-    parser.NextToken;		// Skip end token
-    Output.WriteByte(0);	// Terminate property list
+    parser.NextToken;           // Skip end token
+    Output.WriteByte(0);        // Terminate property list
   end;
 
 const
@@ -726,14 +726,14 @@ begin
   Output.WriteByte($ff);
   Output.WriteByte(10);
   Output.WriteByte(0);
-  Output.Write(name[1], Length(name) + 1);	// Write null-terminated form type name
+  Output.Write(name[1], Length(name) + 1);      // Write null-terminated form type name
   Output.WriteWord($1030);
   SizeStartPos := Output.Position;
-  Output.WriteDWord(0);			// Placeholder for data size
-  ObjectTextToBinary(Input, Output);	// Convert the stuff!
+  Output.WriteDWord(0);                 // Placeholder for data size
+  ObjectTextToBinary(Input, Output);    // Convert the stuff!
   BinSize := Output.Position - SizeStartPos - 4;
   Output.Position := SizeStartPos;
-  Output.WriteDWord(BinSize);		// Insert real resource data size
+  Output.WriteDWord(BinSize);           // Insert real resource data size
 end;
 
 
@@ -755,7 +755,10 @@ end;
 
 {
   $Log$
-  Revision 1.15  2000-01-06 01:20:32  peter
+  Revision 1.16  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.15  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.2  2000/01/04 18:07:16  michael

fcl/inc/classesh.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by Michael Van Canneyt and Florian Klaempfl
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -72,7 +72,7 @@ const
   toInteger = Char(3);
   toFloat   = Char(4);
 
-Const 
+Const
   FilerSignature : Array[1..4] of char = 'TPF0';
 
 type
@@ -126,7 +126,7 @@ type
   TAbstractFiler = Class;
   TAbstractWriter = Class;
   TAbstractReader = Class;
-  
+
   TFiler = class;
   TReader = class;
   TWriter = class;
@@ -700,7 +700,7 @@ type
     function ReadStr: string;
     function ReadString: string;
     function ReadValue: TValueType;
-    procedure CopyValue(Writer: TWriter); 
+    procedure CopyValue(Writer: TWriter);
     {!!!}
     property Owner: TComponent read FOwner write FOwner;
     property Parent: TComponent read FParent write FParent;
@@ -784,7 +784,7 @@ type
   end;
 
   TWriter = class(TAbstractWriter)
-  Private 
+  Private
     FStream : TStream;
     function GetPosition: Longint;
     procedure SetPosition(Value: Longint);
@@ -833,7 +833,7 @@ type
   end;
 
   TTextWriter = class(TAbstractWriter)
-  Private 
+  Private
     FStream : TStream;
     Procedure Write(Const Msg : String);
     Procedure WriteLn(Const Msg : String);
@@ -842,7 +842,7 @@ type
   protected
    Procedure StartCollection(Const AName : String);
    Procedure StartCollectionItem;
-   Procedure EndCollectionItem;  
+   Procedure EndCollectionItem;
    Procedure EndCollection;
   public
     Constructor Create(S : TStream);
@@ -995,7 +995,7 @@ type
     function GetPosition: Longint;
     procedure SetPosition(Value: Longint);
     procedure WriteBuffer;
-    procedure WriteData(Instance: TComponent); 
+    procedure WriteData(Instance: TComponent);
     procedure WriteProperty(Instance: TPersistent; PropInfo: Pointer);
     procedure WriteProperties(Instance: TPersistent);
     procedure WritePropName(const PropName: string);
@@ -1334,7 +1334,10 @@ function LineStart(Buffer, BufPos: PChar): PChar;
 
 {
   $Log$
-  Revision 1.20  2000-01-06 01:20:32  peter
+  Revision 1.21  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.20  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.3  2000/01/05 11:05:29  michael

fcl/inc/collect.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -35,7 +35,7 @@ begin
     If FCollection<>Nil then FCollection.RemoveItem(Self);
     if Value<>Nil then Value.InsertItem(Self);
     FCollection:=Value;
-    end;  
+    end;
 end;
 
 
@@ -45,7 +45,7 @@ procedure TCollectionItem.Changed(AllItems: Boolean);
 begin
  If (FCollection<>Nil) then
   begin
-  If AllItems then 
+  If AllItems then
     FCollection.Update(Nil)
   else
     FCollection.Update(Self);
@@ -60,7 +60,7 @@ begin
   If FCollection<>Nil then
     Result:=FCollection.GetNamePath+'['+IntToStr(Index)+']'
   else
-    Result:=ClassName; 
+    Result:=ClassName;
 end;
 
 
@@ -72,7 +72,7 @@ end;
 
 
 
-function TCollectionItem.GetDisplayName: string; 
+function TCollectionItem.GetDisplayName: string;
 
 begin
   Result:=ClassName;
@@ -90,7 +90,7 @@ begin
     begin
     FCollection.FItems.Move(Temp,Value);
     Changed(True);
-    end; 
+    end;
 end;
 
 
@@ -102,7 +102,7 @@ end;
 
 
 
-constructor TCollectionItem.Create(ACollection: TCollection); 
+constructor TCollectionItem.Create(ACollection: TCollection);
 
 begin
   Inherited Create;
@@ -111,7 +111,7 @@ end;
 
 
 
-destructor TCollectionItem.Destroy; 
+destructor TCollectionItem.Destroy;
 
 begin
   SetCollection(Nil);
@@ -150,7 +150,7 @@ begin
   Result:=FPropNAme;
   TheOWner:=GetOwner;
   If (Result<>'') or (TheOwner=Nil) Or (TheOwner.Classinfo=Nil) then exit;
-  SetPropName;  
+  SetPropName;
   Result:=FPropName;
 end;
 
@@ -179,14 +179,14 @@ begin
 end;
 
 
-function TCollection.GetAttrCount: Integer; 
+function TCollection.GetAttrCount: Integer;
 
 begin
   Result:=0;
 end;
 
 
-function TCollection.GetAttr(Index: Integer): string; 
+function TCollection.GetAttr(Index: Integer): string;
 
 begin
   Result:='';
@@ -194,7 +194,7 @@ end;
 
 
 
-function TCollection.GetItemAttr(Index, ItemIndex: Integer): string; 
+function TCollection.GetItemAttr(Index, ItemIndex: Integer): string;
 
 
 begin
@@ -203,7 +203,7 @@ end;
 
 
 
-function TCollection.GetNamePath: string; 
+function TCollection.GetNamePath: string;
 
 Var OwnerName,ThePropName : String;
 
@@ -243,7 +243,7 @@ end;
 
 
 
-procedure TCollection.SetItemName(Item: TCollectionItem); 
+procedure TCollection.SetItemName(Item: TCollectionItem);
 
 begin
 end;
@@ -267,7 +267,7 @@ end;
 
 
 
-destructor TCollection.Destroy; 
+destructor TCollection.Destroy;
 
 begin
   If Assigned(FItems) Then Clear;
@@ -341,7 +341,10 @@ end;
 
 {
   $Log$
-  Revision 1.8  2000-01-06 01:20:32  peter
+  Revision 1.9  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.8  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:07  peter

fcl/inc/compon.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -478,7 +478,10 @@ end;
 
 {
   $Log$
-  Revision 1.10  2000-01-06 01:20:32  peter
+  Revision 1.11  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.10  2000/01/06 01:20:32  peter
     * moved out of packages/ back to topdir
 
   Revision 1.2  2000/01/04 18:07:16  michael

fcl/inc/constse.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.

fcl/inc/constsg.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.

fcl/inc/constss.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.

fcl/inc/cregist.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1999 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -100,7 +100,7 @@ begin
     for i := 0 to ComponentPages.Count - 1 do
       if TComponentPage(ComponentPages.Items[i]).Name = Page then begin
         pg := TComponentPage(ComponentPages.Items[i]);
-	break;
+        break;
       end;
 
   if pg = nil then begin
@@ -148,7 +148,10 @@ end;
 
 {
   $Log$
-  Revision 1.3  2000-01-06 01:20:33  peter
+  Revision 1.4  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.3  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:07  peter

fcl/inc/ezcgi.pp

@@ -1,3 +1,16 @@
+{
+    $Id$
+    This file is part of the Free Component Library (FCL)
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
 unit ezcgi;
 
 {$mode delphi}
@@ -34,9 +47,9 @@ type
       procedure GetQueryItems;
       procedure ProcessRequest;
       procedure LoadEnvVariables;
-      function GetVal(Index : String) : String;      
-      function GetName(Index : Integer) : String;      
-      function GetVariable(Index : Integer) : String;      
+      function GetVal(Index : String) : String;
+      function GetName(Index : Integer) : String;
+      function GetVariable(Index : Integer) : String;
       function GetVarCount : Integer;
       procedure ReadPostQuery;
       procedure ReadGetQuery;
@@ -52,7 +65,7 @@ type
       procedure WriteContent(ctype : String);
       procedure PutLine(sOut : String);
       function GetValue(Index : String; defaultValue : String) : String;
-      
+
       procedure DoPost; virtual;
       procedure DoGet; virtual;
 
@@ -60,7 +73,7 @@ type
       property Names[Index : Integer] : String read GetName;
       property Variables[Index : Integer] : String read GetVariable;
       property VariableCount : Integer read GetVarCount;
-      
+
       property Name : String read FName write FName;
       property Email : String read FEmail write FEmail;
    end;
@@ -81,7 +94,7 @@ begin
    FVariables := TStringList.Create;
 
    LoadEnvVariables;
-   
+
 end;
 
 destructor TEZcgi.Destroy;
@@ -174,7 +187,7 @@ var
 begin
 
    request := GetVal('REQUEST_METHOD');
-   
+
    if request = '' then
       OutputError('No REQUEST_METHOD passed from server!')
    else if request = 'POST' then
@@ -185,7 +198,7 @@ begin
    else if request = 'GET' then
       begin
          ReadGetQuery;
-	 DoGet;
+         DoGet;
       end
    else
       OutputError('Invalid REQUEST_METHOD passed from server!');
@@ -219,7 +232,7 @@ var
    code : Word;
    contentLength : Integer;
    theType : String;
-      
+
 begin
 
    temp := GetVal('CONTENT_LENGTH');
@@ -280,22 +293,22 @@ var
    begin
       repeat
          index := Pos('+', queryItem);
-	 if index > 0 then
-	    queryItem[index] := Chr(32);
+         if index > 0 then
+            queryItem[index] := Chr(32);
       until index = 0;
       repeat
          index := Pos('%', queryItem);
-	 if index > 0 then
-	 begin
-	    queryItem[index] := hexConverter(queryItem[index + 1], queryItem[index + 2]);
-	    system.Delete(queryItem, index + 1, 2);
-	 end;
+         if index > 0 then
+         begin
+            queryItem[index] := hexConverter(queryItem[index + 1], queryItem[index + 2]);
+            system.Delete(queryItem, index + 1, 2);
+         end;
       until index = 0;
    end;
 
 begin
    InitToken(FQueryString, '&');
-   
+
    while NextToken(queryItem, delimiter) do
    begin
       if queryItem <> '' then
@@ -314,7 +327,7 @@ begin
    writeln('<center><hr><h1>CGI ERROR</h1><hr></center><br><br>');
    writeln('This CGI application encountered the following error: <br>');
    writeln('<ul><br>');
-   writeln('<li> error: ',errorMessage,'<br><hr>'); 
+   writeln('<li> error: ',errorMessage,'<br><hr>');
    writeln('<h5><p><i>Notify ',FName,' <a href="mailto:',FEmail,'">',FEmail,'</a></i></p></h5>');
    writeln('</body></html>');
 

fcl/inc/filer.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -17,7 +17,10 @@
 
 {
   $Log$
-  Revision 1.4  2000-01-06 01:20:33  peter
+  Revision 1.5  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.4  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.2  2000/01/04 18:07:16  michael

fcl/inc/filerec.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1993,97 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     FileRec record definition
 
@@ -35,7 +35,10 @@ type
 
 {
   $Log$
-  Revision 1.3  2000-01-06 01:20:33  peter
+  Revision 1.4  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.3  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:07  peter

fcl/inc/gettext.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     Gettext interface to resourcestrings.
 
@@ -188,12 +188,12 @@ end;
 {
   Define USEITERATOR if you want to translate the strings using
   the SetResourceStrings call. This is not recommended for this
-  particular iplementation, since we must pass through a global 
+  particular iplementation, since we must pass through a global
   variable TheFile : TMOFile. However that works too.
 }
 
 {$ifdef USEITERATOR}
-Var 
+Var
   Thefile : TMOFile;
 
 Function Translate (Name,Value : AnsiString; Hash : Longint) : AnsiString;
@@ -251,7 +251,10 @@ end.
 
 {
   $Log$
-  Revision 1.7  2000-01-06 01:20:33  peter
+  Revision 1.8  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.7  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:07  peter

fcl/inc/idea.pp

@@ -1,3 +1,16 @@
+{
+    $Id$
+    This file is part of the Free Component Library (FCL)
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
 UNIT IDEA;
 
 {
@@ -44,7 +57,7 @@ PROCEDURE EnKeyIdea(userkey: ideacryptkey; VAR z: ideakey);
 PROCEDURE DeKeyIdea(z: IDEAKey; VAR dk: ideakey);
 PROCEDURE CipherIdea(input: ideacryptdata; VAR out: ideacryptdata; z: IDEAkey);
 
-Type  
+Type
 
 EIDEAError = Class(EStreamError);
 
@@ -83,12 +96,12 @@ TIDEADeCryptStream = Class(TStream)
 
 IMPLEMENTATION
 
-Const 
+Const
   SNoSeekAllowed = 'Seek not allowed on encryption streams';
   SNoReadAllowed = 'Reading from encryption stream not allowed';
   SNoWriteAllowed = 'Writing to decryption stream not allowed';
 
-Type 
+Type
   PByte = ^Byte;
 
 PROCEDURE mul(VAR a:Word; b: Word);
@@ -258,7 +271,7 @@ begin
   Fpos:=0;
 end;
 
-Destructor TIDEAEncryptStream.Destroy; 
+Destructor TIDEAEncryptStream.Destroy;
 
 
 begin
@@ -270,10 +283,10 @@ Procedure TIDEAEncryptStream.Flush;
 
 Var
   OutData : IdeaCryptData;
-  
+
 begin
   If FBufPos>0 then
-    begin 
+    begin
     // Fill with spaces.
     FillChar(PByte(@FData)[FBufPos],SizeOf(FData)-FBufPos,' ');
     CipherIdea(Fdata,OutData,FKey);
@@ -281,15 +294,15 @@ begin
     end;
 end;
 
-function TIDEAEncryptStream.Read(var Buffer; Count: Longint): Longint; 
+function TIDEAEncryptStream.Read(var Buffer; Count: Longint): Longint;
 
 begin
   Raise EIDEAError.Create(SNoReadAllowed);
 end;
 
-function TIDEAEncryptStream.Write(const Buffer; Count: Longint): Longint; 
+function TIDEAEncryptStream.Write(const Buffer; Count: Longint): Longint;
 
-Var 
+Var
   mvsize : Longint;
   OutData : IDEAcryptdata;
 
@@ -318,7 +331,7 @@ begin
 end;
 
 
-function TIDEAEncryptStream.Seek(Offset: Longint; Origin: Word): Longint; 
+function TIDEAEncryptStream.Seek(Offset: Longint; Origin: Word): Longint;
 
 begin
   if (Offset = 0) and (Origin = soFromCurrent) then
@@ -337,14 +350,14 @@ begin
   FSrc:=Src;
 end;
 
-destructor TIDEADeCryptStream.Destroy; 
+destructor TIDEADeCryptStream.Destroy;
 begin
   Inherited destroy;
 end;
 
-function TIDEADeCryptStream.Read(var Buffer; Count: Longint): Longint; 
-  
-Var 
+function TIDEADeCryptStream.Read(var Buffer; Count: Longint): Longint;
+
+Var
   mvsize : Longint;
   InData : IDEAcryptdata;
 
@@ -356,14 +369,14 @@ begin
     If FBufPos<SizeOf(FData) then
       begin
       mvSize:=Sizeof(FData)-FBufPos;
-      If MvSize>count then 
+      If MvSize>count then
         mvsize:=Count;
       Move(PByte(@FData)[FBufPos],Pbyte(@Buffer)[Result],MVSize);
       Dec(Count,mvsize);
       Inc(Result,mvsize);
       inc(fBufPos,mvsize);
       end;
-    // Fill buffer again if needed.  
+    // Fill buffer again if needed.
     If (FBufPos=SizeOf(FData)) and (Count>0) then
       begin
       mvsize:=FSrc.Read(InData,SizeOf(InData));
@@ -382,16 +395,16 @@ begin
   Inc(FPos,Result);
 end;
 
-function TIDEADeCryptStream.Write(const Buffer; Count: Longint): Longint; 
+function TIDEADeCryptStream.Write(const Buffer; Count: Longint): Longint;
 begin
   Raise EIDEAError.Create(SNoReadAllowed);
 end;
 
-function TIDEADeCryptStream.Seek(Offset: Longint; Origin: Word): Longint; 
+function TIDEADeCryptStream.Seek(Offset: Longint; Origin: Word): Longint;
 
 Var Buffer : Array[0..1023] of byte;
     i : longint;
-    
+
 begin
   // Fake seek if possible by reading and discarding bytes.
   If ((Offset>=0) and (Origin = soFromCurrent)) or
@@ -402,7 +415,7 @@ begin
       ReadBuffer(Buffer,Offset mod SizeOf(Buffer));
       Result:=FPos;
       end
-  else             
+  else
     Raise EIDEAError.Create(SNoSeekAllowed);
 end;
 

fcl/inc/inifiles.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by Michael A. Hess
+    Copyright (c) 1999-2000 by Michael A. Hess
 
     adapted from code by Stephan Schneider
 
@@ -481,7 +481,10 @@ end.
 
 {
   $Log$
-  Revision 1.7  2000-01-06 01:20:33  peter
+  Revision 1.8  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.7  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:07  peter

fcl/inc/iostream.pp

@@ -1,3 +1,16 @@
+{
+    $Id$
+    This file is part of the Free Component Library (FCL)
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
 unit iostream;
 
 Interface
@@ -6,9 +19,9 @@ Uses Classes;
 
 Type
 
-  TiosType = (iosInput,iosOutPut,iosError); 
+  TiosType = (iosInput,iosOutPut,iosError);
   EIOStreamError = Class(EStreamError);
-  
+
   TIOStream = Class(THandleStream)
     Private
       FType,
@@ -27,7 +40,7 @@ Const
   SReadOnlyStream = 'Cannot write to an input stream.';
   SWriteOnlyStream = 'Cannot read from an output stream.';
   SInvalidOperation = 'Cannot perform this operation on a IOStream.';
-  
+
 Constructor TIOStream.Create(IOSType : TiosType);
 
 begin
@@ -62,14 +75,14 @@ begin
 end;
 
 
-Procedure TIOStream.SetSize(NewSize: Longint); 
+Procedure TIOStream.SetSize(NewSize: Longint);
 
 begin
   Raise EIOStreamError.Create(SInvalidOperation);
 end;
 
 
-Function TIOStream.Seek(Offset: Longint; Origin: Word): Longint; 
+Function TIOStream.Seek(Offset: Longint; Origin: Word): Longint;
 
 Const BufSize = 100;
 
@@ -80,17 +93,17 @@ begin
      result:=FPos;
   { Try to fake seek by reading and discarding }
   if (Ftype>0) or
-     Not((Origin=soFromCurrent) and (Offset>=0) or  
-         ((Origin=soFrombeginning) and (OffSet>=FPos))) then 
+     Not((Origin=soFromCurrent) and (Offset>=0) or
+         ((Origin=soFrombeginning) and (OffSet>=FPos))) then
      Raise EIOStreamError.Create(SInvalidOperation);
   if Origin=soFromBeginning then
     Dec(Offset,FPos);
-  While ((Offset Div BufSize)>0) 
+  While ((Offset Div BufSize)>0)
         and (Read(Buf,SizeOf(Buf))=BufSize) do
      Dec(Offset,BufSize);
   If (Offset>0) then
     Read(Buf,BufSize);
-  Result:=FPos;   
+  Result:=FPos;
 end;
 
 end.

fcl/inc/lists.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -188,7 +188,7 @@ end;
 function TList.First: Pointer;
 
 begin
-  If FCount=0 then 
+  If FCount=0 then
     Result:=Nil
   else
     Result:=Items[0];
@@ -224,7 +224,7 @@ function TList.Last: Pointer;
 
 begin
   // Wouldn't it be better to return nil if the count is zero ?
-  If FCount=0 then 
+  If FCount=0 then
     Result:=Nil
   else
     Result:=Items[FCount-1];
@@ -395,7 +395,10 @@ end;
 
 {
   $Log$
-  Revision 1.9  2000-01-06 01:20:33  peter
+  Revision 1.10  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.9  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:07  peter

fcl/inc/parser.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -307,7 +307,10 @@ begin
 end;
 {
   $Log$
-  Revision 1.10  2000-01-06 01:20:33  peter
+  Revision 1.11  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.10  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:08  peter

fcl/inc/persist.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -21,7 +21,7 @@ procedure TPersistent.AssignError(Source: TPersistent);
 Var SourceName : String;
 
 begin
-  If Source<>Nil then 
+  If Source<>Nil then
     SourceName:=Source.ClassName
   else
     SourceName:='Nil';
@@ -51,7 +51,7 @@ begin
   Result:=Nil;
 end;
 
-destructor TPersistent.Destroy; 
+destructor TPersistent.Destroy;
 
 begin
   Inherited Destroy;
@@ -61,7 +61,7 @@ end;
 procedure TPersistent.Assign(Source: TPersistent);
 
 begin
-  If Source<>Nil then 
+  If Source<>Nil then
     Source.AssignTo(Self)
   else
     AssignError(Nil);
@@ -73,7 +73,7 @@ Var OwnerName :String;
 
 begin
  Result:=ClassNAme;
- If GetOwner<>Nil then 
+ If GetOwner<>Nil then
    begin
    OwnerName:=GetOwner.GetNamePath;
    If OwnerName<>'' then Result:=OwnerName+'.'+Result;
@@ -81,7 +81,10 @@ begin
 end;
 {
   $Log$
-  Revision 1.5  2000-01-06 01:20:33  peter
+  Revision 1.6  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.5  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:08  peter

fcl/inc/pipes.pp

@@ -1,10 +1,10 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by Michael Van Canneyt
+    Copyright (c) 1999-2000 by Michael Van Canneyt
 
     Implementation of pipe stream.
-    
+
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 
@@ -28,7 +28,7 @@ Type
   EPipeCreation = Class (EPipeError);
 
   TInputPipeStream = Class(THandleStream)
-    Private 
+    Private
       FPos : longint;
     public
       Function Write (Const Buffer; Count : Longint) :Longint; Override;
@@ -93,17 +93,17 @@ begin
   If (Origin=soFromCurrent) and (Offset=0) then
      result:=FPos;
   { Try to fake seek by reading and discarding }
-  if Not((Origin=soFromCurrent) and (Offset>=0) or  
-         ((Origin=soFrombeginning) and (OffSet>=FPos))) then 
+  if Not((Origin=soFromCurrent) and (Offset>=0) or
+         ((Origin=soFrombeginning) and (OffSet>=FPos))) then
      Raise EPipeSeek.Create(ENoSeekMSg);
   if Origin=soFromBeginning then
     Dec(Offset,FPos);
-  While ((Offset Div BufSize)>0) 
+  While ((Offset Div BufSize)>0)
         and (Read(Buf,SizeOf(Buf))=BufSize) do
      Dec(Offset,BufSize);
   If (Offset>0) then
     Read(Buf,BufSize);
-  Result:=FPos;   
+  Result:=FPos;
 end;
 
 Function TOutputPipeStream.Read(Var Buffer; Count : Longint) : longint;

fcl/inc/reader.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -373,7 +373,10 @@ begin
 end;
 {
   $Log$
-  Revision 1.5  2000-01-06 01:20:33  peter
+  Revision 1.6  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.5  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.2  2000/01/04 18:07:16  michael

fcl/inc/rtfdata.inc

@@ -1,11 +1,11 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by Michael Van Canneyt, member of the
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the
     Free Pascal development team
 
     All major and minor RTF class definitions.
-    
+
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 
@@ -17,433 +17,433 @@
 
 { ---------------------------------------------------------------------
   Twentieths of a point (twips) per inch (Many RTF measurements
-  are in twips per inch (tpi) units).  Assumes 72 points/inch. 
+  are in twips per inch (tpi) units).  Assumes 72 points/inch.
   ---------------------------------------------------------------------}
 
 Const
- rtfTpi		= 1440;
- rtfBufSiz	= 255; { buffer size}
+ rtfTpi         = 1440;
+ rtfBufSiz      = 255; { buffer size}
 
 { ---------------------------------------------------------------------
-	Tokens are associated with up to three classification numbers:
+        Tokens are associated with up to three classification numbers:
+
+        Class number: Broadest (least detailed) breakdown.  For programs
+                that only care about gross token distinctions.
+        Major/minor numbers: Within their class, tokens have a major
+                number, and may also have a minor number to further
+                distinquish tokens with the same major number.
 
-	Class number: Broadest (least detailed) breakdown.  For programs
-		that only care about gross token distinctions.
-	Major/minor numbers: Within their class, tokens have a major
-		number, and may also have a minor number to further
-		distinquish tokens with the same major number.
+        *** Class, major and minor token numbers are all >= 0 ***
 
-	*** Class, major and minor token numbers are all >= 0 ***
+        Tokens that can't be classified are put in the "unknown" class.
+        For such, the major and minor numbers are meaningless, although
+        rtfTextBuf may be of interest then.
 
-	Tokens that can't be classified are put in the "unknown" class.
-	For such, the major and minor numbers are meaningless, although
-	rtfTextBuf may be of interest then.
+        Text tokens are a single character, and the major number indicates
+        the character value (note: can be non-ascii, i.e., greater than 127).
+        There is no minor number.
 
-	Text tokens are a single character, and the major number indicates
-	the character value (note: can be non-ascii, i.e., greater than 127).
-	There is no minor number.
+        Control symbols may have a parameter value, which will be found in
+        rtfParam.  If no parameter was given, rtfParam = rtfNoParam.
 
-	Control symbols may have a parameter value, which will be found in
-	rtfParam.  If no parameter was given, rtfParam = rtfNoParam.
+        RTFGetToken() return value is the class number, but it sets all the
+        global token vars.
 
-	RTFGetToken() return value is the class number, but it sets all the
-	global token vars.
+        rtfEOF is a fake token used by the reader; the writer never sees
+        it (except in the token reader hook, if it installs one).
 
-	rtfEOF is a fake token used by the reader; the writer never sees
-	it (except in the token reader hook, if it installs one).
+        Information pertaining to last token read by RTFToken.  The
+        text is exactly as it occurs in the input file, e.g.,
+        will be found in rtfTextBuf as, even though it means .
 
-	Information pertaining to last token read by RTFToken.  The
-	text is exactly as it occurs in the input file, e.g., 
-	will be found in rtfTextBuf as, even though it means .
-	
-	These variables are also set when styles are reprocessed.
+        These variables are also set when styles are reprocessed.
  ----------------------------------------------------------------------}
-	rtfNoParam = (-1000000);
-	
-{	Token classes (zero-based and sequential) }
-	rtfUnknown	= 0;
-	rtfGroup	= 1;
-	rtfText		= 2;
-	rtfControl	= 3;
-	rtfEOF		= 4;
-	rtfMaxClass	= 5	{ highest class + 1 };
-
-{	Group class major numbers }
-	rtfBeginGroup	= 0;
-	rtfEndGroup	= 1;
-{	Control class major and minor numbers.}
-	rtfVersion	= 0;
-
-	rtfDefFont	= 1;
-
-	rtfCharSet	= 2;
-		rtfAnsiCharSet		= 0;
-		rtfMacCharSet		= 1;
-		rtfPcCharSet		= 2;
-		rtfPcaCharSet		= 3;
-{	destination minor numbers should be zero-based, sequential }
-	rtfDestination	= 3;
-		rtfPict			= 0;
-		rtfNeXTGraphic		= 1;
-		rtfFootnote		= 2;
-		rtfHeader		= 3;
-		rtfHeaderLeft		= 4;
-		rtfHeaderRight		= 5;
-		rtfHeaderFirst		= 6;
-		rtfFooter		= 7;
-		rtfFooterLeft		= 8;
-		rtfFooterRight		= 9;
-		rtfFooterFirst		= 10;
-		rtfFNSep		= 11;
-		rtfFNContSep		= 12;
-		rtfFNContNotice		= 13;
-		rtfInfo			= 14;
-		rtfStyleSheet		= 15;
-		rtfFontTbl		= 16;
-		rtfColorTbl		= 17;
-		rtfField		= 18;
-		rtfFieldInst		= 19;
-		rtfFieldResult		= 20;
-		rtfIndex		= 21;
-		rtfIndexBold		= 22;
-		rtfIndexItalic		= 23;
-		rtfIndexText		= 24;
-		rtfIndexRange		= 25;
-		rtfTOC			= 26;
-		rtfBookmarkStart	= 27;
-		rtfBookmarkEnd		= 28;
-		rtfITitle		= 29;
-		rtfISubject		= 30;
-		rtfIAuthor		= 31;
-		rtfIOperator		= 32;
-		rtfIKeywords		= 33;
-		rtfIComment		= 34;
-		rtfIVersion		= 35;
-		rtfIDoccomm		= 36;
-		rtfMaxDestination	= 37	{ highest dest + 1 };
-
-	rtfFontFamily	= 4;
-		rtfFFNil		= 0;
-		rtfFFRoman		= 1;
-		rtfFFSwiss		= 2;
-		rtfFFModern		= 3;
-		rtfFFScript		= 4;
-		rtfFFDecor		= 5;
-		rtfFFTech		= 6;
-
-	rtfColorName	= 5;
-		rtfRed			= 0;
-		rtfGreen		= 1;
-		rtfBlue			= 2;
+        rtfNoParam = (-1000000);
+
+{       Token classes (zero-based and sequential) }
+        rtfUnknown      = 0;
+        rtfGroup        = 1;
+        rtfText         = 2;
+        rtfControl      = 3;
+        rtfEOF          = 4;
+        rtfMaxClass     = 5     { highest class + 1 };
+
+{       Group class major numbers }
+        rtfBeginGroup   = 0;
+        rtfEndGroup     = 1;
+{       Control class major and minor numbers.}
+        rtfVersion      = 0;
+
+        rtfDefFont      = 1;
+
+        rtfCharSet      = 2;
+                rtfAnsiCharSet          = 0;
+                rtfMacCharSet           = 1;
+                rtfPcCharSet            = 2;
+                rtfPcaCharSet           = 3;
+{       destination minor numbers should be zero-based, sequential }
+        rtfDestination  = 3;
+                rtfPict                 = 0;
+                rtfNeXTGraphic          = 1;
+                rtfFootnote             = 2;
+                rtfHeader               = 3;
+                rtfHeaderLeft           = 4;
+                rtfHeaderRight          = 5;
+                rtfHeaderFirst          = 6;
+                rtfFooter               = 7;
+                rtfFooterLeft           = 8;
+                rtfFooterRight          = 9;
+                rtfFooterFirst          = 10;
+                rtfFNSep                = 11;
+                rtfFNContSep            = 12;
+                rtfFNContNotice         = 13;
+                rtfInfo                 = 14;
+                rtfStyleSheet           = 15;
+                rtfFontTbl              = 16;
+                rtfColorTbl             = 17;
+                rtfField                = 18;
+                rtfFieldInst            = 19;
+                rtfFieldResult          = 20;
+                rtfIndex                = 21;
+                rtfIndexBold            = 22;
+                rtfIndexItalic          = 23;
+                rtfIndexText            = 24;
+                rtfIndexRange           = 25;
+                rtfTOC                  = 26;
+                rtfBookmarkStart        = 27;
+                rtfBookmarkEnd          = 28;
+                rtfITitle               = 29;
+                rtfISubject             = 30;
+                rtfIAuthor              = 31;
+                rtfIOperator            = 32;
+                rtfIKeywords            = 33;
+                rtfIComment             = 34;
+                rtfIVersion             = 35;
+                rtfIDoccomm             = 36;
+                rtfMaxDestination       = 37    { highest dest + 1 };
+
+        rtfFontFamily   = 4;
+                rtfFFNil                = 0;
+                rtfFFRoman              = 1;
+                rtfFFSwiss              = 2;
+                rtfFFModern             = 3;
+                rtfFFScript             = 4;
+                rtfFFDecor              = 5;
+                rtfFFTech               = 6;
+
+        rtfColorName    = 5;
+                rtfRed                  = 0;
+                rtfGreen                = 1;
+                rtfBlue                 = 2;
 
         rtfSpecialChar = 6;
-		rtfCurHeadPage		= 0;
-		rtfCurFNote		= 1;
-		rtfCurHeadPict		= 2	{ valid? };
-		rtfCurHeadDate		= 3;
-		rtfCurHeadTime		= 4;
-		rtfFormula		= 5;
-		rtfNoBrkSpace		= 6;
-		rtfNoReqHyphen		= 7;
-		rtfNoBrkHyphen		= 8;
-		rtfPage			= 9;
-		rtfLine			= 10;
-		rtfPar			= 11;
-		rtfSect			= 12;
-		rtfTab			= 13;
-		rtfCell			= 14;
-		rtfRow			= 15;
-		rtfCurAnnot		= 16;
-		rtfAnnotation		= 17;
-		rtfAnnotID		= 18;
-		rtfCurAnnotRef		= 19;
-		rtfFNoteSep		= 20;
-		rtfFNoteCont		= 21;
-		rtfColumn		= 22;
-		rtfOptDest		= 23;
-		rtfIIntVersion		= 24;
-		rtfICreateTime		= 25;
-		rtfIRevisionTime	= 26;
-		rtfIPrintTime		= 27;
-		rtfIBackupTime		= 28;
-		rtfIEditTime		= 29;
-		rtfIYear		= 30;
-		rtfIMonth		= 31;
-		rtfIDay			= 32;
-		rtfIHour		= 33;
-		rtfIMinute		= 34;
-		rtfINPages		= 35;
-		rtfINWords		= 36;
-		rtfINChars		= 37;
-		rtfIIntID		= 38;
-
-	rtfStyleAttr	= 7;
-		rtfBasedOn		= 0;
-		rtfNext			= 1;
-
-	rtfDocAttr	= 8;
-		rtfPaperWidth		= 0;
-		rtfPaperHeight		= 1;
-		rtfLeftMargin		= 2;
-		rtfRightMargin		= 3;
-		rtfTopMargin		= 4;
-		rtfBottomMargin		= 5;
-		rtfFacingPage		= 6;
-		rtfGutterWid		= 7;
-		rtfDefTab		= 8;
-		rtfWidowCtrl		= 9;
-		rtfHyphHotZone		= 10;
-		rtfFNoteEndSect		= 11;
-		rtfFNoteEndDoc		= 12;
-		rtfFNoteText		= 13;
-		rtfFNoteBottom		= 14;
-		rtfFNoteStart		= 15;
-		rtfFNoteRestart		= 16;
-		rtfPageStart		= 17;
-		rtfLineStart		= 18;
-		rtfLandscape		= 19;
-		rtfFracWidth		= 20;
-		rtfNextFile		= 21;
-		rtfTemplate		= 22;
-		rtfMakeBackup		= 23;
-		rtfRTFDefault		= 24;
-		rtfRevisions		= 25;
-		rtfMirrorMargin		= 26;
-		rtfRevDisplay		= 27;
-		rtfRevBar		= 28;
-
-	rtfSectAttr	= 9;
-		rtfSectDef		= 0;
-		rtfNoBreak		= 1;
-		rtfColBreak		= 2;
-		rtfPageBreak		= 3;
-		rtfEvenBreak		= 4;
-		rtfOddBreak		= 5;
-		rtfPageStarts		= 6;
-		rtfPageCont		= 7;
-		rtfPageRestart		= 8;
-		rtfPageDecimal		= 9;
-		rtfPageURoman		= 10;
-		rtfPageLRoman		= 11;
-		rtfPageULetter		= 12;
-		rtfPageLLetter		= 13;
-		rtfPageNumLeft		= 14;
-		rtfPageNumTop		= 15;
-		rtfHeaderY		= 16;
-		rtfFooterY		= 17;
-		rtfLineModulus		= 18;
-		rtfLineDist		= 19;
-		rtfLineStarts		= 20;
-		rtfLineRestart		= 21;
-		rtfLineRestartPg	= 22;
-		rtfLineCont		= 23;
-		rtfTopVAlign		= 24;
-		rtfBottomVAlign		= 25;
-		rtfCenterVAlign		= 26;
-		rtfJustVAlign		= 27;
-		rtfColumns		= 28;
-		rtfColumnSpace		= 29;
-		rtfColumnLine		= 30;
-		rtfENoteHere		= 31;
-		rtfTitleSpecial		= 32;
-
-	rtfTblAttr	= 10;
-		rtfCellBordBottom	= 0;
-		rtfCellBordTop		= 1;
-		rtfCellBordLeft		= 2;
-		rtfCellBordRight	= 3;
-		rtfRowDef		= 4;
-		rtfRowLeft		= 5;
-		rtfRowRight		= 6;
-		rtfRowCenter		= 7;
-		rtfRowGapH		= 8;
-		rtfRowHt		= 9;
-		rtfRowLeftEdge		= 10;
-		rtfCellPos		= 11;
-		rtfMergeRngFirst	= 12;
-		rtfMergePrevious	= 13;
-
-	rtfParAttr	= 11;
-		rtfParDef		= 0;
-		rtfStyleNum		= 1;
-		rtfQuadLeft		= 2;
-		rtfQuadRight		= 3;
-		rtfQuadJust		= 4;
-		rtfQuadCenter		= 5;
-		rtfFirstIndent		= 6;
-		rtfLeftIndent		= 7;
-		rtfRightIndent		= 8;
-		rtfSpaceBefore		= 9;
-		rtfSpaceAfter		= 10;
-		rtfSpaceBetween		= 11;
-		rtfInTable		= 12;
-		rtfKeep			= 13;
-		rtfKeepNext		= 14;
-		rtfSideBySide		= 15;
-		rtfPBBefore		= 16;
-		rtfNoLineNum		= 17;
-		rtfTabPos		= 18;
-		rtfTabRight		= 19;
-		rtfTabCenter		= 20;
-		rtfTabDecimal		= 21;
-		rtfTabBar		= 22;
-		rtfBorderTop		= 23;
-		rtfBorderBottom		= 24;
-		rtfBorderLeft		= 25;
-		rtfBorderRight		= 26;
-		rtfBorderBox		= 27;
-		rtfBorderBar		= 28;
-		rtfBorderBetween	= 29;
-		rtfBorderSingle		= 30;
-		rtfBorderThick		= 31;
-		rtfBorderShadow		= 32;
-		rtfBorderDouble		= 33;
-		rtfBorderDot		= 34;
-		rtfBorderHair		= 35;
-		rtfBorderSpace		= 36;
-		rtfLeaderDot		= 37;
-		rtfLeaderHyphen		= 38;
-		rtfLeaderUnder		= 39;
-		rtfLeaderThick		= 40;
-
-	rtfCharAttr	= 12;
-		rtfPlain		= 0;
-		rtfBold			= 1;
-		rtfItalic		= 2;
-		rtfStrikeThru		= 3;
-		rtfOutline		= 4;
-		rtfShadow		= 5;
-		rtfSmallCaps		= 6;
-		rtfAllCaps		= 7;
-		rtfInvisible		= 8;
-		rtfFontNum		= 9;
-		rtfFontSize		= 10;
-		rtfExpand		= 11;
-		rtfUnderline		= 12;
-		rtfWUnderline		= 13;
-		rtfDUnderline		= 14;
-		rtfDbUnderline		= 15;
-		rtfNoUnderline		= 16;
-		rtfSuperScript		= 17;
-		rtfSubScript		= 18;
-		rtfRevised		= 19;
-		rtfForeColor		= 20;
-		rtfBackColor		= 21;
-		rtfGray			= 22;
-
-	rtfPictAttr	= 13;
-		rtfMacQD		= 0;
-		rtfWinMetafile		= 1;
-		rtfWinBitmap		= 2;
-		rtfPicWid		= 3;
-		rtfPicHt		= 4;
-		rtfPicGoalWid		= 5;
-		rtfPicGoalHt		= 6;
-		rtfPicScaleX		= 7;
-		rtfPicScaleY		= 8;
-		rtfPicScaled		= 9;
-		rtfPicCropTop		= 10;
-		rtfPicCropBottom	= 11;
-		rtfPicCropLeft		= 12;
-		rtfPicCropRight		= 13;
-		rtfPixelBits		= 14;
-		rtfBitmapPlanes		= 15;
-		rtfBitmapWid		= 16;
-		rtfPicBinary		= 17;
-
-	rtfNeXTGrAttr	= 14;
-		rtfNeXTGWidth		= 0;
-		rtfNeXTGHeight		= 1;
-
-	rtfFieldAttr	= 15;
-		rtfFieldDirty		= 0;
-		rtfFieldEdited		= 1;
-		rtfFieldLocked		= 2;
-		rtfFieldPrivate		= 3;
-
-		rtfTOCAttr	= 16;
-		rtfTOCType		= 0;
-		rtfTOCLevel		= 1;
-
-	rtfPosAttr	= 17;
-		rtfPosX			= 0;
-		rtfPosXCenter		= 1;
-		rtfPosXInside		= 2;
-		rtfPosXLeft		= 3;
-		rtfPosXOutSide		= 4;
-		rtfPosXRight		= 5;
-		rtfPosY			= 6;
-		rtfPosYInline		= 7;
-		rtfPosYTop		= 8;
-		rtfPosYCenter		= 9;
-		rtfPosYBottom		= 10;
-		rtfAbsWid		= 11;
-		rtfTextDist		= 12;
-		rtfRPosMargV		= 13;
-		rtfRPosPageV		= 14;
-		rtfRPosMargH		= 15;
-		rtfRPosPageH		= 16;
-		rtfRPosColH		= 17;
-
-	rtfBasedOnNone	= 222;	{ "no based-on style" }
+                rtfCurHeadPage          = 0;
+                rtfCurFNote             = 1;
+                rtfCurHeadPict          = 2     { valid? };
+                rtfCurHeadDate          = 3;
+                rtfCurHeadTime          = 4;
+                rtfFormula              = 5;
+                rtfNoBrkSpace           = 6;
+                rtfNoReqHyphen          = 7;
+                rtfNoBrkHyphen          = 8;
+                rtfPage                 = 9;
+                rtfLine                 = 10;
+                rtfPar                  = 11;
+                rtfSect                 = 12;
+                rtfTab                  = 13;
+                rtfCell                 = 14;
+                rtfRow                  = 15;
+                rtfCurAnnot             = 16;
+                rtfAnnotation           = 17;
+                rtfAnnotID              = 18;
+                rtfCurAnnotRef          = 19;
+                rtfFNoteSep             = 20;
+                rtfFNoteCont            = 21;
+                rtfColumn               = 22;
+                rtfOptDest              = 23;
+                rtfIIntVersion          = 24;
+                rtfICreateTime          = 25;
+                rtfIRevisionTime        = 26;
+                rtfIPrintTime           = 27;
+                rtfIBackupTime          = 28;
+                rtfIEditTime            = 29;
+                rtfIYear                = 30;
+                rtfIMonth               = 31;
+                rtfIDay                 = 32;
+                rtfIHour                = 33;
+                rtfIMinute              = 34;
+                rtfINPages              = 35;
+                rtfINWords              = 36;
+                rtfINChars              = 37;
+                rtfIIntID               = 38;
+
+        rtfStyleAttr    = 7;
+                rtfBasedOn              = 0;
+                rtfNext                 = 1;
+
+        rtfDocAttr      = 8;
+                rtfPaperWidth           = 0;
+                rtfPaperHeight          = 1;
+                rtfLeftMargin           = 2;
+                rtfRightMargin          = 3;
+                rtfTopMargin            = 4;
+                rtfBottomMargin         = 5;
+                rtfFacingPage           = 6;
+                rtfGutterWid            = 7;
+                rtfDefTab               = 8;
+                rtfWidowCtrl            = 9;
+                rtfHyphHotZone          = 10;
+                rtfFNoteEndSect         = 11;
+                rtfFNoteEndDoc          = 12;
+                rtfFNoteText            = 13;
+                rtfFNoteBottom          = 14;
+                rtfFNoteStart           = 15;
+                rtfFNoteRestart         = 16;
+                rtfPageStart            = 17;
+                rtfLineStart            = 18;
+                rtfLandscape            = 19;
+                rtfFracWidth            = 20;
+                rtfNextFile             = 21;
+                rtfTemplate             = 22;
+                rtfMakeBackup           = 23;
+                rtfRTFDefault           = 24;
+                rtfRevisions            = 25;
+                rtfMirrorMargin         = 26;
+                rtfRevDisplay           = 27;
+                rtfRevBar               = 28;
+
+        rtfSectAttr     = 9;
+                rtfSectDef              = 0;
+                rtfNoBreak              = 1;
+                rtfColBreak             = 2;
+                rtfPageBreak            = 3;
+                rtfEvenBreak            = 4;
+                rtfOddBreak             = 5;
+                rtfPageStarts           = 6;
+                rtfPageCont             = 7;
+                rtfPageRestart          = 8;
+                rtfPageDecimal          = 9;
+                rtfPageURoman           = 10;
+                rtfPageLRoman           = 11;
+                rtfPageULetter          = 12;
+                rtfPageLLetter          = 13;
+                rtfPageNumLeft          = 14;
+                rtfPageNumTop           = 15;
+                rtfHeaderY              = 16;
+                rtfFooterY              = 17;
+                rtfLineModulus          = 18;
+                rtfLineDist             = 19;
+                rtfLineStarts           = 20;
+                rtfLineRestart          = 21;
+                rtfLineRestartPg        = 22;
+                rtfLineCont             = 23;
+                rtfTopVAlign            = 24;
+                rtfBottomVAlign         = 25;
+                rtfCenterVAlign         = 26;
+                rtfJustVAlign           = 27;
+                rtfColumns              = 28;
+                rtfColumnSpace          = 29;
+                rtfColumnLine           = 30;
+                rtfENoteHere            = 31;
+                rtfTitleSpecial         = 32;
+
+        rtfTblAttr      = 10;
+                rtfCellBordBottom       = 0;
+                rtfCellBordTop          = 1;
+                rtfCellBordLeft         = 2;
+                rtfCellBordRight        = 3;
+                rtfRowDef               = 4;
+                rtfRowLeft              = 5;
+                rtfRowRight             = 6;
+                rtfRowCenter            = 7;
+                rtfRowGapH              = 8;
+                rtfRowHt                = 9;
+                rtfRowLeftEdge          = 10;
+                rtfCellPos              = 11;
+                rtfMergeRngFirst        = 12;
+                rtfMergePrevious        = 13;
+
+        rtfParAttr      = 11;
+                rtfParDef               = 0;
+                rtfStyleNum             = 1;
+                rtfQuadLeft             = 2;
+                rtfQuadRight            = 3;
+                rtfQuadJust             = 4;
+                rtfQuadCenter           = 5;
+                rtfFirstIndent          = 6;
+                rtfLeftIndent           = 7;
+                rtfRightIndent          = 8;
+                rtfSpaceBefore          = 9;
+                rtfSpaceAfter           = 10;
+                rtfSpaceBetween         = 11;
+                rtfInTable              = 12;
+                rtfKeep                 = 13;
+                rtfKeepNext             = 14;
+                rtfSideBySide           = 15;
+                rtfPBBefore             = 16;
+                rtfNoLineNum            = 17;
+                rtfTabPos               = 18;
+                rtfTabRight             = 19;
+                rtfTabCenter            = 20;
+                rtfTabDecimal           = 21;
+                rtfTabBar               = 22;
+                rtfBorderTop            = 23;
+                rtfBorderBottom         = 24;
+                rtfBorderLeft           = 25;
+                rtfBorderRight          = 26;
+                rtfBorderBox            = 27;
+                rtfBorderBar            = 28;
+                rtfBorderBetween        = 29;
+                rtfBorderSingle         = 30;
+                rtfBorderThick          = 31;
+                rtfBorderShadow         = 32;
+                rtfBorderDouble         = 33;
+                rtfBorderDot            = 34;
+                rtfBorderHair           = 35;
+                rtfBorderSpace          = 36;
+                rtfLeaderDot            = 37;
+                rtfLeaderHyphen         = 38;
+                rtfLeaderUnder          = 39;
+                rtfLeaderThick          = 40;
+
+        rtfCharAttr     = 12;
+                rtfPlain                = 0;
+                rtfBold                 = 1;
+                rtfItalic               = 2;
+                rtfStrikeThru           = 3;
+                rtfOutline              = 4;
+                rtfShadow               = 5;
+                rtfSmallCaps            = 6;
+                rtfAllCaps              = 7;
+                rtfInvisible            = 8;
+                rtfFontNum              = 9;
+                rtfFontSize             = 10;
+                rtfExpand               = 11;
+                rtfUnderline            = 12;
+                rtfWUnderline           = 13;
+                rtfDUnderline           = 14;
+                rtfDbUnderline          = 15;
+                rtfNoUnderline          = 16;
+                rtfSuperScript          = 17;
+                rtfSubScript            = 18;
+                rtfRevised              = 19;
+                rtfForeColor            = 20;
+                rtfBackColor            = 21;
+                rtfGray                 = 22;
+
+        rtfPictAttr     = 13;
+                rtfMacQD                = 0;
+                rtfWinMetafile          = 1;
+                rtfWinBitmap            = 2;
+                rtfPicWid               = 3;
+                rtfPicHt                = 4;
+                rtfPicGoalWid           = 5;
+                rtfPicGoalHt            = 6;
+                rtfPicScaleX            = 7;
+                rtfPicScaleY            = 8;
+                rtfPicScaled            = 9;
+                rtfPicCropTop           = 10;
+                rtfPicCropBottom        = 11;
+                rtfPicCropLeft          = 12;
+                rtfPicCropRight         = 13;
+                rtfPixelBits            = 14;
+                rtfBitmapPlanes         = 15;
+                rtfBitmapWid            = 16;
+                rtfPicBinary            = 17;
+
+        rtfNeXTGrAttr   = 14;
+                rtfNeXTGWidth           = 0;
+                rtfNeXTGHeight          = 1;
+
+        rtfFieldAttr    = 15;
+                rtfFieldDirty           = 0;
+                rtfFieldEdited          = 1;
+                rtfFieldLocked          = 2;
+                rtfFieldPrivate         = 3;
+
+                rtfTOCAttr      = 16;
+                rtfTOCType              = 0;
+                rtfTOCLevel             = 1;
+
+        rtfPosAttr      = 17;
+                rtfPosX                 = 0;
+                rtfPosXCenter           = 1;
+                rtfPosXInside           = 2;
+                rtfPosXLeft             = 3;
+                rtfPosXOutSide          = 4;
+                rtfPosXRight            = 5;
+                rtfPosY                 = 6;
+                rtfPosYInline           = 7;
+                rtfPosYTop              = 8;
+                rtfPosYCenter           = 9;
+                rtfPosYBottom           = 10;
+                rtfAbsWid               = 11;
+                rtfTextDist             = 12;
+                rtfRPosMargV            = 13;
+                rtfRPosPageV            = 14;
+                rtfRPosMargH            = 15;
+                rtfRPosPageH            = 16;
+                rtfRPosColH             = 17;
+
+        rtfBasedOnNone  = 222;  { "no based-on style" }
 
 
 Type
 
 { ---------------------------------------------------------------------
-     Callback Types 
+     Callback Types
   ---------------------------------------------------------------------}
-  
+
 TRTFFunc = Procedure of object;
 TRTFFuncPtr = procedure of object;
 
 { ---------------------------------------------------------------------
     RTF font, color and style structures.  Used for font table,
-    color table, and stylesheet processing. 
+    color table, and stylesheet processing.
   ---------------------------------------------------------------------}
-  
+
 PRTFFONT = ^TRTFFONT;
 TRTFFont = Record
-	rtfFName    : string;		{ font name }
-	rtfFNum     : integer;		{ font number }
-	rtfFFamily  : integer;		{ font family }
-	rtfNextFont : PRTFFONT;		{ next font in list }
+        rtfFName    : string;           { font name }
+        rtfFNum     : integer;          { font number }
+        rtfFFamily  : integer;          { font family }
+        rtfNextFont : PRTFFONT;         { next font in list }
 end;
 
 
 { ----------------------------------------------------------------------
-	Color values are -1 if the default color for the the color
-	number should be used.  The default color is writer-dependent.
+        Color values are -1 if the default color for the the color
+        number should be used.  The default color is writer-dependent.
   ----------------------------------------------------------------------}
- 
+
 PRTFColor = ^TRTFColor;
 TRTFColor = Record
-	rtfCNum : integer;	{ color number }
-	rtfCRed : INteger;	{ red value }
-	rtfCGreen : INteger;	{ green value }
-	rtfCBlue : integer;	{ blue value }
-	rtfNextColor : PRTFColor;	{ next color in list }
+        rtfCNum : integer;      { color number }
+        rtfCRed : INteger;      { red value }
+        rtfCGreen : INteger;    { green value }
+        rtfCBlue : integer;     { blue value }
+        rtfNextColor : PRTFColor;       { next color in list }
 end;
 
 PRTFStyleElt = ^TRTFStyleElt;
 TRTFStyleElt = record
-	rtfSEClass,			{ token class }
-	rtfSEMajor,			{ token major number }
-	rtfSEMinor,			{ token minor number }
-	rtfSEParam : Integer;		{ control symbol parameter }
-	rtfSEText : String;		{ text of symbol }
-	rtfNextSE : PRTFStyleElt;	{ next element in style }
+        rtfSEClass,                     { token class }
+        rtfSEMajor,                     { token major number }
+        rtfSEMinor,                     { token minor number }
+        rtfSEParam : Integer;           { control symbol parameter }
+        rtfSEText : String;             { text of symbol }
+        rtfNextSE : PRTFStyleElt;       { next element in style }
 end;
 
 PRTFSTyle = ^TRTFStyle;
 TRTFStyle = record
-	rtfSName : string;		{ style name }
-	rtfSNum,			{ style number }
-	rtfSBasedOn,			{ style this one's based on }
-	rtfSNextPar : integer;		{ style next paragraph style }
-	rtfSSEList : PRTFStyleElt;	{ list of style words }
-	rtfExpanding : Integer;		{ non-zero = being expanded }
-	rtfNextStyle : PRTFStyle;	{ next style in style list }
+        rtfSName : string;              { style name }
+        rtfSNum,                        { style number }
+        rtfSBasedOn,                    { style this one's based on }
+        rtfSNextPar : integer;          { style next paragraph style }
+        rtfSSEList : PRTFStyleElt;      { list of style words }
+        rtfExpanding : Integer;         { non-zero = being expanded }
+        rtfNextStyle : PRTFStyle;       { next style in style list }
 end;
 
 { ---------------------------------------------------------------------
@@ -453,10 +453,10 @@ end;
 
 Type
   TRTFKey = record
-    rtfKMajor : Integer;	{ major number }
-    rtfKMinor : Integer;	{ minor number }
-    rtfKStr   : string[20];	{ symbol name }
-    rtfKHash  : Integer;	{ symbol name hash value }
+    rtfKMajor : Integer;        { major number }
+    rtfKMinor : Integer;        { minor number }
+    rtfKStr   : string[20];     { symbol name }
+    rtfKHash  : Integer;        { symbol name hash value }
     End;
 
 { ---------------------------------------------------------------------
@@ -466,303 +466,303 @@ Type
 
 Const rtfKey : Array [0..281] of TRTFKey =
 (
-( rtfKMajor: RTFSPECIALCHAR; rtfKMinor : rtfCURHEADPICT; rtfKStr  : 'chpict'; rtfKhash :	0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfCurHeadDate; rtfKstr : 'chdate'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfCurHeadTime; rtfKstr : 'chtime'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfCurHeadPage; rtfKstr : 'chpgn'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfCurFNote; rtfKstr : 'chftn'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfCurAnnotRef; rtfKstr : 'chatn'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfFNoteSep; rtfKstr : 'chftnsep'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfFNoteCont; rtfKstr : 'chftnsepc'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfFormula; rtfKstr : '|'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfNoBrkSpace; rtfKstr : '~'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfNoReqHyphen; rtfKstr : '-'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfNoBrkHyphen; rtfKstr : '_'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfCell; rtfKstr : 'cell'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfRow; rtfKstr : 'row'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfPar; rtfKstr : 'par'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfPar; rtfKstr : #10; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfPar; rtfKstr : #13; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfSect; rtfKstr : 'sect'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfPage; rtfKstr : 'page'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfColumn; rtfKstr : 'column'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfLine; rtfKstr : 'line'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfTab; rtfKstr : 'tab'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfOptDest; rtfKstr : '*'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIIntVersion; rtfKstr : 'vern'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfICreateTime; rtfKstr : 'creatim'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIRevisionTime; rtfKstr : 'revtim'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIPrintTime; rtfKstr : 'printim'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIBackupTime; rtfKstr : 'buptim'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIEditTime; rtfKstr : 'edmins'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIYear; rtfKstr : 'yr'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIMonth; rtfKstr : 'mo'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIDay; rtfKstr : 'dy'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIHour; rtfKstr : 'hr'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIMinute; rtfKstr : 'min'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfINPages; rtfKstr : 'nofpages'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfINWords; rtfKstr : 'nofwords'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfINChars; rtfKstr : 'nofchars'; rtfkHash : 0),
-( rtfKMajor: rtfSpecialChar; rtfKMinor: 	rtfIIntID; rtfKstr : 'id'; rtfkHash : 0),
-
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfPlain; rtfKstr : 'plain'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfBold; rtfKstr : 'b'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfItalic; rtfKstr : 'i'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfStrikeThru; rtfKstr : 'strike'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfOutline; rtfKstr : 'outl'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfShadow; rtfKstr : 'shad'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfSmallCaps; rtfKstr : 'scaps'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfAllCaps; rtfKstr : 'caps'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfInvisible; rtfKstr : 'v'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfFontNum; rtfKstr : 'f'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfFontSize; rtfKstr : 'fs'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfExpand; rtfKstr : 'expnd'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfUnderline; rtfKstr : 'ul'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfWUnderline; rtfKstr : 'ulw'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfDUnderline; rtfKstr : 'uld'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfDbUnderline; rtfKstr : 'uldb'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfNoUnderline; rtfKstr : 'ulnone'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfSuperScript; rtfKstr : 'up'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfSubScript; rtfKstr : 'dn'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfRevised; rtfKstr : 'revised'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfForeColor; rtfKstr : 'cf'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfBackColor; rtfKstr : 'cb'; rtfkHash : 0),
-( rtfKMajor: rtfCharAttr; rtfKMinor: 	rtfGray; rtfKstr : 'gray'; rtfkHash : 0),
-
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfParDef; rtfKstr : 'pard'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfStyleNum; rtfKstr : 's'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfQuadLeft; rtfKstr : 'ql'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfQuadRight; rtfKstr : 'qr'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfQuadJust; rtfKstr : 'qj'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfQuadCenter; rtfKstr : 'qc'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfFirstIndent; rtfKstr : 'fi'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfLeftIndent; rtfKstr : 'li'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfRightIndent; rtfKstr : 'ri'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfSpaceBefore; rtfKstr : 'sb'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfSpaceAfter; rtfKstr : 'sa'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfSpaceBetween; rtfKstr : 'sl'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfInTable; rtfKstr : 'intbl'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfKeep; rtfKstr : 'keep'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfKeepNext; rtfKstr : 'keepn'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfSideBySide; rtfKstr : 'sbys'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfPBBefore; rtfKstr : 'pagebb'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfNoLineNum; rtfKstr : 'noline'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfTabPos; rtfKstr : 'tx'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfTabRight; rtfKstr : 'tqr'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfTabCenter; rtfKstr : 'tqc'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfTabDecimal; rtfKstr : 'tqdec'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfTabBar; rtfKstr : 'tb'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderTop; rtfKstr : 'brdrt'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderBottom; rtfKstr : 'brdrb'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderLeft; rtfKstr : 'brdrl'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderRight; rtfKstr : 'brdrr'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderBar; rtfKstr : 'bar'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderBox; rtfKstr : 'box'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderBetween; rtfKstr : 'brdrbtw'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderSingle; rtfKstr : 'brdrs'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderThick; rtfKstr : 'brdrth'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderShadow; rtfKstr : 'brdrsh'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderDouble; rtfKstr : 'brdrdb'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderDot; rtfKstr : 'brdrdot'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderHair; rtfKstr : 'brdrhair'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfLeaderDot; rtfKstr : 'tldot'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfLeaderHyphen; rtfKstr : 'tlhyph'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfLeaderUnder; rtfKstr : 'tlul'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfLeaderThick; rtfKstr : 'tlth'; rtfkHash : 0),
-( rtfKMajor: rtfParAttr; rtfKMinor: 	rtfBorderSpace; rtfKstr : 'brsp'; rtfkHash : 0),
-
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfSectDef; rtfKstr : 'sectd'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfNoBreak; rtfKstr : 'sbknone'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfColBreak; rtfKstr : 'sbkcol'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageBreak; rtfKstr : 'sbkpage'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfEvenBreak; rtfKstr : 'sbkeven'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfOddBreak; rtfKstr : 'sbkodd'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageCont; rtfKstr : 'pgncont'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageStarts; rtfKstr : 'pgnstarts'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageRestart; rtfKstr : 'pgnrestart'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageDecimal; rtfKstr : 'pgndec'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageURoman; rtfKstr : 'pgnucrm'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageLRoman; rtfKstr : 'pgnlcrm'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageULetter; rtfKstr : 'pgnucltr'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageLLetter; rtfKstr : 'pgnlcltr'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageNumLeft; rtfKstr : 'pgnx'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfPageNumTop; rtfKstr : 'pgny'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfHeaderY; rtfKstr : 'headery'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfFooterY; rtfKstr : 'footery'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfLineModulus; rtfKstr : 'linemod'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfLineDist; rtfKstr : 'linex'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfLineStarts; rtfKstr : 'linestarts'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfLineRestart; rtfKstr : 'linerestart'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfLineRestartPg; rtfKstr : 'lineppage'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfLineCont; rtfKstr : 'linecont'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfTopVAlign; rtfKstr : 'vertalt'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfBottomVAlign; rtfKstr : 'vertal'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfCenterVAlign; rtfKstr : 'vertalc'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfJustVAlign; rtfKstr : 'vertalj'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfColumns; rtfKstr : 'cols'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfColumnSpace; rtfKstr : 'colsx'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfColumnLine; rtfKstr : 'linebetcol'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfENoteHere; rtfKstr : 'endnhere'; rtfkHash : 0),
-( rtfKMajor: rtfSectAttr; rtfKMinor: 	rtfTitleSpecial; rtfKstr : 'titlepg'; rtfkHash : 0),
-
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfPaperWidth; rtfKstr : 'paperw'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfPaperHeight; rtfKstr : 'paperh'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfLeftMargin; rtfKstr : 'margl'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfRightMargin; rtfKstr : 'margr'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfTopMargin; rtfKstr : 'margt'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfBottomMargin; rtfKstr : 'margb'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfFacingPage; rtfKstr : 'facingp'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfGutterWid; rtfKstr : 'gutter'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfDefTab; rtfKstr : 'deftab'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfWidowCtrl; rtfKstr : 'widowctrl'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfHyphHotZone; rtfKstr : 'hyphhotz'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfFNoteEndSect; rtfKstr : 'endnotes'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfFNoteEndDoc; rtfKstr : 'enddoc'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfFNoteBottom; rtfKstr : 'ftnbj'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfFNoteText; rtfKstr : 'ftntj'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfFNoteStart; rtfKstr : 'ftnstart'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfFNoteRestart; rtfKstr : 'ftnrestart'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfPageStart; rtfKstr : 'pgnstart'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfLineStart; rtfKstr : 'linestart'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfLandscape; rtfKstr : 'landscape'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfFracWidth; rtfKstr : 'fracwidth'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfNextFile; rtfKstr : 'nextfile'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfTemplate; rtfKstr : 'template'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfMakeBackup; rtfKstr : 'makeback'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfRTFDefault; rtfKstr : 'defformat'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfRevisions; rtfKstr : 'revisions'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfMirrorMargin; rtfKstr : 'margmirror'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfRevDisplay; rtfKstr : 'revprop'; rtfkHash : 0),
-( rtfKMajor: rtfDocAttr; rtfKMinor: 	rtfRevBar; rtfKstr : 'revbar'; rtfkHash : 0),
-
-( rtfKMajor: rtfStyleAttr; rtfKMinor: 	rtfBasedOn; rtfKstr : 'sbasedon'; rtfkHash : 0),
-( rtfKMajor: rtfStyleAttr; rtfKMinor: 	rtfNext; rtfKstr : 'snext'; rtfkHash : 0),
+( rtfKMajor: RTFSPECIALCHAR; rtfKMinor : rtfCURHEADPICT; rtfKStr  : 'chpict'; rtfKhash :        0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfCurHeadDate; rtfKstr : 'chdate'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfCurHeadTime; rtfKstr : 'chtime'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfCurHeadPage; rtfKstr : 'chpgn'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfCurFNote; rtfKstr : 'chftn'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfCurAnnotRef; rtfKstr : 'chatn'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfFNoteSep; rtfKstr : 'chftnsep'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfFNoteCont; rtfKstr : 'chftnsepc'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfFormula; rtfKstr : '|'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfNoBrkSpace; rtfKstr : '~'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfNoReqHyphen; rtfKstr : '-'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfNoBrkHyphen; rtfKstr : '_'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfCell; rtfKstr : 'cell'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfRow; rtfKstr : 'row'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfPar; rtfKstr : 'par'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfPar; rtfKstr : #10; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfPar; rtfKstr : #13; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfSect; rtfKstr : 'sect'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfPage; rtfKstr : 'page'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfColumn; rtfKstr : 'column'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfLine; rtfKstr : 'line'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfTab; rtfKstr : 'tab'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfOptDest; rtfKstr : '*'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIIntVersion; rtfKstr : 'vern'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfICreateTime; rtfKstr : 'creatim'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIRevisionTime; rtfKstr : 'revtim'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIPrintTime; rtfKstr : 'printim'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIBackupTime; rtfKstr : 'buptim'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIEditTime; rtfKstr : 'edmins'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIYear; rtfKstr : 'yr'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIMonth; rtfKstr : 'mo'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIDay; rtfKstr : 'dy'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIHour; rtfKstr : 'hr'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIMinute; rtfKstr : 'min'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfINPages; rtfKstr : 'nofpages'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfINWords; rtfKstr : 'nofwords'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfINChars; rtfKstr : 'nofchars'; rtfkHash : 0),
+( rtfKMajor: rtfSpecialChar; rtfKMinor:         rtfIIntID; rtfKstr : 'id'; rtfkHash : 0),
+
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfPlain; rtfKstr : 'plain'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfBold; rtfKstr : 'b'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfItalic; rtfKstr : 'i'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfStrikeThru; rtfKstr : 'strike'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfOutline; rtfKstr : 'outl'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfShadow; rtfKstr : 'shad'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfSmallCaps; rtfKstr : 'scaps'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfAllCaps; rtfKstr : 'caps'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfInvisible; rtfKstr : 'v'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfFontNum; rtfKstr : 'f'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfFontSize; rtfKstr : 'fs'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfExpand; rtfKstr : 'expnd'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfUnderline; rtfKstr : 'ul'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfWUnderline; rtfKstr : 'ulw'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfDUnderline; rtfKstr : 'uld'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfDbUnderline; rtfKstr : 'uldb'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfNoUnderline; rtfKstr : 'ulnone'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfSuperScript; rtfKstr : 'up'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfSubScript; rtfKstr : 'dn'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfRevised; rtfKstr : 'revised'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfForeColor; rtfKstr : 'cf'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfBackColor; rtfKstr : 'cb'; rtfkHash : 0),
+( rtfKMajor: rtfCharAttr; rtfKMinor:    rtfGray; rtfKstr : 'gray'; rtfkHash : 0),
+
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfParDef; rtfKstr : 'pard'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfStyleNum; rtfKstr : 's'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfQuadLeft; rtfKstr : 'ql'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfQuadRight; rtfKstr : 'qr'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfQuadJust; rtfKstr : 'qj'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfQuadCenter; rtfKstr : 'qc'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfFirstIndent; rtfKstr : 'fi'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfLeftIndent; rtfKstr : 'li'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfRightIndent; rtfKstr : 'ri'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfSpaceBefore; rtfKstr : 'sb'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfSpaceAfter; rtfKstr : 'sa'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfSpaceBetween; rtfKstr : 'sl'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfInTable; rtfKstr : 'intbl'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfKeep; rtfKstr : 'keep'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfKeepNext; rtfKstr : 'keepn'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfSideBySide; rtfKstr : 'sbys'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfPBBefore; rtfKstr : 'pagebb'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfNoLineNum; rtfKstr : 'noline'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfTabPos; rtfKstr : 'tx'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfTabRight; rtfKstr : 'tqr'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfTabCenter; rtfKstr : 'tqc'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfTabDecimal; rtfKstr : 'tqdec'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfTabBar; rtfKstr : 'tb'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderTop; rtfKstr : 'brdrt'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderBottom; rtfKstr : 'brdrb'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderLeft; rtfKstr : 'brdrl'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderRight; rtfKstr : 'brdrr'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderBar; rtfKstr : 'bar'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderBox; rtfKstr : 'box'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderBetween; rtfKstr : 'brdrbtw'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderSingle; rtfKstr : 'brdrs'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderThick; rtfKstr : 'brdrth'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderShadow; rtfKstr : 'brdrsh'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderDouble; rtfKstr : 'brdrdb'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderDot; rtfKstr : 'brdrdot'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderHair; rtfKstr : 'brdrhair'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfLeaderDot; rtfKstr : 'tldot'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfLeaderHyphen; rtfKstr : 'tlhyph'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfLeaderUnder; rtfKstr : 'tlul'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfLeaderThick; rtfKstr : 'tlth'; rtfkHash : 0),
+( rtfKMajor: rtfParAttr; rtfKMinor:     rtfBorderSpace; rtfKstr : 'brsp'; rtfkHash : 0),
+
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfSectDef; rtfKstr : 'sectd'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfNoBreak; rtfKstr : 'sbknone'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfColBreak; rtfKstr : 'sbkcol'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageBreak; rtfKstr : 'sbkpage'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfEvenBreak; rtfKstr : 'sbkeven'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfOddBreak; rtfKstr : 'sbkodd'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageCont; rtfKstr : 'pgncont'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageStarts; rtfKstr : 'pgnstarts'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageRestart; rtfKstr : 'pgnrestart'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageDecimal; rtfKstr : 'pgndec'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageURoman; rtfKstr : 'pgnucrm'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageLRoman; rtfKstr : 'pgnlcrm'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageULetter; rtfKstr : 'pgnucltr'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageLLetter; rtfKstr : 'pgnlcltr'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageNumLeft; rtfKstr : 'pgnx'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfPageNumTop; rtfKstr : 'pgny'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfHeaderY; rtfKstr : 'headery'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfFooterY; rtfKstr : 'footery'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfLineModulus; rtfKstr : 'linemod'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfLineDist; rtfKstr : 'linex'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfLineStarts; rtfKstr : 'linestarts'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfLineRestart; rtfKstr : 'linerestart'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfLineRestartPg; rtfKstr : 'lineppage'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfLineCont; rtfKstr : 'linecont'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfTopVAlign; rtfKstr : 'vertalt'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfBottomVAlign; rtfKstr : 'vertal'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfCenterVAlign; rtfKstr : 'vertalc'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfJustVAlign; rtfKstr : 'vertalj'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfColumns; rtfKstr : 'cols'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfColumnSpace; rtfKstr : 'colsx'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfColumnLine; rtfKstr : 'linebetcol'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfENoteHere; rtfKstr : 'endnhere'; rtfkHash : 0),
+( rtfKMajor: rtfSectAttr; rtfKMinor:    rtfTitleSpecial; rtfKstr : 'titlepg'; rtfkHash : 0),
+
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfPaperWidth; rtfKstr : 'paperw'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfPaperHeight; rtfKstr : 'paperh'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfLeftMargin; rtfKstr : 'margl'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfRightMargin; rtfKstr : 'margr'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfTopMargin; rtfKstr : 'margt'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfBottomMargin; rtfKstr : 'margb'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfFacingPage; rtfKstr : 'facingp'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfGutterWid; rtfKstr : 'gutter'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfDefTab; rtfKstr : 'deftab'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfWidowCtrl; rtfKstr : 'widowctrl'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfHyphHotZone; rtfKstr : 'hyphhotz'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfFNoteEndSect; rtfKstr : 'endnotes'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfFNoteEndDoc; rtfKstr : 'enddoc'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfFNoteBottom; rtfKstr : 'ftnbj'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfFNoteText; rtfKstr : 'ftntj'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfFNoteStart; rtfKstr : 'ftnstart'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfFNoteRestart; rtfKstr : 'ftnrestart'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfPageStart; rtfKstr : 'pgnstart'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfLineStart; rtfKstr : 'linestart'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfLandscape; rtfKstr : 'landscape'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfFracWidth; rtfKstr : 'fracwidth'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfNextFile; rtfKstr : 'nextfile'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfTemplate; rtfKstr : 'template'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfMakeBackup; rtfKstr : 'makeback'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfRTFDefault; rtfKstr : 'defformat'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfRevisions; rtfKstr : 'revisions'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfMirrorMargin; rtfKstr : 'margmirror'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfRevDisplay; rtfKstr : 'revprop'; rtfkHash : 0),
+( rtfKMajor: rtfDocAttr; rtfKMinor:     rtfRevBar; rtfKstr : 'revbar'; rtfkHash : 0),
+
+( rtfKMajor: rtfStyleAttr; rtfKMinor:   rtfBasedOn; rtfKstr : 'sbasedon'; rtfkHash : 0),
+( rtfKMajor: rtfStyleAttr; rtfKMinor:   rtfNext; rtfKstr : 'snext'; rtfkHash : 0),
 
 ( rtfKMajor: rtfPictAttr; rtfKstr : 'macpict'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfWinMetafile; rtfKstr : 'wmetafile'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfWinBitmap; rtfKstr : 'wbitmap'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicWid; rtfKstr : 'picw'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicHt; rtfKstr : 'pich'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicGoalWid; rtfKstr : 'picwgoal'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicGoalWid; rtfKstr : 'picwGoal'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicGoalHt; rtfKstr : 'pichgoal'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicGoalHt; rtfKstr : 'pichGoal'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicScaleX; rtfKstr : 'picscalex'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicScaleY; rtfKstr : 'picscaley'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicScaled; rtfKstr : 'picscaled'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicCropTop; rtfKstr : 'piccropt'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicCropBottom; rtfKstr : 'piccropb'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicCropLeft; rtfKstr : 'piccropl'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPicCropRight; rtfKstr : 'piccropr'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfPixelBits; rtfKstr : 'wbmbitspixel'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfBitmapPlanes; rtfKstr : 'wbmplanes'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor: 	rtfBitmapWid; rtfKstr : 'wbmwidthbytes'; rtfkHash : 0),
-( rtfKMajor: rtfPictAttr; rtfKMinor:	rtfPicBinary; rtfKstr : 'bin'; rtfkHash : 0),
-
-( rtfKMajor: rtfNeXTGrAttr; rtfKMinor:	rtfNeXTGWidth; rtfKstr : 'width'; rtfkHash : 0),
-( rtfKMajor: rtfNeXTGrAttr; rtfKMinor:	rtfNeXTGHeight; rtfKstr : 'height'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfWinMetafile; rtfKstr : 'wmetafile'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfWinBitmap; rtfKstr : 'wbitmap'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicWid; rtfKstr : 'picw'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicHt; rtfKstr : 'pich'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicGoalWid; rtfKstr : 'picwgoal'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicGoalWid; rtfKstr : 'picwGoal'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicGoalHt; rtfKstr : 'pichgoal'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicGoalHt; rtfKstr : 'pichGoal'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicScaleX; rtfKstr : 'picscalex'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicScaleY; rtfKstr : 'picscaley'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicScaled; rtfKstr : 'picscaled'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicCropTop; rtfKstr : 'piccropt'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicCropBottom; rtfKstr : 'piccropb'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicCropLeft; rtfKstr : 'piccropl'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicCropRight; rtfKstr : 'piccropr'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPixelBits; rtfKstr : 'wbmbitspixel'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfBitmapPlanes; rtfKstr : 'wbmplanes'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfBitmapWid; rtfKstr : 'wbmwidthbytes'; rtfkHash : 0),
+( rtfKMajor: rtfPictAttr; rtfKMinor:    rtfPicBinary; rtfKstr : 'bin'; rtfkHash : 0),
+
+( rtfKMajor: rtfNeXTGrAttr; rtfKMinor:  rtfNeXTGWidth; rtfKstr : 'width'; rtfkHash : 0),
+( rtfKMajor: rtfNeXTGrAttr; rtfKMinor:  rtfNeXTGHeight; rtfKstr : 'height'; rtfkHash : 0),
 
 ( rtfKMajor: rtfDestination; rtfKMinor:         rtfPict; rtfKstr : 'pict'; rtfkHash : 0),
 ( rtfKMajor: rtfDestination; rtfKMinor:         rtfNeXTGraphic; rtfKstr : 'NeXTGraphic'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFootnote; rtfKstr : 'footnote'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfHeader; rtfKstr : 'header'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfHeaderLeft; rtfKstr : 'headerl'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfHeaderRight; rtfKstr : 'headerr'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfHeaderFirst; rtfKstr : 'headerf'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFooter; rtfKstr : 'footer'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFooterLeft; rtfKstr : 'footerl'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFooterRight; rtfKstr : 'footerr'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFooterFirst; rtfKstr : 'footerf'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFNSep; rtfKstr : 'ftnsep'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFNContSep; rtfKstr : 'ftnsepc'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFNContNotice; rtfKstr : 'ftncn'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfInfo; rtfKstr : 'info'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfStyleSheet; rtfKstr : 'stylesheet'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFontTbl; rtfKstr : 'fonttbl'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfColorTbl; rtfKstr : 'colortbl'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfAnnotation; rtfKstr : 'annotation'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfAnnotID; rtfKstr : 'atnid'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfField; rtfKstr : 'field'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFieldInst; rtfKstr : 'fldinst'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfFieldResult; rtfKstr : 'fldrslt'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIndex; rtfKstr : 'xe'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIndexBold; rtfKstr : 'bxe'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIndexItalic; rtfKstr : 'ixe'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIndexText; rtfKstr : 'txe'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIndexRange; rtfKstr : 'rxe'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfTOC; rtfKstr : 'tc'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfBookmarkStart; rtfKstr : 'bkmkstart'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfBookmarkEnd; rtfKstr : 'bkmkend'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfITitle; rtfKstr : 'title'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfISubject; rtfKstr : 'subject'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIAuthor; rtfKstr : 'author'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIOperator; rtfKstr : 'operator'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIKeywords; rtfKstr : 'keywords'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIComment; rtfKstr : 'comment'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIVersion; rtfKstr : 'version'; rtfkHash : 0),
-( rtfKMajor: rtfDestination; rtfKMinor: 	rtfIDoccomm; rtfKstr : 'doccomm'; rtfkHash : 0),
-
-( rtfKMajor: rtfTOCAttr; rtfKMinor: 	rtfTOCType; rtfKstr : 'tcf'; rtfkHash : 0),
-( rtfKMajor: rtfTOCAttr; rtfKMinor: 	rtfTOCLevel; rtfKstr : 'tcl'; rtfkHash : 0),
-
-( rtfKMajor: rtfFontFamily; rtfKMinor: 	rtfFFNil; rtfKstr : 'fnil'; rtfkHash : 0),
-( rtfKMajor: rtfFontFamily; rtfKMinor: 	rtfFFRoman; rtfKstr : 'froman'; rtfkHash : 0),
-( rtfKMajor: rtfFontFamily; rtfKMinor: 	rtfFFSwiss; rtfKstr : 'fswiss'; rtfkHash : 0),
-( rtfKMajor: rtfFontFamily; rtfKMinor: 	rtfFFModern; rtfKstr : 'fmodern'; rtfkHash : 0),
-( rtfKMajor: rtfFontFamily; rtfKMinor: 	rtfFFScript; rtfKstr : 'fscript'; rtfkHash : 0),
-( rtfKMajor: rtfFontFamily; rtfKMinor: 	rtfFFDecor; rtfKstr : 'fdecor'; rtfkHash : 0),
-( rtfKMajor: rtfFontFamily; rtfKMinor: 	rtfFFTech; rtfKstr : 'ftech'; rtfkHash : 0),
-
-( rtfKMajor: rtfColorName; rtfKMinor: 	rtfRed; rtfKstr : 'red'; rtfkHash : 0),
-( rtfKMajor: rtfColorName; rtfKMinor: 	rtfGreen; rtfKstr : 'green'; rtfkHash : 0),
-( rtfKMajor: rtfColorName; rtfKMinor: 	rtfBlue; rtfKstr : 'blue'; rtfkHash : 0),
-
-( rtfKMajor: rtfCharSet; rtfKMinor: 	rtfMacCharSet; rtfKstr : 'mac'; rtfkHash : 0),
-( rtfKMajor: rtfCharSet; rtfKMinor: 	rtfAnsiCharSet; rtfKstr : 'ansi'; rtfkHash : 0),
-( rtfKMajor: rtfCharSet; rtfKMinor: 	rtfPcCharSet; rtfKstr : 'pc'; rtfkHash : 0),
-( rtfKMajor: rtfCharSet; rtfKMinor: 	rtfPcaCharSet; rtfKstr : 'pca'; rtfkHash : 0),
-
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfCellBordBottom; rtfKstr : 'clbrdrb'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfCellBordTop; rtfKstr : 'clbrdrt'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfCellBordLeft; rtfKstr : 'clbrdrl'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfCellBordRight; rtfKstr : 'clbrdrr'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfRowDef; rtfKstr : 'trowd'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfRowLeft; rtfKstr : 'trql'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfRowRight; rtfKstr : 'trqr'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfRowCenter; rtfKstr : 'trqc'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfRowGapH; rtfKstr : 'trgaph'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfRowHt; rtfKstr : 'trrh'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfRowLeftEdge; rtfKstr : 'trleft'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfCellPos; rtfKstr : 'cellx'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfMergeRngFirst; rtfKstr : 'clmgf'; rtfkHash : 0),
-( rtfKMajor: rtfTblAttr; rtfKMinor: 	rtfMergePrevious; rtfKstr : 'clmrg'; rtfkHash : 0),
-
-( rtfKMajor: rtfFieldAttr; rtfKMinor: 	rtfFieldDirty; rtfKstr : 'flddirty'; rtfkHash : 0),
-( rtfKMajor: rtfFieldAttr; rtfKMinor: 	rtfFieldEdited; rtfKstr : 'fldedit'; rtfkHash : 0),
-( rtfKMajor: rtfFieldAttr; rtfKMinor: 	rtfFieldLocked; rtfKstr : 'fldlock'; rtfkHash : 0),
-( rtfKMajor: rtfFieldAttr; rtfKMinor: 	rtfFieldPrivate; rtfKstr : 'fldpriv'; rtfkHash : 0),
-
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosX; rtfKstr : 'posx'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosXCenter; rtfKstr : 'posxc'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosXInside; rtfKstr : 'posxi'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosXLeft; rtfKstr : 'posxl'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosXOutSide; rtfKstr : 'posxo'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosXRight; rtfKstr : 'posxr'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosY; rtfKstr : 'posy'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosYInline; rtfKstr : 'posyil'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosYTop; rtfKstr : 'posyt'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosYCenter; rtfKstr : 'posyc'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfPosYBottom; rtfKstr : 'posyb'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfAbsWid; rtfKstr : 'absw'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfTextDist; rtfKstr : 'dxfrtext'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfRPosMargV; rtfKstr : 'pvmrg'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfRPosPageV; rtfKstr : 'pvpg'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfRPosMargH; rtfKstr : 'phmrg'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfRPosPageH; rtfKstr : 'phpg'; rtfkHash : 0),
-( rtfKMajor: rtfPosAttr; rtfKMinor: 	rtfRPosColH; rtfKstr : 'phcol'; rtfkHash : 0),
-
-( rtfKMajor: rtfVersion; rtfKMinor: 	-1; rtfKstr : 'rtf'; rtfkHash : 0),
-( rtfKMajor: rtfDefFont; rtfKMinor: 	-1; rtfKstr : 'deff'; rtfkHash : 0),
-
-( rtfKMajor: 0; rtfKMinor: 		-1; rtfKstr : ''; rtfkHash : 0)
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFootnote; rtfKstr : 'footnote'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfHeader; rtfKstr : 'header'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfHeaderLeft; rtfKstr : 'headerl'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfHeaderRight; rtfKstr : 'headerr'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfHeaderFirst; rtfKstr : 'headerf'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFooter; rtfKstr : 'footer'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFooterLeft; rtfKstr : 'footerl'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFooterRight; rtfKstr : 'footerr'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFooterFirst; rtfKstr : 'footerf'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFNSep; rtfKstr : 'ftnsep'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFNContSep; rtfKstr : 'ftnsepc'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFNContNotice; rtfKstr : 'ftncn'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfInfo; rtfKstr : 'info'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfStyleSheet; rtfKstr : 'stylesheet'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFontTbl; rtfKstr : 'fonttbl'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfColorTbl; rtfKstr : 'colortbl'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfAnnotation; rtfKstr : 'annotation'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfAnnotID; rtfKstr : 'atnid'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfField; rtfKstr : 'field'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFieldInst; rtfKstr : 'fldinst'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfFieldResult; rtfKstr : 'fldrslt'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIndex; rtfKstr : 'xe'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIndexBold; rtfKstr : 'bxe'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIndexItalic; rtfKstr : 'ixe'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIndexText; rtfKstr : 'txe'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIndexRange; rtfKstr : 'rxe'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfTOC; rtfKstr : 'tc'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfBookmarkStart; rtfKstr : 'bkmkstart'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfBookmarkEnd; rtfKstr : 'bkmkend'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfITitle; rtfKstr : 'title'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfISubject; rtfKstr : 'subject'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIAuthor; rtfKstr : 'author'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIOperator; rtfKstr : 'operator'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIKeywords; rtfKstr : 'keywords'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIComment; rtfKstr : 'comment'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIVersion; rtfKstr : 'version'; rtfkHash : 0),
+( rtfKMajor: rtfDestination; rtfKMinor:         rtfIDoccomm; rtfKstr : 'doccomm'; rtfkHash : 0),
+
+( rtfKMajor: rtfTOCAttr; rtfKMinor:     rtfTOCType; rtfKstr : 'tcf'; rtfkHash : 0),
+( rtfKMajor: rtfTOCAttr; rtfKMinor:     rtfTOCLevel; rtfKstr : 'tcl'; rtfkHash : 0),
+
+( rtfKMajor: rtfFontFamily; rtfKMinor:  rtfFFNil; rtfKstr : 'fnil'; rtfkHash : 0),
+( rtfKMajor: rtfFontFamily; rtfKMinor:  rtfFFRoman; rtfKstr : 'froman'; rtfkHash : 0),
+( rtfKMajor: rtfFontFamily; rtfKMinor:  rtfFFSwiss; rtfKstr : 'fswiss'; rtfkHash : 0),
+( rtfKMajor: rtfFontFamily; rtfKMinor:  rtfFFModern; rtfKstr : 'fmodern'; rtfkHash : 0),
+( rtfKMajor: rtfFontFamily; rtfKMinor:  rtfFFScript; rtfKstr : 'fscript'; rtfkHash : 0),
+( rtfKMajor: rtfFontFamily; rtfKMinor:  rtfFFDecor; rtfKstr : 'fdecor'; rtfkHash : 0),
+( rtfKMajor: rtfFontFamily; rtfKMinor:  rtfFFTech; rtfKstr : 'ftech'; rtfkHash : 0),
+
+( rtfKMajor: rtfColorName; rtfKMinor:   rtfRed; rtfKstr : 'red'; rtfkHash : 0),
+( rtfKMajor: rtfColorName; rtfKMinor:   rtfGreen; rtfKstr : 'green'; rtfkHash : 0),
+( rtfKMajor: rtfColorName; rtfKMinor:   rtfBlue; rtfKstr : 'blue'; rtfkHash : 0),
+
+( rtfKMajor: rtfCharSet; rtfKMinor:     rtfMacCharSet; rtfKstr : 'mac'; rtfkHash : 0),
+( rtfKMajor: rtfCharSet; rtfKMinor:     rtfAnsiCharSet; rtfKstr : 'ansi'; rtfkHash : 0),
+( rtfKMajor: rtfCharSet; rtfKMinor:     rtfPcCharSet; rtfKstr : 'pc'; rtfkHash : 0),
+( rtfKMajor: rtfCharSet; rtfKMinor:     rtfPcaCharSet; rtfKstr : 'pca'; rtfkHash : 0),
+
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfCellBordBottom; rtfKstr : 'clbrdrb'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfCellBordTop; rtfKstr : 'clbrdrt'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfCellBordLeft; rtfKstr : 'clbrdrl'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfCellBordRight; rtfKstr : 'clbrdrr'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfRowDef; rtfKstr : 'trowd'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfRowLeft; rtfKstr : 'trql'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfRowRight; rtfKstr : 'trqr'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfRowCenter; rtfKstr : 'trqc'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfRowGapH; rtfKstr : 'trgaph'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfRowHt; rtfKstr : 'trrh'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfRowLeftEdge; rtfKstr : 'trleft'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfCellPos; rtfKstr : 'cellx'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfMergeRngFirst; rtfKstr : 'clmgf'; rtfkHash : 0),
+( rtfKMajor: rtfTblAttr; rtfKMinor:     rtfMergePrevious; rtfKstr : 'clmrg'; rtfkHash : 0),
+
+( rtfKMajor: rtfFieldAttr; rtfKMinor:   rtfFieldDirty; rtfKstr : 'flddirty'; rtfkHash : 0),
+( rtfKMajor: rtfFieldAttr; rtfKMinor:   rtfFieldEdited; rtfKstr : 'fldedit'; rtfkHash : 0),
+( rtfKMajor: rtfFieldAttr; rtfKMinor:   rtfFieldLocked; rtfKstr : 'fldlock'; rtfkHash : 0),
+( rtfKMajor: rtfFieldAttr; rtfKMinor:   rtfFieldPrivate; rtfKstr : 'fldpriv'; rtfkHash : 0),
+
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosX; rtfKstr : 'posx'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosXCenter; rtfKstr : 'posxc'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosXInside; rtfKstr : 'posxi'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosXLeft; rtfKstr : 'posxl'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosXOutSide; rtfKstr : 'posxo'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosXRight; rtfKstr : 'posxr'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosY; rtfKstr : 'posy'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosYInline; rtfKstr : 'posyil'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosYTop; rtfKstr : 'posyt'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosYCenter; rtfKstr : 'posyc'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfPosYBottom; rtfKstr : 'posyb'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfAbsWid; rtfKstr : 'absw'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfTextDist; rtfKstr : 'dxfrtext'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfRPosMargV; rtfKstr : 'pvmrg'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfRPosPageV; rtfKstr : 'pvpg'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfRPosMargH; rtfKstr : 'phmrg'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfRPosPageH; rtfKstr : 'phpg'; rtfkHash : 0),
+( rtfKMajor: rtfPosAttr; rtfKMinor:     rtfRPosColH; rtfKstr : 'phcol'; rtfkHash : 0),
+
+( rtfKMajor: rtfVersion; rtfKMinor:     -1; rtfKstr : 'rtf'; rtfkHash : 0),
+( rtfKMajor: rtfDefFont; rtfKMinor:     -1; rtfKstr : 'deff'; rtfkHash : 0),
+
+( rtfKMajor: 0; rtfKMinor:              -1; rtfKstr : ''; rtfkHash : 0)
 );

fcl/inc/rtfpars.pp

@@ -2,11 +2,11 @@ Unit RTFPars;
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by Michael Van Canneyt, Member of the 
+    Copyright (c) 1999-2000 by Michael Van Canneyt, Member of the
     Free Pascal development team
 
     This unit implements a RTF Parser.
-    
+
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 
@@ -36,15 +36,15 @@ TRTFParser = class(TObject)
     FrtfParam : Integer;
     rtfTextBuf : string [rtfBufSiz];
     rtfTextLen : Integer;
-    pushedChar : Integer;	        { pushback char if read too far }
-    pushedClass : Integer;	{ pushed token info for RTFUngetToken() }
+    pushedChar : Integer;               { pushback char if read too far }
+    pushedClass : Integer;      { pushed token info for RTFUngetToken() }
     pushedMajor,
     pushedMinor,
     pushedParam : Integer;
     pushedTextBuf : String[rtfBufSiz];
     FStream : TStream;
-    ccb : array [0..rtfMaxClass] of TRTFFuncPtr;		{ class callbacks }
-    dcb : array [0..rtfMaxDestination] of TRTFFuncPtr;	{ destination callbacks }
+    ccb : array [0..rtfMaxClass] of TRTFFuncPtr;                { class callbacks }
+    dcb : array [0..rtfMaxDestination] of TRTFFuncPtr;  { destination callbacks }
     readHook : TRTFFUNCPTR;
     Procedure Error (msg : String);
     Procedure LookupInit ;
@@ -138,9 +138,9 @@ Function HexVal (c : Integer) : Integer;
 Begin
   if (c>=ord('A')) and (C<=ord('Z')) then inc (c,32);
   if c<ord ('A') then
-    result:=(c - ord('0'))	{ '0'..'9' }
+    result:=(c - ord('0'))      { '0'..'9' }
   else
-    result:= (c - ord('a') + 10);		{ 'a'..'f' }
+    result:= (c - ord('a') + 10);               { 'a'..'f' }
 End;
 
 { ---------------------------------------------------------------------
@@ -148,7 +148,7 @@ End;
        to read multiple files.  The only thing not reset is the input
        stream; that must be done with RTFSetStream().
   ---------------------------------------------------------------------}
-  
+
 Constructor TRTFParser.Create (Astream : TStream);
 
 Begin
@@ -288,7 +288,7 @@ End;
 { ---------------------------------------------------------------------
    Install or return a writer callback for a destination type
   ---------------------------------------------------------------------}
-  
+
 Procedure TRTFParser.SetDestinationCallback (ADestination : Integer; Acallback : TRTFFuncPtr);
 
 Begin
@@ -373,7 +373,7 @@ Begin
           Begin
           dec(level);
           if (level < 1) then
-            exit;	{ end of initial group }
+            exit;       { end of initial group }
           End;
        End;
 End;
@@ -391,7 +391,7 @@ while true do
   Begin
   Real_RTFGetToken;
   if (assigned(p)) then
-    p;	{ give read hook a look at token }
+    p;  { give read hook a look at token }
   { Silently discard newlines and carriage returns.  }
   if not ((rtfClass=rtfText) and ((rtfMajor=13) or (rtfmajor=10))) then
     break;
@@ -420,7 +420,7 @@ End;
 Procedure TRTFParser.UngetToken;
 
 Begin
-if (pushedClass >= 0) then	{ there's already an ungotten token }
+if (pushedClass >= 0) then      { there's already an ungotten token }
         Error ('cannot unget two tokens');
 if (rtfClass < 0) then
         Error ('no token to unget');
@@ -500,7 +500,7 @@ if c<>ord('\') then
   { Two possibilities here:
     1) ASCII 9, effectively like \tab control symbol
     2) literal text char }
-  if c=ord(#8) then			{ ASCII 9 }
+  if c=ord(#8) then                     { ASCII 9 }
     Begin
     FrtfClass := rtfControl;
     FrtfMajor := rtfSpecialChar;
@@ -547,7 +547,7 @@ if ( not isalpha (c)) then
     exit;
     End;
    { control symbol }
-   Lookup (rtfTextBuf);	{ sets class, major, minor }
+   Lookup (rtfTextBuf); { sets class, major, minor }
    exit;
   End;
 { control word }
@@ -564,7 +564,7 @@ while (isalpha (c)) do
   looking up. }
 if (c<>EOF) then
   delete(rtfTextBuf,length(rtfTextbuf),1);
-Lookup (rtfTextBuf);	{ sets class, major, minor }
+Lookup (rtfTextBuf);    { sets class, major, minor }
 if (c <>EOF) then
   rtfTextBuf:=rtfTextBuf+chr(c);
 { Should be looking at first digit of parameter if there
@@ -580,7 +580,7 @@ if (c<>EOF) then
   if isdigit (c) then
   Begin
   FrtfParam := 0;
-  while (isdigit (c)) do	{ gobble parameter }
+  while (isdigit (c)) do        { gobble parameter }
     Begin
     FrtfParam := FrtfParam * 10 + c - ord('0');
     c:=GetChar;
@@ -673,20 +673,20 @@ While true do
   GetToken;
   if CheckCM (rtfGroup, rtfEndGroup) then
       break;
-  if (old < 0) then		{ first entry - determine tbl type }
+  if (old < 0) then             { first entry - determine tbl type }
     Begin
     if CheckCMM (rtfControl, rtfCharAttr, rtfFontNum) then
-      old:=1	{ no brace }
+      old:=1    { no brace }
     else if CheckCM (rtfGroup, rtfBeginGroup) then
-      old:= 0	{ brace }
-    else			{ can't tell! }
+      old:= 0   { brace }
+    else                        { can't tell! }
       Error ('FTErr - Cannot determine format')
     End;
-  if (old=0) then	{ need to find "Begin" here }
+  if (old=0) then       { need to find "Begin" here }
     Begin
     if not CheckCM (rtfGroup, rtfBeginGroup) then
       Error ('FTErr - missing {');
-    GetToken;	{ yes, skip to next token }
+    GetToken;   { yes, skip to next token }
     End;
   new(fp);
   if (fp=nil) then
@@ -721,14 +721,14 @@ While true do
      Error ('FTErr - missing font name');
   fp^.rtffname:=bp;
   { Read alternate font}
-  if (old=0) then	{ need to see "End;" here }
+  if (old=0) then       { need to see "End;" here }
     Begin
     GetToken;
     if not CheckCM (rtfGroup, rtfEndGroup) then
        Error ('FTErr - missing }');
     End;
   End;
-RouteToken;	{ feed "End;" back to router }
+RouteToken;     { feed "End;" back to router }
 End;
 
 
@@ -766,16 +766,16 @@ While true do
     if not CheckCM (rtfControl, rtfColorName) then
        break;
     case rtfMinor of
-      rtfRed:	cp^.rtfCRed   :=rtfParam;
-      rtfGreen:	cp^.rtfCGreen :=rtfParam;
-      rtfBlue:	cp^.rtfCBlue  :=rtfParam;
+      rtfRed:   cp^.rtfCRed   :=rtfParam;
+      rtfGreen: cp^.rtfCGreen :=rtfParam;
+      rtfBlue:  cp^.rtfCBlue  :=rtfParam;
     End;
     GetToken;
     End;
   if not CheckCM (rtfText, ord(';')) then
      Error ('CTErr - malformed entry');
   End;
-RouteToken;	{ feed "End;" back to router }
+RouteToken;     { feed "End;" back to router }
 End;
 
 
@@ -834,14 +834,14 @@ While true do
     sep^.rtfSEParam:=rtfParam;
     sep^.rtfSEText:=rtfTextBuf;
     if sepLast=nil then
-       sp^.rtfSSEList:=sep	{ first element }
-    else				{ add to end }
+       sp^.rtfSSEList:=sep      { first element }
+    else                                { add to end }
        sepLast^.rtfNextSE:=sep;
     sep^.rtfNextSE:=nil;
     sepLast:=sep;
     End;
-  if sp^.rtfSNextPar=-1 then		{ \snext not given }
-    sp^.rtfSNextPar:=sp^.rtfSNum;	{ next is itself }
+  if sp^.rtfSNextPar=-1 then            { \snext not given }
+    sp^.rtfSNextPar:=sp^.rtfSNum;       { next is itself }
   if rtfClass<>rtfText then
      Error ('SSErr - missing style name');
   while rtfClass=rtfText do
@@ -854,8 +854,8 @@ While true do
     bp:=bp+chr(rtfMajor);
     GetToken;
     End;
-  if (sp^.rtfSNum < 0) then	{ no style number was specified }
-    Begin			{ (only legal for Normal style) }
+  if (sp^.rtfSNum < 0) then     { no style number was specified }
+    Begin                       { (only legal for Normal style) }
     if bp<>'Normal' then
        Error ('SSErr - missing style number');
     sp^.rtfSNum:=0;
@@ -864,7 +864,7 @@ While true do
   if not CheckCM (rtfGroup, rtfEndGroup) then
       Error ('SSErr - missing }');
   End;
-RouteToken;	{ feed "End;" back to router }
+RouteToken;     { feed "End;" back to router }
 End;
 
 
@@ -872,7 +872,7 @@ Procedure TRTFParser.ReadInfoGroup;
 
 Begin
   SkipGroup ;
-  RouteToken ;	{ feed "End;" back to router }
+  RouteToken ;  { feed "End;" back to router }
 End;
 
 
@@ -880,7 +880,7 @@ Procedure TRTFParser.ReadPictGroup;
 
 Begin
   SkipGroup ;
-  RouteToken ;	{ feed "End;" back to router }
+  RouteToken ;  { feed "End;" back to router }
 End;
 
 
@@ -902,7 +902,7 @@ if num<>1 then
     if (s^.rtfSNum=num) then break;
     s:=s^.rtfNextStyle;
     End;
-result:=s;		{ NULL if not found }
+result:=s;              { NULL if not found }
 End;
 
 
@@ -919,7 +919,7 @@ if num<>-1 then
     if f^.rtfFNum=num then break;
     f:=f^.rtfNextFont;
     End;
-result:=f;		{ NULL if not found }
+result:=f;              { NULL if not found }
 End;
 
 Function TRTFParser.GetColor (num : Integer) : PRTFColor;
@@ -935,7 +935,7 @@ if (num<>-1) then
     if c^.rtfCNum=num then break;
     c:=c^.rtfNextColor;
     End;
-Result:=c;		{ NULL if not found }
+Result:=c;              { NULL if not found }
 End;
 
 { ---------------------------------------------------------------------
@@ -955,7 +955,7 @@ if s=nil then exit;
 
 if (s^.rtfExpanding<>0) then
   Error ('Style expansion loop, style '+inttostr(n));
-s^.rtfExpanding:=1;	{ set expansion flag for loop detection }
+s^.rtfExpanding:=1;     { set expansion flag for loop detection }
 {
         Expand "based-on" style.  This is done by synthesizing
         the token that the writer needs to see in order to trigger
@@ -981,7 +981,7 @@ while se<>nil do
   RouteToken;
   se:=se^.rtfNextSE
   End;
-s^.rtfExpanding:=0;	{ done - clear expansion flag }
+s^.rtfExpanding:=0;     { done - clear expansion flag }
 End;
 
 { ---------------------------------------------------------------------
@@ -1014,7 +1014,7 @@ var
  thehash,rp : Integer;
 
 Begin
-delete(s,1,1);			{ skip over the leading \ character }
+delete(s,1,1);                  { skip over the leading \ character }
 thehash:=Hash (s);
 rp:=0;
 while rtfkey[rp].rtfKstr<>'' do

fcl/inc/streams.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -625,7 +625,10 @@ end;
 
 {
   $Log$
-  Revision 1.19  2000-01-06 01:20:33  peter
+  Revision 1.20  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.19  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.2  2000/01/04 18:07:16  michael

fcl/inc/stringl.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -926,7 +926,10 @@ end;
 
 {
   $Log$
-  Revision 1.9  2000-01-06 01:20:33  peter
+  Revision 1.10  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.9  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:08  peter

fcl/inc/syncob.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by Florian Klaempfl
+    Copyright (c) 1999-2000 by Florian Klaempfl
     member of the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
@@ -27,7 +27,10 @@ procedure TCriticalSection.Leave;
 
 {
   $Log$
-  Revision 1.3  2000-01-06 01:20:33  peter
+  Revision 1.4  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.3  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:08  peter

fcl/inc/syncobh.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by Florian Klaempfl
+    Copyright (c) 1999-2000 by Florian Klaempfl
     member of the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
@@ -58,7 +58,10 @@ type
 
 {
   $Log$
-  Revision 1.3  2000-01-06 01:20:33  peter
+  Revision 1.4  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.3  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:08  peter

fcl/inc/twriter.inc

@@ -1,4 +1,16 @@
+{
+    $Id$
+    This file is part of the Free Component Library (FCL)
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
 
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
 
 Procedure TTextWriter.WriteLn(Const Msg : String);
 
@@ -85,7 +97,7 @@ begin
   FPrefix:='';
 end;
 
-Destructor TTextWriter.Destroy; 
+Destructor TTextWriter.Destroy;
 
 begin
 end;
@@ -114,11 +126,11 @@ Procedure TTextWriter.WriteStringProperty(Const Name : ShortString; Const Value
 Type
   TMode = (quoted,unquoted);
 
-Var 
+Var
   Mode : TMode;
   S : String;
   I,L : Longint;
-  c : char; 
+  c : char;
 
    Procedure Add (A : String);
 
@@ -137,13 +149,13 @@ begin
       begin
       If mode=Quoted then
         Add(c)
-      else   
+      else
         begin
         Add(''''+c);
         mode:=quoted
         end
-      end  
-    else   
+      end
+    else
       begin
       If Mode=quoted then
         begin
@@ -155,14 +167,14 @@ begin
     If Length(S)>72 then
       begin
       if mode=quoted then
-        Add ('''');  
-      Add('+');    
+        Add ('''');
+      Add('+');
       Writeln(S);
       Mode:=unQuoted;
       end;
     end;
  if mode=quoted then Add('''');
- Writeln(S);  
+ Writeln(S);
 end;
 
 Procedure TTextWriter.WriteFloatProperty(Const Name : ShortString; Value : Extended);
@@ -174,7 +186,7 @@ end;
 Procedure TTextWriter.WriteCollectionProperty(Const Name : ShortString;Value : TCollection);
 
 begin
- 
+
 end;
 
 Procedure TTextWriter.WriteClassProperty(Instance : TPersistent;Propinfo :PPropInfo);

fcl/inc/util.inc

@@ -1,3 +1,17 @@
+{
+    $Id$
+    This file is part of the Free Component Library (FCL)
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
 Function IntToStr (I : Longint) : String;
 
 begin

fcl/inc/writer.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -38,15 +38,15 @@ end;
 
 {
   These methods do the main work: decide if a property must be written,
-  and then call the write method. 
-  Later on the NeedsWriting function should take the ancestor into 
+  and then call the write method.
+  Later on the NeedsWriting function should take the ancestor into
   account as well, for form inheritance...
 }
 
 
 Procedure TAbstractWriter.DoOrdinalProp(Instance : TPersistent;Propinfo :PPropInfo);
 
-Var 
+Var
   Value : longint;
 
 begin
@@ -72,7 +72,7 @@ begin
     Writeln(stderr,'Writer: Starting DoStringProp');
   {$endif}
   Value:=GetStrProp(Instance,PropInfo);
-  If Value<>'' Then 
+  If Value<>'' Then
     With Propinfo^ do
       WriteStringProperty(Name,Value);
 end;
@@ -100,7 +100,7 @@ begin
   {$ifdef serdebug}
     Writeln(stderr,'Writer: Starting DoCollectionProp');
   {$endif}
-  Try 
+  Try
     OldPrefix:=FPrefix;
     FPrefix:='';
     WriteCollectionProperty(Name,Value)
@@ -115,44 +115,44 @@ Procedure TAbstractWriter.DoClassProp(Instance : TPersistent;Propinfo :PPropInfo
 {
   Some explanation:
   1) Only TPersistent properties can be written, since higher has no
-     RTTI (actually, we could test if the class has RTTI if it isn't 
+     RTTI (actually, we could test if the class has RTTI if it isn't
      TPersistent, but Delphi doesn't - We can add it later)
-  2) If it is a TPersistent but not TComponent, then the only 
+  2) If it is a TPersistent but not TComponent, then the only
      thing that is (can be) written is the defineproperties;
      we have this handled by calling writeproperties again.
-  3) When a property is a TComponent, it is owned by the form or by a 
-     TDataModule; This means that the component is streamed also 
+  3) When a property is a TComponent, it is owned by the form or by a
+     TDataModule; This means that the component is streamed also
      (owner-owned) by the form, so it is sufficient to store a reference
      to the component, not store the component itself.
-     
+
      Again, this is very form-oriented; at a later stage, we should see
      to make this more broader.
-     
+
 }
 
-Var 
+Var
   Value : TObject;
 
   Function NeedsWriting : Boolean;
-  
+
   begin
     Result:=Value<>Nil;
   end;
 
   Function GetComponentPath(Component : TComponent): String;
-  
+
   begin
     If Component.Owner=Root Then
       Result:=Component.Name          // 2 objects In the same form.
     else if Component=Root then
       Result:='Owner'                 // Component = Form.
-    else if Component.Owner<>Nil then  
+    else if Component.Owner<>Nil then
       Result:=Format('%s.%s',[Component.Owner.name,Component.Name]) // Component on other e.g. Datamodule.
-    else 
+    else
       Result:=Format('%s.%s',[Component.Name+'owner']); // All other cases.
-  end;     
+  end;
 
-Var 
+Var
   OldPrefix,CName : String;
 
 begin
@@ -163,12 +163,12 @@ begin
 {$ifdef serdebug}
   If Value=Nil then
     Writeln(stderr,'Writer: value is nil');
-  Writeln(stderr,'name ',propinfo^.Name);  
+  Writeln(stderr,'name ',propinfo^.Name);
 {$endif}
   If (Value=Nil) Then
     begin
     If Needswriting then
-      With Propinfo^ do 
+      With Propinfo^ do
         WriteNilProperty(Name)
     end
   else
@@ -177,8 +177,8 @@ begin
 {$ifdef serdebug}
   Writeln(stderr,'Writer: value is tpersistent');
 {$endif}
-        If Value is TComponent then 
-          { Component is written by itself, 
+        If Value is TComponent then
+          { Component is written by itself,
             just write a reference }
           begin
           Cname:=GetComponentPath(TComponent(Value));
@@ -201,7 +201,7 @@ begin
               FPrefix:=OldPrefix;
             end;
           end;
-      end    
+      end
    // We can't write it if it isn't a TPersistent...
 end;
 
@@ -211,8 +211,8 @@ Procedure TAbstractWriter.DoMethodProp(Instance : TPersistent;Propinfo :PPropInf
   Some explanation: AFAIK Delphi only allows to assign methods from the
   current form to an event. (An event is a Method) this means that the
   instance part of the method IS the Form which IS the 'root' component.
-  this means that we can safely assume that Method.Data = Root...  
-  
+  this means that we can safely assume that Method.Data = Root...
+
   Remark also that Form Methods are always in a Published section of the form,
   Since Delphi manages them, hence the method name is always in RTTI.
 
@@ -220,7 +220,7 @@ Procedure TAbstractWriter.DoMethodProp(Instance : TPersistent;Propinfo :PPropInf
   we would have to write ComponentPath.MethodName or something.
 }
 
-Var 
+Var
   Value : TMethod;
 
 begin
@@ -242,7 +242,7 @@ Const
              'Float','Set','Method','ShortString','LongString',
              'AnsiString','WideString','Variant','Array','Record',
              'Interface','Class','Object','WideChar','Bool');
-                                         
+
  Const OrdinalTypes = [tkInteger,tkChar,tkENumeration,tkbool];
 {$endif}
 
@@ -264,7 +264,7 @@ begin
       tkfloat : DoFloatProp(Instance,PropInfo);
       tkClass : DoClassProp(Instance,PropInfo);
       tkMethod : DoMethodProp(Instance,PropInfo);
-    end;  
+    end;
 end;
 
 
@@ -272,7 +272,7 @@ Procedure TAbstractWriter.WriteProperties(Instance: TPersistent);
 
 Var I,PropCount : Longint;
     Props : PPropList;
-    
+
 begin
 {$ifdef serdebug}
   Writeln(stderr,'Writer: Starting WriteProperties');
@@ -281,7 +281,7 @@ begin
 {$ifdef serdebug}
   Writeln(stderr,'Writer : Propcount: ',PropCount);
 {$endif}
-  Try 
+  Try
     GetMem (Props,SizeOf(Pointer)*PropCount);
     GetPropInfos(Instance.ClassInfo,Props);
     For I:=0 to PropCount-1 do
@@ -289,7 +289,7 @@ begin
   finally
     FreeMem(Props);
   end;
-//  Instance.DefineProperties(Self); 
+//  Instance.DefineProperties(Self);
 end;
 
 Destructor TAbstractWriter.Destroy;
@@ -321,15 +321,15 @@ end;
 
 procedure TAbstractWriter.WriteComponent(Component: TComponent);
 
-Var I : longint;  
+Var I : longint;
     TheAncestor : TComponent;
-    
+
 begin
 {$ifdef serdebug}
   Writeln(stderr,'Writer: Starting WriteComponent');
 {$endif}
   Include(Component.FComponentState,csWriting);
-  TheAncestor:=Nil;  
+  TheAncestor:=Nil;
   If Assigned(FAncestorList) then
     For I:=0 to FAncestorList.Count-1 do
       If TComponent(FAncestorList[i]).Name=Component.Name then
@@ -339,14 +339,14 @@ begin
         end;
   Ancestor:=TheAncestor;
   Component.WriteState(Self);
-  Exclude(Component.FComponentState,csWriting);   
+  Exclude(Component.FComponentState,csWriting);
 end;
 
 
 { ---------------------------------------------------------------------
     TWriter Methods
   ---------------------------------------------------------------------}
-  
+
 Constructor TWriter.Create(S : TStream);
 
 begin
@@ -431,7 +431,7 @@ begin
 end;
 
 
-Procedure TWriter.WriteNilProperty(Const Name : Shortstring); 
+Procedure TWriter.WriteNilProperty(Const Name : Shortstring);
 
 begin
   WritePropName(Name);
@@ -558,7 +558,7 @@ begin
 end;
 
 Procedure TWriter.WritePrefix(Flags: TFilerFlags; AChildPos: Integer);
- 
+
 begin
 end;
 
@@ -629,7 +629,10 @@ end;
 
 {
   $Log$
-  Revision 1.5  2000-01-06 01:20:33  peter
+  Revision 1.6  2000-01-07 01:24:33  peter
+    * updated copyright to 2000
+
+  Revision 1.5  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.2  2000/01/04 18:07:16  michael

fcl/inc/zstream.pp

@@ -2,7 +2,7 @@ unit zstream;
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     Implementation of compression streams.
 

fcl/linux/classes.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by Michael Van Canneyt and Florian Klaempfl
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
 
     Classes unit for linux
 
@@ -47,7 +47,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.14  2000-01-07 00:01:33  peter
+  Revision 1.15  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.14  2000/01/07 00:01:33  peter
     * uses typinfo moved to interface
 
   Revision 1.13  2000/01/06 01:20:33  peter

fcl/linux/pipes.inc

@@ -1,10 +1,10 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by Michael Van Canneyt
+    Copyright (c) 1999-2000 by Michael Van Canneyt
 
     Linux specific part of pipe stream.
-    
+
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 

fcl/linux/thread.inc

@@ -1,8 +1,18 @@
 {
-  $Id$
+    $Id$
+    This file is part of the Free Component Library (FCL)
+    Copyright (c) 1999-2000 by Peter Vreman
 
-  Linux TThread implementation
-}
+    Linux TThread implementation
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
 
 type
   PThreadRec=^TThreadRec;
@@ -273,7 +283,10 @@ end;
 
 {
   $Log$
-  Revision 1.7  2000-01-06 01:20:33  peter
+  Revision 1.8  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.7  2000/01/06 01:20:33  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:09  peter

fcl/os2/classes.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by Michael Van Canneyt and Florian Klaempfl
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
 
     Classes unit for win32
 
@@ -39,7 +39,10 @@ uses typinfo;
 end.
 {
   $Log$
-  Revision 1.7  2000-01-06 01:20:34  peter
+  Revision 1.8  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.7  2000/01/06 01:20:34  peter
     * moved out of packages/ back to topdir
 
   Revision 1.2  2000/01/04 18:10:03  michael

fcl/os2/pipes.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by Michael Van Canneyt
+    Copyright (c) 1999-2000 by Michael Van Canneyt
 
     DOS/go32v2 specific part of pipe stream.
     

fcl/os2/thread.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -92,7 +92,10 @@ end;
 
 {
   $Log$
-  Revision 1.3  2000-01-06 01:20:34  peter
+  Revision 1.4  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.3  2000/01/06 01:20:34  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:09  peter

fcl/shedit/doc_text.pp

@@ -2,7 +2,7 @@
     $Id$
 
     "SHEdit" - Text editor with syntax highlighting
-    Copyright (C) 1999  Sebastian Guenther ([email protected])
+    Copyright (C) 1999-2000 by Sebastian Guenther ([email protected])
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -261,7 +261,10 @@ end.
 
 {
   $Log$
-  Revision 1.6  2000-01-06 01:20:34  peter
+  Revision 1.7  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.6  2000/01/06 01:20:34  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:09  peter

fcl/shedit/drawing.inc

@@ -2,7 +2,7 @@
     $Id$
 
     "SHEdit" - Text editor with syntax highlighting
-    Copyright (C) 1999  Sebastian Guenther ([email protected])
+    Copyright (C) 1999-2000 by Sebastian Guenther ([email protected])
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -243,7 +243,10 @@ end;
 
 {
   $Log$
-  Revision 1.7  2000-01-06 01:20:34  peter
+  Revision 1.8  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.7  2000/01/06 01:20:34  peter
     * moved out of packages/ back to topdir
 
   Revision 1.2  2000/01/05 19:03:16  sg

fcl/shedit/gtk/gtkdemo.pp

@@ -2,7 +2,7 @@
     $Id$
 
     GTK (demo) implementation for shedit
-    Copyright (C) 1999  Sebastian Guenther ([email protected])
+    Copyright (C) 1999-2000 by Sebastian Guenther ([email protected])
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -108,7 +108,10 @@ end.
 
 {
   $Log$
-  Revision 1.2  2000-01-06 16:12:53  sg
+  Revision 1.3  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.2  2000/01/06 16:12:53  sg
   * The demo can't display the file README anymore now in this directory,
     as it doesn't exist here... not it displays the source of gtkshedit.pp
     without syntax highlighting.

fcl/shedit/gtk/gtkshedit.pp

@@ -2,7 +2,7 @@
     $Id$
 
     GTK implementation for SHEdit
-    Copyright (C) 1999  Sebastian Guenther ([email protected])
+    Copyright (C) 1999-2000 by Sebastian Guenther ([email protected])
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -585,7 +585,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2000-01-06 16:03:26  peter
+  Revision 1.2  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.1  2000/01/06 16:03:26  peter
     * moved gtkshedit to gtk dir
 
   Revision 1.12  2000/01/06 01:20:34  peter

fcl/shedit/keys.inc

@@ -2,7 +2,7 @@
     $Id$
 
     "SHEdit" - Text editor with syntax highlighting
-    Copyright (C) 1999  Sebastian Guenther ([email protected])
+    Copyright (C) 1999-2000 by Sebastian Guenther ([email protected])
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -498,7 +498,10 @@ end;
 
 {
   $Log$
-  Revision 1.9  2000-01-06 01:20:34  peter
+  Revision 1.10  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.9  2000/01/06 01:20:34  peter
     * moved out of packages/ back to topdir
 
   Revision 1.2  2000/01/05 19:05:31  sg

fcl/shedit/sh_pas.pp

@@ -2,7 +2,7 @@
     $Id$
 
     "SHEdit" - Text editor with syntax highlighting
-    Copyright (C) 1999  Sebastian Guenther ([email protected])
+    Copyright (C) 1999-2000 by Sebastian Guenther ([email protected])
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -313,7 +313,10 @@ end.
 
 {
   $Log$
-  Revision 1.4  2000-01-06 01:20:34  peter
+  Revision 1.5  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.4  2000/01/06 01:20:34  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:09  peter

fcl/shedit/sh_xml.pp

@@ -2,7 +2,7 @@
     $Id$
 
     "SHEdit" - Text editor with syntax highlighting
-    Copyright (C) 1999  Sebastian Guenther ([email protected])
+    Copyright (C) 1999-2000 by Sebastian Guenther ([email protected])
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -243,7 +243,10 @@ end.
 
 {
   $Log$
-  Revision 1.4  2000-01-06 01:20:34  peter
+  Revision 1.5  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.4  2000/01/06 01:20:34  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:09  peter

fcl/shedit/shedit.pp

@@ -2,7 +2,7 @@
     $Id$
 
     "SHEdit" - Text editor with syntax highlighting
-    Copyright (C) 1999  Sebastian Guenther ([email protected])
+    Copyright (C) 1999-2000 by Sebastian Guenther ([email protected])
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -458,7 +458,10 @@ end.
 
 {
   $Log$
-  Revision 1.11  2000-01-06 16:43:35  sg
+  Revision 1.12  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.11  2000/01/06 16:43:35  sg
   * Re-introduced StartSelectionChange and EndSelectionChange, which get lost
     during some file movements...
 

fcl/shedit/undo.inc

@@ -2,7 +2,7 @@
     $Id$
 
     "SHEdit" - Text editor with syntax highlighting
-    Copyright (C) 1999  Sebastian Guenther ([email protected])
+    Copyright (C) 1999-2000 by Sebastian Guenther ([email protected])
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -136,7 +136,10 @@ end;
 
 {
   $Log$
-  Revision 1.4  2000-01-06 01:20:34  peter
+  Revision 1.5  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.4  2000/01/06 01:20:34  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:10  peter

fcl/template/classes.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by Michael Van Canneyt and Florian Klaempfl
+    Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl
 
     Classes unit for win32
 
@@ -37,7 +37,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.3  2000-01-06 01:20:34  peter
+  Revision 1.4  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.3  2000/01/06 01:20:34  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:10  peter

fcl/template/header

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.

fcl/template/template.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by xxxx
+    Copyright (c) 1999-2000 by xxxx
     member of the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
@@ -23,7 +23,10 @@ end.
 
 {
   $Log$
-  Revision 1.3  2000-01-06 01:20:35  peter
+  Revision 1.4  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.3  2000/01/06 01:20:35  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:10  peter

fcl/template/thread.inc

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Component Library (FCL)
-    Copyright (c) 1998 by the Free Pascal development team
+    Copyright (c) 1999-2000 by the Free Pascal development team
 
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
@@ -92,7 +92,10 @@ end;
 
 {
   $Log$
-  Revision 1.3  2000-01-06 01:20:35  peter
+  Revision 1.4  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.3  2000/01/06 01:20:35  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:10  peter

fcl/tests/testrtf.pp

@@ -1,7 +1,7 @@
 {
     $Id$
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by Michael Van Canneyt, member of the
+    Copyright (c) 1999-2000 by Michael Van Canneyt, member of the
     Free Pascal development team
 
     This program demonstrates the RTF parser object.

fcl/win32/pipes.inc

@@ -4,7 +4,7 @@
     Copyright (c) 1998 by Michael Van Canneyt
 
     Win32 part of pipe stream.
-    
+
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 
@@ -27,7 +27,7 @@ Const piInheritablePipe : TSecurityAttributes = (
 
 
       PipeBufSize = 1024;
-      
+
 
 Function CreatePipeHandles (Var Inhandle,OutHandle : Longint) : Boolean;
 

fcl/xml/dom.pp

@@ -1,7 +1,7 @@
 {
     $Id$
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 Sebastian Guenther ([email protected])
+    This file is part of the Free Component Library
+    Copyright (c) 1999-2000 by Sebastian Guenther
 
     Implementation of DOM level 1 interfaces
 
@@ -1256,7 +1256,10 @@ end.
 
 {
   $Log$
-  Revision 1.9  2000-01-06 23:55:22  peter
+  Revision 1.10  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.9  2000/01/06 23:55:22  peter
     * childnodes property as that is used instead of getchildnodes
       in the apps
 

fcl/xml/htmldoc.pp

@@ -1,12 +1,11 @@
 {
     $Id$
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 1998 by Michael Van Canneyt, member of 
-    the Free Pascal development team
+    This file is part of the Free Component Library
+    Copyright (c) 1999-2000 by Michael Van Canneyt
 
-    Implementation of a HTMLdocument class, 
+    Implementation of a HTMLdocument class,
     following the W3 recommendation.
-    
+
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 
@@ -35,7 +34,7 @@ THTMLHtmlElement = Class;
 THTMLHeadElement = Class;
 THTMLLinkElement = Class;
 THTMLTitleElement = Class;
-THTMLMetaElement = Class;  
+THTMLMetaElement = Class;
 THTMLBaseElement = Class;
 THTMLIsIndexElement = Class;
 THTMLStyleElement = Class;
@@ -47,7 +46,7 @@ THTMLTableSectionElement = Class;
     Miscellaneous objects
   ---------------------------------------------------------------------}
 
-// HTMLCollection  
+// HTMLCollection
 THTMLCollection = Class
   Private
     Flist : TList;
@@ -80,12 +79,12 @@ THTMLDocument = Class(TDOMDocument)
   Public
     Constructor Create; Override;
     Destructor Destroy; Override;
-    
+
     Procedure Open;
     Procedure Close;
     Procedure Write (TheText : DOMString);
     Procedure Writeln (TheText : DOMString);
-    Function GetElementById (Id :longword) : TDOMElement; 
+    Function GetElementById (Id :longword) : TDOMElement;
     Function GetElementByName (Name : DOMString) : TDOMNodeList;
 
     Property Title : DOMString Read FTitle Write FTitle;
@@ -118,7 +117,7 @@ THTMLElement = Class(TDOMElement)
     Property Lang : DOMString Read FLang Write FLang;
     Property Dir : DOMString Read FDir Write FDir;
     Property HTMLClassName : DOMString Read FHTMLClassName Write FHTMLClassName;
-  end;  
+  end;
 
 { ---------------------------------------------------------------------
     THTMLElement descendent classes
@@ -130,16 +129,16 @@ THTMLHtmlElement = Class(THTMLElement)
  Public
    Property Version : DOMString Read FVersion Write FVersion;
  end;
-   
+
 THTMLHeadElement = Class(THTMLElement)
-  Private 
+  Private
     FProfile : DOMString;
-  Public 
+  Public
     Property Profile : DOMString Read FProfile Write FProfile;
   end;
-  
+
 THTMLLinkElement = Class(THTMLElement)
-  Private 
+  Private
     FDisabled : Boolean;
     FCharset,
     FHREF,
@@ -159,14 +158,14 @@ THTMLLinkElement = Class(THTMLElement)
     Property Target : DOMString Read FTarget Write FTarget;
     Property HTMLType : DOMString Read FHTMLType Write FHTMLtype;
   end;
-    
+
 THTMLTitleElement = Class(THTMLElement)
   Private
     FHTMLtext : DOMString;
   Public
     Property HTMLText : DOMString Read FHTMLText Write FHTMLtext;
-  end; 
-  
+  end;
+
 THTMLMetaElement = Class(THTMLElement)
   Private
     FContent,
@@ -179,7 +178,7 @@ THTMLMetaElement = Class(THTMLElement)
     Property Name : DOMString Read FName Write FName;
     Property Scheme : DOMString Read FScheme Write FScheme;
   end;
-  
+
 THTMLBaseElement = Class(TDOMElement)
   Private
     FHref,
@@ -188,7 +187,7 @@ THTMLBaseElement = Class(TDOMElement)
     Property HRef : DOMString Read FHref Write FHRef;
     Property Target : DOMstring Read FTarget Write FTarget;
   end;
-  
+
 THTMLIsIndexElement = Class(THTMLElement)
   Private
     FForm : THTMLFormElement;
@@ -197,8 +196,8 @@ THTMLIsIndexElement = Class(THTMLElement)
     Property Form : THTMLFormElement Read FForm;
     Property Prompt : DOMString Read FPrompt Write FPrompt;
   end;
-  
-  
+
+
 THTMLStyleElement = Class(THTMLElement)
   Private
     FDisabled : Boolean;
@@ -208,7 +207,7 @@ THTMLStyleElement = Class(THTMLElement)
     Property Disabled : Boolean Read FDisabled Write FDisabled;
     Property HTMLtype : DOMString Read FHTMLType Write FHTMLtype;
   end;
-  
+
 THTMLBodyElement = Class(THTMLElement)
   Private
     Falink,
@@ -968,8 +967,8 @@ THTMLBodyElement = Class(THTMLElement)
       Property compact : boolean Read Fcompact Write Fcompact;
       Property htmltype : DOMString Read Ftype Write Ftype;
   End;
-  
-implementation    
+
+implementation
 
 { ---------------------------------------------------------------------
     THTMLCollection
@@ -1010,7 +1009,7 @@ Var I : longword;
 begin
   Name:=UpperCase(Name);
   // linear search, since the list is not ordered.
-  // W3 says nothing about ordering; maybe we can implement it ? 
+  // W3 says nothing about ordering; maybe we can implement it ?
   For i:=0 to FList.Count-1 do
     If UpperCase(TDomNode(FList[i]).NodeName)=Name then
       begin
@@ -1023,7 +1022,7 @@ end;
 { ---------------------------------------------------------------------
     THTMLDocument class
   ---------------------------------------------------------------------}
-  
+
 
 Constructor THTMLDocument.Create;
 
@@ -1063,7 +1062,7 @@ begin
 end;
 
 
-Function THTMLDocument.GetElementById (Id :longword) : TDOMElement; 
+Function THTMLDocument.GetElementById (Id :longword) : TDOMElement;
 
 begin
 end;
@@ -1074,7 +1073,7 @@ Function THTMLDocument.GetElementByName (Name : DOMString) : TDOMNodeList;
 begin
 end;
 
-    
+
 Constructor THTMLFormElement.Create(AOwner : TDOMDocument);
 
 begin

fcl/xml/xmlcfg.pp

@@ -1,10 +1,10 @@
 {
     $Id$
-    This file is part of the Free Pascal run time library.
-    Copyright (c)  1999 Sebastian Guenther, [email protected]
+    This file is part of the Free Component Library
+    Copyright (c) 1999-2000 by Sebastian Guenther
 
     Implementation of TXMLConfig class
-    
+
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 
@@ -203,7 +203,10 @@ end.
 
 {
   $Log$
-  Revision 1.6  2000-01-06 01:20:37  peter
+  Revision 1.7  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.6  2000/01/06 01:20:37  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:11  peter

fcl/xml/xmlread.pp

@@ -1,7 +1,7 @@
 {
     $Id$
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 Sebastian Guenther
+    This file is part of the Free Component Library
+    Copyright (c) 1999-2000 by Sebastian Guenther
 
     XML reading routines.
 
@@ -985,7 +985,10 @@ end.
 
 {
   $Log$
-  Revision 1.12  2000-01-06 01:20:37  peter
+  Revision 1.13  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.12  2000/01/06 01:20:37  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:11  peter

fcl/xml/xmlwrite.pp

@@ -1,10 +1,10 @@
 {
     $Id$
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 1999 Sebastian Guenther, [email protected]
+    This file is part of the Free Component Library
+    Copyright (c) 1999-2000 by Sebastian Guenther
 
     XML writing routines
-    
+
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 
@@ -262,7 +262,10 @@ end.
 
 {
   $Log$
-  Revision 1.5  2000-01-06 01:20:37  peter
+  Revision 1.6  2000-01-07 01:24:34  peter
+    * updated copyright to 2000
+
+  Revision 1.5  2000/01/06 01:20:37  peter
     * moved out of packages/ back to topdir
 
   Revision 1.1  2000/01/03 19:33:12  peter