summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-02-06 06:48:51 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-02-06 06:48:51 +0000
commite1c4af1f368d34d876d5e5565cd4916bad84f436 (patch)
tree36627beca707eaf09da7b8c13282dbe476f66e50
parentb135f85080af457237045f45e2fcb3b9d0a3f31a (diff)
xfor v1.05 (5 February 2009)
git-svn-id: svn://tug.org/texlive/trunk@12104 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/xfor/CHANGES6
-rw-r--r--Master/texmf-dist/doc/latex/xfor/README4
-rw-r--r--Master/texmf-dist/doc/latex/xfor/xfor.pdfbin117462 -> 118215 bytes
-rw-r--r--Master/texmf-dist/source/latex/xfor/xfor.dtx21
-rw-r--r--Master/texmf-dist/source/latex/xfor/xfor.ins2
-rw-r--r--Master/texmf-dist/tex/latex/xfor/xfor.sty10
6 files changed, 25 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/xfor/CHANGES b/Master/texmf-dist/doc/latex/xfor/CHANGES
index 926dfd76f44..23010df08cd 100644
--- a/Master/texmf-dist/doc/latex/xfor/CHANGES
+++ b/Master/texmf-dist/doc/latex/xfor/CHANGES
@@ -1,8 +1,12 @@
xfor change log:
+v1.05 (5 February 2009):
+ changed \@forloop to \@xforloop to avoid conflict caused
+ by new syntax.
+
v1.04 (25 January 2009):
rewrite of internals to improve loop efficiency
- (code provided by Morten Høgholm)
+ (code provided by Morten H\o gholm)
v1.03 (21 August 2007):
fixed license text
diff --git a/Master/texmf-dist/doc/latex/xfor/README b/Master/texmf-dist/doc/latex/xfor/README
index dcefb0eff65..f5f98515d21 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 : 25 January 2009
-Version : 1.04
+Last Modified : 5 February 2009
+Version : 1.05
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 96ca0f6497f..4d9c7bf290f 100644
--- a/Master/texmf-dist/doc/latex/xfor/xfor.pdf
+++ b/Master/texmf-dist/doc/latex/xfor/xfor.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/xfor/xfor.dtx b/Master/texmf-dist/source/latex/xfor/xfor.dtx
index e7e9ea5fa45..1157d190570 100644
--- a/Master/texmf-dist/source/latex/xfor/xfor.dtx
+++ b/Master/texmf-dist/source/latex/xfor/xfor.dtx
@@ -7,7 +7,7 @@
% -author "Nicola Talbot"
% -dir "source"
% xfor
-% Created on 2009/1/27 9:19
+% Created on 2009/2/5 16:02
%\fi
%\iffalse
%<*package>
@@ -57,7 +57,7 @@
%\fi
%\MakeShortVerb{"}
%
-% \title{xfor v1.04: Reimplementation of \cs{@for} to allow
+% \title{xfor v1.05: Reimplementation of \cs{@for} to allow
%premature termination of the loop}
% \author{Nicola L.C. Talbot\\[10pt]
%School of Computing Sciences\\
@@ -66,7 +66,7 @@
%NR4 7TJ. United Kingdom.\\
%\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
%
-%\date{25th January 2009}
+%\date{5th February 2009}
%\maketitle
%\tableofcontents
%
@@ -258,7 +258,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xfor}[2009/01/25 v1.04 (NLCT)]
+\ProvidesPackage{xfor}[2009/02/05 v1.05 (NLCT)]
% \end{macrocode}
%\begin{macro}{\if@endfor}
% Define a switch to determine if the for loop should be
@@ -303,7 +303,7 @@
%\changes{1.04}{2009 January 25}{Added by Morten H\o gholm}
% \begin{macrocode}
\long\def\@@for#1#2#3{%
- \@forloop#1{#3}#2,\@nil,\@nil,%
+ \@xforloop#1{#3}#2,\@nil,\@nil,%
\@xfor@endmarker% magic end marker
}
% \end{macrocode}
@@ -318,12 +318,15 @@
\long\def\@xfornoop#1\@xfor@endmarker{}
% \end{macrocode}
%\end{macro}
-%\begin{macro}{\@forloop}
+%\begin{macro}{\@xforloop}
%\cs{@forloop}\marg{var}\marg{action}
%\changes{1.04}{2009 January 25}{Modified by Morten H\o gholm to
% improve efficiency}
+%\changes{1.05}{2009 February 5}{\cs{@forloop} replaced by
+% \cs{@xforloop} to prevent conflict with other packages that
+% use \cs{@forloop}}
% \begin{macrocode}
-\long\def\@forloop#1#2#3,#4,{%
+\long\def\@xforloop#1#2#3,#4,{%
\def#1{#3}%
\ifx#1\@nnil
% \end{macrocode}
@@ -340,7 +343,7 @@
\if@endfor
\expandafter\@iforgatherrest
\fi
- \@forloop#1{#2}{#4},%
+ \@xforloop#1{#2}{#4},%
}
% \end{macrocode}
%\end{macro}
@@ -350,7 +353,7 @@
%\changes{1.01}{2007 July 11}{made long}%
%\changes{1.04}{2009 January 25}{argument syntax changed (MH)}
% \begin{macrocode}
-\long\def\@iforgatherrest \@forloop#1#2#3,#4\@xfor@endmarker{%
+\long\def\@iforgatherrest \@xforloop#1#2#3,#4\@xfor@endmarker{%
\def\@fortmp{#3}%
\ifx\@fortmp\@nnil
\def\@forremainder{}%
diff --git a/Master/texmf-dist/source/latex/xfor/xfor.ins b/Master/texmf-dist/source/latex/xfor/xfor.ins
index 5734e241eb0..3615cd61b05 100644
--- a/Master/texmf-dist/source/latex/xfor/xfor.ins
+++ b/Master/texmf-dist/source/latex/xfor/xfor.ins
@@ -1,4 +1,4 @@
-% xfor.ins generated using makedtx version 0.94b 2009/1/27 9:19
+% xfor.ins generated using makedtx version 0.94b 2009/2/5 16:02
\input docstrip
\preamble
diff --git a/Master/texmf-dist/tex/latex/xfor/xfor.sty b/Master/texmf-dist/tex/latex/xfor/xfor.sty
index 8c64bba73fd..eb3900baabf 100644
--- a/Master/texmf-dist/tex/latex/xfor/xfor.sty
+++ b/Master/texmf-dist/tex/latex/xfor/xfor.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xfor}[2009/01/25 v1.04 (NLCT)]
+\ProvidesPackage{xfor}[2009/02/05 v1.05 (NLCT)]
\newif\if@endfor
\long\def\@gobbleseven#1#2#3#4#5#6#7{}
\long\def\@for#1:=#2\do{%
@@ -52,11 +52,11 @@
\expandafter\@@for\expandafter#1\expandafter{#2}%
}
\long\def\@@for#1#2#3{%
-\@forloop#1{#3}#2,\@nil,\@nil,%
+\@xforloop#1{#3}#2,\@nil,\@nil,%
\@xfor@endmarker% magic end marker
}
\long\def\@xfornoop#1\@xfor@endmarker{}
-\long\def\@forloop#1#2#3,#4,{%
+\long\def\@xforloop#1#2#3,#4,{%
\def#1{#3}%
\ifx#1\@nnil
\expandafter\@xfornoop
@@ -66,9 +66,9 @@
\if@endfor
\expandafter\@iforgatherrest
\fi
-\@forloop#1{#2}{#4},%
+\@xforloop#1{#2}{#4},%
}
-\long\def\@iforgatherrest \@forloop#1#2#3,#4\@xfor@endmarker{%
+\long\def\@iforgatherrest \@xforloop#1#2#3,#4\@xfor@endmarker{%
\def\@fortmp{#3}%
\ifx\@fortmp\@nnil
\def\@forremainder{}%