svn-prov 1747 (25mar10)

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

6 files changed, 165 insertions, 79 deletions

diff --git a/Master/texmf-dist/doc/latex/svn-prov/README b/Master/texmf-dist/doc/latex/svn-prov/README
deleted file mode 100644
index e037a717da8..00000000000
--- a/Master/texmf-dist/doc/latex/svn-prov/README
+++ /dev/null
@@ -1,17 +0,0 @@
-Package svn-prov
-~~~~~~~~~~~~~~~~
-Copyright (C) 2009 Martin Scharrer <martin@scharrer-online.de>
-See the svn-prov.dtx or svn-prov.ins file for the licence information (LPPL).
-
-
-This package introduces Subversion variants of the standard LaTeX macros
-\ProvidesPackage, \ProvidesClass and \ProvidesFile where the file name and date 
-is extracted from Subversion Id keywords. The file name can also be given 
-explicitly as an optional argument.
-
-Syntax summary:
-
-\ProvidesPackageSVN [file name]{$Id: ... $}[Package Information (version, description)]
-\ProvidesClassSVN [file name]{$Id: ... $}[Class Information (version, description)]
-\ProvidesFileSVN [file name]{$Id: ... $}[File Information (version, description)]
-
diff --git a/Master/texmf-dist/doc/latex/svn-prov/svn-prov.pdf b/Master/texmf-dist/doc/latex/svn-prov/svn-prov.pdf
index 9d1264ae95c..92b5294c9e8 100644
--- a/Master/texmf-dist/doc/latex/svn-prov/svn-prov.pdf
+++ b/Master/texmf-dist/doc/latex/svn-prov/svn-prov.pdf
diff --git a/Master/texmf-dist/source/latex/svn-prov/Makefile b/Master/texmf-dist/source/latex/svn-prov/Makefile
index e630b9a1d6b..3bc5a902b3a 100644
--- a/Master/texmf-dist/source/latex/svn-prov/Makefile
+++ b/Master/texmf-dist/source/latex/svn-prov/Makefile
@@ -1,37 +1,47 @@
-# $Id: Makefile 1049 2009-05-03 00:24:49Z martin $
+# $Id: Makefile 1464 2009-10-21 17:09:12Z martin $
 
-PACKAGE = svn-prov
+PACKAGE     = svn-prov
 PACKAGE_STY = ${PACKAGE}.sty
-PACKAGE_DOC = ${PACKAGE}.pdf
-PACKAGE_SRC = ${PACKAGE}.dtx ${PACKAGE}.ins Makefile
-PACKFILES = ${PACKAGE_SRC} ${PACKAGE_DOC} README
-TEXAUX = *.aux *.log *.glo *.ind *.idx *.out *.svn *.svx *.svt *.toc *.ilg *.gls *.hd *.exa *.exb
+PACKAGE_DTX = ${PACKAGE}.dtx
+PACKAGE_SCR =
+PACKAGE_DOC = $(PACKAGE_DTX:.dtx=.pdf)
+PACKAGE_SRC = ${PACKAGE_DTX} ${PACKAGE}.ins Makefile
+PACKFILES   = ${PACKAGE_SRC} ${PACKAGE_DOC} README
+
+TEXAUX = *.aux *.log *.glo *.ind *.idx *.out *.svn *.svx *.svt *.toc *.ilg *.gls *.hd *.fdb_latexmk
 INSGENERATED = ${PACKAGE_STY}
+GENERATED = ${INSGENERATED} ${PACKAGE}.pdf ${PACKAGE}.zip ${PACKAGE}.tar.gz ${TESTDIR}/test*.pdf
 ZIPFILE = ${PACKAGE}-${ZIPVERSION}.zip
 TDSZIPFILE = ${PACKAGE}-${ZIPVERSION}.tds.zip
-GENERATED = ${INSGENERATED} ${PACKAGE}.pdf
-ZIPS = zip tdszip
+
+TESTDIR = tests
+TESTS = $(patsubst %.tex,%,$(subst ${TESTDIR}/,,$(wildcard ${TESTDIR}/test?.tex ${TESTDIR}/test??.tex))) # look for all test*.tex file names and remove the '.tex' 
+TESTARGS = -output-directory ${TESTDIR}
 
 LATEX_OPTIONS = -interaction=batchmode
 LATEX = pdflatex ${LATEX_OPTIONS}
 
 TEXMFDIR = ${HOME}/texmf
 
+RED   = \033[01;31m
+GREEN = \033[01;32m
+WHITE = \033[00m
+
 CP = cp -v
 MV = mv -v
 RMDIR = rm -rf
 MKDIR = mkdir -p
 
-.PHONY: all doc package clean fullclean tds
+.PHONY: all doc package clean fullclean example testclean ${TESTS} tds ${CHECK_LOG}
+
+###############################################################################
 
 all: package doc example
 new: fullclean all
 
-doc: ${PACKAGE}.pdf
-
-package: ${PACKAGE}.sty
+doc: ${PACKAGE_DOC}
 
-example:
+package: ${PACKAGE_STY} ${PACKAGE_SCR}
 
 %.pdf: %.dtx
 	${LATEX} $*.dtx
@@ -42,46 +52,90 @@ example:
 
 ${PACKAGE}.pdf: ${PACKAGE}.sty
 
-${INSGENERATED}: *.dtx ${PACKAGE}.ins 
+${INSGENERATED}: ${PACKAGE_DTX} ${PACKAGE}.ins 
 	yes | latex ${PACKAGE}.ins
 
 clean:
-	rm -f ${TEXAUX}
+	rm -f ${TEXAUX} $(addprefix ${TESTDIR}/, ${TEXAUX})
 
 fullclean: clean
 	rm -f ${GENERATED} *~ *.backup
 	rm -f ${PACKAGE}*.zip
 	rm -rf tds/
 
-zip: fullclean package doc example ${ZIPFILE}
-${PACKAGE}.zip: zip
 
-${ZIPS}: ZIPVERSION=$(shell grep "Package: ${PACKAGE} " ${PACKAGE}.log | \
+zip: ${PACKFILES}
+	@${MAKE} --no-print-directory ${ZIPFILE}
+
+zip: ZIPVERSION=$(shell grep "Package: ${PACKAGE} " ${PACKAGE}.log | \
+	sed -e "s/.*Package: ${PACKAGE} ....\/..\/..\s\+\(v\S\+\).*/\1/")
+
+tdszip: ZIPVERSION=$(shell grep "Package: ${PACKAGE} " ${PACKAGE}.log | \
 	sed -e "s/.*Package: ${PACKAGE} ....\/..\/..\s\+\(v\S\+\).*/\1/")
 
-${ZIPFILE}: ${PACKFILES}
-	grep -q '\* Checksum passed \*' ${PACKAGE}.log
+${PACKAGE}%.zip: ${PACKFILES}
+	@test -n "${IGNORE_CHECKSUM}" || grep -L '\* Checksum passed \*' ${PACKAGE_DTX:.dtx=.log} | wc -l | grep -q '^0$$'
 	-pdfopt ${PACKAGE}.pdf opt_${PACKAGE}.pdf && mv opt_${PACKAGE}.pdf ${PACKAGE}.pdf
-	${RM} ${ZIPFILE}
-	zip ${ZIPFILE} ${PACKFILES}
+	${RM} $@
+	zip $@ ${PACKFILES}
 	@echo
-	@echo "ZIP file ${ZIPFILE} created!"
+	@echo "ZIP file $@ created!"
+
+release: fullclean package doc example tests zip
+
+###############################################################################
 
-tds: package doc
+# Make sure TeX finds the input files in TESTDIR
+tests ${TESTS}: export TEXINPUTS:=${TEXINPUTS}:${TESTDIR}
+tests ${TESTS}: LATEX_OPTIONS=
+
+testclean:
+	@${RM} $(foreach ext, aux log out pdf svn svx, tests/test*.${ext})
+
+tests: package testclean
+	@echo "Running tests: ${TESTS}:"
+	@${MAKE} -e -i --no-print-directory ${TESTS} \
+		TESTARGS="-interaction=batchmode -output-directory=${TESTDIR}"\
+		TESTPLOPT="-q"\
+		> /dev/null
+
+${TESTS}: % : ${TESTDIR}/%.tex package testclean
+	@-${LATEX} -interaction=nonstopmode ${TESTARGS} $< 1>/dev/null 2>/dev/null
+	@if (${LATEX} ${TESTARGS} $< && (test ! -e ${TESTDIR}/$*.pl || ${TESTDIR}/$*.pl ${TESTPLOPT})); \
+		then /bin/echo -e "${GREEN}$@ succeeded${WHITE}" >&2; \
+		else /bin/echo -e "${RED}$@ failed!!!!!!${WHITE}" >&2; fi
+
+###############################################################################
+
+tds: .tds
+
+.tds: ${PACKAGE_STY} ${PACKAGE_DOC} ${PACKAGE_SRC}
 	@grep -q '\* Checksum passed \*' ${PACKAGE}.log
 	${RMDIR} tds
 	${MKDIR} tds/
 	${MKDIR} tds/tex/ tds/tex/latex/ tds/tex/latex/${PACKAGE}/
 	${MKDIR} tds/doc/ tds/doc/latex/ tds/doc/latex/${PACKAGE}/
 	${MKDIR} tds/source/ tds/source/latex/ tds/source/latex/${PACKAGE}/
+	-test -n "${PACKAGE_SCR}" && ${MKDIR} tds/scripts/ tds/scripts/${PACKAGE}/
 	${CP} ${PACKAGE_STY} tds/tex/latex/${PACKAGE}/
 	${CP} ${PACKAGE_DOC} tds/doc/latex/${PACKAGE}/
-	${CP} ${PACKAGE_SRC} tds/source/latex/${PACKAGE}/
+	-${CP} ${PACKAGE_SRC} tds/source/latex/${PACKAGE}/
+	-test -n "${PACKAGE_SCR}" && ${CP} ${PACKAGE_SCR} tds/scripts/${PACKAGE}/
+	@touch $@
+
+tdszip: ${TDSZIPFILE}
 
-tdszip: tds
+${TDSZIPFILE}: .tds
 	${RM} ${TDSZIPFILE}
 	cd tds && zip -r ../${TDSZIPFILE} .
 
-install: tds
+###############################################################################
+
+install: .tds
 	test -d "${TEXMFDIR}" && ${CP} -a tds/* "${TEXMFDIR}/" && texhash ${TEXMFDIR}
 
+uninstall:
+	test -d "${TEXMFDIR}" && ${RM} -rv "${TEXMFDIR}/tex/latex/${PACKAGE}" \
+	"${TEXMFDIR}/doc/latex/${PACKAGE}" "${TEXMFDIR}/source/latex/${PACKAGE}" \
+	"${TEXMFDIR}/scripts/${PACKAGE}" && texhash ${TEXMFDIR}
+
diff --git a/Master/texmf-dist/source/latex/svn-prov/svn-prov.dtx b/Master/texmf-dist/source/latex/svn-prov/svn-prov.dtx
index 8b0c79f2976..9b73cedc852 100644
--- a/Master/texmf-dist/source/latex/svn-prov/svn-prov.dtx
+++ b/Master/texmf-dist/source/latex/svn-prov/svn-prov.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
-% $Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $
+% $Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $
 %
-% Copyright (C) 2009 by Martin Scharrer <martin@scharrer-online.de>
+% Copyright (C) 2009-2010 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.3c
@@ -28,10 +28,10 @@
 \makeatletter
 %</driver>
 %<*driver|package>
-\def\svnprov@version{v1.\rev}
+\def\svnprov@version{v2.\rev}
 %</driver|package>
 %<*driver>
-\ProvidesFileSVN{$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+\ProvidesFileSVN{$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
   [\svnprov@version\space DTX for \filebase.sty]
 \DefineFileInfoSVN[svnprov]
 \DefineFileInfoSVN
@@ -103,7 +103,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{246}
+% \CheckSum{274}
 %
 % \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
@@ -124,6 +124,8 @@
 %
 % \changes{v0.922}{2009/04/26}{Initial version}
 % \changes{v1.}{2009/05/03}{Added \cs{DefineFileInfoSVN} macro.}
+% \changes{v2.}{2010/03/25}{Fixed issues when used in font definition \texttt{*.fd} files due to changed catcodes.
+% Also fixed error which occurred when Id line was not expanded.}
 %
 % ^^A \GetFileInfo{\jobname.dtx}
 %
@@ -167,7 +169,7 @@
 % \texttt{\frenchspacing\${}Id: \meta{filename} \meta{revision} \meta{date} 
 % \meta{time} \meta{author} \$}\\[\smallskipamount]
 % e.g. for the source file of this document:\\*[\smallskipamount]
-% |$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $|
+% |$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $|
 % \par\smallskip
 % For this to work the Subversion \emph{property} \texttt{svn:keywords} must be 
 % set to (at least) `|Id|' for the source file(s). e.g.\ using the command 
@@ -302,66 +304,66 @@
 % \subsubsection*{Minimal usage}
 % \begin{example}
 %   \ProvidesPackageSVN
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 % \end{example}
 % \begin{example}
 %   \ProvidesClassSVN
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 % \end{example}
 % \begin{example}
 %   \ProvidesFileSVN
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 % \end{example}
 %
 % \subsubsection*{Normal Usage}
 % \begin{example}
 %   \ProvidesPackageSVN
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 %     [v1.0 Example Description]
 % \end{example}
 % \begin{example}
 %   \ProvidesClassSVN
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 %     [v1.0 Example Description]
 % \end{example}
 % \begin{example}
 %   \ProvidesFileSVN
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 %     [v1.0 Example Description]
 % \end{example}
 %
 % \subsubsection*{Overwriting Name}
 % \begin{example}
 %   \ProvidesPackageSVN[othername]
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 %     [v1.0 Example Description]
 % \end{example}
 %
 % \subsubsection*{Overwriting Name including unneeded Extension}
 % \begin{example}
 %   \ProvidesPackageSVN[othername.sty]
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 %     [v1.0 Example Description]
 % \end{example}
 %
 % \subsubsection*{Overwriting Name using Macros}
 % \begin{example}
 %   \ProvidesFileSVN[\filebase.cfg]
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 %     [v1.0 Example Description]
 % \end{example}
 %
 % \subsubsection*{Using Macros in File Information String}
 % \begin{example}
 %   \ProvidesPackageSVN
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 %     [v1.\Rev Example Description]
 % \end{example}
 %
 % \subsubsection*{Adding Text to Default Information}
 % \begin{example}
 %   \ProvidesPackageSVN
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 %     [v1.\Rev Extra Text \revinfo]
 % \end{example}
 %
@@ -371,7 +373,7 @@
 %
 % \begin{example}
 %   \ProvidesPackageSVN
-%     {$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}
+%     {$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}
 %     [v1.\Rev Extra Text \revinfo]
 %   \GetFileInfoSVN*
 %   % ...
@@ -435,6 +437,8 @@
 \def\svnprov@generic#1#2{%
   \def\svnprov@ltxprov{#1}%
   \def\svnprov@filemask{#2}%
+  \begingroup
+  \svnprov@catcodes
   \@ifnextchar{[}%
     {\svnprov@getid}%
     {\svnprov@getid[\svnprov@svnfilename]}%
@@ -442,14 +446,34 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\svnprov@generic}
+% \begin{macro}{\svnprov@catcodes}
+% Sets the normal catcodes for all characters required by the |getid| macro.
+%    \begin{macrocode}
+\def\svnprov@catcodes{%
+  \catcode`\ =10%
+  \catcode`\$=3%
+  \@makeother\:%
+  \@makeother\-%
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% Enforce normal catcodes for the definition of the |Id| scanning macros.
+% This makes sure that all scan patterns have the same catcodes during definition and execution.
+%    \begin{macrocode}
+\begingroup
+\svnprov@catcodes
+%    \end{macrocode}
+%
+% \begin{macro}{\svnprov@getid}
 % Saves first argument as filename and calls the scan macro with the second.
 % A fall-back string is provided to avoid \TeX\ parsing errors.
 %    \begin{macrocode}
-\def\svnprov@getid[#1]#2{%
+\gdef\svnprov@getid[#1]#2{%
+  \endgroup
   \def\svnprov@filename{#1}%
   \svnprov@scanid #2\relax $%
-    Id: unknown.xxx 0 0000-00-00 00:00:00Z user $\svnprov@endmarker
+    Id: unknown.xxx 0 0000-00-00 00:00:00Z user $\empty\svnprov@endmarker
 }
 %    \end{macrocode}
 % \end{macro}
@@ -460,11 +484,14 @@
 % Otherwise a warning message is printed. In both cases any remaining text of 
 % the parsing procedure is gobbled before the next step.
 % \begin{macrocode}
-\def\svnprov@scanid#1$%
+\gdef\svnprov@scanid#1$%
   Id: #2 #3 #4-#5-#6 #7 $#8{%
   \def\next{%
-    \PackageWarning{svn-prov}{Did not found valid SVN Id line in file 
-    '#2'.}{}{}{}%
+    \begingroup
+    \def\@tempa####1>####2 {####2}%
+    \PackageWarning{svn-prov}{Invalid SVN Id line found! File name might be
+    '#2' or '\expandafter\@tempa\meaning\@filef@und'. This occured}{}{}{}%
+    \endgroup
     \svnprov@gobbleopt
   }%
   \ifx\relax#1\relax
@@ -473,7 +500,7 @@
       \svnprov@splitfilename{#2}%
       \def\svnprov@filerev{#3}%
       \def\svnprov@filedate{#4/#5/#6}%
-      \def\next{\svnprov@buildstring}%
+      \def\next{\begingroup\svnprov@catcodes\svnprov@buildstring}%
     \fi
   \fi
   \expandafter\next\svnprov@gobblerest
@@ -481,6 +508,11 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% End of area with enforced catcodes.
+%    \begin{macrocode}
+\endgroup
+%    \end{macrocode}
+%
 % \begin{macro}{\svnprov@splitfilename}
 % Expands the argument and initialises the file base macro before it calls the 
 % next macro with the expanded argument and a dot to protect for \TeX\ parsing 
@@ -563,6 +595,7 @@
 % filename and information.
 %    \begin{macrocode}
 \newcommand*\svnprov@buildstring[1][\svnprov@defaultdesc]{%
+  \endgroup
   \begingroup
     \let\rev\svnprov@filerev
     \let\filerev\svnprov@filerev
@@ -653,7 +686,7 @@
 %
 % Finally, call the macro for this package itself.
 %    \begin{macrocode}
-\ProvidesPackageSVN{$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}%
+\ProvidesPackageSVN{$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}%
   [\svnprov@version\space Package Date/Version from SVN Keywords]
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/svn-prov/svn-prov.ins b/Master/texmf-dist/source/latex/svn-prov/svn-prov.ins
index 4ffd973b633..1ad59c32ee0 100644
--- a/Master/texmf-dist/source/latex/svn-prov/svn-prov.ins
+++ b/Master/texmf-dist/source/latex/svn-prov/svn-prov.ins
@@ -1,4 +1,4 @@
-%% $Id: svn-prov.ins 1049 2009-05-03 00:24:49Z martin $
+%% $Id: svn-prov.ins 1039 2009-05-02 15:42:31Z martin $
 \input docstrip.tex
 \preamble
 
diff --git a/Master/texmf-dist/tex/latex/svn-prov/svn-prov.sty b/Master/texmf-dist/tex/latex/svn-prov/svn-prov.sty
index 2a74bc8a8f2..96ad3ff3403 100644
--- a/Master/texmf-dist/tex/latex/svn-prov/svn-prov.sty
+++ b/Master/texmf-dist/tex/latex/svn-prov/svn-prov.sty
@@ -25,7 +25,7 @@
 %% This work consists of the files svn-prov.dtx, svn-prov.ins
 %% and the derived file svn-prov.sty.
 %% 
-\def\svnprov@version{v1.\rev}
+\def\svnprov@version{v2.\rev}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \def\ProvidesClassSVN{%
   \svnprov@generic\ProvidesClass{\svnprov@filebase}%
@@ -39,20 +39,34 @@
 \def\svnprov@generic#1#2{%
   \def\svnprov@ltxprov{#1}%
   \def\svnprov@filemask{#2}%
+  \begingroup
+  \svnprov@catcodes
   \@ifnextchar{[}%
     {\svnprov@getid}%
     {\svnprov@getid[\svnprov@svnfilename]}%
 }
-\def\svnprov@getid[#1]#2{%
+\def\svnprov@catcodes{%
+  \catcode`\ =10%
+  \catcode`\$=3%
+  \@makeother\:%
+  \@makeother\-%
+}
+\begingroup
+\svnprov@catcodes
+\gdef\svnprov@getid[#1]#2{%
+  \endgroup
   \def\svnprov@filename{#1}%
   \svnprov@scanid #2\relax $%
-    Id: unknown.xxx 0 0000-00-00 00:00:00Z user $\svnprov@endmarker
+    Id: unknown.xxx 0 0000-00-00 00:00:00Z user $\empty\svnprov@endmarker
 }
-\def\svnprov@scanid#1$%
+\gdef\svnprov@scanid#1$%
   Id: #2 #3 #4-#5-#6 #7 $#8{%
   \def\next{%
-    \PackageWarning{svn-prov}{Did not found valid SVN Id line in file
-    '#2'.}{}{}{}%
+    \begingroup
+    \def\@tempa####1>####2 {####2}%
+    \PackageWarning{svn-prov}{Invalid SVN Id line found! File name might be
+    '#2' or '\expandafter\@tempa\meaning\@filef@und'. This occured}{}{}{}%
+    \endgroup
     \svnprov@gobbleopt
   }%
   \ifx\relax#1\relax
@@ -61,11 +75,12 @@
       \svnprov@splitfilename{#2}%
       \def\svnprov@filerev{#3}%
       \def\svnprov@filedate{#4/#5/#6}%
-      \def\next{\svnprov@buildstring}%
+      \def\next{\begingroup\svnprov@catcodes\svnprov@buildstring}%
     \fi
   \fi
   \expandafter\next\svnprov@gobblerest
 }% $
+\endgroup
 \def\svnprov@splitfilename#1{%
   \edef\g@tempa{#1}%
   \let\svnprov@filebase\@gobble
@@ -94,6 +109,7 @@
   (SVN Rev:\space\svnprov@filerev)%
 }
 \newcommand*\svnprov@buildstring[1][\svnprov@defaultdesc]{%
+  \endgroup
   \begingroup
     \let\rev\svnprov@filerev
     \let\filerev\svnprov@filerev
@@ -150,7 +166,7 @@
     \def\svnprov@fileinfoonly{#2}%
   \fi
 }
-\ProvidesPackageSVN{$Id: svn-prov.dtx 1049 2009-05-03 00:24:49Z martin $}%
+\ProvidesPackageSVN{$Id: svn-prov.dtx 1747 2010-03-25 20:25:48Z martin $}%
   [\svnprov@version\space Package Date/Version from SVN Keywords]
 
 \endinput