Lots up debug output added and some extras.

* The RichText View component is now up to date with
  the latest NewView from SVN. INF processing units
  are still way out dated.
* Debug output added and controlled via define in
  nvUtilities unit.

Signed-off-by: Graeme Geldenhuys <graeme@mastermaths.co.za>

4 files changed, 58 insertions, 18 deletions

diff --git a/src/HelpFile.pas b/src/HelpFile.pas
index b38e1972..0c6ce12d 100644
--- a/src/HelpFile.pas
+++ b/src/HelpFile.pas
@@ -206,6 +206,7 @@ destructor THelpFile.Destroy;
 var
   TopicIndex: longint;
 begin
+writeln('DEBUG:  THelpFile.Destroy >>>>');
   FreeMem( HighlightWords, _Dictionary.Count * sizeof( longint ) );
   FreeMem( _Data, _DataLen );
   for TopicIndex:= 0 to _Topics.Count - 1 do
@@ -214,6 +215,7 @@ begin
   _Index.Free;
   _Dictionary.Free;
   _SearchTable.Free;
+writeln('DEBUG:  THelpFile.Destroy <<<<<');
 end;
 
 procedure THelpFile.ReadContents;
diff --git a/src/docview.lpi b/src/docview.lpi
index bba79ea4..91cc0e95 100644
--- a/src/docview.lpi
+++ b/src/docview.lpi
@@ -27,15 +27,12 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="2">
+    <RequiredPackages Count="1">
       <Item1>
-        <PackageName Value="fpgui_richtext"/>
-      </Item1>
-      <Item2>
         <PackageName Value="fpgui_toolkit"/>
-      </Item2>
+      </Item1>
     </RequiredPackages>
-    <Units Count="16">
+    <Units Count="23">
       <Unit0>
         <Filename Value="docview.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -115,17 +112,54 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="SearchUnit"/>
       </Unit15>
+      <Unit16>
+        <Filename Value="../components/richtext/RichTextStyleUnit.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="RichTextStyleUnit"/>
+      </Unit16>
+      <Unit17>
+        <Filename Value="../components/richtext/CanvasFontManager.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="CanvasFontManager"/>
+      </Unit17>
+      <Unit18>
+        <Filename Value="../components/richtext/ACLStringUtility.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="ACLStringUtility"/>
+      </Unit18>
+      <Unit19>
+        <Filename Value="../components/richtext/RichTextDocumentUnit.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="RichTextDocumentUnit"/>
+      </Unit19>
+      <Unit20>
+        <Filename Value="../components/richtext/RichTextView.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="RichTextView"/>
+      </Unit20>
+      <Unit21>
+        <Filename Value="../components/richtext/RichTextLayoutUnit.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="RichTextLayoutUnit"/>
+      </Unit21>
+      <Unit22>
+        <Filename Value="../components/richtext/RichTextDisplayUnit.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="RichTextDisplayUnit"/>
+      </Unit22>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="8"/>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)/"/>
+      <OtherUnitFiles Value="../components/richtext/"/>
       <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <CStyleOperator Value="False"/>
+        <IncludeAssertionCode Value="True"/>
         <AllowLabel Value="False"/>
         <CPPInline Value="False"/>
       </SyntaxOptions>
@@ -135,15 +169,10 @@
         <OptimizationLevel Value="0"/>
       </Optimizations>
     </CodeGeneration>
-    <Linking>
-      <Debugging>
-        <GenerateDebugInfo Value="True"/>
-        <UseHeaptrc Value="True"/>
-      </Debugging>
-    </Linking>
     <Other>
       <CustomOptions Value="-O-
--dTimingX"/>
+-dTimingX
+"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
diff --git a/src/docview.lpr b/src/docview.lpr
index 8b001f6a..34e0c34e 100644
--- a/src/docview.lpr
+++ b/src/docview.lpr
@@ -8,10 +8,11 @@ uses
   {$ENDIF}{$ENDIF}
   Classes,
   {$IFDEF Timing}EpikTimer,{$ENDIF}
-  fpg_main, frm_main, DataTypes, HelpFileHeader, HelpWindow,
-  IPFEscapeCodes, HelpTopic, CompareWordUnit, SearchTable, TextSearchQuery,
-  nvUtilities, nvNullObjects, HelpFile, SearchUnit,
-  fpg_cmdlineparams, customstyle;
+  fpg_main, frm_main, DataTypes, HelpFileHeader, HelpWindow, IPFEscapeCodes,
+  HelpTopic, CompareWordUnit, SearchTable, TextSearchQuery, nvUtilities,
+  nvNullObjects, HelpFile, SearchUnit, fpg_cmdlineparams, customstyle,
+  RichTextStyleUnit, CanvasFontManager, ACLStringUtility, RichTextDocumentUnit,
+  RichTextView, RichTextLayoutUnit, RichTextDisplayUnit;
 
 
 procedure MainProc;
diff --git a/src/frm_main.pas b/src/frm_main.pas
index f0aa4462..34a2f73f 100644
--- a/src/frm_main.pas
+++ b/src/frm_main.pas
@@ -165,10 +165,12 @@ end;
 
 procedure TMainForm.MainFormDestroy(Sender: TObject);
 begin
+writeln('DEBUG:  TMainForm.MainFormDestroy >>>>');
   // save splitter position
   gINI.WriteInteger('Options', 'SplitterLeft', PageControl1.Width);
   // save form size and position
   gINI.WriteFormState(self);
+writeln('DEBUG:  TMainForm.MainFormDestroy <<<<');
 end;
 
 procedure TMainForm.miFileQuitClicked(Sender: TObject);
@@ -260,7 +262,9 @@ end;
 
 procedure TMainForm.MainFormCloseQuery(Sender: TObject; var CanClose: boolean);
 begin
+writeln('DEBUG:  TMainForm.MainFormCloseQuery >>>>>');
   CloseFile(True);
+writeln('DEBUG:  TMainForm.MainFormCloseQuery <<<<<');
 end;
 
 procedure TMainForm.PageControl1Change(Sender: TObject; NewActiveSheet: TfpgTabSheet);
@@ -713,6 +717,8 @@ Begin
   { TODO -oGraeme : We do not support images yet }
   ImageIndices.Free;
 
+//  writeln(lText);
+//  writeln('-----------------------------');
   RichView.AddText(PChar(lText));
 end;
 
@@ -759,6 +765,7 @@ var
   FileIndex: integer;
   lHelpFile: THelpFile;
 begin
+writeln('DEBUG:  TMainForm.Destroy >>>>');
   FFileOpenRecent := nil;   // it was a reference only
   if (Files <> nil) and (Files.Count > 0) then
   begin
@@ -771,7 +778,9 @@ begin
   end;
   Files.Clear;
   Files.Free;
+writeln('DEBUG:  TMainForm.Destroy   1');
   inherited Destroy;
+writeln('DEBUG:  TMainForm.Destroy <<<<');
 end;
 
 procedure TMainForm.AfterCreate;
@@ -1235,7 +1244,6 @@ begin
   mru.MaxItems        := gINI.ReadInteger('Options', 'MRUFileCount', 8);
   mru.ShowFullPath    := gINI.ReadBool('Options', 'ShowFullPath', True);
   mru.LoadMRU;
-
 end;