* merged

docs/Makefile

@@ -54,6 +54,10 @@ LATEX2HTMLOPTS = -no_reuse -up_url "../fpctoc.html"\
                  -html_version 4.0 -split 3 -image_type gif
 endif
 
+# Icons for latex2html
+ICONSERVER=../buttons
+export ICONSERVER
+
 # Ascii mode ? (i.e. no pics)
 ifndef ASCIIMODE
 ASCIIMODE=NO
@@ -89,16 +93,16 @@ export TMP=/tmp
 # End of configurable section. Do not edit after this line.
 #######################################################################
 
-PS = $(addsuffix .ps, $(HTML))
+PS = $(addsuffix .ps, $(HTML) onechap)
-DVI = $(addsuffix .dvi, $(HTML))
+DVI = $(addsuffix .dvi, $(HTML) onechap)
-TXT = $(addsuffix .txt, $(HTML))
+TXT = $(addsuffix .txt, $(HTML) onechap)
-PDF = $(addsuffix .pdf, $(HTML))
+PDF = $(addsuffix .pdf, $(HTML) onechap)
-TOC = $(addsuffix .toc, $(HTML))
+TOC = $(addsuffix .toc, $(HTML) onechap)
-AUX = $(addsuffix .aux, $(HTML))
+AUX = $(addsuffix .aux, $(HTML) onechap)
-LOG = $(addsuffix .log, $(HTML))
+LOG = $(addsuffix .log, $(HTML) onechap)
-LOT = $(addsuffix .lot, $(HTML))
+LOT = $(addsuffix .lot, $(HTML) onechap)
-OUT = $(addsuffix .out, $(HTML))
+OUT = $(addsuffix .out, $(HTML) onechap)
-CHK = $(addsuffix .chk, $(HTML) unitex refex)
+CHK = $(addsuffix .chk, $(HTML) progex unitex refex htex onechap)
 
 CHAPTERS = $(addsuffix .tex, crt dos getopts go32 graph linux printer\
              strings objects heaptrc sysutils ipc mouse gpm dxeload \
@@ -161,9 +165,9 @@ help:
 	@echo ' pdfdist       : pdf, and archive result.'
 
 clean:
+	-rm -f *.htex
 	-rm -rf $(HTML) onechap
 	-rm -f $(TOC) $(LOG) $(DVI) $(PDF) $(AUX) $(OUT) $(PS) *.i* $(LOT) $(TXT) $(CHK)
-	-rm -f onechap.dvi onechap.aux onechap.log onechap.chk
 
 # Units
 	-$(MAKE) -C crtex clean
@@ -212,6 +216,12 @@ ifndef INSTALLDEBUG
 endif
 	touch refex.chk
 
+progex.chk:
+ifndef INSTALLDEBUG
+	$(MAKE) -C progex tex
+endif
+	touch progex.chk
+
 messages: 
 	msg2inc -TE ../compiler/errore.msg messages.tex
 
@@ -250,15 +260,19 @@ all : dvi ps pdf txt html
 # Html creation
 #####################################################################
 
-user: user.chk
+htex: htex.chk
+htex.chk: $(wildcard *.tex)
+	./tex2htex
+	touch htex.chk
 
-user.chk: user.tex date.inc
+user: user.chk
+user.chk: htex.chk date.inc
 ifdef INSTALLDEBUG
 	mkdir user
 	cp user.tex user/index.html
 else
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 2 -link 2\
-         -t "User's guide for Free Pascal" user.tex
+	-t "User's guide for Free Pascal" user.htex
 	-sed -f foot.sed <user/footnode.html >user/footnote.html
 	-mv user/footnote.html user/footnode.html
 	-rm -f user/labels.pl user/internals.pl user/.*.pag user/.*.dir
@@ -267,14 +281,13 @@ endif
 	touch user.chk
 
 units: units.chk
-
+units.chk: unitex.chk htex.chk date.inc
-units.chk: units.tex unitex.chk date.inc
 ifdef INSTALLDEBUG
 	mkdir units
 	cp units.tex units/index.html
 else
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 3 -link 2\
-        -t "Unit reference for Free Pascal" units.tex
+	-t "Unit reference for Free Pascal" units.htex
 	-sed -f foot.sed <units/footnode.html >units/footnote.html
 	-mv units/footnote.html units/footnode.html
 	-rm -f units/labels.pl units/internals.pl units/.*.pag units/.*.dir
@@ -283,14 +296,13 @@ endif
 	touch units.chk
 
 ref: ref.chk
-
+ref.chk: refex.chk htex.chk date.inc
-ref.chk: refex.chk ref.tex date.inc
 ifdef INSTALLDEBUG
 	mkdir ref
 	cp ref.tex ref/index.html
 else
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 4 -link 2\
-        -t "Free Pascal reference guide" ref.tex
+	-t "Free Pascal reference guide" ref.htex
 	-sed -f foot.sed <ref/footnode.html >ref/footnote.html
 	-mv ref/footnote.html ref/footnode.html
 	-rm -f ref/labels.pl ref/internals.pl ref/.*.pag ref/.*.dir
@@ -299,14 +311,13 @@ endif
 	touch ref.chk	
 
 prog: prog.chk
-
+prog.chk: progex.chk htex.chk date.inc
-prog.chk: prog.tex date.inc
 ifdef INSTALLDEBUG
 	mkdir prog
 	cp prog.tex prog/index.html
 else
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 2 -link 2\
-        -t "Free Pascal programmers guide" prog.tex
+	-t "Free Pascal programmers guide" prog.htex
 	-sed -f foot.sed <prog/footnode.html >prog/footnote.html
 	-mv prog/footnote.html prog/footnode.html
 	-rm -f prog/labels.pl prog/internals.pl prog/.*.pag prog/.*.dir
@@ -315,14 +326,13 @@ endif
 	touch prog.chk
 
 internal: internal.chk
-
+internal.chk: htex.chk date.inc
-internal.chk: internal.tex date.inc
 ifdef INSTALLDEBUG
 	mkdir internal
 	cp internal.tex internal/index.html
 else
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 4 -link 2\
-        -t "Free Pascal Compiler Documentation" internal.tex
+	-t "Free Pascal Compiler Documentation" internal.htex
 	-sed -f foot.sed <internal/footnode.html >internal/footnote.html
 	-mv internal/footnote.html internal/footnode.html
 	-rm -f internal/labels.pl internal/internals.pl internal/.*.pag internal/.*.dir
@@ -331,14 +341,13 @@ endif
 	touch internal.chk	
 
 onechap: onechap.chk
-
+onechap.chk: unitex.chk htex.chk date.inc
-onechap.chk: onechap.tex date.inc
 ifdef INSTALLDEBUG
 	mkdir onechap
 	cp onechap.tex onechap/index.html
 else
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 4 -link 2\
-        -t "Free Pascal reference guide" onechap.tex
+	-t "Free Pascal reference guide" onechap.htex
 	-sed -f foot.sed <onechap/footnode.html >onechap/footnote.html
 	-mv onechap/footnote.html onechap/footnode.html
 	-rm -f onechap/labels.pl onechap/internals.pl onechap/.*.pag onechap/.*.dir
@@ -348,6 +357,7 @@ endif
 
 html: $(HTML)
 
+
 #####################################################################
 # Installation
 #####################################################################
@@ -460,7 +470,10 @@ linuxexamples: examples
 
 #
 # $Log$
-# Revision 1.1  2000-07-13 09:10:03  michael
+# Revision 1.2  2000-09-02 17:36:02  peter
+#   * merged
+#
+# Revision 1.1  2000/07/13 09:10:03  michael
 # + Initial import
 #
 # Revision 1.40  2000/07/11 18:07:26  peter

docs/fpc-html.tex

@@ -108,6 +108,7 @@
 % some OSes
 %
 \newcommand{\linux}{\textsc{linux}\xspace}
+\newcommand{\unix}{\textsc{unix}\xspace}
 \newcommand{\dos}  {\textsc{dos}\xspace}
 \newcommand{\msdos}{\textsc{ms-dos}\xspace}
 \newcommand{\ostwo}{\textsc{os/2}\xspace}
@@ -139,4 +140,4 @@
 
 %
 % end of fpc-html.tex
-%
+%

docs/fpc.sty

@@ -166,6 +166,7 @@
 % some OSes
 %
 \newcommand{\linux}{\textsc{linux}\xspace}
+\newcommand{\unix}{\textsc{unix}\xspace}
 \newcommand{\dos}  {\textsc{dos}\xspace}
 \newcommand{\msdos}{\textsc{ms-dos}\xspace}
 \newcommand{\ostwo}{\textsc{os/2}\xspace}
@@ -234,8 +235,7 @@
 \lstset{basicstyle=\sffamily\small}%
 \lstset{commentstyle=\itshape}%
 \lstset{keywordstyle=\bfseries}%
-\lstset{frame=tb}
+\lstset{frame=tb}%
-\lstset{blankstring=true}%
 %
 % Page settings
 \setlength{\oddsidemargin}{20pt}
@@ -263,4 +263,4 @@
 \usepackage{html}
 \usepackage{htmllist}
 %
-% end of fpc.sty
+% end of fpc.sty

docs/internal.tex

@@ -33,7 +33,6 @@
   \usepackage{html}
   \usepackage{htmllist}
 \fi
-\usepackage{fpc}
 \latex{%
   \ifpdf
   \pdfcompresslevel=9
@@ -47,6 +46,7 @@
   \fi
 }
 %
+\latex{\usepackage{fpc}}
 \html{\input{fpc-html.tex}}
 %
 % Settings

docs/linux.tex

@@ -961,7 +961,7 @@ On error, -1 is returned to the parent, and no child is created.
 \seef{Fork}, \seem{clone}{2}
 \end{function}
 
-\FPCexample{ex14}
+\FPCexample{ex71}
 
 \begin{function}{CloseDir}
 \Declaration
@@ -3398,7 +3398,7 @@ Other errors may occur, but aren't documented.
 
 \begin{function}{WaitPid}
 \Declaration
-Function WaitPid (Pid : longint; Status : pointer; Options : Integer) : Longint;
+Function WaitPid (Pid : longint; Status : pointer; Options : Longint) : Longint;
 \Description
  \var{WaitPid} waits for a child process with process ID \var{Pid} to exit. The
 value of \var{Pid} can be one of the following:
@@ -3419,6 +3419,8 @@ behaves:
 exited.
 \item [WUNTRACED] Causes \var{WaitPid} to return also for children which are
 stopped, but whose status has not yet been reported.
+\item[__WCLONE] Causes \var{WaitPid} also to wait for threads created by
+the \seef{Clone} call.
 \end{description} 
 Upon return, it returns the exit status of the process, or -1 in case of
 failure. 

docs/onechap.tex

@@ -26,22 +26,19 @@
   \usepackage{html}
   \usepackage{htmllist}
 \fi
-\usepackage{fpc}
+\latex{\usepackage{listings}\lstset{language=delphi}}
-\latex{
+\latex{\usepackage{fpc}}
-\usepackage{listings}
-\lstset{language=delphi}
-}
 \html{\input{fpc-html.tex}}
 \begin{document}
-%\input{crt.tex}
+\input{crt.tex}
 %\input{dos.tex}
-%\input{dxeload}
+%\input{dxeload.tex}
 %\input{emu387}
 %\input{getopts.tex}
 %\input{go32.tex}
 %\input{gpm.tex}
 %\input{graph.tex}
-\input{heaptrc.tex}
+%\input{heaptrc.tex}
 %\input{ipc.tex}
 %\input{ide.tex}
 %\input{linux.tex}

docs/prog.tex

@@ -28,7 +28,6 @@
   \usepackage{html}
   \usepackage{htmllist}
 \fi
-\usepackage{fpc}
 \latex{%
   \ifpdf
   \pdfinfo{/Author(Michael Van Canneyt)
@@ -39,6 +38,7 @@
   \fi
 }
 %
+\latex{\usepackage{fpc}}
 \html{\input{fpc-html.tex}}
 %
 % Settings
@@ -3039,11 +3039,8 @@ of this function. This has as a consequence that the return type is
 of your program.  This returns zero in the \fpc implementation of the
 system unit, since both code and data are in the same memory space.
 \item [Ptr:] Accepted a segment and offset from an address, and would return
-a pointer to this address. This has been changed in the run-time library.
+a pointer to this address. This has been changed in the run-time library, it
-Standard it returns now simply the offset. If you want to retain the old
+now simply returns the offset. 
-functionality, you can recompile the run-time library with the
-\var{DoMapping} symbol defined. This will restore the Turbo Pascal
-behaviour.
 \item [memw and mem] These arrays gave access to the \dos memory. \fpc
 supports them on the go32v2 platform, they are mapped into \dos memory
 space. You need the \var{GO32} unit for this. On other platforms, they are

docs/ref.tex

@@ -28,7 +28,6 @@
   \usepackage{html}
   \usepackage{htmllist}
 \fi
-\usepackage{fpc}
 \latex{%
   \ifpdf
   \pdfinfo{/Author(Michael Van Canneyt)
@@ -39,6 +38,7 @@
   \fi
 }
 %
+\latex{\usepackage{fpc}}
 \html{\input{fpc-html.tex}}
 \makeindex
 %

docs/units.tex

@@ -34,7 +34,6 @@
   \usepackage{html}
   \usepackage{htmllist}
 \fi
-\usepackage{fpc}
 \latex{\usepackage{multicol}}
 \latex{%
   \ifpdf
@@ -49,6 +48,7 @@
   \fi
 }
 %
+\latex{\usepackage{fpc}}
 \html{\input{fpc-html.tex}}
 %
 % Settings
@@ -129,7 +129,7 @@ lookup.
 % The graph unit
 \input{graph.tex}
 % The HeapTrc unit
-\input{heaptrc}
+\input{heaptrc.tex}
 % The IPC unit
 \input{ipc.tex}
 % the Linux unit

docs/user.tex

@@ -28,7 +28,6 @@
   \usepackage{html}
   \usepackage{htmllist}
 \fi
-\usepackage{fpc}
 \latex{%
   \usepackage{times}
   \ifpdf
@@ -40,6 +39,7 @@
   \fi
 }
 %
+\latex{\usepackage{fpc}}
 \html{\input{fpc-html.tex}}
 \makeindex
 %