Commit efc3d8c5 authored by Raymond Toy's avatar Raymond Toy

Merge branch 'pfominykh-cmu-user-fixes' into 'master'

Restore hevea support for cmu-user

See merge request !35
parents 52a93a05 9b55c3e4
Pipeline #297 passed with stage
in 9 minutes and 19 seconds
......@@ -70,7 +70,7 @@ all: cmu-user.pdf
# the "-fix" option to hevea makes it run as many times as necessary
# to resolve all cross-references and generate an index.
%.html : %.tex $(FILES)
%.html : %.tex $(FILES) cmu-user.hva
$(HEVEA) -fix cmu-user.hva $<
$(HACHA) -tocbis $@
-$(TIDY) -m *.html
......@@ -105,6 +105,7 @@ clean:
rm -f *.log *.bbl *.blg *.ps *.pdf *.aux *.lof *.toc *.out *.ilg
rm -f *.vdx *.cdx *.tdx *.fdx *.idx *.cnd *.fnd *.tnd *.vnd *.haux
rm -f *.html *.hcnd *.htnd *.hvnd *.hfnd *.htoc
rm -f cmu-user.css
index:
makeindex cmu-user.tdx -o cmu-user.tnd
......
......@@ -295,7 +295,7 @@ This section describes the basic operations on Alien values.
\subsection{Alien Access Operations}
\begin{defun}{alien:}{deref}{\args{\var{pointer-or-array} \amprest \var{indices}}}
\begin{defun}{alien:}{deref}{\args{\var{pointer-or-array} \amprest{} \var{indices}}}
This function returns the value pointed to by an Alien pointer or
the value of an Alien array element. If a pointer, an optional
......@@ -766,7 +766,7 @@ and two return values (\var{a} and \var{i}).
macro:
\begin{defmac}{alien:}{def-callback}{\var{name} (\var{return-type}
\mstar{(arg-name arg-type)}) \ampbody\ body}
\mstar{(arg-name arg-type)}) \ampbody{} \var{body}}
This macro defines a Lisp function that can be called from C and a
Lisp variable. The arguments to the function must be alien types,
and the return type must also be an alien type. This Lisp function
......@@ -789,7 +789,7 @@ macro:
\code{def-callback} macro.
\end{defmac}
\begin{defmac}{alien:}{callback-funcall}{\var{callback-name} \amprest
\begin{defmac}{alien:}{callback-funcall}{\var{callback-name} \amprest{}
\var{args}}
This macro does the necessary stuff to call the callback named
\var{callback-name} with the given arguments.
......
......@@ -4,18 +4,24 @@
% to HTML using Hevea. By Luc Maranget and Eric Marsden.
\newif\ifhmode\hmodefalse
\newcommand{\xspace}{}
\newcommand{\pdfinfo}[1]{\@print{<!--} #1 \@print{-->}}
\let\hbox\mbox
\def\hfil{}
\def\hfill{}
\newcommand{\parbox}[3][]{\mbox{#3}}
\newcommand{\lengthtest}[1]{true}
\newenvironment{minipage}[2][]{}{}
\newcommand{\layout}[4][]
{\@open{DIV}{align=left}
\newcommand{\layout}[5][]
{\@open{DIV}{align=left}#5%
[#4] \\
\begin{tabbing}
\fcnname{#1}\fcnname{#2} #3 \@print{&nbsp;&nbsp;&nbsp;}
\end{tabbing}
\@close{DIV}}
\newcommand{\keys}[1]{\code{\&key}\@print{&nbsp;}\= #1}
\renewcommand{\textgreater}{\@print{&gt;}}
\renewcommand{\textless}{\@print{&lt;}}
% \newcommand{\layout}[4][]
% {\begin{tabular}
......@@ -26,13 +32,12 @@
% \end{tabular}}
\newcommand{\fcntype}[1]{\@open{TT}{class=function-type}#1\@close{TT}}
\newcommand{\argtype}[1]{\@open{TT}{class=argument-type}#1\@close{TT}}
\newcommand{\fcnname}[1]{\@open{TT}{class=function-name}#1\@close{TT}}
\newcommand{\var}[1]{\@open{TT}{class=variable}#1\@close{TT}}
\newcommand{\code}[1]{\@open{TT}{class=code}#1\@close{TT}}
\newcommand{\file}[1]{\@open{TT}{class=filename}#1\@close{TT}}
\newcommand{\fcntype}[1]{\@styleattr{TT}{class=function-type}#1\@clearstyle}
\newcommand{\argtype}[1]{\@styleattr{TT}{class=argument-type}#1\@clearstyle}
\newcommand{\fcnname}[1]{\@styleattr{TT}{class=function-name}#1\@clearstyle}
\newcommand{\var}[1]{\@styleattr{TT}{class=variable}#1\@clearstyle}
\newcommand{\code}[1]{\@styleattr{TT}{class=code}#1\@clearstyle}
\newcommand{\file}[1]{\@styleattr{TT}{class=filename}#1\@clearstyle}
%% Define a new type
%%
......@@ -40,40 +45,40 @@
%% some description
%% \end{deftp}
\newenvironment{deftp}[3]
{\par\bigskip\index[types]{#2|textbf}%
\layout{#2}{\var{#3}}{#1}
{\layout{#2}{\var{#3}}{#1}%
{\bigskip\index[types]{#2|textbf}}
\begin{quote}}
{\end{quote}}
%% Define a function
%%
%% \begin{defun}{pkg}{name}{params}
%% \begin{defun}[suffix]{pkg}{name}{params}
%% \defunx[pkg]{name}{params}
%% description of function
%% \end{defun}
\newenvironment{defun}[3]
{\par\defunvspace\fnindexbold{#2}\label{FN:#2}%
\layout[#1]{#2}{#3}{Function}
\newenvironment{defun}[4][]
{\layout[#2]{#3}{#4}{Function}%
{\defunvspace\fnindexbold{#3}\label{FN:#3#1}}
\begin{quote}}
{\end{quote}}
\newcommand{\defunx}[3][\mbox{}]{%
\par\fnindexbold{#2}\label{FN:#2}%
\layout[#1]{#2}{#3}{Function}}
\layout[#1]{#2}{#3}{Function}%
{\fnindexbold{#2}\label{FN:#2}}}
%% Define a macro
%%
%% \begin{defmac}{pkg}{name}{params}
%% \begin{defmac}[suffix]{pkg}{name}{params}
%% \defmacx[pkg]{name}{params}
%% description of macro
%% \end{defmac}
\newenvironment{defmac}[3]{%
\par\defunvspace\fnindexbold{#2}\label{FN:#2}%
\layout[#1]{#2}{#3}{Macro}
\newenvironment{defmac}[4][]{%
\layout[#2]{#3}{#4}{Macro}%
{\defunvspace\fnindexbold{#3}\label{FN:#3#1}}
\begin{quote}}
{\end{quote}}
\newcommand{\defmacx}[3][\mbox{}]{%
\par\fnindexbold{#2}\label{FN:#2}%
\layout[#1]{#2}{#3}{Function}}
\layout[#1]{#2}{#3}{Function}%
{\fnindexbold{#2}\label{FN:#2}}}
%% Define a variable
%%
......@@ -82,13 +87,13 @@
%% description of defvar
%% \end{defvar}
\newenvironment{defvar}[2]{%
\par\defunvspace\vrindexbold{#2}\label{VR:#2}
\layout[#1]{*#2*}{}{Variable}
\layout[#1]{*#2*}{}{Variable}%
{\defunvspace\vrindexbold{#2}\label{VR:#2}}
\begin{quote}}
{\end{quote}}
\newcommand{\defvarx}[2][\mbox{}]{%
\par\vrindexbold{#2}\label{VR:#2}
\layout[#1]{*#2*}{}{Variable}}
\layout[#1]{*#2*}{}{Variable}%
{\vrindexbold{#2}\label{VR:#2}}}
%% Define a constant
%%
......@@ -97,11 +102,12 @@
%% description of defconst
%% \end{defconst}
\newenvironment{defconst}[2]{%
\defunvspace\defconstx[#1]{#2}
\layout[#1]{#2}{}{Constant}%
{\defunvspace}
\begin{quote}}
{\end{quote}}
\newcommand{\defconstx}[2][\mbox{}]{%
\layout[#1]{#2}{}{Constant}}
\layout[#1]{#2}{}{Constant}{}}
......@@ -110,10 +116,10 @@
{\@open{BLOCKQUOTE}{class=example}\begin{alltt}}
{\end{alltt}\@close{BLOCKQUOTE}}
\newenvironment{lisp}
{\@open{BLOCKQUOTE}{CLASS=lisp} \begin{alltt}}
{\@open{BLOCKQUOTE}{CLASS=lisp}\begin{alltt}}
{\end{alltt}\@close{BLOCKQUOTE}}
\newcommand{\cmucl}{CMUCL}
\newcommand{\cmucl}{{\scshape cmucl}}
% there are no page numbers in HTML, so we need to override certain
% cross-referencing macros
......@@ -134,7 +140,7 @@
% disable ``this document generated by'' footer
\setcounter{footer}{0}
\def\@footer{}
% \htmlhead{\@print{
% <a href="../../">CMUCL</a> -&gt
......@@ -165,12 +171,19 @@
\setcounter{cuttingdepth}{10}
\input{report.hva}
\input{fancysection.hva}
%%\input{fancysection.hva}
\usepackage{color}
\definecolor{chapter}{rgb}{1, 1, 0.74}
\definecolor{part}{rgb}{1, 1, 0.81}
\definecolor{section}{rgb}{1, 1, 0.83}
\definecolor{subsection}{rgb}{1, 1, 0.89}
\definecolor{subsubsection}{rgb}{1, 1, 0.93}
\newstyle{.chapter}{padding:0.5ex;background-color:\@getstylecolor{chapter}}
\newstyle{.section} {padding:.5ex;background-color:\@getstylecolor{section}}%
\newstyle{.subsection} {padding:0.3ex;background-color:\@getstylecolor{subsection}}%
\newstyle{.subsubsection} {padding:0.5ex;background-color:\@getstylecolor{subsubsection}}%
\newstyle{.paragraph} {padding:0.5ex;background-color:\@getstylecolor{paragraph}}%
\renewcommand{\@bodyargs}{}
% EOF
......@@ -35,7 +35,7 @@ h3 {
.code {
background: #faf0e6;
border:solid #faf0e6 1px;
white-space:pre;
white-space:pre-line;
}
.technical {
......
......@@ -142,7 +142,7 @@ source file), and so is identified by the XREF facility by a string.
\end{defun}
\begin{defun}{xref:}{xref-context-file}{context}
\begin{defun}{xref:}{xref-context-file}{\var{context}}
Return the truename (in the sense of the variable
\vindexed{compile-file-truename}) of the source file from which the
referencing forms were compiled. This slot will be \nil{} if the
......@@ -150,7 +150,7 @@ source file), and so is identified by the XREF facility by a string.
listener.
\end{defun}
\begin{defun}{xref:}{xref-context-source-path}{context}
\begin{defun}{xref:}{xref-context-source-path}{\var{context}}
Return a list of positive integers identifying the form that
contains the cross-reference. The first integer in the source-path
is the number of the top-level form containing the cross-reference
......
......@@ -998,8 +998,7 @@ printing of the trace information and conditional breakpoints on
function entry or exit.
\begin{defmac}{}{trace}{%
\args{\mstar{option global-value} \mstar{name \mstar{option
value}}}}
\args{\mstar{option global-value} \mstar{name \mstar{option value}}}}
\code{trace} is a debugging tool that prints information when
specified functions are called. In its simplest form:
......
This diff is collapsed.
......@@ -80,7 +80,7 @@ See also \verb|cmucl(1)|. Currently \cmucl{} accepts the following
switches:
\begin{Lentry}
\item[\code{--help}] Same as \code{-help}.
\item[\code{-{}-help}] Same as \code{-help}.
\item[\code{-help}] Print ou the command line options and exit.
......
......@@ -161,7 +161,7 @@ could use \code{prin1-to-string} locally, send the string, and use
\end{defmac}
\begin{defmac}{wire:}{remote-value-bind}{%
\args{\var{wire} (\mstar{variable}) remote-form
\args{\var{wire} (\mstar{variable}) \var{remote-form}
\mstar{local-forms}}}
\code{remote-value-bind} is similar to \code{multiple-value-bind}
......
......@@ -348,10 +348,10 @@ this encoding and handle the surrogate pairs correctly.
\begin{defun}{}{string=}{\args \var{s1} \var{s2} \keys{\kwd{start1}
\kwd{end1} \kwd{start2} \kwd{end2}}}
\defunx{string/=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}}
\defunx{string$<$}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}}
\defunx{string$>$}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}}
\defunx{string$<$=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}}
\defunx{string$>$=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}}
\defunx{string\textless}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}}
\defunx{string\textgreater}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}}
\defunx{string\textless=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}}
\defunx{string\textgreater=}{\args \var{s1} \var{s2} \keys{\kwd{start1} \kwd{end1} \kwd{start2} \kwd{end2}}}
The string comparison is done in codepoint order. (This is
different from just comparing the order of the individual characters
due to surrogate pairs.) Unicode collation is not done.
......@@ -443,7 +443,7 @@ The Unicode data base is stored in compressed form in the file
\file{ext-formats:unidata.bin}. If this file is not found, Unicode
support is severely reduced; you can only use ASCII characters.
\begin{defun}{}{open}{\args \var{filename} \amprest \var{options}
\begin{defun}{}{open}{\args \var{filename} \amprest{} \var{options}
\keys{\kwd{direction} \kwd{element-type} \kwd{if-exists}
\kwd{if-does-not-exist} \morekeys \kwd{class} \kwd{mapped}
\kwd{input-handle} \kwd{output-handle}
......@@ -497,7 +497,7 @@ support is severely reduced; you can only use ASCII characters.
formats and composing external formats.
\end{defun}
\begin{defun}{extensions:}{describe-external-format}{external-format}
\begin{defun}{extensions:}{describe-external-format}{\var{external-format}}
Print a description of the given \var{external-format}. This may
cause the external format to be loaded (silently) if it is not
already loaded.
......@@ -627,12 +627,12 @@ An external format basically needs two functions:
external format is defined using the macro
\code{stream::define-external-format}.
\begin{defmac}[base]{stream:}{define-external-format}{\args \var{name}
(\keys{\var{base} \var{min} \var{max} \var{size}
\var{documentation}})
% tricky
\begin{defmac}[base]{stream::}{define-external-format}{\args \var{name}
(\keys{\kwd{base} \kwd{min} \kwd{max} \kwd{size} \kwd{documentation}})
(\amprest{} \var{slots})
\morekeys{\var{octets-to-code} \var{code-to-octets}
\var{flush-state} \var{copy-state}}}
\\
\= \ampoptional{} \var{octets-to-code} \var{code-to-octets} \var{flush-state} \var{copy-state}}
If \kwd{base} is not given, this defines a new external format of
......@@ -726,7 +726,7 @@ external format is defined using the macro
\subsection{Composing External Formats}
\begin{defmac}{stream:}{define-composing-external-format}{\args \var{name}
(\keys{\var{min} \var{max} \var{size} \var{documentation}}) \var{input}
(\keys{\kwd{min} \kwd{max} \kwd{size} \kwd{documentation}}) \var{input}
\var{output}}
This is the same as \code{define-external-format}, except that a
composing external format is created.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment