From da819f53f9bb3dcbcc1686475be857c0170d27d8 Mon Sep 17 00:00:00 2001 From: Bert Burgemeister Date: Mon, 24 Mar 2014 11:31:11 +0100 Subject: [PATCH] Fix description of typecase; and some minor changes Thanks to Sian Mountbatten for the bug report. --- Makefile | 20 +++++++++----------- clqr-control-structure.tex | 12 +++++++++--- clqr-types-and-classes.tex | 12 +++++++++--- clqr.tex | 5 +++-- 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 +- 9 files changed, 36 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 3a04839..011e661 100644 --- 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 "// 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 index 46f18c2..73681d6 100644 --- 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,9 +656,12 @@ \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}\\ @@ -666,10 +669,13 @@ \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 index b14ec4b..9c82c53 100644 --- 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 @@ For any class, there is always a corresponding type of the same name. \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 @@ For any class, there is always a corresponding type of the same name. \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 index 3d89a71..1cef382 100644 --- 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 @@ \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 index 6a62077..f3089f5 100644 --- a/html-template/download.html +++ b/html-template/download.html @@ -139,7 +139,7 @@ - © 2008 - 2013   + © 2008 - 2014   Bert Burgemeister diff --git a/html-template/index.html b/html-template/index.html index 0ad1e9f..cb9464d 100644 --- a/html-template/index.html +++ b/html-template/index.html @@ -68,7 +68,7 @@ - © 2008 - 2013   + © 2008 - 2014   Bert Burgemeister diff --git a/html-template/license.html b/html-template/license.html index b12b18e..56d2676 100644 --- a/html-template/license.html +++ b/html-template/license.html @@ -31,7 +31,7 @@

License

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

Permission is granted to copy, distribute and/or modify this @@ -556,7 +556,7 @@ - © 2008 - 2013   + © 2008 - 2014   Bert Burgemeister diff --git a/html-template/printing.html b/html-template/printing.html index 4a91f1b..261ee13 100644 --- a/html-template/printing.html +++ b/html-template/printing.html @@ -67,7 +67,7 @@ - © 2008 - 2013   + © 2008 - 2014   Bert Burgemeister diff --git a/html-template/source.html b/html-template/source.html index ce07e24..09b7609 100644 --- a/html-template/source.html +++ b/html-template/source.html @@ -65,7 +65,7 @@ - © 2008 - 2013   + © 2008 - 2014   Bert Burgemeister -- 2.11.4.GIT