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

* Patch from DoDi to allow easy import

Browse Source 
git-svn-id: trunk@22150 -
This commit is contained in:
michael 2012-08-20 22:24:57 +00:00
parent 62eed2e3f2
commit 9d528c65e3
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/fpdoc/dwriter.pp
View File

@ -168,6 +168,7 @@ type
Function InterpretOption(Const Cmd,Arg : String) : Boolean; Virtual; Function InterpretOption(Const Cmd,Arg : String) : Boolean; Virtual;
Class Function FileNameExtension : String; virtual; Class Function FileNameExtension : String; virtual;
Class Procedure Usage(List : TStrings); virtual; Class Procedure Usage(List : TStrings); virtual;
Class procedure SplitImport(var AFilename, ALinkPrefix: String); virtual;
procedure WriteDoc; virtual; Abstract; procedure WriteDoc; virtual; Abstract;
Function WriteDescr(Element: TPasElement) : TDocNode; Function WriteDescr(Element: TPasElement) : TDocNode;
procedure WriteDescr(Element: TPasElement; DocNode: TDocNode); procedure WriteDescr(Element: TPasElement; DocNode: TDocNode);
@ -370,6 +371,19 @@ begin
// Do nothing. // Do nothing.
end; end;
class procedure TFPDocWriter.SplitImport(var AFilename, ALinkPrefix: String);
var
i: integer;
begin
//override in HTML and CHM writer
i := Pos(',', AFilename);
if i > 0 then
begin //split CSV into filename and prefix
ALinkPrefix := Copy(AFilename,i+1,Length(AFilename));
SetLength(AFilename, i-1);
end;
end;
Function TFPDocWriter.FindTopicElement(Node : TDocNode): TTopicElement; Function TFPDocWriter.FindTopicElement(Node : TDocNode): TTopicElement;
Var Var

6
utils/fpdoc/mkfpdoc.pp
View File

@ -186,16 +186,18 @@ var
i,j: Integer; i,j: Integer;
Engine : TFPDocEngine; Engine : TFPDocEngine;
Cmd,Arg : String; Cmd,Arg : String;
WriterClass: TFPDocWriterClass;
begin begin
FCurPackage:=APackage; FCurPackage:=APackage;
Engine:=TFPDocEngine.Create; Engine:=TFPDocEngine.Create;
try try
WriterClass:=GetWriterClass(Options.Backend);
For J:=0 to Apackage.Imports.Count-1 do For J:=0 to Apackage.Imports.Count-1 do
begin begin
Arg:=Apackage.Imports[j]; Arg:=Apackage.Imports[j];
i := Pos(',', Arg); WriterClass.SplitImport(Arg,Cmd);
Engine.ReadContentFile(Copy(Arg,1,i-1),Copy(Arg,i+1,Length(Arg))); Engine.ReadContentFile(Arg, Cmd);
end; end;
for i := 0 to APackage.Descriptions.Count - 1 do for i := 0 to APackage.Descriptions.Count - 1 do
Engine.AddDocFile(APackage.Descriptions[i],Options.donttrim); Engine.AddDocFile(APackage.Descriptions[i],Options.donttrim);