From 7e9172217089ded0a0b2bc0d5a9354746f37b16d Mon Sep 17 00:00:00 2001 From: Bert Burgemeister Date: Mon, 15 Jan 2018 15:24:54 +0100 Subject: [PATCH] Remove a bit-rotten LaTeX dependency Minor layout modifications. --- Makefile | 2 +- clqr-arrays.tex | 35 +++--- clqr-characters.tex | 18 +-- clqr-clos.tex | 4 +- clqr-compiler.tex | 239 ++++++++++++++++++++------------------- clqr-conditions-and-errors.tex | 33 +++--- clqr-conses.tex | 177 +++++++++++++++-------------- clqr-external-environment.tex | 22 ++-- clqr-hash-tables.tex | 22 ++-- clqr-input-output.tex | 143 +++++++++++------------ clqr-numbers.tex | 45 ++++---- clqr-packages-and-symbols.tex | 35 +++--- clqr-sequences.tex | 46 ++++---- clqr-strings.tex | 18 +-- clqr-structures.tex | 10 +- clqr-types-and-classes.mp | 48 ++++---- clqr-typographic-conventions.tex | 10 +- clqr.macros.tex | 13 +-- clqr.packages.tex | 18 +-- clqr.tex | 113 ++++++++++-------- html-template/download.html | 2 +- html-template/index.html | 2 +- html-template/license.html | 4 +- html-template/printing.html | 2 +- html-template/source.html | 2 +- paper-a4.tex | 2 - paper-letter.tex | 2 - 27 files changed, 541 insertions(+), 526 deletions(-) diff --git a/Makefile b/Makefile index 5be770d..c5bec09 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,7 @@ sample-firstpage-consec.jpg: clqr-a4-consec.pdf $(RM) temp.jpg sample-source.jpg: clqr-numbers.tex - $(HEAD) -n 57 $< | $(TAIL) -n 40 | $(CONVERT) -font Courier -crop 120x80+30+2 +repage label:@- temp.jpg $(SEND-TO-LOG) + $(HEAD) -n 59 $< | $(TAIL) -n 40 | $(CONVERT) -font Courier -crop 120x80+30+2 +repage label:@- temp.jpg $(SEND-TO-LOG) $(MONTAGE) temp.jpg -tile 1x1 -geometry +1+1 -background gray $@ $(SEND-TO-LOG) $(RM) temp.jpg diff --git a/clqr-arrays.tex b/clqr-arrays.tex index 8ca63d8..ad04fa3 100644 --- a/clqr-arrays.tex +++ b/clqr-arrays.tex @@ -1,4 +1,5 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2018 +% Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -7,12 +8,12 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Arrays} +\section{Arrays} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \label{section:Arrays} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Predicates} +\subsection{Predicates} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -30,7 +31,7 @@ (\FU*{ARRAY-HAS-FILL-POINTER-P} \VAR{ array})}{.}} { \retval{\T} if \VAR{array} is adjustable/has a fill pointer, - respectively. + respectively. } \IT{(\FU*{ARRAY-IN-BOUNDS-P} \VAR{array} \Op{\VAR{subscripts}})} @@ -43,7 +44,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Array Functions} +\subsection{Array Functions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -58,8 +59,8 @@ \kwd{:initial-contents} \VAR{ tree-or-array}\\ \kwd{:displaced-to } \VAR{array}\DF{\NIL}\text{ } \Op{\kwd{:displaced-index-offset } \VAR{i}\DF{\LIT{0}}}}{.}}{\}})} - { - Return fresh, or readjust, respectively, \retval{vector} or \retval{array}. + { + Return fresh, or readjust, respectively, \retval{vector} or \retval{array}. } \IT{(\FU*{AREF} \VAR{array} \OP{\VAR{subscripts}})} @@ -82,7 +83,7 @@ \IT{(\FU*{ARRAY-DIMENSIONS} \VAR{array})} { - \retval{List} containing the lengths of \VAR{array}'s dimensions. + \retval{List} containing the lengths of \VAR{array}'s dimensions. } \IT{(\FU*{ARRAY-DIMENSION} \VAR{array} \VAR{i})} @@ -109,14 +110,14 @@ (\FU*{SBIT} \VAR{ simple-bit-array } \Op{\VAR{subscripts}})}{.}} { Return \retval{element} of \VAR{bit-array} or of - \VAR{simple-bit-array}. \kwd{setf}\-able. + \VAR{simple-bit-array}. \kwd{setf}\-able. } \IT{(\FU*{BIT-NOT} \DES{\VAR{bit-array}} \Op{\DES{\VAR{result-bit-array}}\DF{\NIL}})} { Return \retval{result} of bitwise negation of \VAR{bit-array}. If \VAR{result-bit-array} is \T, put result in \VAR{bit-array}; if it is \NIL, make a new array for - result. + result. } \IT{(\xorGOO{% @@ -136,7 +137,7 @@ (cf.\ operations of \FU{boole}, page \pageref{section:Logic Functions}) on \VAR{bit-array-a} and \VAR{bit-array-b}. If \VAR{result-bit-array} is \T, put result in \VAR{bit-array-a}; if it is \NIL, make a new array for - result. + result. } \IT{\CNS*{ARRAY-RANK-LIMIT}} @@ -158,14 +159,14 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Vector Functions} +\subsection{Vector Functions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Vectors can as well be manipulated by sequence functions; see -section~\ref{section:Sequences}. +section~\ref{section:Sequences}. \begin{LIST}{1cm} - + \IT{(\FU*{VECTOR} \OPn{\VAR{foo}})} { Return fresh \retval{simple vector of \VAR{foo}s}. @@ -182,7 +183,7 @@ section~\ref{section:Sequences}. Return \retval{\NIL} if \VAR{vector}'s fill pointer equals size of \VAR{vector}. Otherwise replace element of \VAR{vector} pointed to by \retval{fill pointer} with \VAR{foo}; then increment fill - pointer. + pointer. } \IT{(\FU*{VECTOR-PUSH-EXTEND} \VAR{foo} \DES{\VAR{vector}} @@ -208,7 +209,7 @@ section~\ref{section:Sequences}. -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-characters.tex b/clqr-characters.tex index b33fbc9..c8ee550 100644 --- a/clqr-characters.tex +++ b/clqr-characters.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2008, 2010, 2011, 2014 Bert Burgemeister +% Copyright (C) 2008, 2010, 2011, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -7,12 +7,12 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Characters} +\section{Characters} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% The \kwd*{standard-char} type comprises \LIT{a}-\LIT{z}, \LIT{A}-\LIT{Z}, \LIT{0}-\LIT{9}, \LIT{Newline}, \LIT{Space}, and -\LIT{!?\$"'`.:,;*+-/|{\tt\char`\\}\TLD\_\^{}<=>\#\%@\&()[]\{\}}. +\LIT{!?\$"'`.:,;*+-/|{\char`\\}\TLD\_\^{}<=>\#\%@\&()[]\{\}}. \index{NEWLINE}\index{SPACE} \begin{LIST}{1cm} @@ -78,9 +78,9 @@ The \kwd*{standard-char} type comprises \LIT{a}-\LIT{z}, } \IT{\arrGOO{ - (\FU*{CHAR-GREATERP}\RP{\VAR{ character}})\\ - (\FU*{CHAR-NOT-LESSP}\RP{\VAR{ character}})\\ - (\FU*{CHAR-LESSP}\RP{\VAR{ character}})\\ + (\FU*{CHAR-GREATERP}\RP{\VAR{ character}})\\ + (\FU*{CHAR-NOT-LESSP}\RP{\VAR{ character}})\\ + (\FU*{CHAR-LESSP}\RP{\VAR{ character}})\\ (\FU*{CHAR-NOT-GREATERP}\RP{\VAR{ character}})}{.}} { Return \retval{\T} if \VAR{character}s are monotonically @@ -104,7 +104,7 @@ The \kwd*{standard-char} type comprises \LIT{a}-\LIT{z}, \IT{(\FU*{CHAR-NAME} \VAR{char})} { \VAR{char}'s \retval{name} if any, or - \retval{\NIL}. + \retval{\NIL}. } \IT{(\FU*{NAME-CHAR} \VAR{foo})\qquad\qquad} @@ -136,7 +136,7 @@ The \kwd*{standard-char} type comprises \LIT{a}-\LIT{z}, \end{LIST} -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-clos.tex b/clqr-clos.tex index 4b697cf..ca8b1b9 100644 --- a/clqr-clos.tex +++ b/clqr-clos.tex @@ -201,7 +201,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection[Generic~Functns]{Generic Functions} +\subsection{Generic Functions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -363,7 +363,7 @@ \end{LIST} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection[Method Combi- nation Types]{Method Combination Types} +\subsection{Method Combination Types} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \label{section:Method Combination Types} \begin{LIST}{1cm} diff --git a/clqr-compiler.tex b/clqr-compiler.tex index 4502ef9..3b77926 100644 --- a/clqr-compiler.tex +++ b/clqr-compiler.tex @@ -1,44 +1,45 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Bert Burgemeister -% +% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2018 +% Bert Burgemeister +% % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, % Version 1.2; with no Invariant Sections, no Front-Cover Texts and % no Back-Cover Texts. For details see file COPYING. -% +% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Compiler} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Compiler} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Predicates} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Predicates} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} \IT{(\FU*{SPECIAL-OPERATOR-P} \VAR{foo})} { - \retval{\T} if \VAR{foo} is a special operator. + \retval{\T} if \VAR{foo} is a special operator. } \IT{(\FU*{COMPILED-FUNCTION-P} \VAR{foo})} { - \retval{\T} if \VAR{foo} is of type \kwd{compiled-function}. + \retval{\T} if \VAR{foo} is of type \kwd{compiled-function}. } \end{LIST} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Compilation} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Compilation} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} - \IT{(\FU*{COMPILE} + \IT{(\FU*{COMPILE} \xorGOO{\NIL\VAR{ definition}\\ \xorGOO{\VAR{name}\\ - (\kwd{setf } \VAR{name})}{\}}\text{ }\Op{\VAR{definition}}}{\}})} + (\kwd{setf } \VAR{name})}{\}}\text{ }\Op{\VAR{definition}}}{\}})} { Return \retval{compiled function} or replace \retval{\VAR{name}}'s function definition with the compiled function. Return @@ -47,7 +48,7 @@ \kwd{style-warning}s. } - \IT{(\FU*{COMPILE-FILE} \VAR{file} + \IT{(\FU*{COMPILE-FILE} \VAR{file} \orGOO{\kwd{:output-file}\VAR{ out-path}\\ \kwd{:verbose} \VAR{ bool}\DF{\V{\A compile-verbose\A}}\\ \kwd{:print}\VAR{ bool}\DF{\V{\A compile-print\A}}\\ @@ -63,19 +64,19 @@ \IT{(\FU*{COMPILE-FILE-PATHNAME} \VAR{file} \Op{\kwd{:output-file} \VAR{path}} \Op{\VAR{other-keyargs}})} { - \retval{Pathname} \FU{COMPILE-FILE} writes to if invoked with the - same arguments. + \retval{Pathname} \FU{COMPILE-FILE} writes to if invoked with the + same arguments. } - \IT{(\FU*{LOAD} \VAR{path} + \IT{(\FU*{LOAD} \VAR{path} \orGOO{\kwd{:verbose} \VAR{ bool}\DF{\V{\A load-verbose\A}}\\ \kwd{:print} \VAR{ bool}\DF{\V{\A load-print\A}}\\ \kwd{:if-does-not-exist} \VAR{ bool}\DF{\T}\\ \kwd{:external-format} \VAR{ file-format}\DF{\kwd{:default}}}{\}})} { - Load source file or compiled file into Lisp environment. Return - \retval{\T} if successful. + Load source file or compiled file into Lisp environment. Return + \retval{\T} if successful. } \IT{\arrGOO{\V{\A compile-file}\\ @@ -83,162 +84,162 @@ \xorGOO{\kwd{pathname\A}\DF{\NIL}\\ \kwd{truename\A}\DF{\NIL}}{.}} {\index{*COMPILE-FILE-PATHNAME*@\A COMPILE-FILE-PATHNAME\A}\index{*COMPILE-FILE-TRUENAME*@\A COMPILE-FILE-TRUENAME\A}\index{*LOAD-PATHNAME*@\A LOAD-PATHNAME\A}\index{*LOAD-TRUENAME*@\A LOAD-TRUENAME\A} - Input file used by \FU{compile-file}/by \FU{load}. + Input file used by \FU{compile-file}/by \FU{load}. } \IT{\arrGOO{\V{\A compile}\\ \V{\A load}}{\}}\kwd{-}% \xorGOO{\kwd{print\A}\\ - \kwd{verbose\A}}{.}} + \kwd{verbose\A}}{.}} {\index{*COMPILE-PRINT*@\A COMPILE-PRINT\A}\index{*COMPILE-VERBOSE*@\A COMPILE-VERBOSE\A}\index{*LOAD-PRINT*@\A LOAD-PRINT\A}\index{*LOAD-VERBOSE*@\A LOAD-VERBOSE\A} - Defaults used by \FU{compile-file}/by \FU{load}. + Defaults used by \FU{compile-file}/by \FU{load}. } \IT{(\SO*{EVAL-WHEN} (% \orGOO{\Goo{\kwd{:compile-toplevel}\XOR\kwd{compile}}\\ \Goo{\kwd{:load-toplevel}\XOR\kwd{load}}\\ - \Goo{\kwd{:execute}\XOR\kwd{eval}}}{\}}) \PROGN{\VAR{form}})} + \Goo{\kwd{:execute}\XOR\kwd{eval}}}{\}}) \PROGN{\VAR{form}})} { - Return \retval{values of \VAR{form}s} if - \SO{EVAL-WHEN} is in the top-level of a file being compiled, in the - top-level of a compiled file being loaded, or anywhere, - respectively. Return \retval{\NIL} if \VAR{form}s are not - evaluated. (\kwd{compile}, \kwd{load} and \kwd{eval} deprecated.) + Return \retval{values of \VAR{form}s} if + \SO{EVAL-WHEN} is in the top-level of a file being compiled, in the + top-level of a compiled file being loaded, or anywhere, + respectively. Return \retval{\NIL} if \VAR{form}s are not + evaluated. (\kwd{compile}, \kwd{load} and \kwd{eval} deprecated.) } \IT{(\SO*{LOCALLY} \OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})} \PROGN{\VAR{form}})} { - Evaluate \VAR{form}s in a lexical environment with declarations - \VAR{decl} in effect. Return \retval{values of \VAR{form}s}. + Evaluate \VAR{form}s in a lexical environment with declarations + \VAR{decl} in effect. Return \retval{values of \VAR{form}s}. } \IT{(\MC*{WITH-COMPILATION-UNIT} (\Op{\kwd{:override} \VAR{bool}\DF{\NIL}}) \PROGN{\VAR{form}})} { - Return \retval{values of \VAR{form}s}. Warnings deferred by the - compiler until end of compilation are deferred until the end of - evaluation of \VAR{form}s. + Return \retval{values of \VAR{form}s}. Warnings deferred by the + compiler until end of compilation are deferred until the end of + evaluation of \VAR{form}s. } \IT{(\SO*{LOAD-TIME-VALUE} \VAR{form} \Op{\NEV{\VAR{read-only}}\DF{\NIL}})} { - Evaluate \VAR{form} at compile time and treat \retval{its value} as - literal at run time. + Evaluate \VAR{form} at compile time and treat \retval{its value} as + literal at run time. } \IT{(\SO*{QUOTE} \NEV{\VAR{foo}})} { - Return \retval{unevaluated \VAR{foo}}. + Return \retval{unevaluated \VAR{foo}}. } \IT{(\GFU*{MAKE-LOAD-FORM} \VAR{foo} \Op{\VAR{environment}})} { - Its methods are to return a \retval{creation form} which on - evaluation at \FU{load} time returns an object equivalent to - \VAR{foo}, and an optional \retvalii{initialization form} which on - evaluation performs some initialization of the object. + Its methods are to return a \retval{creation form} which on + evaluation at \FU{load} time returns an object equivalent to + \VAR{foo}, and an optional \retvalii{initialization form} which on + evaluation performs some initialization of the object. } \IT{(\FU*{MAKE-LOAD-FORM-SAVING-SLOTS} \VAR{foo} \orGOO{\kwd{:slot-names} \VAR{ slots}\DF{all local slots}\\ \kwd{:environment} \VAR{ environment}}{\}})} { - Return a \retval{creation form} and an \retvalii{initialization - form} which on evaluation construct an object equivalent to - \VAR{foo} with \VAR{slots} initialized with the corresponding values - from \VAR{foo}. + Return a \retval{creation form} and an \retvalii{initialization + form} which on evaluation construct an object equivalent to + \VAR{foo} with \VAR{slots} initialized with the corresponding values + from \VAR{foo}. } \IT{\arrGOO{(\FU*{MACRO-FUNCTION} \VAR{ symbol } \Op{\VAR{environment}})\\ - (\FU*{COMPILER-MACRO-FUNCTION}\text{ } + (\FU*{COMPILER-MACRO-FUNCTION}\text{ } \xorGOO{\VAR{name}\\ (\kwd{setf } \VAR{name})}{\}}\text{ } \Op{\VAR{environment}})}{.}} { - Return specified \retval{macro function}, or \retval{compiler mac\-ro - func\-tion}, respectively, if any. Return \retval{\NIL} - otherwise. \kwd{setf}able. + Return specified \retval{macro function}, or \retval{compiler mac\-ro + func\-tion}, respectively, if any. Return \retval{\NIL} + otherwise. \kwd{setf}able. } - + \IT{(\FU*{EVAL} \VAR{arg})} { - Return \retval{values of value of \VAR{arg}} evaluated in global environment. + Return \retval{values of value of \VAR{arg}} evaluated in global environment. } \end{LIST} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection[REPL~\&~Debug]{REPL and Debugging} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{REPL and Debugging} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} - + \IT{\arrGOO{\V*{+}\XOR\V*{++}\XOR\V*{+++}\\[1pt] \V{\A}\text{ }\XOR\text{ }\V{\A\A}\text{ }\XOR\text{ }\V{\A\A\A}\\[1pt] \V*{/}\text{ }\XOR\text{ }\V*{//}\text{ }\XOR\text{ }\V*{///}}{.}} {\index{*@\A}\index{**@\A\A}\index{***@\A\A\A} - Last, penultimate, or antepenultimate \retval{form} evaluated in the REPL, or - their respective \retval{primary value}, or a \retval{list} of their respective - values. + Last, penultimate, or antepenultimate \retval{form} evaluated in the REPL, or + their respective \retval{primary value}, or a \retval{list} of their respective + values. } \IT{\V*{--}} { - \retval{Form} currently being evaluated by the REPL. + \retval{Form} currently being evaluated by the REPL. } \IT{(\FU*{APROPOS} \VAR{string} \Op{\VAR{package}\DF{\NIL}})} { - Print interned symbols containing \VAR{string}. + Print interned symbols containing \VAR{string}. } \IT{(\FU*{APROPOS-LIST} \VAR{string} \Op{\VAR{package}\DF{\NIL}})} { - \retval{List of interned symbols} containing \VAR{string}. + \retval{List of interned symbols} containing \VAR{string}. } \IT{(\FU*{DRIBBLE} \Op{\VAR{path}})} { - Save a record of interactive session to file at \VAR{path}. Without - \VAR{path}, close that file. + Save a record of interactive session to file at \VAR{path}. Without + \VAR{path}, close that file. } \IT{(\FU*{ED} \Op{\VAR{file-or-function}\DF{\NIL}})} { - Invoke editor if possible. + Invoke editor if possible. } \IT{(\xorGOO{\FU*{MACROEXPAND-1}\\ \FU*{MACROEXPAND}}{\}} \VAR{form} \Op{\VAR{environment}\DF{\NIL}})} { - Return \retval{macro expansion}, once or entirely, respectively, of - \VAR{form} and \retvalii{\T} if \VAR{form} was a macro form. - Return \retval{\VAR{form}} and \retvalii{\NIL} otherwise. + Return \retval{macro expansion}, once or entirely, respectively, of + \VAR{form} and \retvalii{\T} if \VAR{form} was a macro form. + Return \retval{\VAR{form}} and \retvalii{\NIL} otherwise. } \IT{\V{\A macroexpand-hook\A}} {\index{*MACROEXPAND-HOOK*@\A MACROEXPAND-HOOK\A} - Function of arguments expansion function, macro form, and - environment called by \FU{macroexpand-1} to generate macro - expansions. + Function of arguments expansion function, macro form, and + environment called by \FU{macroexpand-1} to generate macro + expansions. } \IT{(\MC*{TRACE} \xorGOO{\VAR{function}\\ - (\kwd{setf } \VAR{function})}{\}^{\!\!*}})} + (\kwd{setf } \VAR{function})}{\}^{\!\!*}})} { - Cause \VAR{function}s to be traced. With no arguments, - return \retval{list of traced functions}. + Cause \VAR{function}s to be traced. With no arguments, + return \retval{list of traced functions}. } \IT{(\MC*{UNTRACE} \xorGOO{\VAR{function}\\ - (\kwd{setf } \VAR{function})}{\}^{\!\!*}})} + (\kwd{setf } \VAR{function})}{\}^{\!\!*}})} { - Stop \VAR{function}s, or each currently traced function, from being - traced. + Stop \VAR{function}s, or each currently traced function, from being + traced. } \IT{\V{\A trace-output\A}} @@ -248,21 +249,21 @@ \IT{(\MC*{STEP} \VAR{form})} { - Step through evaluation of \VAR{form}. Return \retval{values of - \VAR{form}}. + Step through evaluation of \VAR{form}. Return \retval{values of + \VAR{form}}. } \IT{(\FU*{BREAK} \Op{\VAR{control} \OPn{\VAR{arg}}})} { - Jump directly into debugger; return \retval{\NIL}. - See page \pageref{section:Format}, \FU{format}, for \VAR{control} - and \VAR{arg}s. + Jump directly into debugger; return \retval{\NIL}. + See page \pageref{section:Format}, \FU{format}, for \VAR{control} + and \VAR{arg}s. } \IT{(\MC*{TIME} \VAR{form})} { - Evaluate \VAR{form}s and print timing information to - \V{\A trace-output\A}. Return \retval{values of \VAR{form}}. + Evaluate \VAR{form}s and print timing information to + \V{\A trace-output\A}. Return \retval{values of \VAR{form}}. } \IT{(\FU*{INSPECT} \VAR{foo})} { @@ -272,7 +273,7 @@ \IT{(\FU*{DESCRIBE} \VAR{foo} \Op{\DES{\VAR{stream}}\DF{\V{\A standard-output\A}}})} { - Send information about \VAR{foo} to \VAR{stream}. + Send information about \VAR{foo} to \VAR{stream}. } \IT{(\GFU*{DESCRIBE-OBJECT} \VAR{foo} \Op{\DES{\VAR{stream}}})} @@ -283,8 +284,8 @@ \IT{(\FU*{DISASSEMBLE} \VAR{function})} { - Send disassembled representation of \VAR{function} to - \V{\A standard-output\A}. Return \retval{\NIL}. + Send disassembled representation of \VAR{function} to + \V{\A standard-output\A}. Return \retval{\NIL}. } \IT{(\FU*{ROOM} \Op{\Goo{\NIL\XOR\kwd{:default}\XOR\T}\DF{\kwd{:default}}})} @@ -298,23 +299,23 @@ \end{LIST} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \subsection{Declarations} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} \IT{\arrGOO{(\FU*{PROCLAIM} \VAR{ decl})\\ (\MC*{DECLAIM } \OPn{\NEV{\VAR{decl}}})}{.}} { - Globally make declaration(s) \VAR{decl}. \VAR{decl} can be: - \kwd{declaration}, - \kwd{type}, - \kwd{ftype}, - \kwd{inline}, - \kwd{notinline}, - \kwd{optimize}, or - \kwd{special}. - See below. + Globally make declaration(s) \VAR{decl}. \VAR{decl} can be: + \kwd{declaration}, + \kwd{type}, + \kwd{ftype}, + \kwd{inline}, + \kwd{notinline}, + \kwd{optimize}, or + \kwd{special}. + See below. } \IT{(\kwd*{DECLARE} \OPn{\NEV{\VAR{decl}}})} @@ -323,23 +324,23 @@ \OPn{\VAR{decl}}. \VAR{decl} can be: \kwd{dynamic-extent}, \kwd{type}, - \kwd{ftype}, - \kwd{ignorable}, - \kwd{ignore}, - \kwd{inline}, - \kwd{notinline}, + \kwd{ftype}, + \kwd{ignorable}, + \kwd{ignore}, + \kwd{inline}, + \kwd{notinline}, \kwd{optimize}, or \kwd{special}. - See below. + See below. } \begin{LIST}{.5cm} - + \IT{(\kwd*{DECLARATION} \OPn{foo})} { Make \VAR{foo}s names of declarations. } - + \IT{(\kwd*{DYNAMIC-EXTENT} \OPn{\VAR{variable}} \OPn{(\kwd{function} \VAR{function})})} { @@ -360,15 +361,15 @@ \VAR{var}\\ (\kwd{function} \VAR{ function})}{\}^{\!\!*}})} { - Suppress warnings about used/unused bindings. - } + Suppress warnings about used/unused bindings. + } \IT{\arrGOO{(\kwd*{INLINE} \OPn{\VAR{ function}})\\ (\kwd*{NOTINLINE} \OPn{\VAR{ function}})}{.}} { - Tell compiler to integrate/not to integrate, respectively, called - \VAR{function}s into the calling routine. - } + Tell compiler to integrate/not to integrate, respectively, called + \VAR{function}s into the calling routine. + } \IT{(\kwd*{OPTIMIZE} \orGOO{% \kwd*{COMPILATION-SPEED}\XOR(\kwd*{COMPILATION-SPEED}\VAR{ n}\DF{\LIT{3}})\\ @@ -377,14 +378,14 @@ \kwd*{SPACE}\XOR(\kwd*{SPACE}\VAR{ n}\DF{\LIT{3}})\\ \kwd*{SPEED}\XOR(\kwd*{SPEED}\VAR{ n}\DF{\LIT{3}})}{\}})} { - Tell compiler how to optimize. $n=0$ means unimportant, $n=1$ is - neutral, $n=3$ means important. - } + Tell compiler how to optimize. $n=0$ means unimportant, $n=1$ is + neutral, $n=3$ means important. + } \IT{(\kwd*{SPECIAL} \OPn{\VAR{var}})} { - Declare \VAR{var}s to be dynamic. - } + Declare \VAR{var}s to be dynamic. + } \end{LIST} \end{LIST} @@ -394,7 +395,7 @@ % LocalWords: mac ro func tion -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-conditions-and-errors.tex b/clqr-conditions-and-errors.tex index b00f4a1..5d296a0 100644 --- a/clqr-conditions-and-errors.tex +++ b/clqr-conditions-and-errors.tex @@ -1,4 +1,5 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2018 +% Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -7,7 +8,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Conditions and Errors} +\section{Conditions and Errors} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% For standardized condition types cf.\ Figure \ref{data-types} on @@ -17,7 +18,7 @@ page \pageref{data-types}. \IT{(\MC*{DEFINE-CONDITION} \VAR{foo} (\OPn{\VAR{parent-type}}\DF{\kwd{condition}}) (\xorGOO{\VAR{slot}\\ - (\VAR{slot } + (\VAR{slot } \orGOO{\Goos{\kwd{:reader} \VAR{reader}}\\ \Goos{\kwd{:writer} \xorGOO{% \VAR{writer}\\ @@ -46,7 +47,7 @@ page \pageref{data-types}. \VAR{report-function} of arguments condition and stream. } - \IT{(\FU*{MAKE-CONDITION} + \IT{(\FU*{MAKE-CONDITION} \VAR{condition-type} \Goos{\kwd{:}\VAR{initarg-name} \VAR{value}})} { Return new \retval{instance of \VAR{condition-type}}. @@ -59,7 +60,7 @@ page \pageref{data-types}. }{\}} \xorGOO{% \VAR{condition}\\ - \VAR{condition-type}\text{ } \Goos{\kwd{:}\VAR{initarg-name} \VAR{value}}\\ + \VAR{condition-type}\text{ } \Goos{\kwd{:}\VAR{initarg-name} \VAR{value}}\\ \VAR{control}\text{ } \OPn{\VAR{arg}}% }{\}})} { @@ -98,11 +99,11 @@ page \pageref{data-types}. Invoke debugger with \VAR{condition}. } - \IT{(\MC*{ASSERT} \VAR{test} \OP{(\OPn{\VAR{place}}) + \IT{(\MC*{ASSERT} \VAR{test} \OP{(\OPn{\VAR{place}}) \Op{% \xorGOO{% \VAR{condition}\text{ } \OPn{\VAR{continue-arg}}\\ - \VAR{condition-type}\text{ } + \VAR{condition-type}\text{ } \Goos{\kwd{:}\VAR{initarg-name} \VAR{value}}\\ \VAR{control}\text{ } \OPn{\VAR{arg}}}{\}}}})} { @@ -115,7 +116,7 @@ page \pageref{data-types}. \VAR{test}. Return \retval{\NIL}. } - \IT{(\MC*{HANDLER-CASE} \VAR{foo} + \IT{(\MC*{HANDLER-CASE} \VAR{foo} \penalty-5 \OPn{(\VAR{type} (\Op{\VAR{var}}) \OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})} @@ -139,7 +140,7 @@ page \pageref{data-types}. { Return \retval{values of \VAR{form}s} after evaluating them with \VAR{condition-type}s dynamically bound to their respective - \VAR{handler-function}s of argument condition. + \VAR{handler-function}s of argument condition. } \IT{(\MC*{WITH-SIMPLE-RESTART} (\xorGOO{\VAR{restart}\\ @@ -155,8 +156,8 @@ page \pageref{data-types}. \IT{(\MC*{RESTART-CASE} \VAR{form} \OPn{(\VAR{restart} - (\OPn{\VAR{ord-$\lambda$}}) - \orGOO{\kwd{:interactive} \VAR{ arg-function}\\ + (\OPn{\VAR{ord-$\lambda$}}) + \orGOO{\kwd{:interactive} \VAR{ arg-function}\\ \kwd{:report } \xorGOO{% \VAR{report-function}\\ \VAR{string}\DF{\LIT{"}\VAR{restart}\LIT{"}}}{.}\\ @@ -186,7 +187,7 @@ page \pageref{data-types}. \NIL}{\}} \VAR{restart-function} \orGOO{% - \kwd{:interactive-function} \VAR{ arg-function}\\ + \kwd{:interactive-function} \VAR{ arg-function}\\ \kwd{:report-function} \VAR{ report-function}\\ \kwd{:test-function} \VAR{ test-function}}{\}})}) \PROGN{\VAR{form}})} @@ -247,7 +248,7 @@ page \pageref{data-types}. { Evaluate \VAR{form}s with \VAR{restarts} dynamically associated with \VAR{condition}. Return \retval{values - of \VAR{form}s}. + of \VAR{form}s}. } \IT{\arrGOO{(\FU*{ARITHMETIC-ERROR-OPERATION} \VAR{ condition})\\ @@ -278,7 +279,7 @@ page \pageref{data-types}. (\FU*{STREAM-ERROR-STREAM } \VAR{condition})}{.}} { \retval{Package}, \retval{path}, or \retval{stream}, respectively, - which caused the \VAR{condition} of indicated type. + which caused the \VAR{condition} of indicated type. } \IT{\arrGOO{(\FU*{TYPE-ERROR-DATUM} \VAR{ condition})\\ @@ -309,7 +310,7 @@ page \pageref{data-types}. \end{LIST} -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-conses.tex b/clqr-conses.tex index 574c9bb..35c8350 100644 --- a/clqr-conses.tex +++ b/clqr-conses.tex @@ -1,40 +1,41 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2018 +% Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, % Version 1.2; with no Invariant Sections, no Front-Cover Texts and % no Back-Cover Texts. For details see file COPYING. -% +% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Conses} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Conses} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Predicates} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Predicates} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} \IT{\arrGOO{(\FU*{CONSP} \VAR{ foo})\\ (\FU*{LISTP} \VAR{ foo})}{.}} { Return \retval{\T} if \VAR{foo} is of indicated type. - } + } \IT{\arrGOO{(\FU*{ENDP} \VAR{ list})\\ (\FU*{NULL} \VAR{ foo})}{.}\qquad\qquad} { - Return \retval{\T} if \VAR{list}/\VAR{foo} is \NIL. + Return \retval{\T} if \VAR{list}/\VAR{foo} is \NIL. } \IT{(\FU*{ATOM} \VAR{foo})\qquad} {Return \retval{\T} if \VAR{foo} is not a - \kwd{cons}. + \kwd{cons}. } \IT{(\FU*{TAILP} \VAR{foo} \VAR{list})} { - Return \retval{\T} if \VAR{foo} is a tail of \VAR{list}. + Return \retval{\T} if \VAR{foo} is a tail of \VAR{list}. } \IT{(\FU*{MEMBER} \VAR{foo} \VAR{list} @@ -43,9 +44,9 @@ \kwd{:test-not} \VAR{ function}}{.}\\ \kwd{:key} \VAR{ function}}{\}})} { - Return \retval{tail of \VAR{list}} starting with - its first element matching \VAR{foo}. Return \retval{\NIL} if - there is no such element. + Return \retval{tail of \VAR{list}} starting with + its first element matching \VAR{foo}. Return \retval{\NIL} if + there is no such element. } \IT{(\xorGOO{\FU*{MEMBER-IF}\\ @@ -53,42 +54,42 @@ \VAR{test} \VAR{list} \Op{\kwd{:key} \VAR{function}})} { - Return \retval{tail of \VAR{list}} starting with - its first element satisfying \VAR{test}. Return \retval{\NIL} if - there is no such element. + Return \retval{tail of \VAR{list}} starting with + its first element satisfying \VAR{test}. Return \retval{\NIL} if + there is no such element. } - \IT{(\FU*{SUBSETP} \VAR{list-a} \VAR{list-b} + \IT{(\FU*{SUBSETP} \VAR{list-a} \VAR{list-b} \orGOO{\xorGOO{% \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ \kwd{:test-not} \VAR{ function}}{.}\\ \kwd{:key} \VAR{ function}}{\}})} { - Return \retval{\T} if \VAR{list-a} is a subset of - \VAR{list-b}. + Return \retval{\T} if \VAR{list-a} is a subset of + \VAR{list-b}. } \end{LIST} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Lists} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Lists} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} \IT{(\FU*{CONS} \VAR{foo} \VAR{bar})} { - Return new cons \retval{(\VAR{foo} \kwd {.} \VAR{bar})}. + Return new cons \retval{(\VAR{foo} \kwd {.} \VAR{bar})}. } \IT{(\FU*{LIST} \OPn{\VAR{foo}})\qquad\qquad} {Return \retval{list of \VAR{foo}s}. - } + } \IT{(\FU*{LIST\A} \RP{\VAR{foo}})} {Return \retval{list of \VAR{foo}s} - with last \VAR{foo} becoming cdr of last cons. Return - \retval{\VAR{foo}} if only one \VAR{foo} given. + with last \VAR{foo} becoming cdr of last cons. Return + \retval{\VAR{foo}} if only one \VAR{foo} given. } \IT{(\FU*{MAKE-LIST} \VAR{num} \Op{\kwd{:initial-element} @@ -99,33 +100,33 @@ \IT{(\FU*{LIST-LENGTH} \VAR{list})} {\retval{Length} of \VAR{list}; - \retval{\NIL} for circular \VAR{list}. + \retval{\NIL} for circular \VAR{list}. } \IT{(\FU*{CAR} \VAR{list})\qquad\qquad} { - \retval{Car of \VAR{list}} or \retval{\NIL} if \VAR{list} is - \NIL. \kwd{SETF}able. + \retval{Car of \VAR{list}} or \retval{\NIL} if \VAR{list} is + \NIL. \kwd{SETF}able. } \IT{\arrGOO{(\FU*{CDR} \VAR{ list})\qquad\\ (\FU*{REST} \VAR{ list})}{.}} { - \retval{Cdr of \VAR{list}} or \retval{\NIL} if \VAR{list} - is \NIL. \kwd{SETF}able. + \retval{Cdr of \VAR{list}} or \retval{\NIL} if \VAR{list} + is \NIL. \kwd{SETF}able. } \IT{(\FU*{NTHCDR} \VAR{n list})} {Return \retval{tail of \VAR{list}} after calling \FU{cdr} \VAR{n} times. - } + } \IT{(\Goo{\FU*{FIRST}\XOR\FU*{SECOND}\XOR\FU*{THIRD}\XOR\FU*{FOURTH}\XOR\FU*{FIFTH}\XOR\FU*{SIXTH}\XOR\dots\XOR\FU*{NINTH}\XOR\FU*{TENTH}} \VAR{list})} { - \index{SEVENTH}% - \index{EIGHTH}% - Return \retval{nth element of \VAR{list}} if any, - or \retval{\NIL} otherwise. \kwd{SETF}able. + \index{SEVENTH}% + \index{EIGHTH}% + Return \retval{nth element of \VAR{list}} if any, + or \retval{\NIL} otherwise. \kwd{SETF}able. } \IT{(\FU*{NTH} \VAR{n list})} @@ -135,21 +136,21 @@ \IT{(\FU{C}\VAR{X}\kwd{R} \VAR{list})} { - \index{CAAR}% - \index{CADR}% - \index{CDAR}% - \index{CDDR}% - With \VAR{X} being one to four - \kwd{a}s and \kwd{d}s representing \FU{CAR}s and \FU{CDR}s, e.g. - (\FU{CADR} \VAR{bar}) is equivalent to (\FU{CAR} (\FU{CDR} - \VAR{bar})). - \kwd{SETF}able. + \index{CAAR}% + \index{CADR}% + \index{CDAR}% + \index{CDDR}% + With \VAR{X} being one to four + \kwd{a}s and \kwd{d}s representing \FU{CAR}s and \FU{CDR}s, e.g. + (\FU{CADR} \VAR{bar}) is equivalent to (\FU{CAR} (\FU{CDR} + \VAR{bar})). + \kwd{SETF}able. } \IT{(\FU*{LAST} \VAR{list} \Op{\VAR{num}\DF{\LIT{1}}})} { - Return list of \retval{last \VAR{num} - conses} of \VAR{list}. + Return list of \retval{last \VAR{num} + conses} of \VAR{list}. } \IT{(\xorGOO{\FU*{BUTLAST } \VAR{list}\\ @@ -161,25 +162,25 @@ } \IT{(\xorGOO{\FU*{RPLACA}\\ - \FU*{RPLACD}}{\}} \DES{\VAR{cons}} \VAR{object})} + \FU*{RPLACD}}{\}} \DES{\VAR{cons}} \VAR{object})} { - Replace car, or cdr, respectively, of \retval{\VAR{cons}} with \VAR{object}. + Replace car, or cdr, respectively, of \retval{\VAR{cons}} with \VAR{object}. } \IT{(\FU*{LDIFF} \VAR{list} \VAR{foo})} { - If \VAR{foo} is a tail of \VAR{list}, return \retval{preceding - part of \VAR{list}}. Otherwise return \retval{\VAR{list}}. + If \VAR{foo} is a tail of \VAR{list}, return \retval{preceding + part of \VAR{list}}. Otherwise return \retval{\VAR{list}}. } - \IT{(\FU*{ADJOIN} \VAR{foo} \VAR{list} + \IT{(\FU*{ADJOIN} \VAR{foo} \VAR{list} \orGOO{\xorGOO{% \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ \kwd{:test-not} \VAR{ function}}{.}\\ \kwd{:key} \VAR{ function}}{\}})} {Return \retval{\VAR{list}} if \VAR{foo} is - already member of \VAR{list}. If not, return \retval{(\FU{CONS} - \VAR{foo} \VAR{list})}. + already member of \VAR{list}. If not, return \retval{(\FU{CONS} + \VAR{foo} \VAR{list})}. } \IT{(\MC*{POP} \DES{\VAR{place}})} @@ -193,7 +194,7 @@ Set \VAR{place} to \retval{(\FU{cons} \VAR{foo} \VAR{place})}. } - \IT{(\MC*{PUSHNEW} \VAR{foo} \DES{\VAR{place}} + \IT{(\MC*{PUSHNEW} \VAR{foo} \DES{\VAR{place}} \orGOO{\xorGOO{% \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ \kwd{:test-not} \VAR{ function}}{.}\\ @@ -202,9 +203,9 @@ Set \VAR{place} to \retval{(\FU{adjoin} \VAR{foo} \VAR{place})}. } - \IT{\arrGOO{(\FU*{APPEND } \Op{\OPn{\VAR{proper-list}} + \IT{\arrGOO{(\FU*{APPEND } \Op{\OPn{\VAR{proper-list}} \VAR{ foo}\DF{\NIL}})\\ - (\FU*{NCONC } \Op{\OPn{\DES{\VAR{non-circular-list}}} + (\FU*{NCONC } \Op{\OPn{\DES{\VAR{non-circular-list}}} \VAR{ foo}\DF{\NIL}})}{.}} { Return \retval{concatenated list} or, with only one argument, @@ -230,9 +231,9 @@ \IT{(\xorGOO{\FU*{MAPCAN}\\ \FU*{MAPCON}}{\}} \VAR{function} \RP{\VAR{\DES{list}}})} % Example of list argument being modified: - % (let ((list '((1 2) (3 4)))) - % (mapcan #'identity list) - % list) + % (let ((list '((1 2) (3 4)))) + % (mapcan #'identity list) + % list) { Return list of \retval{concatenated return values} of \VAR{function} successively invoked with corresponding arguments, @@ -257,9 +258,9 @@ \end{LIST} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Association Lists} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Association Lists} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \label{section:Association Lists} \begin{LIST}{1cm} @@ -283,8 +284,8 @@ \kwd{:test-not} \VAR{ test}}{.}\\ \kwd{:key} \VAR{ function} }{\}})\\ - (\xorGOO{\FU*{ASSOC-IF}\Op{\kwd{-NOT}}\\ - \FU*{RASSOC-IF}\Op{\kwd{-NOT}}}{\}} \VAR{ test} \VAR{ alist } + (\xorGOO{\FU*{ASSOC-IF}\Op{\kwd{-NOT}}\\ + \FU*{RASSOC-IF}\Op{\kwd{-NOT}}}{\}} \VAR{ test} \VAR{ alist } \Op{\kwd{:key} \VAR{ function}})}{.}} {\index{ASSOC-IF-NOT}\index{RASSOC-IF-NOT}% First \retval{cons} whose car, or cdr, respectively, satisfies @@ -299,12 +300,12 @@ \end{LIST} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Trees} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Trees} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} - \IT{(\FU*{TREE-EQUAL} \VAR{foo} \VAR{bar} + \IT{(\FU*{TREE-EQUAL} \VAR{foo} \VAR{bar} \xorGOO{\kwd{:test} \VAR{ test}\DF{\kwd{\#'eql}}\\ \kwd{:test-not} \VAR{ test}}{\}})} { @@ -325,15 +326,15 @@ } \IT{(\xorGOO{\FU{SUBST-IF\Op{-NOT}} \VAR{ new} \VAR{ test } \VAR{tree}\\ - \FU{NSUBST-IF\Op{-NOT}} \VAR{ new} \VAR{ test } \DES{\VAR{tree}}}{\}} + \FU{NSUBST-IF\Op{-NOT}} \VAR{ new} \VAR{ test } \DES{\VAR{tree}}}{\}} \Op{\kwd{:key} \VAR{function}})} { - \index{SUBST-IF}% - \index{SUBST-IF-NOT}% - \index{NSUBST-IF}% - \index{NSUBST-IF-NOT}% - Make \retval{copy of \VAR{tree}} with each subtree or leaf - satisfying \VAR{test} replaced by \VAR{new}. + \index{SUBST-IF}% + \index{SUBST-IF-NOT}% + \index{NSUBST-IF}% + \index{NSUBST-IF-NOT}% + Make \retval{copy of \VAR{tree}} with each subtree or leaf + satisfying \VAR{test} replaced by \VAR{new}. } \IT{(\xorGOO{\FU*{SUBLIS} \VAR{ association-list } \VAR{tree} \\ @@ -344,11 +345,11 @@ \kwd{:key} \VAR{ function}% }{\}})} { - Make \retval{copy of \VAR{tree}} with each subtree or leaf matching - a key in \VAR{association-list} replaced by that key's value. + Make \retval{copy of \VAR{tree}} with each subtree or leaf matching + a key in \VAR{association-list} replaced by that key's value. } - \IT{(\FU*{COPY-TREE} \VAR{tree})} + \IT{(\FU*{COPY-TREE} \VAR{tree})} { \retval{Copy of \VAR{tree}} with same shape and leaves. } @@ -356,9 +357,9 @@ \end{LIST} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Sets} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\subsection{Sets} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} \IT{(\xorGOO{% @@ -382,14 +383,14 @@ \kwd{:test-not} \VAR{ function}}{.}\\ \kwd{:key} \VAR{ function}}{\}})} { - Return \retval{$a\cap b$}, \retval{$a\setminus b$}, \retval{$a\cup b$}, or - \retval{$a\,\triangle\, b$}, respectively, of lists \VAR{a} and \VAR{b}. + Return \retval{$a\cap b$}, \retval{$a\setminus b$}, \retval{$a\cup b$}, or + \retval{$a\,\triangle\, b$}, respectively, of lists \VAR{a} and \VAR{b}. } \end{LIST} -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-external-environment.tex b/clqr-external-environment.tex index 6bef35b..d52e864 100644 --- a/clqr-external-environment.tex +++ b/clqr-external-environment.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2008, 2010, 2011, 2012, 2014 Bert Burgemeister +% Copyright (C) 2008, 2010, 2011, 2012, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -17,26 +17,26 @@ \retval{Current time}, or \retval{computing time}, respectively, in clock ticks. } - + \IT{\CNS*{INTERNAL-TIME-UNITS-PER-SECOND}} { Number of clock ticks per second. } - + \IT{\arrGOO{% (\FU*{ENCODE-UNIVERSAL-TIME} - \VAR{\hspace{.7ex}sec} \VAR{\hspace{.7ex}min} - \VAR{\hspace{.7ex}hour} \VAR{\hspace{.7ex}date} - \VAR{\hspace{.7ex}month} \VAR{\hspace{.7ex}year\hspace{1ex}} - \Op{\VAR{zone}\DF{curr}})\\ + \VAR{ sec } \VAR{min } + \VAR{hour } \VAR{date } + \VAR{month } \VAR{year } + \Op{\VAR{zone}\DF{curr}})\\ (\FU*{GET-UNIVERSAL-TIME})}{.}} { \retval{Seconds from 1900-01-01, 00:00}, ignoring leap seconds. } - \IT{\arrGOO{(\FU*{DECODE-UNIVERSAL-TIME} \VAR{ universal-time } + \IT{\arrGOO{(\FU*{DECODE-UNIVERSAL-TIME} \VAR{ universal-time } \Op{\VAR{time-zone}\DF{current}})\\ - (\FU*{GET-DECODED-TIME})}{.}} + (\FU*{GET-DECODED-TIME})}{.}} { Return \retval{second}, \retvalii{minute}, \retvaliii{hour}, \retvaln{4}{date}, \retvaln{5}{month}, \retvaln{6}{year}, @@ -73,7 +73,7 @@ \end{LIST} -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-hash-tables.tex b/clqr-hash-tables.tex index b9a3fea..6d64aca 100644 --- a/clqr-hash-tables.tex +++ b/clqr-hash-tables.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2008, 2009, 2012, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2012, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -7,14 +7,14 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Hash Tables} +\section{Hash Tables} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% The Loop Facility provides additional hash table-related functionality; see \kwd{loop}, page \pageref{section:Loop Facility}. Key-value storage similar to hash tables can as well be achieved using association lists and property lists; see -pages \pageref{section:Association Lists} and \pageref{:property_lists}. +pages \pageref{section:Association Lists} and \pageref{:property_lists}. \begin{LIST}{1cm} @@ -24,21 +24,21 @@ pages \pageref{section:Association Lists} and \pageref{:property_lists}. Return \retval{\T} if \VAR{foo} is of type \kwd{hash-table}. } - \IT{(\FU*{MAKE-HASH-TABLE} + \IT{(\FU*{MAKE-HASH-TABLE} \orGOO{\kwd{:test }\Goo{\FU{eq}\XOR \FU{eql}\XOR - \FU{equal} \XOR \FU{equalp}}\DF{\kwd{\#'eql}}\\ + \FU{equal} \XOR \FU{equalp}}\DF{\kwd{\#'eql}}\\ \kwd{:size} \VAR{ int}\\ \kwd{:rehash-size} \VAR{ num}\\ \kwd{:rehash-threshold} \VAR{ num}}{\}})} { - Make a \retval{hash table}. + Make a \retval{hash table}. } \IT{(\FU*{GETHASH} \VAR{key} \VAR{hash-table} \Op{\VAR{default}\DF{\NIL}})} { Return \retval{object} with \VAR{key} if any or \retval{\VAR{default}} otherwise; and \retvalii{\T} if found, \retvalii{\NIL} - otherwise. \kwd{setf}able. + otherwise. \kwd{setf}able. } \IT{(\FU*{HASH-TABLE-COUNT} \VAR{hash-table})} @@ -49,7 +49,7 @@ pages \pageref{section:Association Lists} and \pageref{:property_lists}. \IT{(\FU*{REMHASH} \VAR{key} \DES{\VAR{hash-table}})} { Remove from \VAR{hash-table} entry with \VAR{key} and return - \retval{\T} if it existed. Return \retval{\NIL} otherwise. + \retval{\T} if it existed. Return \retval{\NIL} otherwise. } \IT{(\FU*{CLRHASH} \DES{\VAR{hash-table}})} @@ -81,7 +81,7 @@ pages \pageref{section:Association Lists} and \pageref{:property_lists}. (\FU*{HASH-TABLE-REHASH-THRESHOLD} \VAR{ hash-table})}{.}} { Current \retval{size}, \retval{rehash-size}, or - \retval{rehash-threshold}, respectively, as used in \FU{make-hash-table}. + \retval{rehash-threshold}, respectively, as used in \FU{make-hash-table}. } \IT{(\FU*{SXHASH} \VAR{foo})} @@ -93,7 +93,7 @@ pages \pageref{section:Association Lists} and \pageref{:property_lists}. -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-input-output.tex b/clqr-input-output.tex index a68ad3a..a8b30b6 100644 --- a/clqr-input-output.tex +++ b/clqr-input-output.tex @@ -1,4 +1,5 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2018 +% Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -7,11 +8,11 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Input/Output} +\section{Input/Output} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Predicates} +\subsection{Predicates} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -53,7 +54,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Reader} +\subsection{Reader} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -63,7 +64,7 @@ { Ask user a question and return \retval{\T} or \retval{\NIL} depending on their answer. See page \pageref{section:Format}, - \FU{format}, for \VAR{control} and \VAR{arg}s. + \FU{format}, for \VAR{control} and \VAR{arg}s. } \IT{(\MC*{WITH-STANDARD-IO-SYNTAX} \PROGN{\VAR{form}})} @@ -74,14 +75,14 @@ \IT{(\xorGOO{\FU*{READ}\\ \FU*{READ-PRESERVING-WHITESPACE}}{\}} - \OP{\DES{\VAR{stream}}\DF{\V{\A standard-input\A}} % standard-input not explicitly in standard - \OP{\VAR{eof-err}\DF{\T} + \OP{\DES{\VAR{stream}}\DF{\V{\A standard-input\A}} % standard-input not explicitly in standard + \OP{\VAR{eof-err}\DF{\T} \Op{\VAR{eof-val}\DF{\NIL} \Op{\VAR{recursive}\DF{\NIL}}}}})} { Read printed representation of \retval{object}. } - \IT{(\FU*{READ-FROM-STRING} \VAR{string} + \IT{(\FU*{READ-FROM-STRING} \VAR{string} \OP{\VAR{eof-error}\DF{\T} \OP{\VAR{eof-val}\DF{\NIL} \OP{\orGOO{% @@ -118,7 +119,7 @@ } \IT{(\FU*{PEEK-CHAR} - \OP{\VAR{mode}\DF{\NIL} \OP{\DES{\VAR{stream}}\DF{\V{\A standard-input\A}} + \OP{\VAR{mode}\DF{\NIL} \OP{\DES{\VAR{stream}}\DF{\V{\A standard-input\A}} \OP{\VAR{eof-error}\DF{\T} \Op{\VAR{eof-val}\DF{\NIL} \Op{\VAR{recursive}\DF{\NIL}}}}}})} { @@ -131,7 +132,7 @@ \Op{\DES{\VAR{stream}}\DF{\V{\A standard-input\A}}})} { Put last \FU{read-char}ed \VAR{character} back into \VAR{stream}; return - \retval{\NIL}. + \retval{\NIL}. } \IT{(\FU*{READ-BYTE} \DES{\VAR{stream}} \OP{\VAR{eof-err}\DF{\T} @@ -145,7 +146,7 @@ \Op{\VAR{recursive}\DF{\NIL}}}}})} { Return a \retval{line of text} from \VAR{stream} and - \retvalii{\T} if line has been ended by end of file. + \retvalii{\T} if line has been ended by end of file. } \IT{(\FU*{READ-SEQUENCE} \DES{\VAR{sequence}} \DES{\VAR{stream}} @@ -161,7 +162,7 @@ { \retval{Case sensitivity attribute} (one of \kwd{:upcase}, \kwd{:downcase}, \kwd{:preserve}, \kwd{:invert}) of - \VAR{readtable}. \kwd{setf}able. + \VAR{readtable}. \kwd{setf}able. } \IT{(\FU*{COPY-READTABLE} \OP{\VAR{from-readtable}\DF{\V{\A readtable\A}} @@ -189,7 +190,7 @@ \IT{\V{\A read-default-float-format\A}\DF{\kwd{single-float}}} {\index{*READ-DEFAULT-FLOAT-FORMAT*@\A READ-DEFAULT-FLOAT-FORMAT\A} - Floating point format to use when not indicated in the number read. + Floating point format to use when not indicated in the number read. } \IT{\V{\A read-suppress\A}\DF{\NIL}} @@ -220,7 +221,7 @@ } \IT{(\FU*{SET-DISPATCH-MACRO-CHARACTER} \VAR{char} \VAR{sub-char} - \VAR{function} + \VAR{function} \Op{\DES{\VAR{rt}}\DF{\V{\A readtable\A}}})} { Make \VAR{function} of stream, \VAR{n}, \VAR{sub-char} a dispatch @@ -252,25 +253,25 @@ \begin{LIST}{.5cm} \IT{\KWD{;;;;} \VAR{title}\qquad\qquad} {Short title for a block of code.} - + \IT{\KWD{;;;} \VAR{intro}\qquad\qquad} {Description before a block of code.} - + \IT{\KWD{;;} \VAR{state}\qquad\qquad} {State of program or of following code.} - + \IT{\arrGOO{% \KWD{;}\VAR{explanation}\\ \KWD{;}\VAR{ continuation}}{.}} {Regarding line on which it appears.} - + \end{LIST} - + \IT{\KWD*{(}\OPn{\VAR{foo}}\Op{ \KWD*{.} \VAR{bar}\DF{\NIL}}\KWD*{)}} { List of \VAR{foo}s with the terminating cdr \VAR{bar}. } - + \IT{\KWD{"}\qquad\qquad} {\index{""} Begin and end of a string. @@ -386,7 +387,7 @@ {\index{\#<@\#$<$}% Have the reader signal \kwd{reader-error}. } - + \IT{\arrGOO{\KWD*{\#+}\VAR{feature } \VAR{when-feature}\\ \KWD*{\#--}\VAR{feature } \VAR{unless-feature}}{.}} { @@ -412,13 +413,13 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Printer} +\subsection{Printer} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} - \IT{(\xorGOO{\FU*{PRIN1}\\ + \IT{(\xorGOO{\FU*{PRIN1}\\ \FU*{PRINT}\\ \FU*{PPRINT}\\ \FU*{PRINC}}{\}} @@ -441,7 +442,7 @@ \IT{(\GFU*{PRINT-OBJECT} \VAR{object} \DES{\VAR{stream}})} { Print \retval{\VAR{object}} to \VAR{stream}. Called by the Lisp - printer. + printer. } \IT{(\MC*{PRINT-UNREADABLE-OBJECT} (\VAR{foo} \DES{\VAR{stream}} @@ -450,7 +451,7 @@ \PROGN{\VAR{form}})} { Enclosed in \kwd{\#\boldmath$<$} and \kwd{\boldmath$>$}, print - \VAR{foo} by means of \VAR{form}s to \VAR{stream}. Return \retval{\NIL}. + \VAR{foo} by means of \VAR{form}s to \VAR{stream}. Return \retval{\NIL}. } \IT{(\FU*{TERPRI} \Op{\DES{\VAR{stream}}\DF{\V{\A standard-output\A}}})} @@ -487,7 +488,7 @@ } \IT{(\FU*{WRITE-SEQUENCE} \VAR{sequence} - \DES{\VAR{stream}} \orGOO{\kwd{:start}\VAR{ start}\DF{\LIT{0}}\\ + \DES{\VAR{stream}} \orGOO{\kwd{:start}\VAR{ start}\DF{\LIT{0}}\\ \kwd{:end} \VAR{ end}\DF{\NIL}}{\}})} { Write elements of \retval{\VAR{sequence}} to binary or character @@ -547,7 +548,7 @@ \OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})} \PROGN{\VAR{form}})} { Evaluate \VAR{form}s, which should print \VAR{list}, with - \VAR{stream} locally bound to a pretty + \VAR{stream} locally bound to a pretty printing stream which outputs to the original \VAR{stream}. If \VAR{list} is in fact not a list, it is printed by \FU{write}. Return \retval{\NIL}. @@ -560,7 +561,7 @@ Take \retval{next element} off \VAR{list}. If there is no remaining tail of \VAR{list}, or \V{\A print-length\A} or \V{\A print-circle\A} indicate printing should end, send element together with an appropriate - indicator to \VAR{stream}. + indicator to \VAR{stream}. } \IT{(\FU*{PPRINT-TAB} \xorGOO{\kwd{:line}\\ @@ -572,7 +573,7 @@ Move cursor forward to column number $c + ki$, $k \geq 0$ being as small as possible. } - + \IT{(\FU*{PPRINT-INDENT} \xorGOO{% \kwd{:block}\\ \kwd{:current}}{\}} \VAR{n} @@ -581,13 +582,13 @@ Specify indentation for innermost logical block relative to leftmost position/to current position. Return \retval{\NIL}. } - + \IT{(\MC*{PPRINT-EXIT-IF-LIST-EXHAUSTED})} { If \VAR{list} is empty, terminate logical block. Return \retval{\NIL} otherwise. } - + \end{LIST} \IT{(\FU*{PPRINT-NEWLINE} \xorGOO{% @@ -598,7 +599,7 @@ \OP{\DES{\VAR{stream}}\DF{\V{\A standard-output\A}}})} { Print a conditional newline if \VAR{stream} is a pretty printing - stream. Return \retval{\NIL}. + stream. Return \retval{\NIL}. } \IT{\V{\A print-array\A}} @@ -620,7 +621,7 @@ \IT{\V{\A print-circle\A}\DF{\NIL}} {\index{*PRINT-CIRCLE*@\A PRINT-CIRCLE\A} If \T, avoid indefinite recursion while printing circular - structure. + structure. } \IT{\V{\A print-escape\A}\DF{\T}} @@ -661,7 +662,7 @@ \IT{\V{\A print-readably\A}\DF{\NIL}} {\index{*PRINT-READABLY*@\A PRINT-READABLY\A} If \T, print \FU{read}ably or signal error - \kwd{print-not-readable}. + \kwd{print-not-readable}. } \IT{\V{\A print-right-margin\A}\DF{\NIL}} @@ -676,7 +677,7 @@ Install entry comprising \VAR{function} of arguments stream and object to print; and \VAR{priority} as \VAR{type} into \VAR{table}. If \VAR{function} - is \NIL, remove \VAR{type} from \VAR{table}. Return \retval{\NIL}. + is \NIL, remove \VAR{type} from \VAR{table}. Return \retval{\NIL}. } \IT{(\FU*{PPRINT-DISPATCH} \VAR{foo} @@ -727,7 +728,7 @@ \OPn{\VAR{arg}}. Output to \VAR{out-string}, \VAR{out-stream} or, if first argument is \T, to \V{\A standard-output\A}. Return \retval{\NIL}. If first argument is \NIL, return - \retval{formatted output}. + \retval{formatted output}. } \begin{LIST}{.5cm} @@ -743,7 +744,7 @@ than \LIT{nil}; with \kwd{@}, add \VAR{pad-char}s on the left rather than on the right. } - + \IT{\KWD{\TLD} \Op{\VAR{radix}\DF{\LIT{10}}} \OP{\KWD{,}\Op{\VAR{width}} \OP{\KWD{,}\Op{\kwd{'}\VAR{pad-char}\DF{\textvisiblespace}} \OP{\KWD{,}\Op{\kwd{'}\VAR{comma-char}\DF{\LIT{,}}} @@ -753,7 +754,7 @@ \EM{Radix. } (With one or more prefix arguments.) Print argument as number; with \KWD{:}, group digits \VAR{comma-interval} each; with \kwd{@}, - always prepend a sign. + always prepend a sign. } \IT{\Goo{\KWD{\TLD R}\XOR\KWD{\TLD :R}\XOR\KWD{\TLD @@ -772,18 +773,18 @@ \KWD{\Op{:} \Op{@} \Goo{D\XOR B\XOR O\XOR X}}} {\index{\~D@$\sim$D}\index{\~B@$\sim$B}\index{\~O@$\sim$O}\index{\~X@$\sim$X}% \EM{Decimal/Binary/Octal/Hexadecimal. } - Print integer argument as number. With \kwd{:}, group digits + Print integer argument as number. With \kwd{:}, group digits \VAR{comma-interval} each; with \kwd{@}, always prepend a sign. } \IT{\KWD{\TLD} \Op{\VAR{width}} \OP{\KWD{,}\Op{\VAR{dec-digits}} - \OP{\KWD{,}\Op{\VAR{shift}\DF{\LIT{0}}} + \OP{\KWD{,}\Op{\VAR{shift}\DF{\LIT{0}}} \OP{\KWD{,}\Op{\kwd{'}\VAR{overflow-char}} \OP{\KWD{,'}\VAR{pad-char}\DF{\textvisiblespace}}}}} \KWD{\Op{@} F}} {\index{\~F@$\sim$F}% \EM{Fixed-Format Floating-Point. } With - \kwd{@}, always pre\-pend a sign. + \kwd{@}, always pre\-pend a sign. } \IT{\KWD{\TLD} \Op{\VAR{width}} \OP{\KWD{,}\Op{\VAR{dec-digits}} @@ -798,7 +799,7 @@ Print argument as floating-point number with \VAR{dec-digits} after decimal point and \VAR{exp-digits} in the signed exponent. With \KWD{\TLD G}, choose either \KWD{\TLD E} or - \KWD{\TLD F}. With \KWD{@}, always prepend a sign. + \KWD{\TLD F}. With \KWD{@}, always prepend a sign. } \IT{\KWD{\TLD} \Op{\VAR{dec-digits}\DF{\LIT{2}}} @@ -812,14 +813,14 @@ put sign before any padding; with \KWD{@}, always prepend a sign. } - + \IT{\Goo{\KWD{\TLD C}\XOR\KWD{\TLD :C}\XOR\KWD{\TLD @C}\XOR\KWD{\TLD @:C}}} {\index{\~C@$\sim$C}% \EM{Character. } Print, spell out, print in \kwd{\#$\backslash$} syntax, or tell how to type, respectively, argument as (possibly non-printing) - character. + character. } \IT{\Goo{% @@ -831,7 +832,7 @@ \EM{Case-Conversion. } Convert \VAR{text} to lowercase, convert first letter of each word to uppercase, capitalize first word and convert the rest to - lowercase, or convert to uppercase, respectively. + lowercase, or convert to uppercase, respectively. } \IT{\Goo{\KWD{\TLD P}\XOR\KWD{\TLD:P} @@ -841,7 +842,7 @@ If argument \kwd{eql} \LIT{1} print nothing, otherwise print \LIT{s}; do the same for the previous argument; if argument \kwd{eql} \LIT{1} print \LIT{y}, otherwise print \LIT{ies}; do the same for the - previous argument, respectively. + previous argument, respectively. } \IT{\KWD{\TLD} \Op{\VAR{n}\DF{\LIT{1}}} \KWD{\%}} @@ -890,7 +891,7 @@ \OP{\KWD{,}\Op{\VAR{col-inc}\DF{\LIT{1}}} \OP{\KWD{,}\Op{\VAR{min-pad}\DF{\LIT{0}}} \OP{\KWD{,'}\VAR{pad-char}\DF{\textvisiblespace}}}} - \KWD{\Op{:} \Op{@} \boldmath{$<$}} + \KWD{\Op{:} \Op{@} \boldmath{$<$}} \OP{\VAR{nl-text} \KWD{\TLD}\Op{\VAR{spare}\DF{\LIT{0}} \Op{\KWD{,}\VAR{width}}}\kwd{:;}} \Goos{\VAR{text} \KWD{\TLD;}} \VAR{text} \KWD{\TLD\boldmath{$>$}}} {\index{\~<\~>@$\sim$$<$ $\sim$$>$}% @@ -915,7 +916,7 @@ \kwd{pprint-pop}. With \KWD{:}, \VAR{prefix} and \VAR{suffix} default to \LIT{(} and \LIT{)}. When closed by \KWD{\TLD @:\boldmath{$>$}}, spaces in \VAR{body} are replaced with - conditional newlines. + conditional newlines. } \IT{\Goo{\KWD{\TLD} \Op{\VAR{n}\DF{\LIT{0}}} @@ -923,7 +924,7 @@ {\index{\~I@$\sim$I}% \EM{Indent. } Set indentation to \VAR{n} relative to leftmost/to current - position. + position. } \IT{\KWD{\TLD} \Op{\VAR{c}\DF{\LIT{1}}} @@ -961,7 +962,7 @@ {\index{\~\^{}@$\sim$\^{}}% \EM{Escape Upward. } Leave immediately \kwd{\TLD\boldmath{$<$} \TLD\boldmath{$>$}}, - \kwd{\TLD\boldmath{$<$} \TLD:\boldmath{$>$}}, + \kwd{\TLD\boldmath{$<$} \TLD:\boldmath{$>$}}, \kwd{\TLD\boldmath{$\{$} \TLD\boldmath{$\}$}}, \kwd{\TLD?}, or the entire \FU{format} operation. With one to three prefixes, act only if $x=0$, $x=y$, or $x\leq y \leq z$, respectively. @@ -992,13 +993,13 @@ } \IT{\KWD{\TLD} \OP{\VAR{prefix} \Goos{\kwd{,}% - \VAR{prefix}}} - \Op{\kwd{:}} \Op{\kwd{@}} + \VAR{prefix}}} + \Op{\kwd{:}} \Op{\kwd{@}} \KWD{/}\OP{\VAR{package} \Op{\LIT{:}}\LIT{:}\DF{\LIT{cl-user:}}}\VAR{function}\KWD{/}} {\index{\~/ /@$\sim$/ /}% \EM{Call Function. } - Call all-uppercase \VAR{package\KWD{::}function} with the + Call all-uppercase \VAR{package}\KWD{::}\VAR{function} with the arguments stream, format-ar\-gu\-ment, colon-p, at-sign-p and \VAR{prefix}es for printing format-argument. } @@ -1023,7 +1024,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Streams} +\subsection{Streams} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -1089,17 +1090,17 @@ { Return \retval{list of streams} \VAR{concatenated-stream} still has to read from/\VAR{broadcast-stream} is - broadcasting to. + broadcasting to. } \IT{\arrGOO{% - (\FU*{TWO-WAY-STREAM-INPUT-STREAM} \VAR{ two-way-stream})\\ + (\FU*{TWO-WAY-STREAM-INPUT-STREAM} \VAR{ two-way-stream})\\ (\FU*{TWO-WAY-STREAM-OUTPUT-STREAM} \VAR{ two-way-stream})\\ (\FU*{ECHO-STREAM-INPUT-STREAM} \VAR{ echo-stream})\\ (\FU*{ECHO-STREAM-OUTPUT-STREAM} \VAR{ echo-stream})}{.}} { Return \retval{source stream} or \retval{sink stream} of - \VAR{two-way-stream}\slash\VAR{echo-stream}, respectively. + \VAR{two-way-stream}\slash\VAR{echo-stream}, respectively. } \IT{(\FU*{SYNONYM-STREAM-SYMBOL} \VAR{synonym-stream})} @@ -1118,7 +1119,7 @@ \VAR{position}}{\}}})} { Return \retval{position within stream}, or set it to - \retval{\VAR{position}} and return \retval{\T} on success. + \retval{\VAR{position}} and return \retval{\T} on success. } \IT{(\FU*{FILE-STRING-LENGTH} \VAR{stream} \VAR{foo})} @@ -1151,7 +1152,7 @@ \VAR{bool}\DF{\NIL}})} { Close \VAR{stream}. Return \retval{\T} if \VAR{stream} had been - open. If \kwd{:abort} is \T, delete associated file. + open. If \kwd{:abort} is \T, delete associated file. } \IT{(\MC*{WITH-OPEN-FILE} (\VAR{stream} \VAR{path} @@ -1167,10 +1168,10 @@ \OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})} \PROGN{\VAR{form}})} { Evaluate \VAR{form}s with \VAR{foo} locally bound to - \VAR{stream}. Return \retval{values of \VAR{form}s}. + \VAR{stream}. Return \retval{values of \VAR{form}s}. } - \IT{(\MC*{WITH-INPUT-FROM-STRING} (\VAR{foo} \VAR{string} + \IT{(\MC*{WITH-INPUT-FROM-STRING} (\VAR{foo} \VAR{string} \orGOO{\kwd{:index } \DES{\VAR{index}}\\ \kwd{:start} \VAR{ start}\DF{\LIT{0}}\\ \kwd{:end} \VAR{ end}\DF{\NIL}}{\}}) \OPn{(\kwd{declare} @@ -1181,17 +1182,17 @@ \VAR{form}s}; store next reading position into \VAR{index}. } - \IT{(\MC*{WITH-OUTPUT-TO-STRING} (\VAR{foo} + \IT{(\MC*{WITH-OUTPUT-TO-STRING} (\VAR{foo} \OP{\DES{\VAR{string}}\DF{\NIL} \Op{\kwd{:element-type} - \VAR{type}\DF{\kwd{character}}}}) + \VAR{type}\DF{\kwd{character}}}}) \OPn{(\kwd{declare} \OPn{\NEV{\VAR{decl}}})} \PROGN{\VAR{form}})} { Evaluate \VAR{form}s with \VAR{foo} locally bound to an output \kwd{string-stream}. Append output to \VAR{string} and return \retval{values of \VAR{form}s} if \VAR{string} is given. Return - \retval{string containing output} otherwise. + \retval{string containing output} otherwise. } \IT{(\FU*{STREAM-EXTERNAL-FORMAT} \VAR{stream})} @@ -1210,7 +1211,7 @@ {\index{*STANDARD-INPUT*@\A STANDARD-INPUT\A}% \index{*STANDARD-OUTPUT*@\A STANDARD-OUTPUT\A}% \index{*ERROR-OUTPUT*@\A ERROR-OUTPUT\A} - Standard input stream, standard output stream, + Standard input stream, standard output stream, or standard error output stream, respectively. } @@ -1224,12 +1225,12 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection[Paths and Files]{Pathnames and Files} +\subsection{Pathnames and Files} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} - \IT{(\FU*{MAKE-PATHNAME} + \IT{(\FU*{MAKE-PATHNAME} \orGOO{\kwd{:host } \Goo{\VAR{host}\XOR\NIL\XOR\kwd{:unspecific}}\\ \kwd{:device } \Goo{\VAR{device}\XOR\NIL\XOR\kwd{:unspecific}}\\ \kwd{:directory } \xorGOO{% @@ -1279,7 +1280,7 @@ Return \retval{pathname component}. } - \IT{(\FU*{PARSE-NAMESTRING} \VAR{foo} + \IT{(\FU*{PARSE-NAMESTRING} \VAR{foo} \OP{\VAR{host} \OP{\VAR{default-pathname}\DF{\V{\A default-pathname-defaults\A}} \orGOO{\kwd{:start} \VAR{ start}\DF{\LIT{0}}\\ @@ -1377,7 +1378,7 @@ \IT{(\FU*{TRANSLATE-LOGICAL-PATHNAME} \VAR{path-or-stream})} { \retval{Physical pathname} corresponding to (possibly logical) - pathname of \VAR{path-or-stream}. + pathname of \VAR{path-or-stream}. } \IT{\arrGOO{(\FU*{PROBE-FILE} \VAR{ file})\\ @@ -1433,7 +1434,7 @@ % LocalWords: ies argumenth ar gu ment -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-numbers.tex b/clqr-numbers.tex index eaa5da1..b866834 100644 --- a/clqr-numbers.tex +++ b/clqr-numbers.tex @@ -1,4 +1,5 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2018 +% Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -7,11 +8,11 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Numbers} +\section{Numbers} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Predicates} +\subsection{Predicates} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -35,7 +36,7 @@ \index{<=@$<$=}% Return \retval{\T} if \VAR{number}s are monotonically decreasing, monotonically non-increasing, - monotonically increasing, or monotonically non-decreasing, respectively. + monotonically increasing, or monotonically non-decreasing, respectively. } \IT{\arrGOO{(\FU*{MINUSP} \VAR{ a})\\ @@ -68,7 +69,7 @@ \end{LIST} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection[Numeric~Functns]{Numeric Functions} +\subsection{Numeric Functions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -193,7 +194,7 @@ { Return as \kwd{integer} or \kwd{float}, respectively, \retval{$n/d$} rounded, or rounded towards $-\infty$, $+\infty$, or $0$, - respectively; and \retvalii{re\-main\-der}. + respectively; and \retvalii{re\-main\-der}. } \IT{(\xorGOO{\FU*{MOD}\\ @@ -202,17 +203,17 @@ \FU{truncate}, respectively, but return \retval{re\-main\-der} only. } - \IT{(\FU*{RANDOM} \VAR{limit} \Op{\DES{\VAR{state}}\DF{\V{\A random-state\A}}})} + \IT{(\FU*{RANDOM} \VAR{limit} \Op{\DES{\VAR{state}}\DF{\V{\A random-state\A}}})} { Return non-negative \retval{random number} less than \VAR{limit}, - and of the same type. + and of the same type. } \IT{(\FU*{MAKE-RANDOM-STATE} \OP{\Goo{\VAR{state}\XOR\NIL\XOR\T}\DF{\NIL}})} { \retval{Copy} of \kwd{random-state} object \VAR{state} or of the current random state; or a randomly initialized fresh \retval{random - state}. + state}. } \IT{\V{\A random-state\A}\qquad\qquad\qquad} @@ -274,7 +275,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Logic Functions} +\subsection{Logic Functions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \label{section:Logic Functions} Negative integers are used in @@ -288,7 +289,7 @@ two's complement representation. \retval{value} of bitwise logical \VAR{operation}. \VAR{operation}s are } - + \begin{LIST}{.5cm} \IT{\CNS*{BOOLE-1}\qquad\qquad} {\retval{\VAR{int-a}}.} \IT{\CNS*{BOOLE-2}\qquad\qquad} {\retval{\VAR{int-b}}.} @@ -370,20 +371,20 @@ two's complement representation. \IT{(\FU*{LOGCOUNT} \VAR{int})} { \retval{Number of 1 bits} in $\text{\VAR{int}}\ge 0$, - \retval{number of 0 bits} in $\text{\VAR{int}}< 0$. + \retval{number of 0 bits} in $\text{\VAR{int}}< 0$. } \end{LIST} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Integer Functions} +\subsection{Integer Functions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} \IT{(\FU*{INTEGER-LENGTH} \VAR{integer})} { - \retval{Number of bits} necessary to represent \VAR{integer}. + \retval{Number of bits} necessary to represent \VAR{integer}. } \IT{(\FU*{LDB-TEST} \VAR{byte-spec} \VAR{integer})} @@ -397,13 +398,13 @@ two's complement representation. Return copy of \retval{\VAR{integer}} arithmetically shifted left by \VAR{count} adding zeros at the right, or, for $\VAR{count}<0$, shifted right discarding - bits. + bits. } \IT{(\FU*{LDB} \VAR{byte-spec} \VAR{integer})} { Extract \retval{byte} denoted by \VAR{byte-spec} from - \VAR{integer}. \kwd{setf}able. + \VAR{integer}. \kwd{setf}able. } \IT{(\xorGOO{\FU*{DEPOSIT-FIELD}\\ @@ -412,7 +413,7 @@ two's complement representation. { Return \retval{\VAR{int-b}} with bits denoted by \VAR{byte-spec} replaced by corresponding bits of \VAR{int-a}, or by the low (\FU{byte-size} - \VAR{byte-spec}) bits of \VAR{int-a}, respectively. + \VAR{byte-spec}) bits of \VAR{int-a}, respectively. } \IT{(\FU*{MASK-FIELD} \VAR{byte-spec} \VAR{integer})} @@ -424,7 +425,7 @@ two's complement representation. \IT{(\FU*{BYTE} \VAR{size} \VAR{position})} { \retval{Byte specifier} for a byte of \VAR{size} bits starting at a - weight of $2^{\VAR{position}}$. + weight of $2^{\VAR{position}}$. } \IT{\arrGOO{(\FU*{BYTE-SIZE} \VAR{ byte-spec})\\ @@ -437,7 +438,7 @@ two's complement representation. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection[Implementation- Dependent]{Implementation-Dependent} +\subsection{Implementation-Dependent} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -536,7 +537,7 @@ two's complement representation. \IT{(\FU*{UPGRADED-COMPLEX-PART-TYPE} \VAR{foo} \Op{\VAR{environment}\DF{\NIL}})} {\retval{Type} of most specialized \kwd{complex} number able to hold - parts of type \VAR{foo}. + parts of type \VAR{foo}. } \end{LIST} @@ -544,7 +545,7 @@ two's complement representation. % LocalWords: de na der nored ored -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-packages-and-symbols.tex b/clqr-packages-and-symbols.tex index 408fe30..63b3145 100644 --- a/clqr-packages-and-symbols.tex +++ b/clqr-packages-and-symbols.tex @@ -1,4 +1,5 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2018 +% Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -46,7 +47,7 @@ The Loop Facility provides additional means of symbol handling; see \kwd{loop}, Possibly unexported \VAR{symbol} of \VAR{package}. } - \IT{(\MC*{DEFPACKAGE}\VAR{ foo} + \IT{(\MC*{DEFPACKAGE}\VAR{ foo} \orGOO{% \OPn{(\kwd{:nicknames }\OPn{\VAR{nick}})}\\ (\kwd{:documentation }\VAR{string})\\ @@ -84,13 +85,13 @@ The Loop Facility provides additional means of symbol handling; see \kwd{loop}, } \IT{(\xorGOO{\FU*{USE-PACKAGE}\\ - \FU*{UNUSE-PACKAGE}}{\}} + \FU*{UNUSE-PACKAGE}}{\}} \VAR{other-packages} \Op{\VAR{package}\DF{\V{\A package\A}}})} { Make exported symbols of \VAR{other-packages} available in \VAR{package}, or remove them from \VAR{package}, - respectively. Return \retval{\T}. + respectively. Return \retval{\T}. } \IT{\arrGOO{% @@ -127,7 +128,7 @@ The Loop Facility provides additional means of symbol handling; see \kwd{loop}, \IT{(\FU*{FIND-PACKAGE} \VAR{name})} { - \retval{Package} with \VAR{name} (case-sensitive). + \retval{Package} with \VAR{name} (case-sensitive). } \IT{(\FU*{FIND-ALL-SYMBOLS} \VAR{foo})} @@ -169,7 +170,7 @@ The Loop Facility provides additional means of symbol handling; see \kwd{loop}, packages. Return \retval{\T}. } - \IT{(\FU*{PACKAGE-SHADOWING-SYMBOLS} \VAR{package})} + \IT{(\FU*{PACKAGE-SHADOWING-SYMBOLS} \VAR{package})} { \retval{List of symbols} of \VAR{package} that shadow any otherwise accessible, equally named symbols from other packages. @@ -185,7 +186,7 @@ The Loop Facility provides additional means of symbol handling; see \kwd{loop}, { Revert \VAR{symbols} to internal status. Return \retval{\T}. } - + \IT{(\xorGOO{% \arrGOO{% \MC*{DO-SYMBOLS}\\ @@ -200,9 +201,9 @@ The Loop Facility provides additional means of symbol handling; see \kwd{loop}, { Evaluate \SO{tagbody}-like body with \VAR{var} successively bound to every symbol from \VAR{package}, to every external symbol from - \VAR{package}, or to every symbol from all registered packages, + \VAR{package}, or to every symbol from all registered packages, respectively. Return \retval{values of \VAR{result}}. Implicitly, - the whole form is a \SO{block} named \NIL. + the whole form is a \SO{block} named \NIL. } \IT{(\MC*{WITH-PACKAGE-ITERATOR} (\VAR{foo} \VAR{packages} @@ -220,13 +221,13 @@ The Loop Facility provides additional means of symbol handling; see \kwd{loop}, { If not in \V{\A modules\A}, try \VAR{paths} to load \VAR{module} from. Signal \kwd{error} if - unsuccessful. Deprecated. + unsuccessful. Deprecated. } \IT{(\FU*{PROVIDE} \VAR{module})} { If not already there, add \VAR{module} to - \V{\A modules\A}. Deprecated. + \V{\A modules\A}. Deprecated. } \IT{\V{\A modules\A}} @@ -280,7 +281,7 @@ function (\kwd{function}, macro, or special operator \VAR{name}). { \retval{Name}, \retval{package}, \retval{property list}, \retval{value}, or \retval{function}, respectively, - of \VAR{symbol}. \kwd{setf}able. + of \VAR{symbol}. \kwd{setf}able. } \IT{(\xorGOO{% @@ -311,14 +312,14 @@ function (\kwd{function}, macro, or special operator \VAR{name}). { Falsity; the empty list; the empty type, subtype of every type; \V{\A standard-input\A}; \V{\A standard-output\A}; the global - environment. + environment. } \end{LIST} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection[Std Packages]{Standard Packages} +\subsection{Standard Packages} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -330,7 +331,7 @@ function (\kwd{function}, macro, or special operator \VAR{name}). \IT{\kwd*{COMMON-LISP-USER}\XOR\kwd*{CL-USER}} { - Current package after startup; uses package \kwd{common-lisp}. + Current package after startup; uses package \kwd{common-lisp}. } \IT{\kwd*{KEYWORD}} @@ -340,7 +341,7 @@ function (\kwd{function}, macro, or special operator \VAR{name}). \end{LIST} -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-sequences.tex b/clqr-sequences.tex index e348001..35eb28a 100644 --- a/clqr-sequences.tex +++ b/clqr-sequences.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2008, 2009, 2010, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -7,12 +7,12 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Sequences} +\section{Sequences} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \label{section:Sequences} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection[Seq.~Predicates]{Sequence Predicates} +\subsection{Sequence Predicates} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -21,7 +21,7 @@ \RP{\VAR{sequence}})} { Return \retval{\NIL} or \retval{\T}, respectively, as soon as \VAR{test} on - any set of corresponding elements of \VAR{sequence}s returns \NIL. + any set of corresponding elements of \VAR{sequence}s returns \NIL. } \IT{(\xorGOO{\FU*{SOME}\\ @@ -30,10 +30,10 @@ { Return \retval{value of \VAR{test}} or \retval{\NIL}, respectively, as soon as \VAR{test} on any set of corresponding elements of - \VAR{sequence}s returns non-\NIL. + \VAR{sequence}s returns non-\NIL. } - \IT{(\FU*{MISMATCH} \VAR{sequence-a} \VAR{sequence-b} + \IT{(\FU*{MISMATCH} \VAR{sequence-a} \VAR{sequence-b} \orGOO{\kwd{:from-end} \VAR{ bool}\DF{\NIL}\\ \xorGOO{% \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ @@ -53,7 +53,7 @@ \end{LIST} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection[Seq.~Functions]{Sequence Functions} +\subsection{Sequence Functions} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} @@ -74,10 +74,10 @@ { Return \retval{interleaved sequence} of \VAR{type}. Merged sequence will be sorted if both \VAR{sequence-a} and \VAR{sequence-b} are - sorted. + sorted. } - \IT{(\FU*{FILL} \DES{\VAR{sequence}} \VAR{foo} + \IT{(\FU*{FILL} \DES{\VAR{sequence}} \VAR{foo} \orGOO{\kwd{:start} \VAR{ start}\DF{\LIT{0}}\\ \kwd{:end} \VAR{ end}\DF{\NIL}}{\}})} { @@ -90,7 +90,7 @@ \VAR{sequence}} (being value of fill pointer if applicable). } - \IT{(\FU*{COUNT} \VAR{foo} \VAR{sequence} + \IT{(\FU*{COUNT} \VAR{foo} \VAR{sequence} \orGOO{\kwd{:from-end} \VAR{ bool}\DF{\NIL}\\ \xorGOO{% \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ @@ -104,7 +104,7 @@ } \IT{(\xorGOO{\FU*{COUNT-IF}\\ - \FU*{COUNT-IF-NOT}}{\}} \VAR{test} \VAR{sequence} + \FU*{COUNT-IF-NOT}}{\}} \VAR{test} \VAR{sequence} \orGOO{\kwd{:from-end} \VAR{ bool}\DF{\NIL}\\ \kwd{:start} \VAR{ start}\DF{\LIT{0}}\\ \kwd{:end} \VAR{ end}\DF{\NIL}\\ @@ -117,7 +117,7 @@ \IT{(\FU*{ELT} \VAR{sequence} \VAR{index})} {Return \retval{element of \VAR{sequence}} pointed to by zero-indexed - \VAR{index}. \kwd{setf}able. + \VAR{index}. \kwd{setf}able. } \IT{(\FU*{SUBSEQ} \VAR{sequence} \VAR{start} @@ -142,7 +142,7 @@ } \IT{(\xorGOO{\FU*{FIND}\\ - \FU*{POSITION}}{\}} \VAR{foo} \VAR{sequence} + \FU*{POSITION}}{\}} \VAR{foo} \VAR{sequence} \orGOO{\kwd{:from-end} \VAR{ bool}\DF{\NIL}\\ \xorGOO{% \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ @@ -158,7 +158,7 @@ \IT{(\xorGOO{\FU*{FIND-IF}\\ \FU*{FIND-IF-NOT}\\\FU*{POSITION-IF}\\ - \FU*{POSITION-IF-NOT}}{\}} \VAR{test} \VAR{sequence} + \FU*{POSITION-IF-NOT}}{\}} \VAR{test} \VAR{sequence} \orGOO{\kwd{:from-end} \VAR{ bool}\DF{\NIL}\\ \kwd{:start} \VAR{ start}\DF{\LIT{0}}\\ \kwd{:end} \VAR{ end}\DF{\NIL}\\ @@ -168,7 +168,7 @@ its \retval{position} relative to the begin of \VAR{sequence}, respectively. } - \IT{(\FU*{SEARCH} \VAR{sequence-a} \VAR{sequence-b} + \IT{(\FU*{SEARCH} \VAR{sequence-a} \VAR{sequence-b} \orGOO{\kwd{:from-end} \VAR{ bool}\DF{\NIL}\\ \xorGOO{% \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ @@ -181,7 +181,7 @@ { Search \VAR{sequence-b} for a subsequence matching \VAR{sequence-a}. Return \retval{position} in \VAR{sequence-b}, or - \retval{\NIL}. + \retval{\NIL}. } \IT{(\xorGOO{\FU*{REMOVE} \VAR{ foo } \VAR{sequence}\\ @@ -221,7 +221,7 @@ \FU*{DELETE-DUPLICATES } \DES{\VAR{sequence}}}{\}} \orGOO{\kwd{:from-end} \VAR{ bool}\DF{\NIL}\\ \xorGOO{% - \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ + \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ \kwd{:test-not} \VAR{ function}}{.}\\ \kwd{:start} \VAR{ start}\DF{\LIT{0}}\\ \kwd{:end} \VAR{ end}\DF{\NIL}\\ @@ -232,7 +232,7 @@ \IT{(\xorGOO{% \FU*{SUBSTITUTE} \VAR{ new} \VAR{ old } \VAR{sequence} \\ - \FU*{NSUBSTITUTE} \VAR{ new} \VAR{ old } \DES{\VAR{sequence}} }{\}} + \FU*{NSUBSTITUTE} \VAR{ new} \VAR{ old } \DES{\VAR{sequence}} }{\}} \orGOO{\kwd{:from-end} \VAR{ bool}\DF{\NIL}\\ \xorGOO{% \kwd{:test} \VAR{ function}\DF{\kwd{\#'eql}}\\ @@ -288,14 +288,14 @@ \OPn{\VAR{sequence}})} { Store into \retval{\VAR{result-sequence}} successively values of - \VAR{function} applied to corresponding elements of the \VAR{sequence}s. + \VAR{function} applied to corresponding elements of the \VAR{sequence}s. } - \IT{(\FU*{REDUCE} \VAR{function} \VAR{sequence} + \IT{(\FU*{REDUCE} \VAR{function} \VAR{sequence} \orGOO{\kwd{:initial-value} \VAR{ foo}\DF{\NIL}\\ \kwd{:from-end} \VAR{ bool}\DF{\NIL}\\ \kwd{:start} \VAR{ start}\DF{\LIT{0}}\\ - \kwd{:end} \VAR{ end}\DF{\NIL}\\ + \kwd{:end} \VAR{ end}\DF{\NIL}\\ \kwd{:key} \VAR{ function}}{\}})} { Starting with the first two elements of \VAR{sequence}, apply @@ -313,7 +313,7 @@ -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-strings.tex b/clqr-strings.tex index 58b7f5b..ec67b21 100644 --- a/clqr-strings.tex +++ b/clqr-strings.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2008, 2010, 2014 Bert Burgemeister +% Copyright (C) 2008, 2010, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -7,7 +7,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Strings} +\section{Strings} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Strings can as well be manipulated by array and sequence functions; see pages \pageref{section:Arrays} and \pageref{section:Sequences}. @@ -22,7 +22,7 @@ see pages \pageref{section:Arrays} and \pageref{section:Sequences}. } \IT{(\xorGOO{\FU*{STRING=}\\\FU*{STRING-EQUAL}}{\}} \VAR{foo} - \VAR{bar} + \VAR{bar} \orGOO{\kwd{:start1} \VAR{ start-foo}\DF{\LIT{0}}\\ \kwd{:start2} \VAR{ start-bar}\DF{\LIT{0}}\\ \kwd{:end1} \VAR{ end-foo}\DF{\NIL}\\ @@ -66,7 +66,7 @@ see pages \pageref{section:Arrays} and \pageref{section:Sequences}. \FU*{STRING-CAPITALIZE}\\ \FU*{STRING-UPCASE}\\ \FU*{STRING-DOWNCASE}}{\}} - \VAR{ x } + \VAR{ x } \orGOO{\kwd{:start} \VAR{ start}\DF{\LIT{0}}\\ \kwd{:end} \VAR{ end}\DF{\NIL}}{\}})}{.}} { @@ -80,13 +80,13 @@ see pages \pageref{section:Arrays} and \pageref{section:Sequences}. \FU*{NSTRING-CAPITALIZE}\\ \FU*{NSTRING-UPCASE}\\ \FU*{NSTRING-DOWNCASE}}{\}} - \VAR{\DES{string}} + \VAR{\DES{string}} \orGOO{\kwd{:start} \VAR{ start}\DF{\LIT{0}}\\ \kwd{:end} \VAR{ end}\DF{\NIL}}{\}})} { Convert \VAR{string} into a \retval{string with capitalized words}, an \retval{all-uppercase string}, or an - \retval{all-lowercase string}, respectively. + \retval{all-lowercase string}, respectively. } \IT{(\xorGOO{\FU*{STRING-TRIM}\\ @@ -95,7 +95,7 @@ see pages \pageref{section:Arrays} and \pageref{section:Sequences}. { Return \retval{\VAR{string}} with all characters in sequence \VAR{char-bag} removed from both ends, from the beginning, or from - the end, respectively. + the end, respectively. } \IT{\arrGOO{(\FU*{CHAR} \VAR{ string} \VAR{ i})\\ @@ -117,7 +117,7 @@ see pages \pageref{section:Arrays} and \pageref{section:Sequences}. \end{LIST} -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-structures.tex b/clqr-structures.tex index e11dfb5..91784cf 100644 --- a/clqr-structures.tex +++ b/clqr-structures.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2008, 2009, 2010, 2012, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2012, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -11,7 +11,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} - + \IT{(\MC*{DEFSTRUCT} \xorGOO{\VAR{foo}\\ (\VAR{foo\hspace{.5ex}} @@ -69,7 +69,7 @@ Define structure \retval{\VAR{foo}} together with functions \LIT{MAKE-}\VAR{foo}, \LIT{COPY-}\VAR{foo} and \VAR{foo}\LIT{-P}; and \kwd{setf}able accessors - \VAR{foo}\LIT{-}\VAR{slot}. Instances are of class \VAR{foo} or, if + \VAR{foo}\LIT{-}\VAR{slot}. Instances are of class \VAR{foo} or, if \kwd{defstruct} option \kwd{:type} is given, of the specified type. They can be created by (\LIT{MAKE-}\VAR{foo} \Goos{\kwd{:}\VAR{slot} @@ -96,7 +96,7 @@ -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr-types-and-classes.mp b/clqr-types-and-classes.mp index c4fcfa3..bde69db 100644 --- a/clqr-types-and-classes.mp +++ b/clqr-types-and-classes.mp @@ -1,4 +1,4 @@ -% Copyright (C) 2010, 2014 Bert Burgemeister +% Copyright (C) 2010, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -79,7 +79,7 @@ beginfig(1); t.se+(12,0) = atom.nw; drawboxed_type(atom); drawboxed_system_class(readtable,package,symbol); - + boxjoin(a.sw+(0,-3) = b.nw); boxit.keyword(btex \kwd{KEYWORD} etex); boxit.boolean_(btex \kwd{BOOLEAN} etex); @@ -95,7 +95,7 @@ beginfig(1); boolean_.sw+(-35,-5) = restart.nw; drawboxed_system_class(restart,random_state,hash_table); drawboxed_class(structure_object,standard_object); - + boxjoin() boxit.null(btex \kwd{NULL} etex); symbol.se+(15,0) = null.sw; @@ -112,28 +112,28 @@ beginfig(1); boxit.structure_class(btex \kwd{STRUCTURE-CLASS} etex); class.sw+(15,-3) = built_in_class.nw; drawboxed_system_class(built_in_class,standard_class,structure_class); - + boxjoin(a.sw+(0,-3) = b.nw); boxit.method(btex \kwd{METHOD} etex); boxit.standard_method(btex \kwd{STANDARD-METHOD} etex); structure_class.sw+(-5,-6) = method.nw; drawboxed_system_class(method,standard_method); - + boxjoin(); boxit.method_combination(btex \kwd{METHOD-COMBINATION} etex); method_combination.nw = (xpart t.w,ypart standard_method.s - 3); drawboxed_system_class(method_combination); - + boxjoin(); boxit.character(btex \kwd{CHARACTER} etex); atom.ne+(23,-10) = character.nw; drawboxed_system_class(character); - + boxjoin() boxit.function(btex \kwd{FUNCTION} \OP{\VAR{arg-types} \Op{\VAR{value-types}}} etex); function.nw = (205,-10); drawboxed_system_class(function); - + boxjoin(a.sw+(0,-3) = b.nw); boxit.compiled_function(btex \kwd{COMPILED-FUNCTION} etex); boxit.generic_function(btex \kwd{GENERIC-FUNCTION} etex); @@ -141,7 +141,7 @@ beginfig(1); function.se+(0,-3) = compiled_function.ne; drawboxed_type(compiled_function); drawboxed_system_class(generic_function,standard_generic_function); - + boxjoin(a.sw+(0,-3) = b.nw); boxit.pathname(btex \kwd{PATHNAME} etex); boxit.logical_pathname(btex \kwd{LOGICAL-PATHNAME} etex); @@ -154,7 +154,7 @@ beginfig(1); boxit.real(btex \kwd{REAL} \OP{\VAR{lower-limit}\DF{\kwd{\A}} \Op{\VAR{upper-limit}\DF{\kwd{\A}}}} etex); number.nw = (433,-44); drawboxed_system_class(number,complex,real); - + boxjoin() boxit.float(btex \kwd{FLOAT} \OP{\VAR{lower-limit}\DF{\kwd{\A}} \Op{\VAR{upper-limit}\DF{\kwd{\A}}}} etex); real.s+(15,-3) = float.n; @@ -170,7 +170,7 @@ beginfig(1); float.se+(-15,-3) = short_float.ne; drawboxed_type(short_float,single_float,double_float,long_float); drawboxed_system_class(rational,integer); - + boxjoin(); boxit.ratio(btex \kwd{RATIO} etex); integer.sw+(0,-3) = ratio.nw; @@ -188,18 +188,18 @@ beginfig(1); boxit.bit(btex \kwd{BIT} etex); signed_byte.sw+(25,-3) = unsigned_byte.nw; drawboxed_type(unsigned_byte,bit); - + boxjoin(a.ne+(20,0) = b.sw); boxit.list(btex \kwd{LIST} etex); boxit.sequence(btex \kwd{SEQUENCE} etex); list.sw = (143,-71); drawboxed_system_class(list,sequence); - + boxjoin(); boxit.cons(btex \kwd{CONS} \OP{\VAR{car-type}\DF{\kwd{\A}} \Op{\VAR{cdr-type}\DF{\kwd{\A}}}} etex); list.se+(0,-3) = cons.n; drawboxed_system_class(cons); - + boxjoin(a.sw+(0,-3) = b.nw); boxit.array(btex \kwd{ARRAY} \OP{\VAR{type}\DF{\kwd{\A}} \Op{\VAR{rank}\DF{\kwd{\A}}\XOR(\OPn{\VAR{dimension}})}} etex); boxit.simple_array(btex \kwd{SIMPLE-ARRAY} \OP{\VAR{type}\DF{\kwd{\A}} \Op{\VAR{rank}\DF{\kwd{\A}}\XOR(\OPn{\VAR{dimension}})}} etex); @@ -234,13 +234,13 @@ beginfig(1); boxit.echo_stream(btex \kwd{ECHO-STREAM} etex); stream.se+(-33,-69) = file_stream.ne; drawboxed_system_class(file_stream,two_way_stream,synonym_stream,string_stream,broadcast_stream,concatenated_stream,echo_stream); - + boxjoin(a.s+(0,-3) = b.n); boxit.extended_char(btex \kwd{EXTENDED-CHAR} etex); boxit.base_char(btex \kwd{BASE-CHAR} etex); character.e+(10,0) = extended_char.w; drawboxed_type(extended_char,base_char); - + boxjoin(); boxit.standard_char(btex \kwd{STANDARD-CHAR} etex); base_char.s+(5,-3) = standard_char.n; @@ -269,7 +269,7 @@ beginfig(1); boxit.error(btex \kwd{ERROR}\\ etex); type_error.sw+(-15,-3) = error.nw; drawboxed_condition_type(error); - + boxjoin(a.sw+(0,-3) = b.nw); boxit.program_error(btex \kwd{PROGRAM-ERROR} etex); boxit.control_error(btex \kwd{CONTROL-ERROR} etex); @@ -315,8 +315,8 @@ beginfig(1); boxit.unbound_variable(btex \kwd{UNBOUND-VARIABLE} etex); boxit.unbound_slot(btex \kwd{UNBOUND-SLOT} etex); cell_error.e+(15,0) = undefined_function.w; - drawboxed_condition_type(end_of_file,reader_error,unbound_variable,undefined_function,unbound_slot); - + drawboxed_condition_type(end_of_file,reader_error,unbound_variable,undefined_function,unbound_slot); + boxjoin(a.sw+(0,-3) = b.nw); boxit.division_by_zero(btex \kwd{DIVISION-BY-ZERO} etex); boxit.floating_point_inexact(btex \kwd{FLOATING-POINT-INEXACT} etex); @@ -342,7 +342,7 @@ beginfig(1); drawarrow t.s{down} ... readtable.w{right}; drawarrow t.s{down} ... package.w{right}; drawarrow t.s{down} ... symbol.w{right}; - + drawarrow t.s{down} .. t.s+(0,-25){down} ... array.w+(0,3){right}; drawarrow t.s{down} .. t.s+(0,-25){down} ... restart.w{right}; drawarrow t.s{down} .. t.s+(0,-25){down} ... random_state.w{right}; @@ -350,14 +350,14 @@ beginfig(1); drawarrow t.s{down} .. t.s+(0,-25){down} ... structure_object.w{right}; drawarrow t.s{down} .. t.s+(0,-25){down} ... standard_object.w{right}; drawarrow t.s{down} .. t.s+(0,-25){down} ... method.w{right}; - + drawarrow standard_object.s{down} .. class.e{left}; drawarrow class.sw+(5,0){down} ... standard_class.w{right}; drawarrow class.sw+(5,0){down} ... built_in_class.w{right}; drawarrow class.sw+(5,0){down} ... structure_class.w{right}; drawarrow t.s{down} -- (xpart t.s,ypart method_combination.nw); - + drawarrow standard_object.s{down} .. built_in_class.ne+(2,2) ... standard_class.e+(7,0) ... structure_class.se+(-2,-4) .. method.e{down} .. standard_method.ne+(-20,2){down} ... standard_method.ne+(-20,0){down} dashed evenly; halfdisc_e (method.e); @@ -431,11 +431,11 @@ beginfig(1); drawarrow stream.s{down} ... echo_stream.e{left}; drawarrow pathname.e{right} .. logical_pathname.ne+(-15,0){down}; - + drawarrow condition.e{right} .. condition.e+(95,0){right} .. (xpart warning.w,ypart condition.e){right}; drawarrow condition.e{right} .. condition.e+(95,0){right} .. simple_condition.n+(-15,0){down}; drawarrow condition.e{right} ... serious_condition.ne+(-10,0){down}; - + drawarrow (xpart warning.e,ypart condition.e){right} .. style_warning.ne+(-10,0){down}; drawarrow serious_condition.e{right} .. storage_condition.w{right}; diff --git a/clqr-typographic-conventions.tex b/clqr-typographic-conventions.tex index 9f3bb2a..af34799 100644 --- a/clqr-typographic-conventions.tex +++ b/clqr-typographic-conventions.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2008, 2009, 2012, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2012, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -61,7 +61,7 @@ \IT{\orGOO{ \VAR{foo}\\ \VAR{bar}\\ - \VAR{baz} + \VAR{baz} }{.}} { Anything from none to each of \VAR{foo}, \VAR{bar}, and \VAR{baz}. @@ -92,10 +92,10 @@ { \kwd*{T}, or truth in general; and \kwd*{NIL} or \kwd{()}. } - + \end{LIST} -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr.macros.tex b/clqr.macros.tex index be8f7dd..475c536 100644 --- a/clqr.macros.tex +++ b/clqr.macros.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2011, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, @@ -55,13 +55,6 @@ \fi% } % -% -\newpagestyle{lispref}[\sffamily\mdseries\slshape]{ - \headrule\footrule - \sethead*{}{}{\maintitle\/} - \setfoot*{}{}{\thepage\/}} -\pagestyle{lispref} - % Emphasize \newcommand{\EM}[1]{% \text{{\fontfamily{cmr}\fontseries{b}\fontshape{n}\selectfont#1}}} @@ -252,7 +245,7 @@ \hyphenation{white-space pa-ra-me-ters} -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: "clqr" -%%% End: +%%% End: diff --git a/clqr.packages.tex b/clqr.packages.tex index 30cd83f..c8c70a3 100644 --- a/clqr.packages.tex +++ b/clqr.packages.tex @@ -1,20 +1,21 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2014 Bert Burgemeister +% Copyright (C) 2008, 2009, 2010, 2011, 2014, 2018 Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this % document under the terms of the GNU Free Documentation License, % Version 1.2; with no Invariant Sections, no Front-Cover Texts and % no Back-Cover Texts. For details see file COPYING. % +%\usepackage[T1]{fontenc} % problem with index font \usepackage{amsmath} -\usepackage{amsfonts} +%\usepackage{amsfonts} \usepackage{amssymb} -\usepackage[mathcal]{euscript} +%\usepackage[mathcal]{euscript} \usepackage{rotating} -\usepackage{graphicx} +%\usepackage{graphicx} \usepackage{multicol} -\usepackage{textcase} +%\usepackage{textcase} \usepackage{textcomp} \usepackage{ulem} \usepackage[usenames,dvips]{color} @@ -22,14 +23,15 @@ \usepackage{makeidx} \definecolor{frontcovergray}{gray}{.85} \definecolor{backcovergray}{gray}{.9} -\usepackage[pagestyles]{titlesec} -\usepackage{titletoc} +%\usepackage[pagestyles]{titlesec} +\usepackage{scrlayer-scrpage} +%\usepackage{titletoc} % %%%%%%%%%%%%%%%%%% % Two font alternatives: % (A) All (except cover pages) Computer Modern -- % everything comes from the same sound root; gets about 5% longer -% than alternative (B) +% than alternative (B) \usepackage{type1cm} \usepackage{exscale} %%%%%%%%%%%%%%%%%% diff --git a/clqr.tex b/clqr.tex index 4bac410..3ddfe4f 100644 --- a/clqr.tex +++ b/clqr.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 +% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2018 % Bert Burgemeister % % Permission is granted to copy, distribute and/or modify this @@ -20,7 +20,10 @@ \newcommand{\clearpagebeforeindex}{} % % -\documentclass[8pt,pagesize,twoside,footinclude=false,headinclude=false]{scrartcl} +\documentclass[fontsize=8pt,DIV=24,BCOR=3mm,pagesize,twoside, +footinclude=false,headinclude=true, +footsepline=.25pt,headsepline=.25pt, +toc=flat]{scrartcl} % % %%%%%%%%%%%%%%%%%% @@ -28,11 +31,11 @@ \input{paper-current} %\setlength{\paperwidth}{10.5cm} %\setlength{\paperheight}{29.7cm} -%%\areaset[3mm]{9cm}{28.3cm} -%\typearea[2mm]{20} %\renewcommand{\clearpagebeforeindex}{\clearpage} %%%%%%%%%%%%%%%%%% % +\recalctypearea +% %%%%%%%%%%%%%%%%%% % outsourced hypertext colors \input{color-current} @@ -44,43 +47,58 @@ % \input{clqr.packages} % should remain last usepackage: -\usepackage% - [breaklinks,linktocpage,colorlinks,% - bookmarksnumbered,bookmarks=\bookmarks,% - linkcolor=\linkcolor,urlcolor=\urlcolor,% - pdfpagelayout=\pdfpagelayout,% - pdftitle=\maintitle,pdfauthor=\AUTHOR,% - pdfsubject=\SUBJECT,pdfkeywords=\KEYWORDS]% - {hyperref} +\usepackage[% +breaklinks,linktocpage,colorlinks,% +bookmarksnumbered,bookmarks=\bookmarks,% +linkcolor=\linkcolor,urlcolor=\urlcolor,% +pdfpagelayout=\pdfpagelayout,% +pdftitle=\maintitle,pdfauthor=\AUTHOR,% +pdfsubject=\SUBJECT,pdfkeywords=\KEYWORDS]% +{hyperref} % \makeindex -\titleformat{\section}{\sffamily\mdseries\slshape} - {\huge\thesection}{.7em}{\huge}[{\titlerule[0.25pt]}] - -\titleformat{\subsection}{\sffamily\mdseries\slshape} - {\Large\thesubsection}{.7em}{\Large}[{\titlerule[0.25pt]}] - +% +\setkomafont{pageheadfoot}{\sffamily\mdseries\slshape} +\setkomafont{pagenumber}{\sffamily\mdseries\slshape} +\setkomafont{section}{\sffamily\mdseries\slshape\huge} +\setkomafont{subsection}{\sffamily\mdseries\slshape\Large} +% +\makeatletter +\renewcommand{\sectionlinesformat}[4]{% + \ifstr{#1}{section}{% + \parbox[t]{\linewidth}{% + \raggedsection\@hangfrom{\hskip #2#3}{#4}\par% + \kern-1\ht\strutbox\rule{\linewidth}{.25pt}% + }% + }{% + {% + \ifstr{#1}{subsection}{% + \parbox[t]{\linewidth}{% + \raggedsection\@hangfrom{\hskip #2#3}{#4}\par% + \kern-1\ht\strutbox\rule{\linewidth}{.25pt}% + }% + }{% + \@hangfrom{\hskip #2#3}{#4}}}}% +} +\makeatother +% +\RedeclareSectionCommand[beforeskip=-2.5\baselineskip plus -1ex]{section} +\RedeclareSectionCommand[beforeskip=-2.5\baselineskip plus -1ex,afterskip=.4\baselineskip]{subsection} +\DeclareTOCStyleEntry[beforeskip=1.5ex plus 1pt]{tocline}{section} +\DeclareTOCStyleEntry[entryformat=\sffamily\mdseries,pagenumberformat=\sffamily\mdseries]{tocline}{subsection} +% % Kill toc header as we want it to span columns \deftocheading{toc}{} - -\titlecontents{section}% - [1.5em]% - {\vspace{.5em plus 1em minus .2em}\sffamily\bfseries\upshape\filright}% - {\contentslabel{1.5em}}% - {\hspace*{3em}}% - {\hfill\contentspage\vspace{.1em}}% - -\titlecontents{subsection}% - [4em]% - {\sffamily\mdseries\upshape\filright}% - {\contentslabel{2.5em}}% - {\hspace*{5.5em}}% - {\hspace{.5ex plus .5ex minus .3ex}\titlerule*[1em]{.}\contentspage}% - +% \input{clqr.macros} % +\pagestyle{scrheadings} +% +% \begin{document} - +% +% +\markboth{\sffamily\mdseries\slshape\maintitle}{\sffamily\mdseries\slshape\maintitle} \newlength{\titlepagewidth} \setlength{\titlepagewidth}{8cm} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -165,7 +183,6 @@ % \clearpagebeforeindex % \clearpage dependent on paper size % -\renewcommand{\indexpagestyle}{lispref} \renewenvironment{theindex}% {\begin{list}{}% {\setlength{\itemindent}{-1em}\setlength{\leftmargin}{1em}}% @@ -175,10 +192,10 @@ {\end{list}} \begin{multicols}{4} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - [\section*{Index}\vspace{-5ex}] + [\section*{Index}\vspace{-3ex}] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Stock \printindex won't do as we want more than two columns. - \tiny\sffamily\input{clqr.ind} + \tiny\sffamily\mdseries\input{clqr.ind} \end{multicols} @@ -187,18 +204,18 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \clearpage \pagestyle{empty} -\newcount\currentpage -\currentpage=\value{page} -\divide\currentpage by 4 -\multiply\currentpage by 4 +\newcount\currentpage +\currentpage=\value{page} +\divide\currentpage by 4 +\multiply\currentpage by 4 \advance\currentpage by -\value{page} % -\ifnum\the\currentpage=-3 +\ifnum\the\currentpage=-3 \rule{0pt}{0pt}\clearpage \else\ifnum\the\currentpage=-2 -\rule{0pt}{0pt}\clearpage\rule{0pt}{0pt}\clearpage +\rule{0pt}{0pt}\clearpage\rule{0pt}{0pt}\clearpage \else\ifnum\the\currentpage=-1 -\rule{0pt}{0pt}\clearpage\rule{0pt}{0pt}\clearpage\rule{0pt}{0pt}\clearpage +\rule{0pt}{0pt}\clearpage\rule{0pt}{0pt}\clearpage\rule{0pt}{0pt}\clearpage \fi\fi\fi % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -226,13 +243,13 @@ \hfill Revision \input{REVISION} [\input{DATE}\hspace{-.65ex}]} - \makebox[\textwidth][l]{Copyright \copyright\ 2008 - 2014 + \makebox[\textwidth][l]{Copyright \copyright\ 2008--2018 \AUTHOR\hfill} \makebox[\textwidth][l]{\LaTeX\ source: \href{http://clqr.boundp.org}{http://clqr.boundp.org} \hfill \raisebox{-1mm}[0mm][0mm]{\includegraphics[origin=c,height=5mm,keepaspectratio,angle=-40]{housefly.eps}} - }\\[1mm] + }\\[1mm] Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2; with no Invariant Sections, no Front-Cover Texts and @@ -249,7 +266,7 @@ % LocalWords: ptm lightgray cl lispref theindex pt -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: t -%%% End: +%%% End: diff --git a/html-template/download.html b/html-template/download.html index f3089f5..60f708e 100644 --- a/html-template/download.html +++ b/html-template/download.html @@ -139,7 +139,7 @@ - © 2008 - 2014   + © 2008 - 2018   Bert Burgemeister diff --git a/html-template/index.html b/html-template/index.html index cb9464d..2c77b24 100644 --- a/html-template/index.html +++ b/html-template/index.html @@ -68,7 +68,7 @@ - © 2008 - 2014   + © 2008 - 2018   Bert Burgemeister diff --git a/html-template/license.html b/html-template/license.html index aa7f144..a3339d3 100644 --- a/html-template/license.html +++ b/html-template/license.html @@ -31,7 +31,7 @@

License

- Copyright © 2008 - 2014 Bert Burgemeister + Copyright © 2008 - 2008 Bert Burgemeister

Permission is granted to copy, distribute and/or modify this @@ -555,7 +555,7 @@ - © 2008 - 2014   + © 2008 - 2018   Bert Burgemeister diff --git a/html-template/printing.html b/html-template/printing.html index 261ee13..3d83c62 100644 --- a/html-template/printing.html +++ b/html-template/printing.html @@ -67,7 +67,7 @@ - © 2008 - 2014   + © 2008 - 2018   Bert Burgemeister diff --git a/html-template/source.html b/html-template/source.html index 09b7609..4eb178f 100644 --- a/html-template/source.html +++ b/html-template/source.html @@ -65,7 +65,7 @@ - © 2008 - 2014   + © 2008 - 2018   Bert Burgemeister diff --git a/paper-a4.tex b/paper-a4.tex index 4bd93a7..2e9296c 100644 --- a/paper-a4.tex +++ b/paper-a4.tex @@ -1,6 +1,4 @@ % outsourced page dimensions for A4 paper \setlength{\paperwidth}{10.5cm} \setlength{\paperheight}{29.7cm} -%%\areaset[10mm]{8cm}{29cm} -\typearea[3mm]{20} \renewcommand{\clearpagebeforeindex}{\clearpage} \ No newline at end of file diff --git a/paper-letter.tex b/paper-letter.tex index 54fd1e0..9710f1d 100644 --- a/paper-letter.tex +++ b/paper-letter.tex @@ -1,6 +1,4 @@ % outsourced page dimensions for letter paper \setlength{\paperwidth}{4.25in} \setlength{\paperheight}{11in} -%%\areaset[10mm]{8cm}{29cm} -\typearea[3mm]{20} \renewcommand{\clearpagebeforeindex}{\clearpage} -- 2.11.4.GIT