* fixes for html creation

docs/Makefile

@@ -40,7 +40,7 @@ endif
 ifndef LATEX2HTMLOPTS
 LATEX2HTMLOPTS = -no_reuse -up_url "../fpctoc.html"\
                  -up_title "Free Pascal manuals" -contents_in_navigation\
-                 -html_version 3.0
+                 -html_version 3.2
 endif
 
 # Ascii mode ? (i.e. no pics)
@@ -88,6 +88,7 @@ TOC = $(addsuffix .toc, $(HTML))
 AUX = $(addsuffix .aux, $(HTML))
 LOG = $(addsuffix .log, $(HTML))
 LOT = $(addsuffix .lot, $(HTML))
+OUT = $(addsuffix .out, $(HTML))
 CHK = $(addsuffix .chk, $(HTML) unitex refex)
 
 CHAPTERS = $(addsuffix .tex, crt dos getopts go32 graph linux printer\
@@ -151,23 +152,23 @@ help:
 
 clean:
 	-rm -rf $(HTML)
-	-rm -f $(TOC) $(LOG) $(DVI) $(PDF) $(AUX) $(PS) *.i* $(LOT) $(TXT) $(CHK)
+	-rm -f $(TOC) $(LOG) $(DVI) $(PDF) $(AUX) $(OUT) $(PS) *.i* $(LOT) $(TXT) $(CHK)
+# Units
 	-$(MAKE) -C crtex clean
 	-$(MAKE) -C dosex clean
 	-$(MAKE) -C go32ex clean
+	-$(MAKE) -C heapex clean
+	-$(MAKE) -C ipcex clean
 	-$(MAKE) -C linuxex clean
 	-$(MAKE) -C mouseex clean
-	-$(MAKE) -C optex clean
+	-$(MAKE) -C objectex clean
+	-$(MAKE) -C opclean clean
 	-$(MAKE) -C printex clean
 	-$(MAKE) -C sockex clean
-	-$(MAKE) -C mouseex clean
-	-$(MAKE) -C go32ex clean
 	-$(MAKE) -C stringex clean
-	-$(MAKE) -C refex clean
-	-$(MAKE) -C heapex clean
-	-$(MAKE) -C objectex clean
-	-$(MAKE) -C ipcex clean
 	-$(MAKE) -C sysutex clean
+# Reference
+	-$(MAKE) -C refex clean
 
 $(TXT) : %.txt: %.dvi
 
@@ -179,17 +180,16 @@ unitex.chk:
 	$(MAKE) -C crtex tex
 	$(MAKE) -C dosex tex
 	$(MAKE) -C go32ex tex
+	$(MAKE) -C heapex tex
+	$(MAKE) -C ipcex tex
 	$(MAKE) -C linuxex tex
-	$(MAKE) -C optex tex
 	$(MAKE) -C mouseex tex
+	$(MAKE) -C objectex tex
+	$(MAKE) -C optex tex
 	$(MAKE) -C printex tex
-	$(MAKE) -C stringex tex
 	$(MAKE) -C sockex tex
-	$(MAKE) -C mouseex tex
-	$(MAKE) -C go32ex tex
-	$(MAKE) -C heapex tex
-	$(MAKE) -C objectex tex
-	$(MAKE) -C ipcex tex
+	$(MAKE) -C stringex tex
+	$(MAKE) -C sysutex tex
 	touch unitex.chk
 
 refex.chk:
@@ -329,6 +329,7 @@ examples:
 	$(MAKE) -C stringex
 	$(MAKE) -C ipcex
 	$(MAKE) -C objectex
+	$(MAKE) -C sysutex
 
 dosexamples: examples
 	$(MAKE) -C go32ex
@@ -341,7 +342,10 @@ linuxexamples: examples
 
 #
 # $Log$
-# Revision 1.22  1999-05-31 16:37:08  peter
+# Revision 1.23  1999-06-02 17:41:33  peter
+#   * fixes for html creation
+#
+# Revision 1.22  1999/05/31 16:37:08  peter
 #   * fixes for html creation
 #
 # Revision 1.21  1999/05/28 19:59:37  michael

docs/fpc-html.tex

@@ -29,28 +29,20 @@
 %
 %  The environments
 %
-\newenvironment{functionl}[2]{\subsection{#1}%
-\index{#1}\label{fu:#2}\begin{FPCList}}{\end{FPCList}}
-\newenvironment{procedurel}[2]{\subsection{#1}%
-\index{#1}\label{pro:#2}\begin{FPCList}}{\end{FPCList}}
+\newenvironment{functionl}[2]{\subsection{#1}\index{#1}\label{fu:#2}\begin{FPCList}}{\end{FPCList}}
+\newenvironment{procedurel}[2]{\subsection{#1}\index{#1}\label{pro:#2}\begin{FPCList}}{\end{FPCList}}
 \newenvironment{function}[1]{\begin{functionl}{#1}{#1}}{\end{functionl}}
 \newenvironment{procedure}[1]{\begin{procedurel}{#1}{#1}}{\end{procedurel}}
-\newcommand{\seefl}[2]{
-\htmlref{#1}{fu:#2}
-}
-\newcommand{\seepl}[2]{
-\htmlref{#1}{pro:#2}
-}
+\newcommand{\seefl}[2]{\htmlref{#1}{fu:#2}}
+\newcommand{\seepl}[2]{\htmlref{#1}{pro:#2}}
 %
 % Now the ones without label.
 %
 \newcommand{\seef}[1]{\seefl{#1}{#1}}
 \newcommand{\seep}[1]{\seepl{#1}{#1}}
 %
-\newcommand{\seet}[1]{
-\htmlref{#1}{sec:types}
-}
-\newcommand{\seem}[2] {\texttt{#1} (#2) }
+\newcommand{\seet}[1]{\htmlref{#1}{sec:types}}
+\newcommand{\seem}[2]{ \texttt{#1} (#2) }
 \newcommand{\var}[1]{\texttt {#1}}
 \newcommand{\file}[1]{\textsf {#1}}
 %
@@ -97,12 +89,14 @@
 \newenvironment{FPCtable}[2]{\begin{table}\caption{#2}\begin{center}\begin{tabular}{#1}}{\end{tabular}\end{center}\end{table}}
 % The same, but with label in third argument (tab:#3)
 \newenvironment{FPCltable}[3]{\begin{table}\caption{#2}\label{tab:#3}\begin{center}\begin{tabular}{#1}}{\end{tabular}\end{center}\end{table}}
+% Listings
+\newenvironment{listing}{\begin{verbatim}}{\end{verbatim}}
 %
 % Commands to reference these things.
 %
-\newcommand{\seet}[1]{table (\ref{tab:#1}) }
-\newcommand{\seec}[1]{chapter (\ref{ch:#1}) }
-\newcommand{\sees}[1]{section (\ref{se:#1}) }
+%\newcommand{\seet}[1]{table (\ref{tab:#1}) }
+%\newcommand{\seec}[1]{chapter (\ref{ch:#1}) }
+%\newcommand{\sees}[1]{section (\ref{se:#1}) }
 \htmladdtonavigation{%
 \htmladdnormallink{\htmladdimg{../buttons/search.gif}}{javascript:opensearch()}%
 }

docs/prog.tex

@@ -19,41 +19,47 @@
 %   Boston, MA 02111-1307, USA. 
 %
 \documentclass{report}
-\usepackage{a4}
+
+\usepackage{a4dutch}
+\usepackage{makeidx}
 \usepackage{html}
-\latex{\usepackage{multicol}}
-\latex{\usepackage{fpcman}}
 \usepackage{fancyheadings}
+\usepackage{fpc}
+\latex{\usepackage{multicol}}
+\latex{%
+  \ifpdf
+  \usepackage[pdftex,bookmarks=true]{hyperref}
+  \pdfcompresslevel=9
+  \pdfpagewidth=210mm
+  \pdfpageheight=297mm
+  \pdfinfo{/Author(Michael Van Canneyt)
+           /Title(Programmers' Guide)
+           /Subject(Free Pascal Programmers' guide)
+           /Keywords(Free Pascal)
+  }
+  \fi
+}
+\html{\input{fpc-html.tex}}
 \pagestyle{fancy}
 \renewcommand{\chaptermark}[1]{\markboth{#1}{}}
-\html{\input{fpc-html.tex}}
-% define the version number here, and not in the fpc.sty !!!
+\makeindex
 \newcommand{\remark}[1]{\par$\rightarrow$\textbf{#1}\par}
 \newcommand{\olabel}[1]{\label{option:#1}}
-% We should change this to something better. See \seef etc.
+%
+% start of document.
+%
 \title{Free Pascal \\ Programmers' manual}
 \docdescription{Programmers' manual for \fpc, version \fpcversion}
 \docversion{1.5}
 \input{date.inc}
 \author{Micha\"el Van Canneyt}
-\latex{%
-\ifpdf
-\usepackage[pdftex,bookmarks=true]{hyperref}
-\pdfcompresslevel=9
-\pdfpagewidth=210mm
-\pdfpageheight=297mm
-\pdfinfo{/Author(Michael Van Canneyt)
-/Title(Programmers' Guide)
-/Subject(Free Pascal Programmers' guide)
-/Keywords(Free Pascal)
-}
-\fi
-}
 \makeindex
 \begin{document}
 \maketitle
 \tableofcontents
 \newpage
+\listoftables
+\newpage
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Introduction
@@ -1832,7 +1838,7 @@ Procedure ProcName (Args : TPRocArgs); external 'Name' Index SomeIndex;
 This tells the compiler that the procedure \var{ProcName} resides in a
 dynamic link library, with index {SomeIndex}.
 
-\em{Remark:} Note that this is ONLY available under \windows and \ostwo.
+{\em Remark :} Note that this is ONLY available under \windows and \ostwo.
 \end{enumerate}
 
 In earlier versions of the \fpc compiler, the following construct was

docs/ref.tex

@@ -22,53 +22,59 @@
 %
 % Preamble
 %
-\usepackage{a4}
+\usepackage{a4dutch}
 \usepackage{makeidx}
-\usepackage{multicol}
 \usepackage{html}
 \usepackage{syntax}
+\usepackage{fancyheadings}
+\usepackage{fpc}
+\latex{\usepackage{multicol}}
+\latex{%
+  \ifpdf
+  \usepackage[pdftex,bookmarks=true]{hyperref}
+  \pdfcompresslevel=9
+  \pdfpagewidth=210mm
+  \pdfpageheight=297mm
+  \pdfinfo{/Author(Michael Van Canneyt)
+           /Title(Standard units Reference Guide)
+           /Subject(Free Pascal Reference guide)
+           /Keywords(Free Pascal, Language, System Unit)
+	   }
+  \fi
+} 
 %
 % syntax style
 %
-\latex{\input{syntax/diagram.tex}}
-\latex{\usepackage{fpc}}
-\latex{\usepackage{listings}\blankstringtrue%
-\selectlisting{tp}\stringstyle{\ttfamily}\keywordstyle{\bfseries}
-\prelisting{\sffamily\sloppy}}
+\input{syntax/diagram.tex}
+\latex{\usepackage{listings}\usepackage{lst017}\usepackage{lstdelphi}%
+  \blankstringtrue
+  \selectlisting{delphi}
+  \stringstyle{\ttfamily}
+  \keywordstyle{\bfseries}
+  \prelisting{\sffamily\sloppy}
+}
 \html{\input{fpc-html.tex}}
-\usepackage{fancyheadings}
 \pagestyle{fancy}
 \renewcommand{\chaptermark}[1]{\markboth{#1}{}}
-\latex{%
-\ifpdf
-\usepackage[pdftex,bookmarks=true]{hyperref}
-\pdfcompresslevel=9
-\pdfpagewidth=210mm
-\pdfpageheight=297mm
-\pdfinfo{/Author(Michael Van Canneyt)
-/Title(Standard units Reference Guide)
-/Subject(Free Pascal Reference guide)
-/Keywords(Free Pascal, Language, System Unit)
-}
-\fi
-}
-\makeindex
 %
 % start of document.
 %
-\begin{document}
 \title{Free Pascal :\\ Reference guide.}
 \docdescription{Reference guide for Free Pascal.}
 \docversion{1.4}
 \input{date.inc}
-\author{Micha\"el Van Canneyt
-% \\ Florian Kl\"ampfl
-}
+\author{Micha\"el Van Canneyt}
+\makeindex
+\begin{document}
 \maketitle
 \tableofcontents
 \newpage
 \listoftables
 \newpage
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Introduction
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{About this guide}
 This document describes all constants, types, variables, functions and
 procedures as they are declared in the system unit.
@@ -384,7 +390,6 @@ declaration at compile time.  This means that most of the functions
 in the Run-Time library cannot be used in a constant declaration.
 Operators such as \var{+, -, *, /, not, and, or, div(), mod(), ord(), chr(), 
 sizeof} can be used, however. For more information on expressions,
-\seec{Expressions}
 You can only declare constants of the following types: \var{Ordinal types},
 \var{Real types}, \var{Char}, and \var{String}. 
 The following are all valid constant declarations:

docs/syntax/numbers.syn

@@ -25,7 +25,9 @@
  \begin{stack}
   \synt{digit\ sequence} \\
   \lit*{\$} \synt{hex\ digit\ sequence} \\
-  \lit*{\%} \synt{bin\ digit\ sequence}
+  \lit*{
+  \%
+  } \synt{bin\ digit\ sequence}
  \end{stack}
 \end{mysyntdiag}
 \begin{mysyntdiag}

docs/units.tex

@@ -24,29 +24,37 @@
 %
 % Preamble
 %
-\usepackage{a4}
+\usepackage{a4dutch}
 \usepackage{makeidx}
 \usepackage{html}
-\latex{\usepackage{fpc}}
-\latex{\usepackage{listings}\blankstringtrue%
-\selectlisting{tp}\stringstyle{\ttfamily}}
-\html{\input{fpc-html.tex}}
 \usepackage{fancyheadings}
-\pagestyle{fancy}
-\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
+\usepackage{fpc}
 \latex{%
-\ifpdf
-\usepackage[pdftex,bookmarks=true]{hyperref}
-\pdfcompresslevel=9
-\pdfpagewidth=210mm
-\pdfpageheight=297mm
-\pdfinfo{/Author(Michael Van Canneyt)
-/Title(Standard units Reference Guide)
-/Subject(Free Pascal Standard units reference guide)
-/Keywords(Free Pascal, Units,RTL)
+  \ifpdf
+  \usepackage[pdftex,bookmarks=true]{hyperref}
+  \pdfcompresslevel=9
+  \pdfpagewidth=210mm
+  \pdfpageheight=297mm
+  \pdfinfo{/Author(Michael Van Canneyt)
+           /Title(Standard units Reference Guide)
+           /Subject(Free Pascal Standard units reference guide)
+           /Keywords(Free Pascal, Units,RTL)
+  }
+  \fi
 }
-\fi
+%
+% syntax style
+%
+\latex{\usepackage{listings}\usepackage{lst017}\usepackage{lstdelphi}%
+  \blankstringtrue
+  \selectlisting{delphi}
+  \stringstyle{\ttfamily}
+  \keywordstyle{\bfseries}
+  \prelisting{\sffamily\sloppy}
 }
+\html{\input{fpc-html.tex}}
+\pagestyle{fancy}
+\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
 \makeindex
 %
 % start of document.

docs/user.tex

@@ -19,32 +19,32 @@
 %   Boston, MA 02111-1307, USA. 
 %
 \documentclass{report}
-\usepackage{a4}
+\usepackage{a4dutch}
 \usepackage{html}
+\usepackage{fancyheadings}
+\usepackage{fpcman}
+\html{\input{fpc-html.tex}}
 \latex{\usepackage{multicol}}
-\latex{\usepackage{fpcman}}
 \latex{\usepackage{epsfig}}
-\html{\input{fpc-html.tex}}
-\usepackage{fancyheadings}
+\latex{%
+  \ifpdf
+  \usepackage[pdftex,bookmarks=true]{hyperref}
+  \pdfcompresslevel=9
+  \pdfpagewidth=210mm
+  \pdfpageheight=297mm
+  \pdfinfo{/Author(Michael Van Canneyt)
+           /Title(Users' Guide)
+	   /Subject(Free Pascal Users' guide)
+	   /Keywords(Free Pascal)
+	   }
+  \fi
+} 
 \pagestyle{fancy}
 \renewcommand{\chaptermark}[1]{\markboth{#1}{}}
 \newcommand{\remark}[1]{\par$\rightarrow$\textbf{#1}\par}
 \newcommand{\olabel}[1]{\label{option:#1}}
 % We should change this to something better. See \seef etc.
 \newcommand{\seeo}[1]{See \ref{option:#1}}
-\latex{%
-\ifpdf
-\usepackage[pdftex,bookmarks=true]{hyperref}
-\pdfcompresslevel=9
-\pdfpagewidth=210mm
-\pdfpageheight=297mm
-\pdfinfo{/Author(Michael Van Canneyt)
-/Title(Users' Guide)
-/Subject(Free Pascal Users' guide)
-/Keywords(Free Pascal)
-}
-\fi
-}
 \makeindex
 \begin{document}
 \title{Free Pascal :\\ Users' manual}