From 7ee037f358f4abd769821e0d322ad1687ecec0f9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 24 Aug 2007 18:36:00 +0000 Subject: xfor update (21aug07) git-svn-id: svn://tug.org/texlive/trunk@4798 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xfor/CHANGES | 3 + Master/texmf-dist/doc/latex/xfor/README | 4 +- Master/texmf-dist/doc/latex/xfor/xfor.pdf | Bin 108442 -> 108179 bytes Master/texmf-dist/source/latex/xfor/xfor.dtx | 100 +++++++++++++-------------- Master/texmf-dist/source/latex/xfor/xfor.ins | 26 +++++-- Master/texmf-dist/tex/latex/xfor/xfor.sty | 32 +++++---- 6 files changed, 93 insertions(+), 72 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/xfor/CHANGES b/Master/texmf-dist/doc/latex/xfor/CHANGES index f0af3f9af82..1899d18a565 100644 --- a/Master/texmf-dist/doc/latex/xfor/CHANGES +++ b/Master/texmf-dist/doc/latex/xfor/CHANGES @@ -1,5 +1,8 @@ xfor change log: +v1.03 (21 August 2007): + fixed license text + v1.02 (16 August 2007): added look ahead facility diff --git a/Master/texmf-dist/doc/latex/xfor/README b/Master/texmf-dist/doc/latex/xfor/README index fe86d45f2cd..b8980b3caea 100644 --- a/Master/texmf-dist/doc/latex/xfor/README +++ b/Master/texmf-dist/doc/latex/xfor/README @@ -1,7 +1,7 @@ LaTeX Package : xfor -Last Modified : 16 August 2007 -Version : 1.02 +Last Modified : 21 August 2007 +Version : 1.03 Author : Nicola Talbot This package redefines \@for so that it is possible to diff --git a/Master/texmf-dist/doc/latex/xfor/xfor.pdf b/Master/texmf-dist/doc/latex/xfor/xfor.pdf index 385b0419dc1..1ec378b63a9 100644 Binary files a/Master/texmf-dist/doc/latex/xfor/xfor.pdf and b/Master/texmf-dist/doc/latex/xfor/xfor.pdf differ diff --git a/Master/texmf-dist/source/latex/xfor/xfor.dtx b/Master/texmf-dist/source/latex/xfor/xfor.dtx index eda8dbe5802..c49c8f2de61 100644 --- a/Master/texmf-dist/source/latex/xfor/xfor.dtx +++ b/Master/texmf-dist/source/latex/xfor/xfor.dtx @@ -1,12 +1,12 @@ %\iffalse -% xfor.dtx generated using makedtx version 0.93b (c) Nicola Talbot +% xfor.dtx generated using makedtx version 0.94b (c) Nicola Talbot % Command line args: % -src "xfor.sty=>xfor.sty" % -doc "manual.tex" % -author "Nicola Talbot" % -dir "source" % xfor -% Created on 2007/8/16 15:55 +% Created on 2007/8/21 17:28 %\fi %\iffalse %<*package> @@ -56,7 +56,7 @@ %\fi %\MakeShortVerb{"} % -% \title{xfor v1.02: Reimplementation of \cs{@for} to allow +% \title{xfor v1.03: Reimplementation of \cs{@for} to allow %premature termination of the loop} % \author{Nicola L.C. Talbot\\[10pt] %School of Computing Sciences\\ @@ -65,7 +65,7 @@ %NR4 7TJ. United Kingdom.\\ %\url{http://theoval.cmp.uea.ac.uk/~nlct/}} % -%\date{16th August 2007} +%\date{21st August 2007} %\maketitle %\tableofcontents % @@ -97,11 +97,11 @@ %On the last iteration, this value %will be \cs{@nil}, and so can be checked using %\begin{verbatim} -%\ifx\@xfor@nextelement\@nnil -%% last iteration -%\else -%% not last iteration -%\fi +% \ifx\@xfor@nextelement\@nnil +% % last iteration +% \else +% % not last iteration +% \fi %\end{verbatim} % %\subsection{Example (ordered insertion)} @@ -124,50 +124,50 @@ %defines the command \cs{insertinto}\marg{new val}\marg{list} %which uses this method: %\begin{verbatim} -%\newcommand{\insertinto}[2]{% -%\def\nlst{}% -%\@for\n:=#2\do{% -%% store new list in \toks@ -%\expandafter\toks@\expandafter{\nlst}% -%% test current value against new value -%\ifnum\n>#1\relax -% \edef\newstuff{\number#1,\n}% -% % end for loop at the end of this iteration -% \@endfortrue -%\else -% \edef\newstuff{\n}% -%\fi -%% append new stuff to new list -%\ifx\nlst\@empty -% \edef\nlst{\newstuff}% -%\else -% \edef\nlst{\the\toks@,\newstuff}% -%\fi -%}% -%% check to see if for loop was prematurely terminated -%\if@endfor -% % loop may have been terminated during final iteration, in -% % which case \@forremainder is empty. -% \ifx\@forremainder\@empty -% % do nothing +% \newcommand{\insertinto}[2]{% +% \def\nlst{}% +% \@for\n:=#2\do{% +% % store new list in \toks@ +% \expandafter\toks@\expandafter{\nlst}% +% % test current value against new value +% \ifnum\n>#1\relax +% \edef\newstuff{\number#1,\n}% +% % end for loop at the end of this iteration +% \@endfortrue % \else -% % loop prematurely ended, append remainder of original list -% % to new list -% \expandafter\toks@\expandafter{\nlst}% -% \edef\nlst{\the\toks@,\@forremainder}% +% \edef\newstuff{\n}% +% \fi +% % append new stuff to new list +% \ifx\nlst\@empty +% \edef\nlst{\newstuff}% +% \else +% \edef\nlst{\the\toks@,\newstuff}% % \fi -%\else -% % wasn't prematurely terminated, so new value hasn't been added -% % add now. -% \expandafter\toks@\expandafter{\nlst}% -% \ifx\nlst\@empty -% \edef\nlst{\number#1}% +% }% +% % check to see if for loop was prematurely terminated +% \if@endfor +% % loop may have been terminated during final iteration, in +% % which case \@forremainder is empty. +% \ifx\@forremainder\@empty +% % do nothing % \else -% \edef\nlst{\the\toks@,\number#1}% +% % loop prematurely ended, append remainder of original list +% % to new list +% \expandafter\toks@\expandafter{\nlst}% +% \edef\nlst{\the\toks@,\@forremainder}% % \fi -%\fi -%\let#2=\nlst -%} +% \else +% % wasn't prematurely terminated, so new value hasn't been added +% % add now. +% \expandafter\toks@\expandafter{\nlst}% +% \ifx\nlst\@empty +% \edef\nlst{\number#1}% +% \else +% \edef\nlst{\the\toks@,\number#1}% +% \fi +% \fi +% \let#2=\nlst +% } %\end{verbatim} %The \cs{insertinto} macro can then be used as follows: %\begin{verbatim} @@ -249,7 +249,7 @@ % Declare package: % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xfor}[2007/08/16 v1.02 (NLCT)] +\ProvidesPackage{xfor}[2007/08/21 v1.03 (NLCT)] % \end{macrocode} % Define a switch to determine if the for loop should be % terminated: diff --git a/Master/texmf-dist/source/latex/xfor/xfor.ins b/Master/texmf-dist/source/latex/xfor/xfor.ins index 45caba065e3..3269a9fd46d 100644 --- a/Master/texmf-dist/source/latex/xfor/xfor.ins +++ b/Master/texmf-dist/source/latex/xfor/xfor.ins @@ -1,13 +1,25 @@ -% xfor.ins generated using makedtx version 0.93b 2007/8/16 15:55 +% xfor.ins generated using makedtx version 0.94b 2007/8/21 17:28 \input docstrip \preamble -Copyright (C) 2007 Nicola Talbot, all rights reserved. -If you modify this file, you must change its name first. -You are NOT ALLOWED to distribute this file alone. You are NOT -ALLOWED to take money for the distribution or use of either this -file or a changed version, except for a nominal charge for copying -etc. + + xfor.dtx + Copyright 2007 Nicola Talbot + + This work may be distributed and/or modified under the + conditions of the LaTeX Project Public License, either version 1.3 + of this license of (at your option) any later version. + The latest version of this license is in + http://www.latex-project.org/lppl.txt + and version 1.3 or later is part of all distributions of LaTeX + version 2005/12/01 or later. + + This work has the LPPL maintenance status `maintained'. + + The Current Maintainer of this work is Nicola Talbot. + + This work consists of the files xfor.dtx and xfor.ins and the derived file xfor.sty. + \endpreamble \askforoverwritefalse diff --git a/Master/texmf-dist/tex/latex/xfor/xfor.sty b/Master/texmf-dist/tex/latex/xfor/xfor.sty index 77a81d5fe86..87f899aaaf5 100644 --- a/Master/texmf-dist/tex/latex/xfor/xfor.sty +++ b/Master/texmf-dist/tex/latex/xfor/xfor.sty @@ -5,12 +5,24 @@ %% The original source files were: %% %% xfor.dtx (with options: `xfor.sty,package') -%% Copyright (C) 2007 Nicola Talbot, all rights reserved. -%% If you modify this file, you must change its name first. -%% You are NOT ALLOWED to distribute this file alone. You are NOT -%% ALLOWED to take money for the distribution or use of either this -%% file or a changed version, except for a nominal charge for copying -%% etc. +%% +%% xfor.dtx +%% Copyright 2007 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license of (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot. +%% +%% This work consists of the files xfor.dtx and xfor.ins and the derived file xfor.sty. +%% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -26,14 +38,8 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -%% last iteration -%% not last iteration -%% store new list in \toks@ -%% test current value against new value -%% append new stuff to new list -%% check to see if for loop was prematurely terminated \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xfor}[2007/08/16 v1.02 (NLCT)] +\ProvidesPackage{xfor}[2007/08/21 v1.03 (NLCT)] \newif\if@endfor \long\def\@for#1:=#2\do#3{% \@endforfalse -- cgit v1.2.3