paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-10 21:49:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Hans-Peter Diettrich to extend and append filenameextension (bug 21101)

Browse Source 
git-svn-id: trunk@20091 -
This commit is contained in:
michael 2012-01-16 09:03:05 +00:00
parent df6957decb
commit 9788e2cad8
10 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/fpdoc/dw_html.pp
View File

@ -255,6 +255,7 @@ type
Function InterPretOption(Const Cmd,Arg : String) : boolean; override;
Procedure WriteDoc; override;
Class Function FileNameExtension : String; override;
class procedure Usage(List: TStrings); override;
Property SearchPage: String Read FSearchPage Write FSearchPage;
property Allocator: TFileAllocator read FAllocator;
@ -3454,6 +3455,11 @@ begin
List.Add(SHTMLImageUrl);
end;
Class Function THTMLWriter.FileNameExtension : String;
begin
result:='.html';
end;
// private methods
function THTMLWriter.GetPageCount: Integer;

2
utils/fpdoc/dw_ipflin.pas
View File

@ -89,7 +89,6 @@ type
procedure EndOverview; override;
procedure WriteOverviewMember(const ALabel,AName,Access,ADescr : String); override;
procedure WriteOverviewMember(const ALabel,AName,ADescr : String); override;
class function FileNameExtension: string; override;
procedure DescrBeginURL(const AURL: DOMString); override;
procedure DescrEndURL; override;
// Description node conversion. Overrides for TFPDocWriter.
@ -141,6 +140,7 @@ type
// TFPDocWriter class methods
public
constructor Create(APackage: TPasPackage; AEngine: TFPDocEngine); override;
class function FileNameExtension: string; override;
end;

3
utils/fpdoc/dw_latex.pp
View File

@ -79,7 +79,6 @@ Type
procedure EndOverview; override;
procedure WriteOverviewMember(const ALabel,AName,Access,ADescr : String); override;
procedure WriteOverviewMember(const ALabel,AName,ADescr : String); override;
Class Function FileNameExtension : String; override;
// Description node conversion
procedure DescrBeginBold; override;
procedure DescrEndBold; override;
@ -131,6 +130,8 @@ Type
// TFPDocWriter class methods
Function InterPretOption(Const Cmd,Arg : String) : boolean; override;
Property ImageDir : String Read FImageDir Write FImageDir;
public
Class Function FileNameExtension : String; override;
end;

3
utils/fpdoc/dw_linrtf.pp
View File

@ -114,7 +114,6 @@ type
procedure WriteOverviewMember(const ALabel,AName,Access,ADescr : String); override;
procedure WriteOverviewMember(const ALabel,AName,ADescr : String); override;
procedure EndOverview; override;
Class Function FileNameExtension : String; override;
// Description node conversion
procedure DescrBeginBold; override;
procedure DescrEndBold; override;
@ -162,6 +161,8 @@ type
procedure DescrEndTableCell; override;
// TFPDocWriter class methods
Function InterPretOption(Const Cmd,Arg : String) : boolean; override;
public
Class Function FileNameExtension : String; override;
end;

3
utils/fpdoc/dw_lintmpl.pp
View File

@ -91,7 +91,6 @@ Type
procedure EndOverview; override;
procedure WriteOverviewMember(const ALabel,AName,Access,ADescr : String); override;
procedure WriteOverviewMember(const ALabel,AName,ADescr : String); override;
Class Function FileNameExtension : String; override;
// Description node conversion. Overrides for TFPDocWriter.
procedure DescrBeginBold; override;
procedure DescrEndBold; override;
@ -139,6 +138,8 @@ Type
procedure DescrEndTableCell; override;
// TFPDocWriter class methods
Function InterPretOption(Const Cmd,Arg : String) : boolean; override;
public
Class Function FileNameExtension : String; override;
Class procedure Usage(List: TStrings); override;
end;

2
utils/fpdoc/dw_man.pp
View File

@ -97,7 +97,6 @@ Type
procedure WriteCommentLine;
procedure WriteComment(Comment : String);
Procedure WriteExampleFile(FN : String); virtual;
Class Function FileNameExtension : String;virtual;
procedure WriteExample(ADocNode: TDocNode);
procedure WriteSeeAlso(ADocNode: TDocNode; Comma : Boolean);
Public
@ -178,6 +177,7 @@ Type
procedure DescrBeginTableCell; override;
procedure DescrEndTableCell; override;
Function InterPretOption(Const Cmd,Arg : String) : boolean; override;
Class Function FileNameExtension : String; override;
Class procedure Usage(List: TStrings); override;
end;

2
utils/fpdoc/dw_template.pp
View File

@ -161,7 +161,7 @@ Type
// Provide feedback about usage of this backend.
Class procedure Usage(List: TStrings); override;
// For info only. See linear writer for an example.
Class Function FileNameExtension : String;virtual;
Class Function FileNameExtension : String; override;
end;
implementation

2
utils/fpdoc/dw_txt.pp
View File

@ -82,7 +82,6 @@ Type
procedure EndOverview; override;
procedure WriteOverviewMember(const ALabel,AName,Access,ADescr : String); override;
procedure WriteOverviewMember(const ALabel,AName,ADescr : String); override;
Class Function FileNameExtension : String; override;
// Description node conversion
procedure DescrBeginBold; override;
procedure DescrEndBold; override;
@ -130,6 +129,7 @@ Type
procedure DescrEndTableCell; override;
Public
Constructor Create(APackage: TPasPackage; AEngine: TFPDocEngine); override;
Class Function FileNameExtension : String; override;
Class Procedure Usage(List : TStrings) ; override;
Function InterpretOption(Const Cmd,Arg : String) : Boolean; override;
end;

1
utils/fpdoc/dwlinear.pp
View File

@ -85,7 +85,6 @@ Type
procedure StartUnitOverview(AModuleName,AModuleLabel : String);virtual; Abstract;
procedure WriteUnitEntry(UnitRef : TPasType);virtual; Abstract;
procedure EndUnitOverview; virtual; Abstract;
Class Function FileNameExtension : String;virtual; Abstract;
Property LastURL : DomString Read FLastURL Write FLastURL;
Public
Constructor Create(APackage: TPasPackage; AEngine: TFPDocEngine); override;

7
utils/fpdoc/dwriter.pp
View File

@ -160,6 +160,7 @@ type
Property ImageExtension : String Read FImgExt Write FImgExt;
// Should return True if option was succesfully interpreted.
Function InterpretOption(Const Cmd,Arg : String) : Boolean; Virtual;
Class Function FileNameExtension : String; virtual;
Class Procedure Usage(List : TStrings); virtual;
procedure WriteDoc; virtual; Abstract;
Function WriteDescr(Element: TPasElement) : TDocNode;
@ -350,6 +351,12 @@ begin
Result:=False;
end;
class function TFPDocWriter.FileNameExtension: String;
begin
//Override in linear writers with the expected extension.
Result := ''; //Output must not contain an extension.
end;
Class procedure TFPDocWriter.Usage(List: TStrings);
begin
// Do nothing.