+ Some changes to output handling, more suitable for tex output

utils/fpdoc/dw_html.pp

@@ -513,6 +513,7 @@ var
   PageDoc: TXMLDocument;
   Filename: String;
 begin
+  Engine.output:=IncludeTrailingBackSlash(Engine.output);
   for i := 0 to PageInfos.Count - 1 do
     with TPageInfo(PageInfos[i]) do
     begin
@@ -2577,7 +2578,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2003-03-17 23:03:20  michael
+  Revision 1.2  2003-03-18 19:28:44  michael
+  + Some changes to output handling, more suitable for tex output
+
+  Revision 1.1  2003/03/17 23:03:20  michael
   + Initial import in CVS
 
   Revision 1.15  2003/03/13 22:02:13  sg

utils/fpdoc/dw_latex.pp

@@ -25,8 +25,9 @@ interface
 uses DOM, dGlobals, PasTree;
 
 const
-  LateXHighLight: Boolean = False;
-
+  LateXHighLight : Boolean = False;
+  TexExtension   : String = '.tex';
+    
 procedure CreateLaTeXDocForPackage(APackage: TPasPackage; AEngine: TFPDocEngine);
 
 
@@ -250,10 +251,13 @@ end;
 
 procedure TLaTeXWriter.WriteDoc;
 var
-  i: Integer;
+  i : Integer;
+  
 begin
   PackageName := LowerCase(Copy(Package.Name, 2, 255));
-  Assign(f,  Engine.Output + PathDelim + PackageName + '.tex');
+  If (Engine.OutPut='') then
+    Engine.Output:=PackageName+TexExtension;
+  Assign(f, Engine.Output);
   Rewrite(f);
   try
     WriteLn('% This file has been created automatically by FPDoc,');
@@ -1298,7 +1302,10 @@ end.
 
 {
   $Log$
-  Revision 1.3  2003-03-18 19:12:29  michael
+  Revision 1.4  2003-03-18 19:28:44  michael
+  + Some changes to output handling, more suitable for tex output
+
+  Revision 1.3  2003/03/18 19:12:29  michael
   + More EscapeTex calls needed
 
   Revision 1.2  2003/03/18 01:11:51  michael

utils/fpdoc/fpdoc.pp

@@ -135,12 +135,8 @@ begin
     else if (Cmd = '-i') or (Cmd = '--input') then
       AddToFileList(InputFiles, Arg)
     else if (Cmd = '-o') or (Cmd = '--output') then
-    begin
-      Engine.Output := Arg;
-      if (Length(Engine.Output) > 0) and not
-        (Engine.Output[Length(Engine.Output)] in DirSeparators) then
-        Engine.Output := Engine.Output + PathDelim;
-    end else if Cmd = '--content' then
+      Engine.Output := Arg
+    else if Cmd = '--content' then
       ContentFile := Arg
     else if Cmd = '--import' then
       ReadContentFile(Arg)
@@ -148,6 +144,8 @@ begin
       PackageName := Arg
     else if Cmd = '--html-search' then
       SearchPage := Arg
+    else if Cmd = '--latex-extension' then
+      TexExtension:=Arg
     else
       WriteLn(StdErr, Format(SCmdLineInvalidOption, [s]));
   end;
@@ -292,7 +290,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2003-03-17 23:03:20  michael
+  Revision 1.2  2003-03-18 19:28:44  michael
+  + Some changes to output handling, more suitable for tex output
+
+  Revision 1.1  2003/03/17 23:03:20  michael
   + Initial import in CVS
 
   Revision 1.13  2003/03/13 22:02:13  sg