svn-multi 2.3 (19jul10)

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

2 files changed, 131 insertions, 30 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 33e43faeece..59de8a64e16 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.2}
+\def\svnmulti@version{v2.3}
 \RequirePackage{svn-prov}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackageSVN
-  {$Id: svn-multi.dtx 1448 2009-10-19 21:28:41Z martin $}
+  {$Id: svn-multi.dtx 1866 2010-07-19 11:17:15Z martin $}
   [\svnmulti@version\space SVN Keywords for multi-file LaTeX documents]
 
 \RequirePackage{kvoptions}
@@ -239,10 +239,29 @@
 
 \def\svn@inputsvx#1{%
   \svn@pushfilestack
+  \begingroup
+  \svn@normalcatcodes
   \svn@input{#1.svx}%
+  \endgroup
   \svn@popfilestack
 }
 
+\def\svn@normalcatcodes{%
+  \catcode`\\=0\relax
+  \catcode`\{=1\relax
+  \catcode`\}=2\relax
+  \catcode`\$=3\relax
+  \catcode`\&=4\relax
+  \catcode`\^^M=5\relax
+  \catcode`\#=6\relax
+  \catcode`\^=7\relax
+  \catcode`\_=8\relax
+  \catcode`\ =10\relax
+  \catcode`\@=12\relax
+  \catcode`\~=13\relax
+  \catcode`\%=14\relax
+}
+
 \def\svn@revinit{-2}
 \let\svnrev\svn@revinit     \let\@svn@rev\svn@revinit
 \let\ifsvnmodified\@secondoftwo
@@ -298,9 +317,9 @@
 
 \newcommand*{\svne@catcodes}{%
   \let\do\@makeother
-  \endlinechar=-1
+  \endlinechar=-1%
   \dospecials
-  \do\- \do\: \do\. \do\^^L
+  \do\-\do\:\do\.\do\^^L%
 }
 
 \def\svne@readline#1{%
@@ -332,24 +351,25 @@
 \newcommand*{\svne@parseentriesfile}[1]{%
   \begingroup
     \let\next\relax
+    \def\svne@version{8}%
     \openin\svne@read=#1format\relax
     \ifeof\svne@read\else
       \svne@readline\svne@version
       \closein\svne@read
+    \fi
       \ifnum\svne@version>7\relax
         \openin\svne@read=#1entries\relax
         \ifeof\svne@read\else
           \svne@catcodes
           \svne@readline\svne@version
           \ifnum\svne@version>7\relax
-            \def\next{\svne@parsedirentry%
-                      \svne@parseentries}
+            \def\next{\svne@parsedirentry
+                      \svne@parseentries}%
           \else
             \closein\svne@read
           \fi
         \fi
       \fi
-    \fi
     \next
   \endgroup
 }
@@ -374,12 +394,12 @@
 \@makeother\.
 
 \gdef\svne@scandate#1{%
-  \expandafter\svne@scandate@#1\relax
-  0000-00-00T00:00:00.00000Z\relax\relax
+  \expandafter\svne@scandate@#1\empty
+  0000-00-00T00:00:00.00000Z\empty\empty
 }
 
-\gdef\svne@scandate@#1-#2-#3T#4:#5:#6.#7\relax#8\relax{%
-  \gdef\svnfileyear{#1}%
+\gdef\svne@scandate@#1-#2-#3T#4:#5:#6.#7\empty#8\empty{%
+  \xdef\svnfileyear{#1}%
   \gdef\svnfilemonth{#2}%
   \gdef\svnfileday{#3}%
   \gdef\svnfilehour{#4}%
@@ -426,8 +446,20 @@
 }
 
 \def\svne@handleentry{%
+  \ifx\svne@rev\empty
+    \let\svne@rev\svn@revinit
+  \fi
   \svn@ifequal{\svne@name}{\svnfilefname}%
     {%
+      \message{^^J%
+        Read from '.svn/entries' file:^^J%
+        Filename:  \svne@name^^J%
+        Date:      \svne@date^^J%
+        Revision:  \svne@rev^^J%
+        Author:    \svne@author^^J%
+        HeadURL:   \svne@url^^J%
+        ^^J%
+      }%
       \svnkwdef{Filename}{\svne@name}%
       \svnkwdef{Date}{\svne@date}%
       \svnkwdef{Revision}{\svne@rev}%
@@ -565,15 +597,54 @@
   \svnkwdef{Date}{}%
   \svnkwdef{Revision}{0}%
   \svnkwdef{Author}{}%
+  \if@svnmulti@verbatim
+    \expandafter\svnidlong@readverb
+  \else
+    \expandafter\svnidlong@readargs
+  \fi
+}
+\def\svnidlong@readverb{%
+  \@ifnextchar\bgroup
+    {\svnidlong@readverb@\svnidlong@readverb@a}%
+    {\PackageError{svn-multi}{Wrong syntax for \string\svnidlong}{}}%
+}
+\def\svnidlong@readverb@#1{%
   \begingroup
-    \if@svnmulti@verbatim
-      \svn@catcodes
-      \catcode`\{=12
-      \catcode`\}=12
-    \else
-      \def\svnidlong@readargsfull{\svnidlong@readargs}%
-    \fi
-    \svnidlong@readargsfull
+  \svn@catcodes
+  \catcode`\{=1\relax
+  \catcode`\}=2\relax
+  #1%
+}
+\def\svnidlong@readverb@a#1{%
+  \endgroup
+  \svnkwsave@read #1\relax
+  \@ifnextchar\bgroup
+    {\svnidlong@readverb@\svnidlong@readverb@b}%
+    {\PackageError{svn-multi}{Wrong syntax for \string\svnidlong}{}}%
+}
+\def\svnidlong@readverb@b#1{%
+  \endgroup
+  \svnkwsave@read #1\relax
+  \@ifnextchar\bgroup
+    {\svnidlong@readverb@\svnidlong@readverb@c}%
+    {\PackageError{svn-multi}{Wrong syntax for \string\svnidlong}{}}%
+}
+\def\svnidlong@readverb@c#1{%
+  \endgroup
+  \svnkwsave@read #1\relax
+  \@ifnextchar\bgroup
+    {\svnidlong@readverb@\svnidlong@readverb@d}%
+    {\PackageError{svn-multi}{Wrong syntax for \string\svnidlong}{}}%
+}
+\def\svnidlong@readverb@d#1{%
+  \endgroup
+  \svnkwsave@read #1\relax
+  \ifx\svnkwDate\empty\else
+    \@svn@scanlongdate{\svnkwDate}%
+  \fi
+  \@svn@updateid{\svnkw{Revision}}{\svnkw{Date}}%
+  {\svnkw{Author}}{\svnkw{URL}}%
+  \ignorespaces
 }
 
 \if@svnmulti@verbatim
@@ -588,17 +659,6 @@
 \else
   \def\svn@catcodes{}
 \fi
-
-\if@svnmulti@verbatim
-\begingroup
-\catcode`\{=12\catcode`\}=12
-\catcode`\(=1\catcode`\)=2
-\gdef\svnidlong@readargsfull#1{#2}#3{#4}#5{#6}#7{#8}(%
- \svnidlong@readargs(#2)(#4)(#6)(#8)%
-)
-\endgroup
-\fi
-
 \def\svnidlong@readargs#1#2#3#4{%
     \svnkwsave@read #1\relax
     \svnkwsave@read #2\relax
@@ -1452,6 +1512,9 @@ patch generated macros '\string\pgf@image@<name>!' from the 'pgf' package!}%
 \def\svn@svt{svt}
 
 \AtBeginDocument{%
+\ifx\chapter\relax
+  \let\chapter\@undefined
+\fi
 \ifx\chapter\@undefined
 
 %% Adapted from the \tableofcontents macro, LaTeX `article' class [2005/09/16]
diff --git a/Master/texmf-dist/tex/latex/svn-multi/svnkw.sty b/Master/texmf-dist/tex/latex/svn-multi/svnkw.sty
new file mode 100644
index 00000000000..0ee32f20c0a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/svn-multi/svnkw.sty
@@ -0,0 +1,38 @@
+%%
+%% This is file `svnkw.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% svn-multi.dtx  (with options: `wrapper')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2006-2009 by Martin Scharrer <martin@scharrer-online.de>
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (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 Martin Scharrer.
+%% 
+%% This work consists of the files svn-multi.dtx, svn-multi-pl.dtx, svn-multi.ins
+%% and the derived files svn-multi.sty, svnkw.sty and svn-multi.pl.
+%% 
+\makeatletter
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{svnkw}
+ [2009/03/27 v2.1 Backward compatibility wrapper for svn-multi]
+\PackageWarning{svnkw}{The package 'svnkw' got renamed to 'svn-multi' and is now
+only a backward compatibility wrapper which loads 'svn-multi'.  Please adjust
+your document preamble to use the new name.}
+\RequirePackage{svn-multi}
+\endinput
+%%
+%% End of file `svnkw.sty'.