* Comments by Luk Vandelaer

docs/fpc.sty

@@ -89,7 +89,6 @@
 \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}}
-
 %
 % Refs
 %
@@ -98,9 +97,8 @@
 \newcommand{\seetyl}[2]{\textsf{#1} (\pageref{ty:#2})}
 \newcommand{\seec}[1]{chapter \ref{ch:#1}, page \pageref{ch:#1}\xspace}
 \newcommand{\sees}[1]{section \ref{se:#1}, page \pageref{se:#1}\xspace}
-\newcommand{\seeo}[1]{See \ref{option:#1}}
-\newcommand{\seet}[1]{table (\ref{tab:#1}) }
-
+\newcommand{\seeo}[1]{See \ref{option:#1}\xspace}
+\newcommand{\seet}[1]{table (\ref{tab:#1})\xspace}
 %
 % Function/procedure environments
 %
@@ -169,7 +167,6 @@
 % Some versions
 %
 \newcommand{\fpcversion}{0.99.12}
-
 %
 % PDF support
 %
@@ -183,4 +180,10 @@
   \fi
 }
 %
+% For examples
+%
+\newcommand{\FPCexample}[1]{\latex{\lstinputlisting{\exampledir/#1.pp}}\html{\input{\exampledir/#1.tex}}}
+\newcommand{\exampledir}{.}
+\newcommand{\FPCexampledir}[1]{\renewcommand{\exampledir}{#1}}
+%
 % end of fpc.sty

docs/onechap.tex

@@ -22,21 +22,14 @@
 \usepackage{a4}
 \usepackage{makeidx}
 \usepackage{html}
-\latex{%
-\usepackage{fpc}%
-\usepackage{listings}%
-\blankstringtrue%
-\selectlisting{tp}%
-\stringstyle{\ttfamily}%
-}
-\html{%
-\input{fpc-html.tex}%
-}
+\usepackage{fpc}
+\usepackage{listings}
+\lstset{language=delphi}
 \begin{document}
 %\input{crt.tex}
 %\input{dos.tex}
 %\input{getopts.tex}
-%\input{go32.tex}
+\input{go32.tex}
 %\input{graph.tex}
 %\input{heaptrc.tex}
 %\input{ipc.tex}
@@ -48,5 +41,5 @@
 %\input{sockets.tex}
 %\input{strings.tex}
 %\input{sysutils.tex}
-\input{makefile.tex}
+%\input{makefile.tex}
 \end{document}

docs/refex/ex13.pp

@@ -5,6 +5,6 @@ Program Example13;
 var W : word;
 
 begin
-  W:=CSeg; {W:=0, provided for comppatibility,
+  W:=CSeg; {W:=0, provided for compatibility,
                   FPC is 32 bit.}
 end.

docs/refex/ex23.pp

@@ -17,13 +17,13 @@ begin
     end;
   Close (F);
   Reset (F);
-  { If ll goes well, nothing is displayed here. }
+  { If all goes well, nothing is displayed here. }
   While not (Eof(F)) do
     begin
     FP:=FilePos (F);
     Read (F,L);
     if L<>FP then 
-      Writeln ('Something is wrong here ! : Got ',l,' on pos ',FP);
+      Writeln ('Something wrong: Got ',l,' on pos ',FP);
     end;
   Close (F);
   Erase (f);

docs/refex/ex25.pp

@@ -10,7 +10,7 @@ begin
     { Fill S with i spaces }
     FillChar (S,SizeOf(S),' ');
     { Set Length }
-    S[0]:=chr(i);
+    SetLength(S,I);
     Writeln (s,'*');
     end;
 end.

docs/syntax/fcall.syn

@@ -16,17 +16,10 @@
 \lit* ( 
 \[
 \<[b] 
-\synt{actual\ parameter} \\ 
+\synt{expression} \\ 
 \lit* , 
 \> 
 \]
 \lit* )
 \end{mysyntdiag}
-\begin{mysyntdiag}
-\synt{actual\ parameter} 
-\( 
-\synt{expression} \\ 
-\synt{variable\ reference}
-\)
-\end{mysyntdiag}
 \end{diagram}

docs/syntax/finally.syn

@@ -4,11 +4,10 @@
 \lit*{try}
 \synt{statement\ list}
 \lit*{finally}
-\synt{statement\ list}
+\synt{finally\ statements}
 \lit*{end}
 \end{mysyntdiag}
 \begin{mysyntdiag}
-\synt{statement\ list}
-\<[b] \synt{statement} \\ \lit*; \>
+\synt{finally\ statements} \synt{statement list}
 \end{mysyntdiag}
 \end{diagram}

docs/syntax/function.syn

@@ -12,7 +12,7 @@
 \synt{qualified\ method\ identifier}
 \)
 \synt{formal\ parameter\ list}
-\lit* : \( \synt{result\ type} \\ \lit*{string} \)
+\lit* : \synt{result\ type} 
 \[ \synt{modifiers} \]
 \end{mysyntdiag}
 \begin{mysyntdiag}

docs/syntax/modifiers.syn

@@ -5,7 +5,7 @@
 ; 
  \( 
  \lit*{public} \\
- \lit*{alias} \synt{string\ constant}\\
+ \lit*{alias} \lit* : \synt{string\ constant}\\
  \lit*{interrupt} \\
  \lit*{call\ modifiers}
 \)

docs/syntax/program.syn

@@ -17,6 +17,6 @@
 \end{mysyntdiag}
 \begin{mysyntdiag}
 \synt{uses\ clause}
-\lit*{uses} \<[b] \synt{identifier} \\ \lit* , \>
+\lit*{uses} \<[b] \synt{identifier} \\ \lit* , \> \lit* ;
 \end{mysyntdiag}
 \end{diagram}

docs/syntax/try.syn

@@ -4,7 +4,7 @@
 \lit*{try}
 \synt{statement\ list}
 \lit*{except}
-\synt{exception\ handling\ statements}
+\synt{exceptionhandlers}
 \lit*{end}
 \end{mysyntdiag}
 \begin{mysyntdiag}
@@ -12,16 +12,15 @@
 \<[b] \synt{statement} \\ \lit*; \>
 \end{mysyntdiag}
 \begin{mysyntdiag}
-\synt{exception\ handling\ statements}
-\(
-\<[b] \synt{exception\ handler} \\ \lit*; \>
+\synt{exceptionhandlers}
 \[
-  \lit*{else} \synt{statement\ list}
+   \<[b] \synt{exception\ handler} \\ \lit*; \>
+   \[ \lit*{else} \synt{statement\ list} \] \\
+   \synt{statement\ list}
 \]
-\synt{statement\ list}
-\)
 \end{mysyntdiag}
 \begin{mysyntdiag}
+\synt{exception\ handler}
 \lit*{on} \[ \synt{identifier} \lit* : \] 
 \synt{class\ type\ identifier}
 \lit*{do}

docs/syntax/typeclas.syn

@@ -43,7 +43,7 @@
 \)
 \lit*;
 \[
-  \( \lit*{virtual}  \\
+  \( \lit*{virtual} \[ \lit*; \lit*{abstract} \]  \\
      \lit*{override} \\
      \lit*{message} 
       \( \synt{integer\ constant} \\
@@ -52,9 +52,6 @@
 \lit*;
 \]
 \[ \synt{call\ modifiers} \lit*; \]
-\[
-\lit*{abstract} \lit*;
-\]
 \end{mysyntdiag}
 \begin{mysyntdiag}
 \synt{class\ visibility\ specifier}

docs/syntax/typeobj.syn

@@ -34,12 +34,10 @@
 \begin{mysyntdiag}
 \synt{method\ directives}
 \[
-\lit*{virtual} \lit*;
+\lit*{virtual} \lit*; 
+\[ \lit*{abstract} \lit*; \]
 \]
 \[ \synt{call\ modifiers} \lit*; \]
-\[
-\lit*{abstract} \lit*;
-\]
 \end{mysyntdiag}
 \begin{mysyntdiag}
 \synt{object\ visibility\ specifier}

docs/syntax/unit.syn

@@ -4,7 +4,9 @@
 \synt{unit\ header}
 \synt{interface\ part}
 \synt{implementation\ part}
-\[ \synt{initialization\ part} \]
+\[ \synt{initialization\ part} \[ \synt{finalization\ part} \] \\
+    \lit*{begin} \<[b] \synt{statement} \\ \lit* ; \>
+\]
 \lit*{end} \lit* .
 \end{mysyntdiag}
 \begin{mysyntdiag}
@@ -14,7 +16,7 @@
 \lit* ;
 \end{mysyntdiag}
 \begin{mysyntdiag}
-\synt{interface\ part} 
+\synt{interface\ part} \lit*{interface}
 \<[b]
   \[  \synt{constant\ declaration\ part} \\
       \synt{type\ declaration\ part}\\
@@ -35,7 +37,12 @@
 \end{mysyntdiag}
 \begin{mysyntdiag}
 \synt{initialization\ part}
-  \lit*{begin} 
+  \lit*{initialization} 
+  \<[b] \synt{statement} \\ \lit* ; \>
+\end{mysyntdiag}
+\begin{mysyntdiag}
+\synt{finalization\ part}
+  \lit*{finalization} 
   \<[b] \synt{statement} \\ \lit* ; \>
 \end{mysyntdiag}
 \end{diagram}

docs/units.tex

@@ -53,6 +53,7 @@
 % Settings
 %
 \pagestyle{fancy}
+\fancyhead[LO,RE]{}
 \makeindex
 %
 % Syntax style