Permalink
Browse files

Entries on apply and defstruct changed.

Plus a few other beautifications and typo fixes.
  • Loading branch information...
1 parent 7424ed4 commit 79207061956e588415b1e31d3b9d3f63cabc9467 @trebb committed Nov 29, 2009
Showing with 36 additions and 61 deletions.
  1. +10 −10 clqr-control-structure.tex
  2. +14 −10 clqr-input-output.tex
  3. +1 −1 clqr-numbers.tex
  4. +11 −8 clqr-structures.tex
  5. +0 −17 fetch-news.sh
  6. +0 −15 upload.sh
@@ -247,10 +247,10 @@ \subsection{Functions}
}
\IT{(\FU*{APPLY} \xorGOO{\VAR{function}\\
- (\kwd{setf } \VAR{function})}{\}} \RP{\VAR{arg}})}
+ (\kwd{setf } \VAR{function})}{\}} \OPn{\VAR{arg}} \VAR{args})}
{
- Return \retval{values of \VAR{function}} called on
- \VAR{arg}s. Last \VAR{arg} must be a list. \kwd{setf}able if
+ Return \retval{values of \VAR{function}} called with
+ \VAR{arg}s and the list elements of \VAR{args}. \kwd{setf}able if
\VAR{function} is one of \FU{aref}, \FU{bit}, and \FU{sbit}.
}
@@ -259,10 +259,9 @@ \subsection{Functions}
Return \retval{values of \VAR{function}} called with \VAR{arg}s.
}
- \IT{(\SO*{MULTIPLE-VALUE-CALL} \VAR{foo} \OPn{\VAR{form}})}
- {Call function
- \VAR{foo} with all the values of each \VAR{form} as its arguments. Return
- \retval{values returned by \VAR{foo}}.
+ \IT{(\SO*{MULTIPLE-VALUE-CALL} \VAR{function} \OPn{\VAR{form}})}
+ {Call \VAR{function} with all the values of each \VAR{form} as its
+ arguments. Return \retval{values returned by \VAR{function}}.
}
\IT{(\FU*{VALUES-LIST} \VAR{list})}
@@ -278,7 +277,7 @@ \subsection{Functions}
\IT{(\FU*{MULTIPLE-VALUE-LIST} \VAR{form})}
{
- Return in a \retval{list} values of \VAR{form}.
+ \retval{List of the values of \VAR{form}}.
}
\IT{(\MC*{NTH-VALUE} \VAR{n} \VAR{form})}
@@ -370,7 +369,7 @@ \subsection{Macros}
\kwd{\&rest}\\
\kwd{\&body}}{\}}
\xorGOO{%
- \VAR{var}\\
+ \VAR{rest-var}\\
(\OPn{\VAR{macro-$\lambda$}})}{\}}}
\penalty-5
\Op{\VAR{E}}
@@ -395,6 +394,7 @@ \subsection{Macros}
\Op{\VAR{E}})
\\
or
+ \\
\penalty-5
(\Op{\kwd{\&whole}
\VAR{var}}
@@ -417,7 +417,7 @@ \subsection{Macros}
\penalty-5
\Op{\VAR{E}}
\kwd{.}
- \VAR{var}).
+ \VAR{rest-var}).
\penalty-5
\end{flushleft}
One toplevel \Op{\VAR{E}} may be replaced by \kwd{\&environment}
View
@@ -304,7 +304,7 @@ \subsection{Reader}
(\FU{complex} \VAR{a} \VAR{b}), the complex number $\VAR{a}+\VAR{b}\text{i}$.
}
- \IT{\KWD*{\#'}\VAR{foo}\qquad\qquad}
+ \IT{\KWD*{\#'}\VAR{foo}\qquad\qquad\qquad}
{
(\SO{function} \VAR{foo}); the function named \VAR{foo}.
}
@@ -627,7 +627,8 @@ \subsection{Printer}
\IT{\V{\A print-miser-width\A}}
{\index{*PRINT-MISER-WIDTH*@\A PRINT-MISER-WIDTH\A}
- Width below which a compact pretty-printing style is used.
+ If integer and greater than the width available for printing a
+ substructure, switch to the more compact miser style.
}
\IT{\V{\A print-pretty\A}}
@@ -878,11 +879,11 @@ \subsection{Format}
}
\IT{\KWD{\TLD}\Op{\KWD{:}}\Op{\KWD{@}}\KWD{\boldmath{$<$}}
- \OP{\Goo{\VAR{prefix}\DF{\LIT{""}}\KWD{\TLD;}}\XOR\Goo{\VAR{per-line-prefix}\KWD{\TLD@;}}}
+ \GOo{\Op{\VAR{prefix}\DF{\LIT{""}}\KWD{\TLD;}}\XOR\Op{\VAR{per-line-prefix}\KWD{\TLD@;}}}
\VAR{body}\OP{\KWD{\TLD;}\VAR{suffix}\DF{\LIT{""}}}\KWD{\TLD:}\Op{\KWD{@}}\KWD{\boldmath{$>$}}}
{\index{\~<\~:>@$\sim$$<$ $\sim$:$>$}%
\EM{Logical Block. }
- Act like \kwd{pprint-logical-block} using \VAR{body} as \MC{format}
+ Act like \kwd{pprint-logical-block} using \VAR{body} as \FU{format}
control string on the elements of the list argument or, with \KWD{@},
on the remaining arguments, which are extracted by
\kwd{pprint-pop}. With \KWD{:}, \VAR{prefix} and \VAR{suffix}
@@ -1135,7 +1136,9 @@ \subsection{Streams}
\IT{\arrGOO{\V{\A standard-input\A}\\
\V{\A standard-output\A}\\
\V{\A error-output\A}}{.}}
- {\index{*STANDARD-INPUT*@\A STANDARD-INPUT\A}\index{*STANDARD-OUTPUT*@\A STANDARD-OUTPUT\A}\index{*ERROR-OUTPUT*@\A ERROR-OUTPUT\A}
+ {\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,
or standard error output stream, respectively.
}
@@ -1159,8 +1162,8 @@ \subsection{Files}
\orGOO{\kwd{:host} \VAR{ host}\\
\kwd{:device} \VAR{ dev}\\
\kwd{:directory} \VAR{ dir}\\
- \kwd{:name} \VAR{ name}\\
- \kwd{:type} \VAR{ type}\\
+ \kwd{:name} \VAR{ file-name}\\
+ \kwd{:type} \VAR{ file-type}\\
\kwd{:version} \VAR{ ver}\\
\kwd{:defaults} \VAR{ path}\\
\kwd{:case
@@ -1198,8 +1201,9 @@ \subsection{Files}
(\FU*{DIRECTORY-NAMESTRING}\VAR{ path})\\
(\FU*{HOST-NAMESTRING}\VAR{ path})}{.}}
{
- Return string representing \retval{full pathname}; \retval{name, type, and version};
- \retval{directory name}; or \retval{host name}, respectively, of \VAR{path}.
+ Return string representing \retval{full pathname}; \retval{name,
+ type, and version}; \retval{directory name}; or \retval{host
+ name}, respectively, of \VAR{path}.
}
\IT{(\FU*{PARSE-NAMESTRING} \VAR{foo}
@@ -1220,7 +1224,7 @@ \subsection{Files}
\FU*{PATHNAME-DIRECTORY}\\
\FU*{PATHNAME-NAME}\\
\FU*{PATHNAME-TYPE}}{\}}
- \VAR{path }
+ \VAR{ path }
\Op{\kwd{:case } \xorGOO{\kwd{:local}\\
\kwd{:common}}{\}}\DF{\kwd{:local}}})\\
(\FU*{PATHNAME-VERSION } \VAR{path})}{.}}
View
@@ -42,7 +42,7 @@ \subsection{Predicates}
\IT{\arrGOO{(\FU*{MINUSP} \VAR{ a})\\
(\FU*{ZEROP} \VAR{ a})\\
(\FU*{PLUSP}
- \VAR{ a})}{.}}
+ \VAR{ a})}{.}\qquad\qquad}
{
\retval{\T} if $a < 0$, $a = 0$, or $a > 0$, respectively.
}
View
@@ -1,4 +1,4 @@
-% Copyright (C) 2008 Bert Burgemeister
+% Copyright (C) 2008, 2009 Bert Burgemeister
%
% Permission is granted to copy, distribute and/or modify this
% document under the terms of the GNU Free Documentation License,
@@ -40,7 +40,7 @@ \section{Structures}
\xorGOO{
(\kwd{:type } \xorGOO{\kwd{list}\\
\kwd{vector}\\
- (\kwd{vector }\NEV{\VAR{size}})}{\}})\text{ }
+ (\kwd{vector }\NEV{\VAR{element-type}})}{\}})\text{ }
\orGOO{%
\kwd{:named}\\
(\kwd{:initial-offset } \NEV{\VAR{n}})\\
@@ -61,17 +61,18 @@ \section{Structures}
\VAR{slot}\\
(\VAR{slot } \Op{\VAR{init}\text{ }
\orGOO{
- \kwd{:type } \NEV{\VAR{type}}\\
+ \kwd{:type } \NEV{\VAR{slot-type}}\\
\kwd{:read-only } \NEV{\VAR{bool}}
}{\}}})
}{\}^{\!\!*}}%
)}
{
- Define structure type \retval{\VAR{foo}} together with functions
- \LIT{MAKE-}\VAR{foo}, \LIT{COPY-}\VAR{foo} and (unless \kwd{:type}
- without \kwd{:named} is used)
+ 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 of type \VAR{foo} can be
+ \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}
\VAR{value}}) or, if \VAR{ord-$\lambda$} (see
p.\ \pageref{section:Functions}) is given, by (\VAR{maker}
@@ -83,7 +84,9 @@ \section{Structures}
\GFU{print-object} method for an instance \VAR{bar} of \VAR{foo}
calling (\VAR{o-printer} \VAR{bar} \VAR{stream}) or (\VAR{f-printer}
\VAR{bar} \VAR{stream} \VAR{print-level}), respectively.
- }
+ If \kwd{:type} without \kwd{:named} is given, no \VAR{foo}\LIT{-P}
+ is created.
+}
\IT{(\FU*{COPY-STRUCTURE} \VAR{structure})}
{
View
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Fetch news and prune them for inclusion by html/index.php
-#
-/usr/bin/wget -q -O news-clqr.tmp \
- 'http://developer.berlios.de/export/projnews.php?group_id=9765&limit=7&flat=1&show_summaries=1' \
- > /dev/null
-/bin/sed -e "s/ &nbsp; - &nbsp; <a href=\"\/\/developer.berlios.de\/projects\/clqr\/\">Common Lisp Quick Reference<\/a>//g"\
- -e "s/<a [^>]*>//g" -e "s/<\/a>//g"\
- -e "s/<b>/<h5>/g" -e "s/<\/b>/<\/h5>/g" \
- -e "s/<i>/<i>[/g" -e "s/<\/i>/]<\/i>/g" \
- -e "s/<div .*<\/div>//g" -e "s/<hr [^>]*>/<p>/g"\
- -e "s/^[ \t\]*//g" -e "s/&nbsp;&nbsp;&nbsp;//g"\
- news-clqr.tmp > /home/groups/clqr/htdocs/news-clqr.html
-/bin/rm news-clqr.tmp
-cp /home/groups/ftp/pub/clqr/clqr/REVISION.tex /home/groups/clqr/htdocs/release-revision.txt
-cp /home/groups/ftp/pub/clqr/clqr/DATE.tex /home/groups/clqr/htdocs/release-date.txt
View
@@ -1,15 +0,0 @@
-#! /bin/sh
-REMOTE='ftp.berlios.de'
-USER='ftp'
-PASSWORD='x'
-FTPLOG='ftp.log'
-
-ftp -ni $REMOTE <<_FTP>>$FTPLOG
-quote USER $USER
-quote PASS $PASSWORD
-bin
-cd /incoming
-mput *.pdf
-put clqr.tar.gz
-quit
-_FTP

0 comments on commit 7920706

Please sign in to comment.