summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/currfile
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-05 00:23:35 +0000
committerKarl Berry <karl@freefriends.org>2011-01-05 00:23:35 +0000
commit3121f2e4839a5b49ac3164f1415b098816244325 (patch)
tree696596a992b6882e34b09f020f43cb68d80a4af6 /Master/texmf-dist/tex/latex/currfile
parentf421a713f2db99addeedb67a3581160f419a5ac3 (diff)
currfile 0.3 (3jan11)
git-svn-id: svn://tug.org/texlive/trunk@20934 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/currfile')
-rw-r--r--Master/texmf-dist/tex/latex/currfile/currfile.sty42
1 files changed, 18 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/currfile/currfile.sty b/Master/texmf-dist/tex/latex/currfile/currfile.sty
index cc8d3c63dfe..cc76c8bf2c3 100644
--- a/Master/texmf-dist/tex/latex/currfile/currfile.sty
+++ b/Master/texmf-dist/tex/latex/currfile/currfile.sty
@@ -1,4 +1,4 @@
-%% Copyright (c) 2010 by Martin Scharrer <martin@scharrer-online.de>
+%% Copyright (c) 2010-2011 by Martin Scharrer <martin@scharrer-online.de>
%% -----------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,26 +18,28 @@
%% This work consists of the files currfile.dtx, currfile.ins
%% and the derived file currfile.sty.
%%
-%% $Id: currfile.dtx 1911 2010-12-08 19:29:13Z martin $
+%% $Id: currfile.dtx 2006 2011-01-03 22:54:46Z martin $
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{currfile}
- [2010/12/08 v0.2 Current input file name and path]
+ [2011/01/03 v0.3 Current input file name and path]
\RequirePackage{kvoptions}
\SetupKeyvalOptions{family=currfile,prefix=currfile@}
-\@ifl@aded{\@pkgextension}{fink}{%
+\@ifpackageloaded{fink}{%
\DeclareStringOption[\fnk@mainext]{mainext}%
\DeclareStringOption[\fnk@maindir]{maindir}%
\DeclareBoolOption[true]{fink}%
- \PackageWarning{currfile}{Package 'fink' detected. %
- The 'fink' option will default to 'true'. %
+ \PackageWarning{currfile}{Deprecated package 'fink' detected. %
+ The 'fink' option will default to 'true'.^^J%
If set to 'false' no 'fink' macros will be changed but they will stop
- working correctly!}{}{}{}%
+ working correctly!}%
}{%
\DeclareStringOption[tex]{mainext}%
\DeclareStringOption[\@currdir]{maindir}%
\DeclareBoolOption[false]{fink}%
}%
+\DeclareVoidOption{force}{\PassOptionsToPackage{force}{filehook}}
+\RequirePackage{filehook}[2011/01/03]
\ProcessKeyvalOptions*\relax
\begingroup
@@ -48,19 +50,11 @@
\global\let\currfile@maindir\empty
\fi
\endgroup
-\RequirePackage{filehook}
-\filehook@prefixwarg\filehook@include@atbegin{%
+\filehook@prefixwarg\filehook@every@atbegin{%
\currfile@push
\currfile@set{#1}%
}
-\filehook@appendwarg\filehook@include@after{%
- \currfile@pop
-}
-\filehook@prefixwarg\filehook@atbegin{%
- \currfile@push
- \currfile@set{#1}%
-}
-\filehook@appendwarg\filehook@atend{%
+\filehook@appendwarg\filehook@every@atend{%
\currfile@pop
}
\def\currfile@set#1{%
@@ -83,7 +77,7 @@
}
\def\currfile@pop{%
\ifx\currfile@stack\empty
- \PackageWarning{currfile}{File stack underflow!}{}{}%
+ \PackageWarning{currfile}{File stack underflow!}%
\global\let\currfile@stack\currfile@stackinit
\fi
\expandafter\currfile@pop@\currfile@stack\relax
@@ -107,19 +101,19 @@
\def\finkpath{\currfilepath}%
\def\finkbase{\currfilebase}%
\def\finkext{\currfileext}%
- \@ifl@aded{\@pkgextension}{fink}{%
+ \@ifpackageloaded{fink}{%
\def\fink@restore#1{}%
}{%
- \@namedef{ver@fink.sty}{2010/12/06}%
+ \@namedef{ver@fink.sty}{2011/01/03}%
\expandafter\edef\csname opt@fink.sty\endcsname{%
maindir=\currfile@maindir,mainext=\currfile@mainext
}%
}%
\else
- \@ifl@aded{\@pkgextension}{fink}{}{%
- \AtBeginOfFile{fink.sty}{%
- \PackageError{currfile}{Package class with deprecated 'fink'. %
- Load 'currfile' with the 'fink' option or see the upgrade guide in the manual}{}{}{}%
+ \@ifpackageloaded{fink}{}{%
+ \AtBeginOfPackageFile{fink}{%
+ \PackageError{currfile}{The 'fink' package is now deprecated. %
+ Load 'currfile' with the 'fink' option or see the upgrade guide in the manual}{}%
}%
}%
\fi