diff options
| author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2009-10-28 12:05:50 +0200 |
|---|---|---|
| committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2009-10-28 12:05:50 +0200 |
| commit | 5893143db25b14d1211247b48d456b84b10f0ecb (patch) | |
| tree | 74c6b951cb5ff53f95576370f0f959486e015889 | |
| parent | 0556658a26a2a41feb20b76013ff561cd795d6ce (diff) | |
| download | fpGUI-5893143db25b14d1211247b48d456b84b10f0ecb.tar.xz | |
Minor code formatting, 2 new types and project file update.
| -rw-r--r-- | src/HelpTopic.pas | 2 | ||||
| -rw-r--r-- | src/IPFFileFormatUnit.pas | 3 | ||||
| -rw-r--r-- | src/SearchTable.pas | 3 | ||||
| -rw-r--r-- | src/docdump/docdump.lpi | 7 | ||||
| -rw-r--r-- | src/docdump/docdump.lpr | 3 |
5 files changed, 13 insertions, 5 deletions
diff --git a/src/HelpTopic.pas b/src/HelpTopic.pas index 99bc098f..f9168a61 100644 --- a/src/HelpTopic.pas +++ b/src/HelpTopic.pas @@ -397,7 +397,7 @@ begin else Title := DefaultTitle; - _ContentsLevel := ( Flags and $f ); + _ContentsLevel := ( Flags and TOCEntryLevelMask ); _ShowInContents := Flags and TOCEntryHidden = 0; if _ContentsLevel = 0 then _ShowInContents := false; // hmmm.... diff --git a/src/IPFFileFormatUnit.pas b/src/IPFFileFormatUnit.pas index e26762ee..d5fef3ae 100644 --- a/src/IPFFileFormatUnit.pas +++ b/src/IPFFileFormatUnit.pas @@ -20,6 +20,9 @@ type pUInt16 = ^uint16; pUInt32 = ^uint32; pUInt8 = ^uint8; + Unsigned_31 = 0 .. (1 shl 31) - 1; // 31-bit type + Unsigned_4 = 0 .. (1 shl 4) - 1; // 4-bit type + PCharArray = packed array[ 0..0 ] of PCHar; UInt32Array = packed array[ 0..0 ] of UInt32; diff --git a/src/SearchTable.pas b/src/SearchTable.pas index 01a1fd51..49c67ff5 100644 --- a/src/SearchTable.pas +++ b/src/SearchTable.pas @@ -55,8 +55,7 @@ constructor TSearchTable.Create( Data: pointer; TopicCount: longint ); begin _Data := Data; - _RecordLengthIs16Bit := - RecordLengthIs16Bit; + _RecordLengthIs16Bit := RecordLengthIs16Bit; _Entries := TList.Create; _DictionaryCount := DictionaryCount; _TopicCount := TopicCount; diff --git a/src/docdump/docdump.lpi b/src/docdump/docdump.lpi index d0516e8d..ebcdd3f5 100644 --- a/src/docdump/docdump.lpi +++ b/src/docdump/docdump.lpi @@ -23,7 +23,7 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> - <Units Count="13"> + <Units Count="14"> <Unit0> <Filename Value="docdump.lpr"/> <IsPartOfProject Value="True"/> @@ -88,6 +88,11 @@ <IsPartOfProject Value="True"/> <UnitName Value="readcontrols"/> </Unit12> + <Unit13> + <Filename Value="readtoc.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="readtoc"/> + </Unit13> </Units> </ProjectOptions> <CompilerOptions> diff --git a/src/docdump/docdump.lpr b/src/docdump/docdump.lpr index 3354d457..135a64ad 100644 --- a/src/docdump/docdump.lpr +++ b/src/docdump/docdump.lpr @@ -11,7 +11,7 @@ uses {$ENDIF}{$ENDIF} Classes, SysUtils, IPFFileFormatUnit, IPFEscapeCodes, CustApp, readheader, filestreamhelper, readextfiles, readstrings, iterator_intf, iterator_impl, - readnlsdata, readfonts, readcontrols; + readnlsdata, readfonts, readcontrols, readtoc; type @@ -60,6 +60,7 @@ begin ProcessNLSData(FIn, FOut); ProcessFonts(FIn, FOut); ProcessControls(FIn, FOut); + ProcessTOC(FIn, FOut); finally FIn.Free; FOut.Free; |