diff options
| -rw-r--r-- | manual/manual/Makefile | 2 | ||||
| -rw-r--r-- | manual/manual/manual.tex | 2 | ||||
| -rw-r--r-- | manual/manual/refman/expr.etex | 8 | ||||
| -rw-r--r-- | manual/manual/refman/exten.etex | 10 | ||||
| -rw-r--r-- | manual/manual/refman/refman.etex | 5 | ||||
| -rw-r--r-- | manual/manual/refman/types.etex | 2 | ||||
| -rw-r--r-- | manual/styles/syntaxdef.hva | 2 |
7 files changed, 19 insertions, 12 deletions
diff --git a/manual/manual/Makefile b/manual/manual/Makefile index 6ba5db4edf..2ed63c14af 100644 --- a/manual/manual/Makefile +++ b/manual/manual/Makefile @@ -64,7 +64,7 @@ html: files $(MLIS) ; \ cp -f ../style.css libref ; \ ${HEVEA} ${HTML} -I .. -I ../refman -I ../library -I ../cmds -I ../tutorials -I ../../styles -I ../texstuff manual.hva -e macros.tex ../manual.tex ;\ - ${HACHA} manual.html ;\ + ${HACHA} -tocter manual.html ;\ info: files diff --git a/manual/manual/manual.tex b/manual/manual/manual.tex index 68d3d416f8..aacc75520e 100644 --- a/manual/manual/manual.tex +++ b/manual/manual/manual.tex @@ -21,7 +21,7 @@ \raggedbottom \input{version.tex} -%HEVEA\setcounter{cuttingdepth}{0} +%HEVEA\setcounter{cuttingdepth}{1} %HEVEA\title{The Objective-Caml system, release \ocamlversion} \input{allfiles.tex} diff --git a/manual/manual/refman/expr.etex b/manual/manual/refman/expr.etex index 82f9521b6f..db0797afd5 100644 --- a/manual/manual/refman/expr.etex +++ b/manual/manual/refman/expr.etex @@ -293,9 +293,9 @@ match case to be selected. Guards occur just before the "->" token and are introduced by the "when" keyword: $$\begin{array}{rlll} -\token{function} & {\sl pattern}_1 \; [\token{when} \; {\sl cond}_1] & \token{->} & {\sl expr}_1 \\ +\token{function} & \nt{pattern}_1 \; [\token{when} \; \nt{cond}_1] & \token{->} & \nt{expr}_1 \\ \token{|} & \ldots \\ -\token{|} & {\sl pattern}_n \; [\token{when} \; {\sl cond}_n] & \token{->} & {\sl expr}_n +\token{|} & \nt{pattern}_n \; [\token{when} \; \nt{cond}_n] & \token{->} & \nt{expr}_n \end{array}$$ @@ -707,8 +707,8 @@ the latter operator should be used. Inside a class definition, coercions to the types newly defined introduce no subtyping (they behave just like type annotations), as the type abbreviations are not yet completely defined. There is an -exception for coercing @self@ to the (exact) type of its class: this -is allowed if the type of @self@ does not appear in a contravariant +exception for coercing @@self@@ to the (exact) type of its class: this +is allowed if the type of @@self@@ does not appear in a contravariant position in the class type, {\em i.e.} if there are no binary methods. \subsubsection*{Object duplication} diff --git a/manual/manual/refman/exten.etex b/manual/manual/refman/exten.etex index 032270d73c..0d3ba86ac2 100644 --- a/manual/manual/refman/exten.etex +++ b/manual/manual/refman/exten.etex @@ -258,7 +258,7 @@ abbreviations, where all aspects of the type implementation are publicized. Private type declarations come in three flavors: for variant and record types (section~\ref{s-private-types-variant}), for type abbreviations (section~\ref{s-private-types-abbrev}), -and for row types (section~\ref{s-private-row}). +and for row types (section~\ref{s-private-rows}). \subsection{Private variant and record types} \label{s-private-types-variant} @@ -338,11 +338,11 @@ supported: if "l" has type "N.t list", the coercion "(l :> int list)" returns the list of underlying integers, like "List.map N.to_int l" but without copying the list "l". -Note that the coercion "("@e@" :> "@typexp@")" is actually an abbreviated form, +Note that the coercion "("@expr@" :> "@typexpr@")" is actually an abbreviated form, and will only work in presence of private abbreviations if both the -type of @e@ and @typexp@ contain no type variables. If this is not the -case, you must use the full form "("@e@" : "@typ\_e@" :> "@typexp@")" where -@typ\_e@ is the expected type of @e@. Concretely, this would be "(x : +type of @expr@ and @typexpr@ contain no type variables. If this is not the +case, you must use the full form "("@expr@" : "@@typ\_e@@" :> "@typexpr@")" where +@@typ\_e@@ is the expected type of @expr@. Concretely, this would be "(x : N.t :> int)" and "(l : N.t list :> int list)" for the above examples. \subsection{Private row types} \label{s-private-rows} diff --git a/manual/manual/refman/refman.etex b/manual/manual/refman/refman.etex index ee22b5fcbe..5da2a58ee5 100644 --- a/manual/manual/refman/refman.etex +++ b/manual/manual/refman/refman.etex @@ -1,7 +1,12 @@ \chapter{The Objective Caml language} \label{c:refman} \pdfchapterfold{-12}{Reference manual for the Objective Caml language} +%HEVEA\cutname{language.html} +%better html output that way, sniff. +%HEVEA\subsection*{Foreword} +%BEGIN LATEX \section*{Foreword} +%END LATEX This document is intended as a reference manual for the Objective Caml language. It lists the language constructs, and gives their precise diff --git a/manual/manual/refman/types.etex b/manual/manual/refman/types.etex index 66437594b1..7fe35170ea 100644 --- a/manual/manual/refman/types.etex +++ b/manual/manual/refman/types.etex @@ -1,6 +1,6 @@ \section{Type expressions} \pdfsection{Type expressions} - +%HEVEA\cutname{types.html} \ikwd{as\@\texttt{as}} \begin{syntax} diff --git a/manual/styles/syntaxdef.hva b/manual/styles/syntaxdef.hva index cdac4c9653..877ac0044d 100644 --- a/manual/styles/syntaxdef.hva +++ b/manual/styles/syntaxdef.hva @@ -48,6 +48,8 @@ \stx@silent{definition}% \stx@silent{specification}% \stx@silent{type-equation}% +%%Redefined in names.etex +\stx@silent{label-name}% %%Not really defined in lexyacc.etex \stx@silent{character-set}% \stx@silent{symbol}% |