Synch with up-to-date code from the scsh repo.

This commit is contained in:
sperber 2003-01-10 13:26:24 +00:00
parent 5880441b02
commit 9eeb665323
2 changed files with 44 additions and 38 deletions

View File

@ -12,11 +12,11 @@
\def\Unix{{Unix}} % Not smallcaps, according to Bart. \def\Unix{{Unix}} % Not smallcaps, according to Bart.
\def\Scheme{{Scheme}} \def\Scheme{{Scheme}}
\def\scm{{Scheme 48}} \def\scm{{Scheme 48}}
\def\RnRS{R5RS\ } \def\RnRS{R5RS}
\def\Posix{\textsc{Posix}} \def\Posix{\textsc{Posix}}
\def\sharpf{\normalfont\texttt{\#f}} \def\sharpf{\textnormal{\texttt{\#f}}}
\def\sharpt{\normalfont\texttt{\#t}} \def\sharpt{\textnormal{\texttt{\#t}}}
\newcommand{\synteq}{\textnormal{::=}} \newcommand{\synteq}{\textnormal{::=}}
\def\maketildeother{\catcode`\~=12} \def\maketildeother{\catcode`\~=12}
@ -41,7 +41,6 @@
% For multiletter vars in math mode: % For multiletter vars in math mode:
\newcommand{\var}[1]{\mbox{\frenchspacing\it{#1}}} \newcommand{\var}[1]{\mbox{\frenchspacing\it{#1}}}
\newcommand{\vari}[2]{\ensuremath{\mbox{\it{#1}}_{#2}}} \newcommand{\vari}[2]{\ensuremath{\mbox{\it{#1}}_{#2}}}
\newcommand{\ovar}[1]{\mbox{\textnormal{[}\frenchspacing\it{#1}\textnormal{]}}}
%% What you frequently want when you say \tt: %% What you frequently want when you say \tt:
\def\ttchars{\catcode``=13\@noligs\frenchspacing} \def\ttchars{\catcode``=13\@noligs\frenchspacing}
@ -82,6 +81,8 @@
\newcommand{\note}[1]{\{Note #1\}} \newcommand{\note}[1]{\{Note #1\}}
\newcommand{\itum}[1]{\item{\bf #1}\\*}
% For use in code. The \llap magicness makes the lambda exactly as wide as % For use in code. The \llap magicness makes the lambda exactly as wide as
% the other chars in \tt; the \hskip shifts it right a bit so it doesn't % the other chars in \tt; the \hskip shifts it right a bit so it doesn't
% crowd the left paren -- which is necessary if \tt is cmtt. % crowd the left paren -- which is necessary if \tt is cmtt.
@ -128,6 +129,11 @@
\newcommand{\keyword} [1]{\index{#1}{\normalfont\textsf{#1}}} \newcommand{\keyword} [1]{\index{#1}{\normalfont\textsf{#1}}}
% \ex{#1} and also generates an index entry.
\newcommand{\exi}[1]{\index{#1@\texttt{#1}}\ex{#1}}
\newcommand{\indextt}[1]{\index{#1@\texttt{#1}}}
\newcommand{\evalto}{$\Longrightarrow$\ } \newcommand{\evalto}{$\Longrightarrow$\ }
\renewcommand{\star}{$^*$\/} \renewcommand{\star}{$^*$\/}
\newcommand{\+}{$^+$} \newcommand{\+}{$^+$}
@ -136,7 +142,7 @@
\newcommand{\sem}{\normalfont\itshape} %semantic font \newcommand{\sem}{\normalfont\itshape} %semantic font
\newcommand{\semvar}[1]{\textit{#1}} %semantic font \newcommand{\semvar}[1]{\textit{#1}} %semantic font
\newcommand{\synvar}[1]{\textrm{\textit{$<$#1$>$}}} %syntactic font \newcommand{\synvar}[1]{\textrm{\textit{$\left<\right.$#1$\left.\right>$}}} %syntactic font
\newcommand{\type}{\sem} \newcommand{\type}{\sem}
\newcommand{\zeroormore}[1]{{\sem #1$_1$ \ldots #1$_n$}} \newcommand{\zeroormore}[1]{{\sem #1$_1$ \ldots #1$_n$}}
\newcommand{\oneormore}[1]{{\sem #1$_1$ #1$_2$ \ldots #1$_n$}} \newcommand{\oneormore}[1]{{\sem #1$_1$ #1$_2$ \ldots #1$_n$}}
@ -209,7 +215,7 @@
\newcommand{\dfn} {\par\medskip\dfnx} % Takes 4 args, actually. \newcommand{\dfn} {\par\medskip\dfnx} % Takes 4 args, actually.
\newcommand{\dfni} {\par\medskip\dfnix} % Takes 5 args, actually. \newcommand{\dfni} {\par\medskip\dfnix} % Takes 5 args, actually.
\newcommand{\defvar} {\par\medskip\defvarx} % Takes 2 args, actually. \newcommand{\defvar} {\par\medskip\defvarx} % Takes 4 args, actually.
\newcommand{\defvarx}[2]% \newcommand{\defvarx}[2]%
{\index{#1} {\index{#1}
\hbox to \linewidth{\ttchars{{\ttt{#1}} \hfill #2}}}% \hbox to \linewidth{\ttchars{{\ttt{#1}} \hfill #2}}}%
@ -233,7 +239,7 @@
\bgroup\begin{list}{}{\topsep=0pt\parskip=0pt}\item[]} \bgroup\begin{list}{}{\topsep=0pt\parskip=0pt}\item[]}
{\end{list}\leavevmode\egroup\global\@ignoretrue} {\end{list}\leavevmode\egroup\global\@ignoretrue}
\newcommand{\defun} [3] {\dfn{#1}{#2}{#3}{procedure}} % preskip \def\defun#1#2#3{\dfn{#1}{#2}{#3}{procedure}} % preskip
\newcommand{\defunx}[3]{\dfnx{#1}{#2}{#3}{procedure}} % no skip \newcommand{\defunx}[3]{\dfnx{#1}{#2}{#3}{procedure}} % no skip
\newenvironment{defundescx}[3]% \newenvironment{defundescx}[3]%
@ -269,11 +275,4 @@
{\begin{figure}[#1]\begin{boxedminipage}{\linewidth}\vskip 1.5ex} {\begin{figure}[#1]\begin{boxedminipage}{\linewidth}\vskip 1.5ex}
{\end{boxedminipage}\end{figure}} {\end{boxedminipage}\end{figure}}
%FIXME-command: types out the desired FIXME
\newcommand{\FIXME}[1]%
{\typeout{**********************************}%
\typeout{FIXME: #1}%
\typeout{**********************************}}
\makeatother \makeatother

View File

@ -9,7 +9,7 @@
% tex2page man % tex2page man
\input css.t2p \input css.t2p
\dontuseimgforhtmlmath \htmlmathstyle{no-image}
\let\pagebreak\relax \let\pagebreak\relax
@ -63,34 +63,41 @@
\imgdef\vdots{\bf.\par.\par.} \imgdef\vdots{\bf.\par.\par.}
\evalh{ %\evalh{
%
%(define all-blanks?
% (lambda (s)
% (andmap
% char-whitespace?
% (string->list s))))
%
%}
%
%
%\def\spaceifnotempty{\evalh{
%
%(let ((x (ungroup (get-token))))
% (unless (all-blanks? x)
% (emit #\space)))
%
%}}
(define all-blanks? \def\spaceifnotempty#1{%
(lambda (s) \def\TEMP{#1}%
(andmap \ifx\TEMP\empty\else\ \fi}
char-whitespace?
(string->list s))))
}
\def\spaceifnotempty{\evalh{
(let ((x (ungroup (get-token))))
(unless (all-blanks? x)
(emit #\space)))
}}
\def\dfnix#1#2#3#4{\leftline{{\tt(#1\spaceifnotempty{#2}{\it#2})} \quad $\longrightarrow$ \quad {\it #3} \qquad (#4)} \index} \def\dfnix#1#2#3#4{\leftline{{\tt(#1\spaceifnotempty{#2}{\it#2})} \quad $\longrightarrow$ \quad {\it #3} \qquad (#4)} \index}
\def\ex#1{{\tt #1}} %\def\ex#1{{\tt #1}}
%\let\ex\texttt
\def\l#1{lambda (#1)} \def\l#1{lambda (#1)}
\def\lx#1{lambda {#1}} \def\lx#1{lambda {#1}}
%\def\notenum#1{} %\def\notenum#1{}
%\def\project#1{} %\def\project#1{}
\def\var#1{{\it #1\/}} %\def\var#1{{\it #1\/}}
\def\vari#1#2{\mbox{{\it #1\/}\undefcsactive\$$_{#2}$}} %\let\var\textit
%\def\vari#1#2{\mbox{{\it #1\/}\undefcsactive\$$_{#2}$}}
%\def\vari#1#2{\textit{#1}$_{#2}$}
\renewenvironment{boxedfigure}{\def\srecomment#1{\\#1\\}% \renewenvironment{boxedfigure}{\def\srecomment#1{\\#1\\}%
\begin{figure}\pagestyle}{\end{figure}} \begin{figure}\pagestyle}{\end{figure}}
@ -103,8 +110,8 @@
\def\evalto{==> }% \def\evalto{==> }%
\defcsactive\%{\%}\obeywhitespace} \defcsactive\%{\%}\obeywhitespace}
\newenvironment{code}{\begin{quote}\bgroup\setupcode\GOBBLEOPTARG} \newenvironment{code}{\begin{quote}\setupcode\GOBBLEOPTARG}
{\egroup\end{quote}} {\end{quote}}
\newenvironment{codebox}{\begin{tableplain}\bgroup\setupcode\GOBBLEOPTARG} \newenvironment{codebox}{\begin{tableplain}\bgroup\setupcode\GOBBLEOPTARG}
{\egroup\end{tableplain}} {\egroup\end{tableplain}}
@ -123,4 +130,4 @@
\renewenvironment{leftinset}{\begin{quote}}{\end{quote}} \renewenvironment{leftinset}{\begin{quote}}{\end{quote}}
\renewenvironment{tightinset}{\begin{quote}}{\end{quote}} \renewenvironment{tightinset}{\begin{quote}}{\end{quote}}
\renewenvironment{tightleftinset}{\begin{quote}}{\end{quote}} \renewenvironment{tightleftinset}{\begin{quote}}{\end{quote}}
} }