From b38d0dc03b854ce6119171b7c516e9671aaafddf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 22 Apr 2009 17:11:56 +0000 Subject: svn-multi 2.1 (21apr09) git-svn-id: svn://tug.org/texlive/trunk@12795 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/svn-multi/svn-multi.sty | 45 ++++++++++++---------- 1 file changed, 25 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/svn-multi/svn-multi.sty b/Master/texmf-dist/tex/latex/svn-multi/svn-multi.sty index 22d1d92e512..ea4351cd212 100644 --- a/Master/texmf-dist/tex/latex/svn-multi/svn-multi.sty +++ b/Master/texmf-dist/tex/latex/svn-multi/svn-multi.sty @@ -26,11 +26,11 @@ %% and the derived files svn-multi.sty, svnkw.sty and svn-multi.pl. %% \makeatletter -\def\svnmulti@version {v2.1} +\def\svnmulti@version {v2.1a} \def\svnmulti@rev $#1: #2 ${\def\svnmulti@rev{#2}} \def\svnmulti@date $#1: #2-#3-#4 #5 ${\def\svnmulti@date{#2/#3/#4}} -\svnmulti@rev $Rev: 691 $\relax -\svnmulti@date $Date: 2009-03-27 21:37:56 +0000 (Fri, 27 Mar 2009) $\relax +\svnmulti@rev $Rev: 845 $\relax +\svnmulti@date $Date: 2009-04-21 13:03:08 +0100 (Tue, 21 Apr 2009) $\relax \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{svn-multi} @@ -840,8 +840,8 @@ Try a different version, e.g. v2.1.1 from 2008/02/27}{}% \def\svn@removedotslash#1{% \def\svn@removedotslash@##1##2##3\relax{% \svn@ifequal{./}{##1##2}% - {\edef#1{##3}\def\next{\svn@removedotslash@##3\empty\empty\empty\relax}}% - {\edef#1{##1##2##3}\let\next\relax}% + {\def\next{\svn@removedotslash@##3\empty\empty\empty\relax}}% + {\xdef#1{##1##2##3}\let\next\relax}% \next }% \expandafter\svn@removedotslash@#1\empty\empty\empty\relax @@ -862,9 +862,10 @@ Try a different version, e.g. v2.1.1 from 2008/02/27}{}% \let\svnmulti@fink@prepare\fink@prepare \renewcommand*{\fink@prepare}[1]{% \svnmulti@fink@prepare{#1}% + \svn@pushfilestack \if@svnmulti@groups \svn@ifequal{\svn@filepath}{\jobname.\svn@mainext}% - {\global\let\svn@pg\svn@g}% + {\xdef\svn@pg{\svn@g}}% {\xdef\svn@pg{\svn@filedir\svn@filebase}}% \fi \xdef\svn@filebase{\fink@nextbase}% @@ -881,6 +882,7 @@ Try a different version, e.g. v2.1.1 from 2008/02/27}{}% \def\fink@restore#1{% \svnmulti@endinputfilehook \svnmulti@fink@restore{#1}% + \svn@popfilestack \xdef\svn@filebase{\finkbase}% \xdef\svn@fileext{\finkext}% \xdef\svn@filedir{\finkdir}% @@ -962,13 +964,6 @@ Try a different version, e.g. v2.1.1 from 2008/02/27}{}% \fi } -\svnmulti@atbegininputfile{% - \svn@pushfilestack -} - -\svnmulti@atendinputfile{% - \svn@popfilestack -}% \fi @@ -1241,6 +1236,9 @@ lof,log,lot,out,svn,svt,svx,toc} \AtBeginDocument{% \if@svnmulti@subgroups \ifsvnsubgroups + \@ifundefined{@svng@\svn@g @files@\jobname}% + {% + \@namedef{@svng@\svn@g @files@\jobname}{1}% \@ifundefined{@svng@\svn@g @files}% {% \expandafter @@ -1251,6 +1249,7 @@ lof,log,lot,out,svn,svt,svx,toc} \xdef\csname @svng@\svn@g @files\endcsname {\jobname,\csname @svng@\svn@g @files\endcsname}% }% + }{}% \svnsubgroup \fi \fi @@ -1263,10 +1262,10 @@ lof,log,lot,out,svn,svt,svx,toc} \if@svnmulti@groups \def\svnexternalgroup#1{% \svn@ifequal{#1}{*}% + {\def\svn@externalgroup{\svn@pg}}% {\def\svn@externalgroup{#1}}% - {\def\svn@externalgroup{\svn@g}}% } -\def\svn@externalgroup{\svn@g} +\def\svn@externalgroup{\svn@pg} \else \def\svn@externalgroup{} \fi @@ -1275,7 +1274,7 @@ lof,log,lot,out,svn,svt,svx,toc} \newcommand*\svnexternal[2][]{% \svn@pushfilestack \svn@ifequal{#1}{*}% - {\edef\svn@eg{\svn@g}}% + {\edef\svn@eg{\svn@pg}}% {\svn@ifempty{#1}% {\edef\svn@eg{\svn@externalgroup}}% {\edef\svn@eg{#1}}% @@ -1297,7 +1296,7 @@ lof,log,lot,out,svn,svt,svx,toc} \svn@checkwrite \begingroup \svn@ifequal{#1}{*}% - {\def\svn@temp{\svn@g}}% + {\def\svn@temp{\svn@pg}}% {\svn@ifempty{#1}% {\def\svn@temp{\svn@externalgroup}}% {\def\svn@temp{#1}}% @@ -1369,7 +1368,7 @@ lof,log,lot,out,svn,svt,svx,toc} \def\svngraphicsgroup#1{% \svn@ifequal{#1}{*}% - {\def\svn@graphicsgroup{\svn@g}}% + {\def\svn@graphicsgroup{\svn@pg}}% {\def\svn@graphicsgroup{#1}}% } \def\svn@graphicsgroup{\svn@externalgroup} @@ -1438,7 +1437,9 @@ patch generated macros '\string\pgf@image@!' from the 'pgf' package!}% %% Adapted from the \tableofcontents macro, LaTeX `book' class [2005/09/16] \newcommand\tableofrevisions{% - \if@twocolumn + \expandafter\ifx + \csname if@twocolumn\expandafter\endcsname + \csname iftrue\endcsname \@restonecoltrue\onecolumn \else \@restonecolfalse @@ -1446,7 +1447,11 @@ patch generated macros '\string\pgf@image@!' from the 'pgf' package!}% \chapter*{\svnrevisionsname \@mkboth{\MakeUppercase\svnrevisionsname}{\MakeUppercase\svnrevisionsname}}% \svn@input{\jobname .\svn@svt}% - \if@restonecol\twocolumn\fi + \expandafter\ifx + \csname if@restonecol\expandafter\endcsname + \csname iftrue\endcsname + \twocolumn + \fi } \fi -- cgit v1.2.3