From 2279aca38e5621084351c14c9c5b031c4b662010 Mon Sep 17 00:00:00 2001 From: tailor Date: Sun, 8 Jun 2008 03:50:41 +0200 Subject: [PATCH] minor changes, mainly html --- Makefile | 20 +++++++++++++++----- REVISION.tex | 2 +- clqr-clos.tex | 42 ++++++++++++++++++++++++++++++------------ clqr-numbers.tex | 2 +- clqr.tex | 24 ++++++++++++++++-------- find-words.el | 21 --------------------- html/download.html | 45 +++++++++++++++++++++++++++++++-------------- html/index.html | 2 +- html/new-pure.css | 12 ++++++++++-- html/source.html | 2 +- upload.sh | 15 +++++++++++++++ 11 files changed, 121 insertions(+), 66 deletions(-) delete mode 100644 find-words.el create mode 100755 upload.sh diff --git a/Makefile b/Makefile index 4a41de9..d54a48f 100644 --- a/Makefile +++ b/Makefile @@ -73,16 +73,26 @@ paper-%: REVISION.tex: $(CLQR).tex if $(BZR_REVISION); then $(BZR_REVISION) > $@; else $(TOUCH) $@; fi $(SEND-TO-LOG) -sample.jpg: $(CLQR)-a4-consec.pdf - $(CONVERT) $<'[0,19-20]' -verbose -resize 40% $@ $(SEND-TO-LOG) - $(MONTAGE) sample-1.jpg sample-2.jpg -tile 2x1 -geometry +1+1 -background gray html/sample-doublepage.jpg - $(MONTAGE) sample-0.jpg -tile 1x1 -geometry +1+1 -background gray html/sample-frontcover.jpg +html/sample-frontcover.jpg: $(CLQR)-a4-consec.pdf + $(CONVERT) $<'[0]' -verbose -resize 40% temp.jpg $(SEND-TO-LOG) + $(MONTAGE) temp.jpg -tile 1x1 -geometry +1+1 -background gray $@ + +html/sample-doublepage.jpg: $(CLQR)-a4-consec.pdf + $(CONVERT) $<'[19-20]' -verbose -resize 30% temp.jpg $(SEND-TO-LOG) + $(MONTAGE) temp-0.jpg temp-1.jpg -tile 2x1 -geometry +1+1 -background gray $@ + +html/sample-firstpage-%.jpg: $(CLQR)-a4-booklet-%.pdf + $(CONVERT) $<'[0]' -verbose -resize 15% temp.jpg $(SEND-TO-LOG) + $(MONTAGE) temp.jpg -tile 1x1 -geometry +1+1 -background gray $@ clean: $(RM) *.dvi *.toc *.aux *.log *.idx *.ilg *.ind *.ps *.pdf *~ sample.* *.tar.gz -publish: sample.jpg $(CLQR)-a4-consec.pdf +publish: html/sample-frontcover.jpg html/sample-doublepage.jpg html/sample-firstpage-all.jpg html/sample-firstpage-four.jpg $(CLQR)-a4-consec.pdf $(RSYNC) ./ trebb@shell.berlios.de:/home/groups/ftp/pub/clqr/clqr/ +release: + ./upload.sh + $(CLQR).tar.gz: $(BZR_EXPORT) $@ diff --git a/REVISION.tex b/REVISION.tex index 8f92bfd..0cfbf08 100644 --- a/REVISION.tex +++ b/REVISION.tex @@ -1 +1 @@ -35 +2 diff --git a/clqr-clos.tex b/clqr-clos.tex index 419fe33..4c260c2 100644 --- a/clqr-clos.tex +++ b/clqr-clos.tex @@ -127,16 +127,18 @@ \IT{(\SF*{WITH-SLOTS}(\Goos{\VAR{slot}\XOR(\VAR{var slot})}) \VAR{instance} \OPn{(\kwd{declare} \OPn{\VAR{decl}})} - \OPn{\VAR{form}})} Evaluate \VAR{form}s with slots of - \VAR{instance} locally visible as \VAR{slot}s or \VAR{var}s. - + \OPn{\VAR{form}})} + Evaluate \VAR{form}s with slots of \VAR{instance} locally visible as + \VAR{slot}s or \VAR{var}s. - \IT{(\GFU*{CLASS-NAME} \VAR{class})} \retval{Name of \VAR{class}}. + \IT{(\GFU*{CLASS-NAME} \VAR{class})} + \retval{Name of \VAR{class}}. - \IT{(\kwd*{CLASS-OF} \VAR{foo})} \retval{Class} \VAR{foo} is an - instance of. + \IT{(\kwd*{CLASS-OF} \VAR{foo})} + \retval{Class} \VAR{foo} is an instance of. - \IT{(\kwd*{MAKE-INSTANCES-OBSOLETE} \VAR{class})} Update instances of \VAR{class}. + \IT{(\kwd*{MAKE-INSTANCES-OBSOLETE} \VAR{class})} + Update instances of \VAR{class}. \IT{(\GFU*{FUNCTION-KEYWORDS} \VAR{method})} \retval{Keyword parameters} of method. @@ -151,10 +153,23 @@ \kwd{:operator} \VAR{ operator}\DF{\VAR{name}}}{\}})} Define new type \retval{\VAR{name}} of method combination. - \IT{(\SF*{DEFINE-METHOD-COMBINATION} \VAR{name}\orGOO{% - \kwd{:documentation} \VAR{ string}\\ - \kwd{:identity-with-one-argument} \VAR{ bool}\DF{\NIL}\\ - \kwd{:operator} \VAR{ operator}\DF{\VAR{name}}}{\}})} + \IT{(\SF*{DEFINE-METHOD-COMBINATION} \VAR{name} (\OPn{\VAR{fu-arg}}) + (\OPn{\VAR{name} \xorGOO{% + \GOOp{\VAR{list}\XOR\kwd{*}}\\ + \VAR{predicate}}{\}} \orGOO{% + \kwd{:description} \VAR{ control}\\ + \kwd{:order} \Goo{\kwd{:most-specific-first}\XOR\kwd{:most-specific-last}}\\ + \kwd{:required} \VAR{ bool}}{\}}}) + \orGOO{\kwd{:arguments}% + (\OPn{\VAR{method-combination-arg}})\\ + \kwd{:generic-function} \VAR{ symbol}\\ + \OPn{(\kwd{declare} \OPn{\VAR{ decl}})}\\ + \VAR{documentation}}{\}}% + \OPn{\VAR{form}})} + Lambda list \OPn{\VAR{fu-arg}} and + \OPn{\VAR{method-combination-arg}} according to + p.\ \pageref{section:Functions}, the latter enhanced + by an optional \kwd{\&whole} argument. \IT{(\GFU*{CHANGE-CLASS} \VAR{instance} \VAR{new-class} \Op{\VAR{arg}})} Change class of \retval{\VAR{instance}} to \VAR{new-class}. @@ -168,7 +183,10 @@ \Op{\VAR{initargs}} \Op{\VAR{other-args}}})} Called by \kwd{make-instances-obsolete}. - \IT{(\GFU*{SHARED-INITIALIZE})} + \IT{(\GFU*{SHARED-INITIALIZE} \VAR{instance} \VAR{slots} + \Op{\VAR{init-args}} \Op{\VAR{other-keyargs}})} + Used to fill \VAR{instance}'s \VAR{slots} using \VAR{init-args} and + \kwd{:initform} forms. \IT{(\GFU*{METHOD-QUALIFIERS} \VAR{method})} List of qualifiers of \VAR{method}. diff --git a/clqr-numbers.tex b/clqr-numbers.tex index 4408dc6..ff75cca 100644 --- a/clqr-numbers.tex +++ b/clqr-numbers.tex @@ -287,7 +287,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\subsection{Implementation-Dependent} +\subsection[Implementation- Dependent]{Implementation-Dependent} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{LIST}{1cm} diff --git a/clqr.tex b/clqr.tex index 5d3df8d..d028344 100644 --- a/clqr.tex +++ b/clqr.tex @@ -133,9 +133,9 @@ \newcommand{\GOos}[1]{\text{{$\big\{${#1}$\big\}^{\!\!*}$}}} \newcommand{\Goos}[1]{\text{{$\{${#1}$\}^{\!*}$}}} % Required Group of Objects, {}+, three sizes -\newcommand{\GOOp}[1]{{$\Big\{${#1}$\Big\}^{\!\!+}$}} -\newcommand{\GOop}[1]{{$\big\{${#1}$\big\}^{\!\!+}$}} -\newcommand{\Goop}[1]{{$\{${#1}$\}^{\!+}$}} +\newcommand{\GOOp}[1]{{\text{$\Big\{$}{#1}\text{$\Big\}^{\!\!+}$}}} +\newcommand{\GOop}[1]{{\text{$\big\{$}{#1}\text{$\big\}^{\!\!+}$}}} +\newcommand{\Goop}[1]{{\text{$\{$}{#1}\text{$\}^{\!+}$}}} % % Vertically Arranged Group of Alternatives, { % usage: \xorGOO{line1\\ line2...}{closing delimiter} @@ -299,15 +299,23 @@ Symbol defined in Common Lisp; esp. function, special form, generic function, variable, constant. - \IT{\VAR{them}\DF{\LIT{foo}}} Placeholder for actual code. Defaults to \LIT{foo}. + \IT{\VAR{them}\DF{\LIT{foo}}} + Placeholder for actual code. Defaults to \LIT{foo}. - \IT{\LIT{me}} Text to input literally, or output literally. + \IT{\LIT{me}} + Text to input literally, or output literally. - \IT{\Op{\VAR{foo}}} Either one \VAR{foo} or nothing. + \IT{\Op{\VAR{foo}}} + Either one \VAR{foo} or nothing. - \IT{\OPn{\VAR{foo}}; \Goos{\VAR{foo}}} Any number of \VAR{foo}s. + \IT{\OPn{\VAR{foo}}; \Goos{\VAR{foo}}} + Zero or more \VAR{foo}s. - \IT{\RP{\VAR{foo}}; \Goop{\VAR{foo}}} One or more \VAR{foo}s. + \IT{\RP{\VAR{foo}}; \Goop{\VAR{foo}}} + One or more \VAR{foo}s. + + \IT{\VAR{foos}} + English plural denotes a list argument. \IT{\Goo{\VAR{foo}\XOR\VAR{bar}\XOR\VAR{baz}}; \xorGOO{ diff --git a/find-words.el b/find-words.el deleted file mode 100644 index 08712d5..0000000 --- a/find-words.el +++ /dev/null @@ -1,21 +0,0 @@ - -(defun search-keywords () - (re-search-forward "\\(\\\\FU{\\|\\\\SF{\\|\\\\kwd{\\|\\\\GF{\\|\\\\V{\\)\\([a-z0-9-+*]*\\)}" nil t)) - -(setq kwd-buffer (get-buffer-create "keywords-lispref")) - -(progn (set-buffer "lispref.tex") - (goto-char 0) - (do ((findings (search-keywords) (search-keywords)) keywords) - ((null findings) - (dolist (word-output(sort (delete-duplicates keywords :test #'string-equal) #'string-lessp)) - (princ word-output kwd-buffer) (princ "\n" kwd-buffer))) - (push (upcase (buffer-substring-no-properties (match-beginning 2) (match-end 2))) keywords))) - - - - - - - - diff --git a/html/download.html b/html/download.html index 238909c..d9a3844 100644 --- a/html/download.html +++ b/html/download.html @@ -34,42 +34,59 @@

Download

- + diff --git a/html/index.html b/html/index.html index ae39787..2ec4f27 100644 --- a/html/index.html +++ b/html/index.html @@ -42,7 +42,7 @@ descriptions of the thousand or so symbols defined in the ANSI standard. It comes with a comprehensive index.

- Doublepage Sample

This rather humble effort is by no means meant to rival diff --git a/html/new-pure.css b/html/new-pure.css index f867f9b..d19d0ff 100644 --- a/html/new-pure.css +++ b/html/new-pure.css @@ -55,12 +55,20 @@ img { } .left { - float: left; + float: left; + clear: both; margin-right: 2ex; } .right { - float: right; + float: right; + clear: both; + margin-left: 2ex; +} + +.here { + float: none; + clear: both; margin-left: 2ex; } diff --git a/html/source.html b/html/source.html index b5e222f..dd3ee2d 100644 --- a/html/source.html +++ b/html/source.html @@ -40,7 +40,7 @@

Alternatively, you can use Bazaar to get the source tree including history. Say at your command prompt - 

bzr checkout ftp://anonymous@ftp.berlios.de/pub/clqr
+ 
bzr checkout ftp://anonymous@ftp.berlios.de/pub/clqr/clqr
or 
bzr checkout http://clqr.berlios.de/clqr
and you will have all there is in a directory called clqr. diff --git a/upload.sh b/upload.sh new file mode 100755 index 0000000..39ff3ae --- /dev/null +++ b/upload.sh @@ -0,0 +1,15 @@ +#! /bin/sh +REMOTE='ftp.berlios.de' +USER='ftp' +PASSWORD='x' +FTPLOG='ftp.log' + +ftp -ni $REMOTE <<_FTP>$FTPLOG +quote USER $USER +quote PASS $PASSWORD +bin +cd /incoming +mput *.pdf +put clqr.tar.gz +quit +_FTP -- 2.11.4.GIT