hyperlinks added, html slightly changed

DATE.tex

@@ -1 +1 @@
-2008-07-27
+2008-07-29

Makefile

@@ -19,6 +19,8 @@ PSBOOK-FOUR	= psbook -s4
 PS2PDF		= ps2pdf
 CONVERT		= convert
 MONTAGE		= montage
+HEAD		= head
+TAIL		= tail
 TOUCH		= touch
 CP		= cp --verbose
 RM		= rm --force --verbose
@@ -32,11 +34,19 @@ RSYNC		= rsync -va
 
 all:	letter a4
 
-letter:	$(CLQR)-letter-booklet-all.pdf $(CLQR)-letter-booklet-four.pdf $(CLQR)-letter-consec.pdf
+letter:	 
+	$(MAKE) letter-booklets
+	$(MAKE) $(CLQR)-letter-consec.pdf
 
-a4:	$(CLQR)-a4-booklet-all.pdf $(CLQR)-a4-booklet-four.pdf $(CLQR)-a4-consec.pdf 
+a4:	
+	$(MAKE) a4-booklets
+	$(MAKE) $(CLQR)-a4-consec.pdf 
 
-$(CLQR)-%-consec.pdf:	$(CLQR)-%-consec.ps
+letter-booklets:	$(CLQR)-letter-booklet-all.pdf $(CLQR)-letter-booklet-four.pdf
+
+a4-booklets:	 $(CLQR)-a4-booklet-all.pdf  $(CLQR)-a4-booklet-four.pdf 
+
+$(CLQR)-%-consec.pdf:	$(CLQR)-%-consec.ps color-colorful.flag
 	$(PS2PDF) $< $@ $(SEND-TO-LOG)
 
 $(CLQR)-letter-booklet-%.pdf:	$(CLQR)-letter-booklet-%.ps
@@ -45,10 +55,10 @@ $(CLQR)-letter-booklet-%.pdf:	$(CLQR)-letter-booklet-%.ps
 $(CLQR)-a4-booklet-%.pdf:	$(CLQR)-a4-booklet-%.ps
 	$(PS2PDF) -sPAPERSIZE=a4 $< $@ $(SEND-TO-LOG)
 
-$(CLQR)-letter-booklet-%.ps:	$(CLQR)-letter-signature-%.ps
+$(CLQR)-letter-booklet-%.ps:	$(CLQR)-letter-signature-%.ps color-black.flag
 	$(PSNUP-LETTER) $< > $@ $(SEND-TO-LOG)
 
-$(CLQR)-a4-booklet-%.ps:	$(CLQR)-a4-signature-%.ps
+$(CLQR)-a4-booklet-%.ps:	$(CLQR)-a4-signature-%.ps color-black.flag
 	$(PSNUP-A4) $< > $@ $(SEND-TO-LOG)
 
 $(CLQR)-%-signature-all.ps:	$(CLQR)-%-consec.ps
@@ -60,7 +70,7 @@ $(CLQR)-%-signature-four.ps:	$(CLQR)-%-consec.ps
 $(CLQR)-%-consec.ps:	$(CLQR)-%.dvi
 	$(DVIPS) -o $@ $< $(SEND-TO-LOG)
 
-$(CLQR)-%.dvi:	$(CLQR).tex $(CLQR)-*.tex paper-%.flag REVISION.tex
+$(CLQR)-%.dvi:	$(CLQR).tex $(CLQR)-*.tex paper-%.flag color-current.tex REVISION.tex
 	$(TOUCH) $(CLQR).ind $(SEND-TO-LOG)
 	$(LATEX) $(CLQR).tex $(SEND-TO-LOG)
 	$(LATEX) $(CLQR).tex $(SEND-TO-LOG)
@@ -78,14 +88,24 @@ paper-letter.flag:
 	$(RM) paper-a4.flag $(SEND-TO-LOG)
 	$(TOUCH) $@
 
+color-colorful.flag:	
+	$(CP) color-colorful.tex color-current.tex $(SEND-TO-LOG)
+	$(RM) color-black.flag $(SEND-TO-LOG)
+	$(TOUCH) $@
+
+color-black.flag:	
+	$(CP) color-black.tex color-current.tex $(SEND-TO-LOG)
+	$(RM) color-colorful.flag $(SEND-TO-LOG)
+	$(TOUCH) $@
+
 REVISION.tex:	DATE.tex
 	if $(BZR_REVISION); then $(BZR_REVISION) > $@; else $(TOUCH) $@; fi $(SEND-TO-LOG)
 
 DATE.tex:	$(CLQR).tex $(CLQR)-*.tex 
 	$(DATE) > $@
 
 clean:
-	$(RM) *.dvi *.toc *.aux *.log *.idx *.ilg *.ind *.ps *.pdf *~ html/*~ *.flag *.jpg html/*.jpg *.tar.gz
+	$(RM) *.dvi *.toc *.aux *.log *.idx *.ilg *.ind *.out *.ps *.pdf *~ html/*~ *.flag *.jpg html/*.jpg *.tar.gz
 
 
 # Project hosting
@@ -94,7 +114,7 @@ maintainance:	release publish
 
 publish:	html/sample-frontcover.jpg html/sample-doublepage.jpg \
 		html/sample-firstpage-all.jpg html/sample-firstpage-four.jpg \
-		html/sample-firstpage-consec.jpg $(CLQR)-a4-consec.pdf
+		html/sample-firstpage-consec.jpg html/sample-source.jpg $(CLQR)-a4-consec.pdf
 	$(MAKE) publishclean
 	$(RSYNC) --delete ./ trebb@shell.berlios.de:/home/groups/ftp/pub/clqr/clqr/ $(SEND-TO-LOG)
 	$(RSYNC) ./html/ trebb@shell.berlios.de:/home/groups/clqr/htdocs/ $(SEND-TO-LOG)
@@ -128,6 +148,11 @@ html/sample-firstpage-consec.jpg:	$(CLQR)-a4-consec.pdf
 	$(MONTAGE) temp.jpg -tile 1x1 -geometry +1+1 -background gray $@ $(SEND-TO-LOG)
 	$(RM) temp.jpg
 
+html/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)
+	$(MONTAGE) temp.jpg -tile 1x1 -geometry +1+1 -background gray $@ $(SEND-TO-LOG)
+	$(RM) temp.jpg
+
 emergency-commit:	
 	if $(BZR_COMMIT) -m "committed automatically by Makefile"; then true; else true; fi
 

README

@@ -1,7 +1,15 @@
-Common Lisp Quick Reference is a free booklet with short descriptions
-of the thousand or so symbols defined in the ANSI standard. 
+Common Lisp Quick Reference is a free (see file COPYING) booklet with
+short descriptions of the thousand or so symbols defined in the ANSI
+standard.
+
 
 It builds well on a Debian system. Have a look into the Makefile to
-learn more about prerequisites.
+learn more about prerequisites. If you have them all in place, type
+
+$ make
+
+and be patient.
+
 
-Visit http://clqr.berlios.de/ for the most recent revision.
+Visit http://clqr.berlios.de/ for the latest revision including
+ready-made pdfs.

REVISION.tex

@@ -1 +1 @@
-38
+40

clqr-numbers.tex

@@ -138,7 +138,7 @@ \subsection{Numeric Functions}
       (\FU*{GCD} \OPn{\VAR{ integer}})}{.}}
   {
   \retval{Least common multiple} or \retval{greatest common
-    denominator}, respectively, of \VAR{integer}s. 
+    de\-no\-mi\-na\-tor}, respectively, of \VAR{integer}s. 
   }
 
   \IT{\CNS*{PI}}

clqr.tex

@@ -7,7 +7,8 @@
 % no Back-Cover Texts. For details see file COPYING.
 %
 
-\newcommand{\maintitle}{Common Lisp Quick Reference}
+\newcommand{\maintitle}{Common\ Lisp\ Quick\ Reference}
+\newcommand{\AUTHOR}{Bert~Burgemeister}
 
 \documentclass[8pt,pagesize,twoside,footexclude,headexclude]{scrartcl}
 %
@@ -19,6 +20,16 @@
 %%\areaset[3mm]{9cm}{28.3cm}
 %\typearea[2mm]{20}
 %%%%%%%%%%%%%%%%%%
+%
+%%%%%%%%%%%%%%%%%%
+% outsourced hypertext colors
+\input{color-current}
+%\newcommand{\linkcolor}{Fuchsia}
+%\newcommand{\urlcolor}{MidnightBlue}
+%\newcommand{\bookmarks}{true}
+%\newcommand{\pdfpagelayout}{TwoColumnLeft}
+%%%%%%%%%%%%%%%%%%
+%
 \usepackage{amsmath}
 \usepackage{amsfonts}
 \usepackage{amssymb}
@@ -46,6 +57,15 @@
 %\usepackage[scaled]{helvet}
 %%%%%%%%%%%%%%%%%%
 %
+% should remain last usepackage:
+\usepackage%
+    [breaklinks,linktocpage,colorlinks,%
+      bookmarksnumbered,bookmarks=\bookmarks,%
+      linkcolor=\linkcolor,urlcolor=\urlcolor,%
+      pdfpagelayout=\pdfpagelayout,%
+      pdftitle=\maintitle,pdfauthor=\AUTHOR]%
+    {hyperref}
+%
 \makeindex
 \titleformat{\section}{\sffamily\mdseries\slshape}
             {\huge\thesection}{.7em}{\huge}[{\titlerule[0.25pt]}]
@@ -310,7 +330,7 @@
     \end{minipage}
     \begin{minipage}{\titlepagewidth}
       \rmfamily\mdseries\upshape\fontsize{14}{0}\selectfont
-      Bert Burgemeister
+      \AUTHOR
       \vspace*{4mm}
     \end{minipage}
   \end{center}
@@ -496,15 +516,14 @@ \section*{\contentsname}
       \rmfamily\small
       \makebox[\textwidth][l]{\maintitle\ \hfill  Revision \input{REVISION}
        [\input{DATE}\hspace{-.65ex}]}
-      \makebox[\textwidth][l]{Copyright \copyright\ 2008 Bert
-        Burgemeister\hfill\LaTeX\ source:
-        http://clqr.berlios.de}\\[1.5mm] 
+      \makebox[\textwidth][l]{Copyright \copyright\ 2008 \AUTHOR\hfill\LaTeX\ source:
+        \href{http://clqr.berlios.de}{http://clqr.berlios.de}}\\[1.5mm] 
       Permission is granted to copy, distribute and/or modify this
       document under the terms of the GNU Free Documentation License,
       Version 1.2 or any later version published by the Free Software
       Foundation; with no Invariant Sections, no Front-Cover Texts and
       no Back-Cover Texts.\hfill
-      http://www.gnu.org/licenses/fdl.html\\
+      \href{http://www.gnu.org/licenses/fdl.html}{http://www.gnu.org/licenses/fdl.html}\\
       \vspace{-1mm}
       \hrule
     \end{minipage}

color-black.tex

@@ -0,0 +1,6 @@
+% outsourced hypertext colors
+% for the printer-friendly version
+\newcommand{\linkcolor}{black}
+\newcommand{\urlcolor}{black}
+\newcommand{\bookmarks}{false}
+\newcommand{\pdfpagelayout}{SinglePage}

color-colorful.tex

@@ -0,0 +1,6 @@
+% outsourced hypertext colors
+% for the screen-only version
+\newcommand{\linkcolor}{Fuchsia}
+\newcommand{\urlcolor}{MidnightBlue}
+\newcommand{\bookmarks}{true}
+\newcommand{\pdfpagelayout}{TwoColumnLeft}

html/download.php

@@ -44,10 +44,11 @@
 	      <a href="http://download.berlios.de/clqr/clqr-a4-consec.pdf">clqr-a4-consec.pdf</a><br />
 	      <a href="http://download.berlios.de/clqr/clqr-letter-consec.pdf">clqr-letter-consec.pdf</a><br />
 	      <ul>
-		<li> Pages in their natural order. 
-		<li>Most convenient for reading on the screen. 
-		<li>Not of much use for printing because of the odd
-		  paper format. 
+		<li>Pages in their natural order. 
+		<li>Suitable only for reading on the screen. Comes
+		with bookmarks and hyperlinks.
+		<li>Not meant for printing because of the odd
+		  paper format and the coloured hyperlinks. 
 	      </ul>
 	      <p>&nbsp;
 	      <p>&nbsp;
@@ -59,7 +60,7 @@
 	      <a href="http://download.berlios.de/clqr/clqr-a4-booklet-all.pdf">clqr-a4-booklet-all.pdf</a><br />
 	      <a href="http://download.berlios.de/clqr/clqr-letter-booklet-all.pdf">clqr-letter-booklet-all.pdf</a><br />
 	      <ul>
-		<li>Suitable for folding lengthwise and nesting the
+		<li>Suitable for printing, folding lengthwise and nesting the
 		  folios.
 		<li>With 48 pages total, first sheet has pages 48, 1, 2, 47.
 		<li>With 48 pages total, last sheet has pages 26, 23, 24, 25.
@@ -74,7 +75,7 @@
 	      <a href="http://download.berlios.de/clqr/clqr-a4-booklet-four.pdf">clqr-a4-booklet-four.pdf</a><br />
 	      <a href="http://download.berlios.de/clqr/clqr-letter-booklet-four.pdf">clqr-letter-booklet-four.pdf</a><br />
 	      <ul>
-		<li>Suitable for folding lengthwise and stacking up the
+		<li>Suitable for printing, folding lengthwise and stacking up the
 		  folios.
 		<li>First sheet has pages 4, 1, 2, 3.
 		<li>With 48 pages total, last sheet has pages 48, 45, 46, 47.
@@ -84,6 +85,8 @@
 	      <p>&nbsp;
 	    </div>
 	    <div class="here">
+	      <img class="left" src="sample-source.jpg"
+		   alt="Sample"/> 
 	      <a href="http://download.berlios.de/clqr/clqr.tar.gz">clqr.tar.gz</a><br />
 	      <ul>
 		<li>LaTeX sources.

html/printing.html

@@ -33,15 +33,15 @@
 	</td>
 	<td class="content">
 	  <h3>Printing</h3>
-	    Chose a file which has your paper size (i.e. "-a4-" or "-letter-")
+	    Chose a file which has your paper size (i.e. "-a4-" or US "-letter-")
 	    and "-booklet-" in its name. Then, a page order suitable for
 	    nested folios is indicated by "-all"; if you want the folios
 	    stacked take a file which says "-four".
 	  <p>
 	    That is clqr-&lt;paper size&gt;-booklet-&lt;page order&gt;.pdf
 	  <p>
 	    On a duplex printer, just print the file. If your printer
-	    can only print one side of the sheet, start with the odd
+	    can only print on one side of the sheet, start with the odd
 	    pages. Depending on your printer's paper handling, you may
 	    or may not have to rearrange the half-printed sheets. Make
 	    sure the first page is on top and put them back into the