summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-05-17 15:42:35 +0000
committerKarl Berry <karl@freefriends.org>2010-05-17 15:42:35 +0000
commit4150020a0ea0a0bb0d00983c2e1c6d97cd33651f (patch)
tree2441d0280d5d61772abd7ba2b38fd08c7590652d
parent10a4077637761a34bb459f8bc9a6cdb7894e8f72 (diff)
multido 1.42 (15may10)
git-svn-id: svn://tug.org/texlive/trunk@18302 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/multido/Changes9
-rw-r--r--Master/texmf-dist/doc/generic/multido/multido-doc.pdfbin0 -> 64366 bytes
-rw-r--r--Master/texmf-dist/doc/generic/multido/multido-doc.tex (renamed from Master/texmf-dist/doc/generic/multido/multido.doc)18
-rw-r--r--Master/texmf-dist/doc/generic/multido/multido-test.tex27
-rw-r--r--Master/texmf-dist/source/generic/multido/Makefile71
-rw-r--r--Master/texmf-dist/tex/generic/multido/multido.tex35
-rw-r--r--Master/texmf-dist/tex/latex/multido/multido.sty9
7 files changed, 95 insertions, 74 deletions
diff --git a/Master/texmf-dist/doc/generic/multido/Changes b/Master/texmf-dist/doc/generic/multido/Changes
index 6db777a0742..1abe6687f75 100644
--- a/Master/texmf-dist/doc/generic/multido/Changes
+++ b/Master/texmf-dist/doc/generic/multido/Changes
@@ -1,9 +1,12 @@
--- multido.tex
-1.4 Small change to make it compatible with PSTricks v0.93 and later.
+1.42 2010-05-14 - small changes to the code (hv)
+ - LPPL license (hv)
1.41 2004-05-18 - fix bug when using the fp-package (same macronames)
FPadd -> fpAdd; FPsub -> fpSub (RN/hv)
+1.4 Small change to make it compatible with PSTricks v0.93 and later.
---- multido.doc
-2004-05-18 - small changes to this documentation (RN/HV)
+--- multido-doc.tex
+2010-05-14 - updated (hv)
2006-01-01 - updated (hv)
+2004-05-18 - small changes to this documentation (RN/HV)
diff --git a/Master/texmf-dist/doc/generic/multido/multido-doc.pdf b/Master/texmf-dist/doc/generic/multido/multido-doc.pdf
new file mode 100644
index 00000000000..54a947cc8b7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/multido/multido-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/multido/multido.doc b/Master/texmf-dist/doc/generic/multido/multido-doc.tex
index da68bedee59..28611001736 100644
--- a/Master/texmf-dist/doc/generic/multido/multido.doc
+++ b/Master/texmf-dist/doc/generic/multido/multido-doc.tex
@@ -1,11 +1,7 @@
-%% BEGIN multido.doc
-%%
-%% Documentation for multido.tex/multido.sty.
-%% Run through LaTeX, with or without the NFSS.
-%%
-
+%% $Id: multido-doc.tex 317 2010-05-14 21:54:15Z herbert $
\documentclass[12pt]{article}
-\usepackage{multido}
+\usepackage{fp,multido}
+\let\MDfv\fileversion
\usepackage{url}
\makeatletter
@@ -98,13 +94,13 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\title{Documentation for multido.tex:\\[2pt]
+\title{Documentation for multido.tex, version \MDfv:\\[2pt]
A loop macro for Generic \protect\TeX}
\author{Timothy Van Zandt%
\thanks{Author's address: Department of Economics, Princeton University,
Princeton, NJ 08544-1021, USA. Internet: \protect\url{tvz@Princeton.EDU}.
- This document was edited by Rolf Niepraschk \protect\url{Rolf.Niepraschk@ptb.de} and
- Herbert Voss \protect\url{voss@perce.de} to get it run with LaTeX2e (2006-01-01)}}
+ This document was edited by Rolf Niepraschk \protect\url{Rolf.Niepraschk@gmx.de} and
+ Herbert Voss \protect\url{hvoss@tug.org} to get it run with LaTeX2e (2006-01-01)}}
\maketitle
"multido.tex"/"multido.sty" contains the \N\multido\ macro, which is a loop
@@ -275,4 +271,4 @@ changes to this documentation (RN/HV)
\end{description}
\end{document}
-%% END multido.doc
+%% END multido-doc
diff --git a/Master/texmf-dist/doc/generic/multido/multido-test.tex b/Master/texmf-dist/doc/generic/multido/multido-test.tex
deleted file mode 100644
index 7cf8c1de267..00000000000
--- a/Master/texmf-dist/doc/generic/multido/multido-test.tex
+++ /dev/null
@@ -1,27 +0,0 @@
-
-\listfiles\errorcontextlines=100
-\documentclass{article}
-
-%\usepackage{fp}
-%\input{multido}
-\usepackage{multido}[2004/05/15]
-\usepackage{fp}
-
-\begin{document}
-
-\typeout{\meaning\FPadd}
-\typeout{\meaning\FPsub}
-\typeout{\meaning\fpAdd}
-\typeout{\meaning\fpSub}
-
-\setlength{\unitlength}{1cm}
-
-\begin{picture}(8,1)(0,-.5)
- \small
- \put(0,0){\vector(1,0){8}}
- \multido{\i=0+1,\n=0+0.25}{8}{%
- \put(\i,-.1){\line(0,1){.2}}
- \put(\i,-.2){\makebox(0,0)[t]{\n}}}
-\end{picture}
-
-\end{document}
diff --git a/Master/texmf-dist/source/generic/multido/Makefile b/Master/texmf-dist/source/generic/multido/Makefile
new file mode 100644
index 00000000000..285260e7ed7
--- /dev/null
+++ b/Master/texmf-dist/source/generic/multido/Makefile
@@ -0,0 +1,71 @@
+
+# `Makefile' for `multido.pdf', hv, 2007/03/17
+
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
+
+PACKAGE = multido
+
+MAIN = $(PACKAGE)-doc
+
+TDS = ~/PSTricks/PSTricks-TDS
+
+LATEX = latex
+
+ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
+
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
+
+all : doc clean
+doc: $(MAIN).pdf
+
+$(MAIN).pdf : $(MAIN).ps
+ GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
+
+$(MAIN).ps : $(MAIN).dvi
+ dvips $<
+
+$(MAIN).dvi : $(MAIN).tex
+ $(LATEX) $<
+ $(LATEX) $<
+# if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
+# if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
+# makeindex -t $(basename $<).ilg -s pst-doc.ist -o $(basename $<).ind $(basename $<).idx
+# makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
+# $(basename $<).glo
+# bibtex $(basename $<)
+# $(LATEX) $<
+# $(LATEX) $<
+
+clean :
+ $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl )
+ $(RM) $(addprefix $(MAIN), .dvi .ps .xcp)
+ $(RM) data3d.Roessler
+
+veryclean : clean
+ $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+
+arch :
+ zip $(ARCHNAME).zip $(ARCHFILES)
+
+tds:
+ cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/
+ cp -u README $(TDS)/doc/generic/$(PACKAGE)/
+ cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/
+#
+ cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/
+ cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/
+#
+ cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/
+ cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/
+#
+ cp -u Changes $(TDS)/dvips/$(PACKAGE)/
+ cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/
+ cp -u $(PACKAGE).pro ~/Links/dvips-local/
+#
+ cp -u Changes $(TDS)/source/$(PACKAGE)/
+ cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/
+ cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/
+ cp -u Makefile $(TDS)/source/$(PACKAGE)/
+
+
+# EOF
diff --git a/Master/texmf-dist/tex/generic/multido/multido.tex b/Master/texmf-dist/tex/generic/multido/multido.tex
index d642ec7a1e2..eca6355b4e6 100644
--- a/Master/texmf-dist/tex/generic/multido/multido.tex
+++ b/Master/texmf-dist/tex/generic/multido/multido.tex
@@ -1,11 +1,13 @@
+%% $Id: multido.tex 317 2010-05-14 21:54:15Z herbert $
%% BEGIN multido.tex
%%
-\def\fileversion{1.41}
-\def\filedate{2004/05/18}
+\def\fileversion{1.42}
+\def\filedate{2010/05/14}
%%
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
-%% Version 1.41 (2004) prepared by Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
-%% Herbert Voss <voss@perce.de>
+%% Version 1.41 (2004) prepared by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
+%% Herbert Voss <hvoss@tug.org>
+%% COPYRIGHT 2010 by Herbert Voss <hvoss@tug.org>
%%
%%
%% This program can be redistributed and/or modified under the terms
@@ -19,40 +21,15 @@
%% is compatible with most TeX macro packages, including Plain TeX, LaTeX,
%% AmSTeX, and Ams-LaTeX.
%%
-%% INSTALLATION:
-%% Put this file where your TeX looks for inputs, under the name multido.tex.
-%% Use the file multido.sty with LaTeX.
-%%
-%% DOCUMENTATION:
-%% See multido.doc.
-%%
-%% COPYING:
-%% Copying of part or all of this file is allowed under the following
-%% conditions only:
-%% (1) You may freely distribute unchanged copies of the file. Please
-%% include the documentation when you do so.
-%% (2) You may modify a renamed copy of the file, but only for personal
-%% use or use within an organization.
-%% (3) You may copy fragments from the file, for personal use or for
-%% distribution, as long as credit is given where credit is due.
-%%
-%% You are NOT ALLOWED to take money for the distribution or use of
-%% this file or modified versions or fragments thereof, except for
-%% a nominal charge for copying etc.
-%%
%% CODE:
% These macros use TeX primitives, plus the Plain TeX commands:
% \dimen@, \dimen@i, \count@, \newcount, \newtoks, \@ne, \tw@, \@z@.
%
% Check if file is loaded, announce file on terminal, and take care of @:
%
-
-
\message{ v\fileversion, \filedate\space <tvz>}
-
\csname MultidoLoaded\endcsname
\let\MultidoLoaded\endinput
-
\edef\TheAtCode{\the\catcode`\@}
\catcode`\@=11
diff --git a/Master/texmf-dist/tex/latex/multido/multido.sty b/Master/texmf-dist/tex/latex/multido/multido.sty
index 1b118ccabd8..c17e7bd999d 100644
--- a/Master/texmf-dist/tex/latex/multido/multido.sty
+++ b/Master/texmf-dist/tex/latex/multido/multido.sty
@@ -1,11 +1,12 @@
-%%
+%%% $Id: multido.sty 317 2010-05-14 21:54:15Z herbert $
+%
%% This is file `multido.sty'.
%%
%% IMPORTANT NOTICE:
%%
%% multido.sty Copyright (C) 1997 Timothy Van Zandt
-%% (C) 2004 Herbert Voss <voss@perce.de>
-%% Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%% (C) 2004-2010 Herbert Voss <hvoss@tug.org>
+%% Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%%
%% This package may be distributed under the terms of the LaTeX Project
%% Public License, as described in lppl.txt in the base LaTeX distribution.
@@ -19,7 +20,7 @@
{%
\input{multido.tex}
\ProvidesFile{multido.tex}
- [\filedate\space v\fileversion\space `multido' (tvz)]
+ [\filedate\space v\fileversion\space `multido' (tvz,hv)]
}{}
\endinput