Fix description of typecase; and some minor changes

Thanks to Sian Mountbatten for the bug report.
trebb · Mar 24, 2014 · da819f5 · da819f5
1 parent 600c954
commit da819f5
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010, 2011, 2012 Bert Burgemeister
+# Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Bert Burgemeister
 #
 # Permission is granted to copy, distribute and/or modify this
 # document under the terms of the GNU Free Documentation License,
@@ -143,13 +143,14 @@ latest-changes.html:	clqr.tex clqr-*.tex
 gh-publish:
 	$(RM) -r gh-pages
 	mkdir gh-pages
-	$(MAKE) gh-pages/clqr-a4-consec.pdf \
-		gh-pages/clqr-letter-consec.pdf \
-		gh-pages/clqr-a4-booklet-all.pdf \
-		gh-pages/clqr-a4-booklet-four.pdf \
-		gh-pages/clqr-letter-booklet-all.pdf \
-		gh-pages/clqr-letter-booklet-four.pdf \
-		gh-pages/sample-frontcover.jpg \
+	$(MAKE) all
+	$(CP) clqr-a4-consec.pdf gh-pages/
+	$(CP) clqr-letter-consec.pdf gh-pages/
+	$(CP) clqr-a4-booklet-all.pdf gh-pages/
+	$(CP) clqr-a4-booklet-four.pdf gh-pages/
+	$(CP) clqr-letter-booklet-all.pdf gh-pages/
+	$(CP) clqr-letter-booklet-four.pdf gh-pages/
+	$(MAKE) gh-pages/sample-frontcover.jpg \
 		gh-pages/sample-firstpage-all.jpg \
 		gh-pages/sample-firstpage-four.jpg \
 		gh-pages/sample-firstpage-consec.jpg \
@@ -177,9 +178,6 @@ gh-pages/index.html: html-template/index.html latest-changes.html
 gh-pages/download.html: html-template/download.html revision-number
 	sed -e "/This is revision/ r REVISION.tex" -e "/<!- date of commit \/>/ r DATE.tex" html-template/download.html > $@
 
-gh-pages/%.pdf: %.pdf
-	$(CP) $< $@
-
 gh-pages/%.tar.gz: %.tar.gz
 	$(CP) $< $@
 

diff --git a/clqr-control-structure.tex b/clqr-control-structure.tex
@@ -1,4 +1,4 @@
-% Copyright (C) 2008, 2009, 2010, 2011, 2012 Bert Burgemeister
+% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Bert Burgemeister
 %
 % Permission is granted to copy, distribute and/or modify this
 % document under the terms of the GNU Free Documentation License,
@@ -656,20 +656,26 @@ \subsection{Control Flow}
     \OP{(\xorGOO{\kwd*{OTHERWISE}\\
       \T}{\}} \PROGN{\VAR{bar}})\DF{\NIL}})}
   {
-    Return the \retval{values} of the first \OPn{\VAR{foo}} one of
+    Return the \retval{values of the first \OPn{\VAR{foo}}} one of
     whose \VAR{key}s is \kwd{eql} \VAR{test}. Return \retval{values of
       \VAR{bar}s} if there is no matching \VAR{key}.
+    % Keep \OPn{\VAR{foo}} instead of the otherwise preferable
+    % \VAR{foo}s because we're talking about one set of foos out
+    % of several.
   }
 
   \IT{(\xorGOO{\MC*{ECASE}\\
       \MC*{CCASE}}{\}} \VAR{test}
     \OPn{(\xorGOO{(\OPn{\NEV{\VAR{key}}})\\
         \NEV{\VAR{key}}}{\}} \PROGN{\VAR{foo}})})}
   {
-    Return the \retval{values} of the first \OPn{\VAR{foo}} one of
+    Return the \retval{values of the first \OPn{\VAR{foo}}} one of
     whose \VAR{key}s is \kwd{eql} \VAR{test}.  Signal
     non-correctable/correctable \kwd{type-error} if there is no
     matching \VAR{key}.
+    % Keep \OPn{\VAR{foo}} instead of the otherwise preferable
+    % \VAR{foo}s because we're talking about one set of foos out
+    % of several.
   }
 
   \IT{(\MC*{AND} \OPn{\VAR{form}}\DF{\T})}

diff --git a/clqr-types-and-classes.tex b/clqr-types-and-classes.tex
@@ -1,4 +1,4 @@
-% Copyright (C) 2008, 2009, 2010, 2011, 2012 Bert Burgemeister
+% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014 Bert Burgemeister
 %
 % Permission is granted to copy, distribute and/or modify this
 % document under the terms of the GNU Free Documentation License,
@@ -159,9 +159,12 @@ \section{Types and Classes}
     \OP{(\xorGOO{\kwd*{OTHERWISE}\\
         \T}{\}} \PROGN{\VAR{b-form}\DF{\NIL}})})}
   {
-    Return \retval{values of the \VAR{a-form}s} whose \VAR{type} is
+    Return \retval{values of the first \OPn{\VAR{a-form}}} whose \VAR{type} is
     \VAR{foo} of. Return \retval{values of \VAR{b-form}s} if no
     \VAR{type} matches.
+    % Keep \OPn{\VAR{a-form}} instead of the otherwise preferable
+    % \VAR{a-form}s because we're talking about one set of a-forms out
+    % of several.
   }
 
   \IT{(\xorGOO{%
@@ -170,9 +173,12 @@ \section{Types and Classes}
     \VAR{foo}
     \OPn{(\NEV{\VAR{type}} \PROGN{\VAR{form}})})}
   {
-    Return \retval{values} of the first \OPn{\VAR{form}} whose \VAR{type} is
+    Return \retval{values of the first \OPn{\VAR{form}}} whose \VAR{type} is
     \VAR{foo} of.  Signal non-correctable/correctable \kwd{type-error}
     if no \VAR{type} matches.
+    % Keep \OPn{\VAR{form}} instead of the otherwise preferable
+    % \VAR{form}s because we're talking about one set of forms out
+    % of several.
   }
 
   \IT{(\FU*{TYPE-OF} \VAR{foo})}

diff --git a/clqr.tex b/clqr.tex
@@ -1,4 +1,5 @@
-% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Bert Burgemeister
+% Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 
+% Bert Burgemeister
 %
 % Permission is granted to copy, distribute and/or modify this
 % document under the terms of the GNU Free Documentation License,
@@ -226,7 +227,7 @@ \section*{\contentsname}
         \hfill
         Revision \input{REVISION}
         [\input{DATE}\hspace{-.65ex}]}
-      \makebox[\textwidth][l]{Copyright \copyright\ 2008 - 2013
+      \makebox[\textwidth][l]{Copyright \copyright\ 2008 - 2014
         \AUTHOR\hfill}
       \makebox[\textwidth][l]{\LaTeX\ source:
         \href{http://clqr.boundp.org}{http://clqr.boundp.org}

diff --git a/html-template/download.html b/html-template/download.html
@@ -139,7 +139,7 @@ <h3>Download</h3>
       </tr>
       <tr>
 	<td class="footer" colspan="2">
-	  &copy; 2008 - 2013 &nbsp;
+	  &copy; 2008 - 2014 &nbsp;
 	  <a href="mailto:trebbu@googlemail.com?subject=CLQR ">
 	    Bert Burgemeister
 	  </a>

diff --git a/html-template/index.html b/html-template/index.html
@@ -68,7 +68,7 @@ <h3>Latest Changes</h3>
       </tr>
       <tr>
 	<td class="footer" colspan="2">
-	  &copy; 2008 - 2013 &nbsp;
+	  &copy; 2008 - 2014 &nbsp;
 	  <a href="mailto:trebbu@googlemail.com?subject=CLQR ">
 	    Bert Burgemeister
 	  </a>

diff --git a/html-template/license.html b/html-template/license.html
@@ -31,7 +31,7 @@
 	<td class="content">
 	  <h3>License</h3>
 	  <p>
-	    Copyright &copy 2008 - 2013 Bert Burgemeister
+	    Copyright &copy 2008 - 2014 Bert Burgemeister
 	  <p>
 	  </p>
 	  Permission is granted to copy, distribute and/or modify this
@@ -556,7 +556,7 @@ <h3>How to use this License for your documents</h3>
       </tr>
       <tr>
 	<td class="footer" colspan="2">
-	  &copy; 2008 - 2013 &nbsp;
+	  &copy; 2008 - 2014 &nbsp;
 	  <a href="mailto:trebbu@googlemail.com?subject=CLQR ">
 	    Bert Burgemeister
 	  </a>

diff --git a/html-template/printing.html b/html-template/printing.html
@@ -67,7 +67,7 @@ <h3>Bookbinding</h3>
       </tr>
       <tr>
 	<td class="footer" colspan="2">
-	  &copy; 2008 - 2013 &nbsp;
+	  &copy; 2008 - 2014 &nbsp;
 	  <a href="mailto:trebbu@googlemail.com?subject=CLQR ">
 	    Bert Burgemeister
 	  </a>

diff --git a/html-template/source.html b/html-template/source.html
@@ -65,7 +65,7 @@ <h3>LaTeX Source</h3>
       </tr>
       <tr>
 	<td class="footer" colspan="2">
-	  &copy; 2008 - 2013 &nbsp;
+	  &copy; 2008 - 2014 &nbsp;
 	  <a href="mailto:trebbu@googlemail.com?subject=CLQR ">
 	    Bert Burgemeister
 	  </a>