* fixed pdf creating (merged)

docs/Makefile

@@ -93,10 +93,10 @@ export TMP=/tmp
 # End of configurable section. Do not edit after this line.
 #######################################################################
 
-PS = $(addsuffix .ps, $(HTML) onechap)
-DVI = $(addsuffix .dvi, $(HTML) onechap)
-TXT = $(addsuffix .txt, $(HTML) onechap)
-PDF = $(addsuffix .pdf, $(HTML) onechap)
+PS = $(addsuffix .ps, $(HTML))
+DVI = $(addsuffix .dvi, $(HTML))
+TXT = $(addsuffix .txt, $(HTML))
+PDF = $(addsuffix .pdf, $(HTML))
 TOC = $(addsuffix .toc, $(HTML) onechap)
 AUX = $(addsuffix .aux, $(HTML) onechap)
 LOG = $(addsuffix .log, $(HTML) onechap)
@@ -470,8 +470,11 @@ linuxexamples: examples
 
 #
 # $Log$
-# Revision 1.2  2000-09-02 17:36:02  peter
-#   * merged
+# Revision 1.3  2000-09-02 21:51:36  peter
+#   * fixed pdf creating (merged)
+#
+# Revision 1.1.2.1  2000/09/02 17:29:51  peter
+#   * example including for html docs
 #
 # Revision 1.1  2000/07/13 09:10:03  michael
 # + Initial import

docs/fpc.sty

@@ -20,6 +20,8 @@
 %
 \ProvidesPackage{fpc}[1996/12/09]
 \NeedsTeXFormat{LaTeX2e}
+\RequirePackage{multicol}
+\RequirePackage{epsfig}
 \RequirePackage{xspace}
 \RequirePackage{ifthen}
 \RequirePackage{listings}
@@ -183,7 +185,7 @@
 %
 % Some versions
 %
-\newcommand{\fpcversion}{1.0.0}
+\newcommand{\fpcversion}{1.0.2}
 %
 % PDF support
 %
@@ -194,18 +196,33 @@
   \pdfoutput=1
   \pdftrue
 \fi
-
+%
+% PDF stuff
+%
+\ifpdf
+  \usepackage[pdftex,bookmarks=true]{hyperref}
+  \usepackage{times}
+  \usepackage[T1]{fontenc}
+  \setcounter{secnumdepth}{1}
+  \pdfcompresslevel=9
+  \pdfpagewidth=210mm
+  \pdfpageheight=297mm
+\fi
+\usepackage{html}
+\usepackage{htmllist}
 %
 % For examples
 %
-\newcommand{\FPCexample}[1]{%
-\latex{\par \file{\textbf{Listing:} \exampledir/#1.pp}%
-\lstinputlisting{\exampledir/#1.pp}}%
-\html{\input{\exampledir/#1.tex}}}
-\newcommand{\Cexample}[1]{%
-\latex{\par \file{\textbf{Listing:} \exampledir/#1.c}%
-\lstinputlisting[language=c]{\exampledir/#1.c}}%
-\html{\input{\exampledir/#1.tex}}}
+\latex{%
+  \newcommand{\FPCexample}[1]{%
+    \par \file{\textbf{Listing:} \exampledir/#1.pp}%
+    \lstinputlisting{\exampledir/#1.pp}%
+  }
+  \newcommand{\Cexample}[1]{%
+    \par \file{\textbf{Listing:} \exampledir/#1.c}%
+    \lstinputlisting[language=c]{\exampledir/#1.c}%
+  }
+}
 \newcommand{\exampledir}{.}
 \newcommand{\FPCexampledir}[1]{\renewcommand{\exampledir}{#1}}
 %
@@ -230,12 +247,14 @@
 %
 % Set some listings options.
 %
-\usepackage{listings}%
-\lstset{language=Delphi}%
-\lstset{basicstyle=\sffamily\small}%
-\lstset{commentstyle=\itshape}%
-\lstset{keywordstyle=\bfseries}%
-\lstset{frame=tb}%
+\latex{%
+  \usepackage{listings}%
+  \lstset{language=Delphi}%
+  \lstset{basicstyle=\sffamily\small}%
+  \lstset{commentstyle=\itshape}%
+  \lstset{keywordstyle=\bfseries}%
+  \lstset{frame=tb}%
+}
 %
 % Page settings
 \setlength{\oddsidemargin}{20pt}
@@ -249,18 +268,4 @@
 \addtolength{\headwidth}{\marginparwidth}
 \addtolength{\headwidth}{-59pt}
 %
-% PDF stuff
-%
-\ifpdf
-\usepackage[pdftex,bookmarks=true]{hyperref}
-\usepackage{times}
-\usepackage[T1]{fontenc}
-\setcounter{secnumdepth}{1}
-\pdfcompresslevel=9
-\pdfpagewidth=210mm
-\pdfpageheight=297mm
-\fi
-\usepackage{html}
-\usepackage{htmllist}
-%
 % end of fpc.sty

docs/internal.tex

@@ -22,36 +22,26 @@
 %
 % Preamble
 %
-\usepackage{ifthen}
-\usepackage{xspace}
-\usepackage{a4dutch}
-\usepackage{makeidx}
-\usepackage{fancyheadings}
-\usepackage{epsfig}
-\usepackage{multicol}
 \ifx\pdfoutput\undefined
   \usepackage{html}
   \usepackage{htmllist}
+  \latex{\usepackage{fpc}}
+\else
+  \usepackage{fpc}
 \fi
-\latex{%
-  \ifpdf
-  \pdfcompresslevel=9
-  \pdfpagewidth=210mm
-  \pdfpageheight=297mm
+%
+\html{\input{fpc-html.tex}}
+%
+\ifpdf
   \pdfinfo{/Author(Michael Van Canneyt)
-           /Title(Compiler documentation)
+           /Title(Programmers' Guide)
            /Subject(Free Pascal Compiler documentation)
            /Keywords(Free Pascal, Compiler, Internals)
            }
-  \fi
-}
-%
-\latex{\usepackage{fpc}}
-\html{\input{fpc-html.tex}}
+\fi
 %
 % Settings
 %
-\pagestyle{fancy}
 \makeindex
 %
 % Start of document.

docs/onechap.tex

@@ -19,16 +19,33 @@
 %   Boston, MA 02111-1307, USA.
 %
 \documentclass{report}
-\usepackage{a4}
-\usepackage{makeidx}
-\usepackage{times}
+%
+% Preamble
+%
 \ifx\pdfoutput\undefined
   \usepackage{html}
   \usepackage{htmllist}
+  \latex{\usepackage{fpc}}
+\else
+  \usepackage{fpc}
 \fi
-\latex{\usepackage{listings}\lstset{language=delphi}}
-\latex{\usepackage{fpc}}
+%
 \html{\input{fpc-html.tex}}
+%
+\ifpdf
+  \pdfinfo{/Author(Michael Van Canneyt)
+           /Title(Programmers' Guide)
+           /Subject(Free Pascal Programmers' guide)
+           /Keywords(Free Pascal)
+           }
+\fi
+%
+% Settings
+%
+\makeindex
+%
+% Start document
+%
 \begin{document}
 \input{crt.tex}
 %\input{dos.tex}

docs/prog.tex

@@ -22,24 +22,23 @@
 %
 % Preamble
 %
-\usepackage{epsfig}
-\usepackage{multicol}
 \ifx\pdfoutput\undefined
   \usepackage{html}
   \usepackage{htmllist}
+  \latex{\usepackage{fpc}}
+\else
+  \usepackage{fpc}
 \fi
-\latex{%
-  \ifpdf
+%
+\html{\input{fpc-html.tex}}
+%
+\ifpdf
   \pdfinfo{/Author(Michael Van Canneyt)
            /Title(Programmers' Guide)
            /Subject(Free Pascal Programmers' guide)
            /Keywords(Free Pascal)
            }
-  \fi
-}
-%
-\latex{\usepackage{fpc}}
-\html{\input{fpc-html.tex}}
+\fi
 %
 % Settings
 %

docs/ref.tex

@@ -22,24 +22,26 @@
 %
 % Preamble
 %
-\usepackage{epsfig}
-\usepackage{multicol}
 \ifx\pdfoutput\undefined
   \usepackage{html}
   \usepackage{htmllist}
+  \latex{\usepackage{fpc}}
+\else
+  \usepackage{fpc}
 \fi
-\latex{%
-  \ifpdf
+%
+\html{\input{fpc-html.tex}}
+%
+\ifpdf
   \pdfinfo{/Author(Michael Van Canneyt)
            /Title(Standard units Reference Guide)
            /Subject(Free Pascal Reference guide)
            /Keywords(Free Pascal, Language, System Unit)
            }
-  \fi
-}
+\fi
+%
+% Settings
 %
-\latex{\usepackage{fpc}}
-\html{\input{fpc-html.tex}}
 \makeindex
 %
 % Syntax style

docs/units.tex

@@ -24,49 +24,32 @@
 %
 % Preamble
 %
-\usepackage{ifthen}
-\usepackage{xspace}
-\usepackage{a4}
-\usepackage{makeidx}
-\usepackage{syntax}
-\usepackage{fancyhdr}
 \ifx\pdfoutput\undefined
   \usepackage{html}
   \usepackage{htmllist}
+  \latex{\usepackage{fpc}}
+\else
+  \usepackage{fpc}
 \fi
-\latex{\usepackage{multicol}}
-\latex{%
-  \ifpdf
-  \pdfcompresslevel=9
-  \pdfpagewidth=210mm
-  \pdfpageheight=297mm
+%
+\html{\input{fpc-html.tex}}
+%
+\ifpdf
   \pdfinfo{/Author(Michael Van Canneyt)
            /Title(Standard units Reference Guide)
            /Subject(Free Pascal Standard units reference guide)
            /Keywords(Free Pascal, Units, RTL)
            }
-  \fi
-}
-%
-\latex{\usepackage{fpc}}
-\html{\input{fpc-html.tex}}
+\fi
 %
 % Settings
 %
-\pagestyle{fancy}
-\fancyhead[LO,RE]{}
 \makeindex
 %
 % Syntax style
 %
 \usepackage{syntax}
 \input{syntax/diagram.tex}
-\latex{
-\usepackage{listings}%
-\lstset{language=Delphi}%
-\lstset{pre=\sffamily}%
-\lstset{keywordstyle=\bfseries}%
-}
 %
 % Start of document.
 %

docs/user.tex

@@ -22,25 +22,30 @@
 %
 % Preamble
 %
+% Don't know why it's needed, but latex2html will else core dump
+% when trying to create an image
 \usepackage{epsfig}
 \usepackage{multicol}
 \ifx\pdfoutput\undefined
   \usepackage{html}
   \usepackage{htmllist}
+  \latex{\usepackage{fpc}}
+\else
+  \usepackage{fpc}
 \fi
-\latex{%
-  \usepackage{times}
-  \ifpdf
+%
+\html{\input{fpc-html.tex}}
+%
+\ifpdf
   \pdfinfo{/Author(Michael Van Canneyt)
            /Title(Users' Guide)
            /Subject(Free Pascal Users' guide)
            /Keywords(Free Pascal)
            }
-  \fi
-}
+\fi
+%
+% Settings
 %
-\latex{\usepackage{fpc}}
-\html{\input{fpc-html.tex}}
 \makeindex
 %
 % Start of document.