Permalink
Browse files

Rearrangements related to new figure on types and classes.

The new one replaces figures Data Types and Condition Types.
  • Loading branch information...
1 parent b47d98a commit b58f067a53f14a8af439253ead8efaf4e73dc1e4 @trebb committed Jul 24, 2010
Showing with 324 additions and 233 deletions.
  1. +6 −7 Makefile
  2. +2 −2 clqr-arrays.tex
  3. +3 −0 clqr-conditions-and-errors.tex
  4. +195 −118 clqr-types-and-classes.mp
  5. +112 −100 clqr-types-and-classes.tex
  6. +1 −1 clqr.tex
  7. +1 −1 html/download.php
  8. +1 −1 html/index.php
  9. +1 −1 html/license.html
  10. +1 −1 html/printing.html
  11. +1 −1 html/source.html
View
@@ -47,7 +47,7 @@ a4:
letter-booklets: $(CLQR)-letter-booklet-all.pdf $(CLQR)-letter-booklet-four.pdf
-a4-booklets: $(CLQR)-a4-booklet-all.pdf $(CLQR)-a4-booklet-four.pdf
+a4-booklets: $(CLQR)-a4-booklet-all.pdf $(CLQR)-a4-booklet-four.pdf
$(CLQR)-%-consec.pdf: $(CLQR)-%-consec.ps
$(PS2PDF) $< $@ $(SEND-TO-LOG)
@@ -81,7 +81,9 @@ $(CLQR)-%.dvi: $(CLQR).tex $(CLQR)-*.tex $(CLQR).*.tex $(CLQR)-types-and-classes
$(LATEX) $(CLQR).tex $(SEND-TO-LOG)
$(MV) $(CLQR).dvi $@ $(SEND-TO-LOG)
-clqr-types-and-classes.1: $(CLQR)-types-and-classes.mp $(CLQR).macros.tex clqr.packages.tex
+$(CLQR)-types-and-classes.1 $(CLQR)-types-and-classes.2 \
+$(CLQR)-types-and-classes.3 $(CLQR)-types-and-classes.4 \
+$(CLQR)-types-and-classes.5: $(CLQR)-types-and-classes.mp $(CLQR).macros.tex clqr.packages.tex
$(MPOST) $< $(SEND-TO-LOG)
paper-a4.flag:
@@ -108,14 +110,11 @@ revision-number:
$(GIT_REVISION) | tee REVISION.tex > html/release-revision.txt
$(DATE) | tee DATE.tex > html/release-date.txt
-#DATE.tex: $(CLQR).tex $(CLQR)-*.tex
-# $(DATE) | tee $@ > html/release-date.txt
-
clean:
$(RM) *.dvi *.toc *.aux *.log *.idx *.ilg *.ind *.out *.ps *.pdf *~ html/*~ \
*.flag *.jpg html/*.jpg *.tar.gz REVISION.tex DATE.tex \
html/latest-changes.html html/release-revision.txt html/release-date.txt \
- *.1 mpxerr.tex paper-current.tex color-current.tex
+ *.[12345] mpxerr.tex paper-current.tex color-current.tex
# Project hosting
@@ -157,4 +156,4 @@ $(CLQR).tar.gz: $(CLQR).tex $(CLQR)-*.tex
if $(GIT_ARCHIVE) > $(CLQR).tar.gz; then true; else true; fi $(SEND-TO-LOG)
publishclean:
- $(RM) *.ps *.1 *~ html/*~
+ $(RM) *.ps *.[12345] *~ html/*~
View
@@ -1,4 +1,4 @@
-% Copyright (C) 2008, 2009 Bert Burgemeister
+% Copyright (C) 2008, 2009, 2010 Bert Burgemeister
%
% Permission is granted to copy, distribute and/or modify this
% document under the terms of the GNU Free Documentation License,
@@ -30,7 +30,7 @@ \subsection{Predicates}
\IT{\arrGOO{(\FU*{ADJUSTABLE-ARRAY-P} \VAR{ array})\\
(\FU*{ARRAY-HAS-FILL-POINTER-P} \VAR{ array})}{.}}
{
- Return \retval{\T} if \VAR{array} is adjustable/has a fill pointer,
+ \retval{\T} if \VAR{array} is adjustable/has a fill pointer,
respectively.
}
@@ -11,6 +11,9 @@
\section{Conditions and Errors}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+For standardized condition types cf.\ Figure \ref{data-types} on
+page \pageref{data-types}.
+
\begin{LIST}{1cm}
\IT{(\MC*{DEFINE-CONDITION} \VAR{foo} (\OPn{\VAR{parent-type}}\DF{\kwd{condition}})
(\xorGOO{\VAR{slot}\\
Oops, something went wrong. Retry.

0 comments on commit b58f067

Please sign in to comment.