diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/currfile/currfile.pdf | bin | 263295 -> 166674 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/currfile/currfile.dtx | 56 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/currfile/currfile-abspath.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/currfile/currfile.sty | 38 |
4 files changed, 73 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/currfile/currfile.pdf b/Master/texmf-dist/doc/latex/currfile/currfile.pdf Binary files differindex f4f7caaddd6..b943c90cc60 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 47a737ea232..40041d304f8 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/10/28 + 2013/02/01 %<=/DATE> %<=*VERSION> - v0.7a + v0.7b %<=/VERSION> DTX file for currfile package] @@ -59,7 +59,7 @@ %</driver> % \fi % -% \CheckSum{1093} +% \CheckSum{1115} % % \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 @@ -88,6 +88,7 @@ % \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}.} +% \changes{v0.7b}{2013/02/01}{Support for \cs{\subinput*} etc.\ from the \pkg{import} package which requires a different path search order.} % % \GetFileInfo{currfile.dtx} % @@ -511,15 +512,7 @@ \def\currfile@checkpath{% \openin\@inputcheck\@filef@und\relax \ifeof\@inputcheck - \expandafter\@tfor - \expandafter\@tempb - \expandafter:\expandafter=\input@path\do{% - \openin\@inputcheck\@tempb\@filef@und\relax - \ifeof\@inputcheck\else - \edef\@filef@und{\@tempb\@filef@und}% - \@break@tfor - \fi - }% + \currfile@check@inputpath \fi \closein\@inputcheck } @@ -527,6 +520,42 @@ % \end{macro} % % +% \begin{macro}{\currfile@check@inputpath} +% Check all paths in the \cs{input@path} macro. +% \begin{macrocode} +\def\currfile@check@inputpath{% + \expandafter\@tfor + \expandafter\@tempb + \expandafter:\expandafter=\input@path\do{% + \openin\@inputcheck\@tempb\@filef@und\relax + \ifeof\@inputcheck\else + \edef\@filef@und{\@tempb\@filef@und}% + \@break@tfor + \fi + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\currfile@checkpath} +% Special version for the \pkg{import} package. +% \begin{macrocode} +\AtEndOfPackageFile*{import}{% +\def\currfile@checkpath{% + \ifx\IfFileExists\@iffileonpath + \currfile@check@inputpath + \else + \openin\@inputcheck\@filef@und\relax + \ifeof\@inputcheck + \currfile@check@inputpath + \fi + \fi + \closein\@inputcheck +}% +} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\currfile@parseext} % Replacement for \Macro\filename@simple to allow multiple dots in a filename. % This needs |\let\filename@base\@gobble| before it is called. @@ -1182,5 +1211,8 @@ %</currfile-abspath.sty> % \fi % +% \iffalse +% \fi +% % \Finale \endinput diff --git a/Master/texmf-dist/tex/latex/currfile/currfile-abspath.sty b/Master/texmf-dist/tex/latex/currfile/currfile-abspath.sty index 01e37626b0c..df969069c26 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/10/28 - v0.7a + 2013/02/01 + v0.7b 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 be5358989e5..904e57cd3cd 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/10/28 - v0.7a + 2013/02/01 + v0.7b Provides the file path elements of the current input file] \RequirePackage{kvoptions} \SetupKeyvalOptions{family=currfile,prefix=currfile@} @@ -108,18 +108,34 @@ \def\currfile@checkpath{% \openin\@inputcheck\@filef@und\relax \ifeof\@inputcheck - \expandafter\@tfor - \expandafter\@tempb - \expandafter:\expandafter=\input@path\do{% - \openin\@inputcheck\@tempb\@filef@und\relax - \ifeof\@inputcheck\else - \edef\@filef@und{\@tempb\@filef@und}% - \@break@tfor - \fi - }% + \currfile@check@inputpath \fi \closein\@inputcheck } +\def\currfile@check@inputpath{% + \expandafter\@tfor + \expandafter\@tempb + \expandafter:\expandafter=\input@path\do{% + \openin\@inputcheck\@tempb\@filef@und\relax + \ifeof\@inputcheck\else + \edef\@filef@und{\@tempb\@filef@und}% + \@break@tfor + \fi + }% +} +\AtEndOfPackageFile*{import}{% +\def\currfile@checkpath{% + \ifx\IfFileExists\@iffileonpath + \currfile@check@inputpath + \else + \openin\@inputcheck\@filef@und\relax + \ifeof\@inputcheck + \currfile@check@inputpath + \fi + \fi + \closein\@inputcheck +}% +} \begingroup \@makeother{.} \gdef\currfile@parseext#1.#2\\{% |