svn-multi (21mar11)

git-svn-id: svn://tug.org/texlive/trunk@21790 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 27 insertions, 3 deletions

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 866217cc2f4..84f28833c88 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.4a}
+\def\svnmulti@version{v2.4b}
 \RequirePackage{svn-prov}[2010/04/14]
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackageSVN
-  {$Id: svn-multi.dtx 2010 2011-01-03 23:11:47Z martin $}
+  {$Id: svn-multi.dtx 2376 2011-03-20 17:41:52Z martin $}
   [\svnmulti@version\space SVN Keywords for multi-file LaTeX documents]
 
 \RequirePackage{kvoptions}
@@ -281,7 +281,7 @@
 \def\svn@temp{}
 
 \def\svn@pg{} \def\svn@g{} \def\svn@cg{\svn@g} \def\svn@rg{\svn@pg}
-\let\@svng@@files\relax
+\let\@svng@@files\empty
 
 \def\svn@initfile{%
   \global\let\svnfilerev\svn@revinit
@@ -572,6 +572,8 @@
 }
 
 \def\@svn@updateid#1#2#3#4{%
+  \begingroup
+  \let\protect\@unexpandable@protect
   \xdef\svnfilerev{#1}%
   \ifsvn@modified
     \global\let\ifsvnfilemodified\@firstoftwo
@@ -611,6 +613,7 @@
       \fi
     \fi
   \fi
+  \endgroup
 }
 
 \def\@svncg@save#1#2{%
@@ -741,7 +744,10 @@
 }
 
 \newcommand{\svnkwdef@}[2]{%
+  \begingroup
+  \let\protect\@unexpandable@protect
   \expandafter\xdef\csname svnkw#1\endcsname{#2}%
+  \endgroup
 }
 
 \def\svnkwdef@Rev#1{%
@@ -1024,6 +1030,11 @@
     }{}%
   \xdef\svn@g{#1}%
   \let\svn@pg\svn@g
+  \svn@checkgroup{#1}%
+}
+\def\svn@checkgroup#1{%
+  \begingroup
+  \edef\svn@g{#1}%
   \ifx\svn@g\empty\else%
     \expandafter
     \ifx\csname @svng@\svn@g @rev\endcsname\relax%
@@ -1035,6 +1046,7 @@
       \fi
     \fi
   \fi
+  \endgroup
 }
 
 \def\thesvngroup{\svn@g}
@@ -1074,12 +1086,16 @@
   \ifx\csname @svng@#2@files@#1\endcsname\relax%
     \expandafter\gdef\csname @svng@#2@files@#1\endcsname{1}%
     %
+    \expandafter\ifx\csname @svng@#2@files\endcsname\empty%
+      \expandafter\xdef\csname @svng@#2@files\endcsname{#1}%
+    \else
     \@ifundefined{@svng@#2@files}%
       {\expandafter\xdef\csname @svng@#2@files\endcsname{#1}}%
       {\expandafter\xdef\csname @svng@#2@files\endcsname{%
         \csname @svng@#2@files\endcsname,#1%
        }%
       }%
+    \fi
   \fi
   }%
 }
@@ -1327,6 +1343,7 @@ lof,log,lot,out,svn,svt,svx,toc}
       {\edef\svn@eg{\svn@externalgroup}}%
       {\edef\svn@eg{#1}}%
     }%
+  \svn@checkgroup{\svn@eg}%
   \svne@@external#2\relax
   \svn@popfilestack
 }
@@ -1348,6 +1365,7 @@ lof,log,lot,out,svn,svt,svx,toc}
           {\def\svn@temp{\svn@externalgroup}}%
           {\def\svn@temp{#1}}%
         }%
+      \let\protect\@unexpandable@protect
       \immediate\write\svn@write{%
         \noexpand\@svnexternal[\svn@temp]{\currfilepath}{#2}%
       }%
@@ -1359,9 +1377,12 @@ lof,log,lot,out,svn,svt,svx,toc}
 
 \def\svnexternalpath#1{%
   \if@filesw
+    \begingroup
+    \let\protect\@unexpandable@protect
     \immediate\write\svn@write{%
       \noexpand\@svnexternalpath{#1}%
     }%
+    \endgroup
   \fi
 }
 
@@ -1785,8 +1806,11 @@ patch generated macros '\string\pgf@image@<name>!' from the 'pgf' package!}%
   \if@filesw
     \ifx\@svn@rev\empty\else
       \ifnum\@svn@rev<1\else
+        \begingroup
+        \let\protect\@unexpandable@protect
         \svn@writesvn
         \svn@writesvt
+        \endgroup
       \fi
     \fi
   \fi