From 42624410f7eeb34b6048b0d015678028d2832ed7 Mon Sep 17 00:00:00 2001
From: Bert Burgemeister <trebbu@googlemail.com>
Date: Wed, 20 Jun 2012 21:28:29 +0200
Subject: [PATCH] Edits to formatter, defclass, and the caption of the types
 figure

---
 clqr-input-output.tex      | 15 ++++++++-------
 clqr-types-and-classes.tex |  8 +++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/clqr-input-output.tex b/clqr-input-output.tex
index cd63573..bcc0a95 100644
--- a/clqr-input-output.tex
+++ b/clqr-input-output.tex
@@ -713,9 +713,9 @@
 
   \IT{(\MC*{FORMATTER} \NEV{\VAR{control}})}
   {
-    Return \retval{function} of stream and a \kwd{\&rest} argument applying \FU{format} to
-    stream, \VAR{control}, and the \kwd{\&rest} argument
-    returning \NIL\ or any excess arguments. 
+    Return \retval{function} of \VAR{stream} and \OPn{\VAR{arg}}
+    applying \FU{format} to \VAR{stream}, \VAR{control}, and
+    \OPn{\VAR{arg}} returning \NIL\ or any excess \VAR{arg}s.
   }
 
   \IT{(\FU*{FORMAT} \Goo{\T\XOR\NIL\XOR\VAR{out-string}\XOR\VAR{out-stream}}
@@ -724,10 +724,11 @@
     Output string \VAR{control} which may
     contain \kwd{\TLD} directives possibly taking some
     \VAR{arg}s. Alternatively, \VAR{control} can be a function returned
-    by \MC{formatter} which is then applied to \VAR{out-stream} and \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}. 
+    by \MC{formatter} which is then applied to \VAR{out-stream} and
+    \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}. 
   }
 
   \begin{LIST}{.5cm}
diff --git a/clqr-types-and-classes.tex b/clqr-types-and-classes.tex
index 0ea515f..317ccd7 100644
--- a/clqr-types-and-classes.tex
+++ b/clqr-types-and-classes.tex
@@ -22,7 +22,8 @@
     Classes (\includegraphics{clqr-types-and-classes.4}),
     Types (\includegraphics{clqr-types-and-classes.2}), and
     Condition Types
-    (\includegraphics{clqr-types-and-classes.5}).
+    (\includegraphics{clqr-types-and-classes.5}).\\
+    Every type is also the supertype of \NIL, the empty type.
     \label{data-types}%
     %
     \index{*@\A}%
@@ -208,9 +209,10 @@ For any class, there is always a corresponding type of the same name.
     \PROGN{\VAR{form}})}
   {
   Define type \retval{\VAR{foo}} which when referenced as (\VAR{foo}
-  \OPn{\NEV{\VAR{arg}}}) applies expanded \VAR{form}s to \VAR{arg}s
+  \OPn{\NEV{\VAR{arg}}}) (or as \VAR{foo} if \VAR{macro-$\lambda$}
+  doesn't contain any required parameters) applies expanded \VAR{form}s to \VAR{arg}s
   returning the new type. For (\OPn{\VAR{macro-$\lambda$}}) see
-  p.~\pageref{section:Macros} but with default value of \kwd{\A}
+  page \pageref{section:Macros} but with default value of \kwd{\A}
   instead of \NIL. \VAR{form}s are enclosed in an implicit \SO{block}
   named \VAR{foo}.
   }
-- 
2.11.4.GIT