currfile (29oct12)

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

4 files changed, 18 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/currfile/currfile.pdf b/Master/texmf-dist/doc/latex/currfile/currfile.pdf
index f078fb718e8..f4f7caaddd6 100644
--- a/Master/texmf-dist/doc/latex/currfile/currfile.pdf
+++ b/Master/texmf-dist/doc/latex/currfile/currfile.pdf
diff --git a/Master/texmf-dist/source/latex/currfile/currfile.dtx b/Master/texmf-dist/source/latex/currfile/currfile.dtx
index 063c20e5fb6..47a737ea232 100644
--- a/Master/texmf-dist/source/latex/currfile/currfile.dtx
+++ b/Master/texmf-dist/source/latex/currfile/currfile.dtx
@@ -29,10 +29,10 @@
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesFile{currfile.dtx}[%
 %<=*DATE>
-    2012/05/15
+    2012/10/28
 %<=/DATE>
 %<=*VERSION>
-    v0.7
+    v0.7a
 %<=/VERSION>
     DTX file for currfile package]
 
@@ -59,7 +59,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{814}
+% \CheckSum{1093}
 %
 % \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
@@ -87,6 +87,7 @@
 % \changes{v0.5}{2011/09/18}{Added support for \cs{input@path} and files with multiple dots.}
 % \changes{v0.6}{2012/05/06}{Added support for absolute file paths.}
 % \changes{v0.7}{2012/05/15}{Added support for parent file paths.}
+% \changes{v0.7a}{2012/10/28}{Fixed issue with \pkg{enumitem} package which redefines \cs{value}.}
 %
 % \GetFileInfo{currfile.dtx}
 %
@@ -461,7 +462,7 @@
         \global\let\currfileabspath\theabspath
         \xdef\currfileabsdir{\theabsdir\currfiledir}%
     \fi
-    \addtocounter{currfiledepth}\@ne
+    \global\advance\c@currfiledepth by\@ne
   \endgroup
 %<debug> \expandafter\gdef\expandafter\dindent\expandafter{\dindent\space}%
 %<debug> \message{^^JDEBUG: \dindent\empty Entering file '\currfilename' ^^J }%
@@ -597,13 +598,13 @@
 %<debug> \message{^^JDEBUG: \dindent\empty Leaving file '\currfilename' ^^J }%
   \ifcase0%
     \ifx\currfile@stack\empty 1\else
-    \ifnum\value{currfiledepth}<\@ne 1\fi\fi
+    \ifnum\c@currfiledepth<\@ne 1\fi\fi
   \relax
-    \addtocounter{currfiledepth}\m@ne
+    \global\advance\c@currfiledepth by\m@ne
   \else
     \PackageWarning{currfile}{File stack underflow!}%
     \global\let\currfile@stack\currfile@stackinit
-    \setcounter{currfiledepth}\z@
+    \global\c@currfiledepth=\z@
   \fi
   \expandafter\currfile@pop@\currfile@stack\relax
   \relax\relax\relax\relax\relax\relax\relax
@@ -746,7 +747,7 @@
 \let\currfileabspath\@empty
 \let\currfileabsdir\@empty
 \newcounter{currfiledepth}
-\setcounter{currfiledepth}\m@ne
+\global\c@currfiledepth\m@ne
 \currfile@push
 \ifcurrfile@realmainfile
     \getmainfile
diff --git a/Master/texmf-dist/tex/latex/currfile/currfile-abspath.sty b/Master/texmf-dist/tex/latex/currfile/currfile-abspath.sty
index 0b733d0a2af..01e37626b0c 100644
--- a/Master/texmf-dist/tex/latex/currfile/currfile-abspath.sty
+++ b/Master/texmf-dist/tex/latex/currfile/currfile-abspath.sty
@@ -1,7 +1,7 @@
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{currfile-abspath}[%
-    2012/05/15
-    v0.7
+    2012/10/28
+    v0.7a
     Provides absolute file paths, the parent working directory and the main file name]
 \newcommand*\thepwd{}
 \newcommand*\theabspath{}
diff --git a/Master/texmf-dist/tex/latex/currfile/currfile.sty b/Master/texmf-dist/tex/latex/currfile/currfile.sty
index 6bb2bf48b73..be5358989e5 100644
--- a/Master/texmf-dist/tex/latex/currfile/currfile.sty
+++ b/Master/texmf-dist/tex/latex/currfile/currfile.sty
@@ -1,7 +1,7 @@
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{currfile}[%
-    2012/05/15
-    v0.7
+    2012/10/28
+    v0.7a
     Provides the file path elements of the current input file]
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{family=currfile,prefix=currfile@}
@@ -79,7 +79,7 @@
         \global\let\currfileabspath\theabspath
         \xdef\currfileabsdir{\theabsdir\currfiledir}%
     \fi
-    \addtocounter{currfiledepth}\@ne
+    \global\advance\c@currfiledepth by\@ne
   \endgroup
 }
 \ifcurrfile@parent
@@ -162,13 +162,13 @@
 \def\currfile@pop{%
   \ifcase0%
     \ifx\currfile@stack\empty 1\else
-    \ifnum\value{currfiledepth}<\@ne 1\fi\fi
+    \ifnum\c@currfiledepth<\@ne 1\fi\fi
   \relax
-    \addtocounter{currfiledepth}\m@ne
+    \global\advance\c@currfiledepth by\m@ne
   \else
     \PackageWarning{currfile}{File stack underflow!}%
     \global\let\currfile@stack\currfile@stackinit
-    \setcounter{currfiledepth}\z@
+    \global\c@currfiledepth=\z@
   \fi
   \expandafter\currfile@pop@\currfile@stack\relax
   \relax\relax\relax\relax\relax\relax\relax
@@ -272,7 +272,7 @@
 \let\currfileabspath\@empty
 \let\currfileabsdir\@empty
 \newcounter{currfiledepth}
-\setcounter{currfiledepth}\m@ne
+\global\c@currfiledepth\m@ne
 \currfile@push
 \ifcurrfile@realmainfile
     \getmainfile