diff --git a/DATE.tex b/DATE.tex index 885edde..86b4dd7 100644 --- a/DATE.tex +++ b/DATE.tex @@ -1 +1 @@ -2008-07-27 \ No newline at end of file +2008-07-29 \ No newline at end of file diff --git a/Makefile b/Makefile index 4b61e86..bb05239 100644 --- a/Makefile +++ b/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,6 +88,16 @@ 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) @@ -85,7 +105,7 @@ 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 diff --git a/README b/README index 3bdd083..cbe4a89 100644 --- a/README +++ b/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. diff --git a/REVISION.tex b/REVISION.tex index c24b6ae..86ee83a 100644 --- a/REVISION.tex +++ b/REVISION.tex @@ -1 +1 @@ -38 \ No newline at end of file +40 \ No newline at end of file diff --git a/clqr-numbers.tex b/clqr-numbers.tex index 932e589..fce9840 100644 --- a/clqr-numbers.tex +++ b/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}} diff --git a/clqr.tex b/clqr.tex index 280501b..6df2175 100644 --- a/clqr.tex +++ b/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} diff --git a/color-black.tex b/color-black.tex new file mode 100644 index 0000000..b15b271 --- /dev/null +++ b/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} diff --git a/color-colorful.tex b/color-colorful.tex new file mode 100644 index 0000000..c5296c7 --- /dev/null +++ b/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} diff --git a/html/download.php b/html/download.php index fa06dd5..c5a337f 100644 --- a/html/download.php +++ b/html/download.php @@ -44,10 +44,11 @@ clqr-a4-consec.pdf
clqr-letter-consec.pdf

 

  @@ -59,7 +60,7 @@ clqr-a4-booklet-all.pdf
clqr-letter-booklet-all.pdf