* Removed conditional define. CHM always included

git-svn-id: trunk@9408 -
This commit is contained in:
michael 2007-12-07 10:55:17 +00:00
parent e261bd766c
commit 46f15635b6

View File

@ -15,14 +15,11 @@
{$mode objfpc} {$mode objfpc}
{$H+} {$H+}
{$DEFINE FPDOC_CHM}
unit dw_HTML; unit dw_HTML;
interface interface
uses Classes, DOM, DOM_HTML, dGlobals, PasTree, dWriter uses Classes, DOM, DOM_HTML, dGlobals, PasTree, dWriter, ChmWriter, ChmBase;
{$IFDEF FPDOC_CHM},ChmWriter, ChmBase{$ENDIF};
const const
// Subpage indices for modules // Subpage indices for modules
@ -255,17 +252,13 @@ type
Procedure CreateAllocator; override; Procedure CreateAllocator; override;
end; end;
{$DEFINE FPDOC_CHM}
{$IFDEF FPDOC_CHM}
{$DEFINE chmInterface} {$DEFINE chmInterface}
{$I dw_htmlchm.inc} {$I dw_htmlchm.inc}
{$UNDEF chmInterface} {$UNDEF chmInterface}
{$ENDIF}
implementation implementation
uses SysUtils, XHTML, XMLRead, XMLWrite, HTMWrite, sh_pas {$IFDEF FPDOC_CHM},chmsitemap{$ENDIF}; uses SysUtils, XHTML, XMLRead, XMLWrite, HTMWrite, sh_pas,chmsitemap;
Function FixHTMLpath(S : String) : STring; Function FixHTMLpath(S : String) : STring;
@ -3019,13 +3012,10 @@ initialization
// Do not localize. // Do not localize.
RegisterWriter(THTMLWriter,'html','HTML output using fpdoc.css stylesheet.'); RegisterWriter(THTMLWriter,'html','HTML output using fpdoc.css stylesheet.');
RegisterWriter(THTMWriter,'htm','HTM (8.3 filenames) output using fpdoc.css stylesheet.'); RegisterWriter(THTMWriter,'htm','HTM (8.3 filenames) output using fpdoc.css stylesheet.');
{$IFDEF FPDOC_CHM}
RegisterWriter(TCHMHTMLWriter,'chm','Compressed HTML file output using fpdoc.css stylesheet.'); RegisterWriter(TCHMHTMLWriter,'chm','Compressed HTML file output using fpdoc.css stylesheet.');
{$ENDIF}
finalization finalization
UnRegisterWriter('html'); UnRegisterWriter('html');
UnRegisterWriter('htm'); UnRegisterWriter('htm');
{$IFDEF FPDOC_CHM}
UnRegisterWriter('chm'); UnRegisterWriter('chm');
{$ENDIF}
end. end.