diff options
Diffstat (limited to 'Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx | 51 |
1 files changed, 46 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx b/Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx index 533aacbf2ba..af503b262f5 100644 --- a/Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx +++ b/Master/texmf-dist/source/latex-dev/base/ltfilehook.dtx @@ -31,8 +31,8 @@ %%% From File: ltfilehook.dtx % % \begin{macrocode} -\providecommand\ltfilehookversion{v1.0l} -\providecommand\ltfilehookdate{2021/08/27} +\providecommand\ltfilehookversion{v1.0m} +\providecommand\ltfilehookdate{2022/03/10} % \end{macrocode} % %<*driver> @@ -1046,7 +1046,8 @@ % % \subsection{Selecting a file (\cs{set@curr@file})} % -% \begin{macro}{\set@curr@file,\@curr@file,\@curr@file@reqd} +% \begin{macro}{\set@curr@file,\set@curr@file@nosearch} +% \begin{macro}{\@curr@file,\@curr@file@reqd} % \changes{v1.0f}{2021/01/31}{set \cs{protect} to \cs{string} gh/481} % Now we hook into \cs{set@curr@file} to resolve a possible file % substitution, and add \cs{@expl@@@filehook@set@curr@file@@nNN} @@ -1070,13 +1071,23 @@ % control sequence. % \changes{v1.0i}{2021/04/20} % {Make \string~ expand to a string (tracks change in l3kernel)} +% \changes{v1.0m}{2022/03/10} +% {Add \cs{set@curr@file@nosearch} for \pkg{graphicx}} % \begin{macrocode} %</2ekernel> %<*2ekernel|latexrelease> -%<latexrelease>\IncludeInRelease{2021/06/01}% +%<latexrelease>\IncludeInRelease{2022/06/01}% %<latexrelease> {\set@curr@file}{Setting current file name}% -\def\set@curr@file#1{% +\def\set@curr@file{% + \begingroup + \set@curr@file@aux} +\edef\set@curr@file@nosearch{% \begingroup + \let\noexpand\input@path\noexpand\@empty + \csname seq_clear:N\endcsname + \expandafter\noexpand\csname l_file_search_path_seq\endcsname + \noexpand\set@curr@file@aux} +\def\set@curr@file@aux#1{% \escapechar\m@ne \let\protect\string \edef~{\string~}% @@ -1117,6 +1128,32 @@ % \end{macrocode} % % \begin{macrocode} +%<latexrelease>\IncludeInRelease{2021/06/01}% +%<latexrelease> {\set@curr@file}{Setting current file name}% +%<latexrelease>\def\set@curr@file#1{% +%<latexrelease> \begingroup +%<latexrelease> \escapechar\m@ne +%<latexrelease> \let\protect\string +%<latexrelease> \edef~{\string~}% +%<latexrelease> \expandafter\def\csname\expandafter\endcsname +%<latexrelease> \expandafter{\csname\endcsname}% +%<latexrelease> \@expl@@@filehook@if@no@extension@@nTF{#1}% +%<latexrelease> {\@tempswatrue}{\@tempswafalse}% +%<latexrelease> \@kernel@make@file@csname\@curr@file +%<latexrelease> \@expl@@@filehook@resolve@file@subst@@w {#1}% +%<latexrelease> \@expl@@@filehook@if@file@replaced@@TF +%<latexrelease> {\@kernel@make@file@csname\@curr@file@reqd +%<latexrelease> \@expl@@@filehook@normalize@file@name@@w{#1}% +%<latexrelease> \if@tempswa \@expl@@@filehook@drop@extension@@N\@curr@file@reqd \fi}% +%<latexrelease> {\if@tempswa \@expl@@@filehook@drop@extension@@N\@curr@file \fi +%<latexrelease> \global\let\@curr@file@reqd\@curr@file}% +%<latexrelease> \@expl@@@filehook@clear@replacement@flag@@ +%<latexrelease> \endgroup} +%<latexrelease>\let\set@curr@file@nosearch\@undefined +%<latexrelease>\EndIncludeInRelease +% \end{macrocode} +% +% \begin{macrocode} %<latexrelease>\IncludeInRelease{2020/10/01}% %<latexrelease> {\set@curr@file}{Setting current file name}% %<latexrelease>\def\set@curr@file#1{% @@ -1136,6 +1173,7 @@ %<latexrelease> \global\let\@curr@file@reqd\@curr@file}% %<latexrelease> \@expl@@@filehook@clear@replacement@flag@@ %<latexrelease> \endgroup} +%<latexrelease>\let\set@curr@file@nosearch\@undefined %<latexrelease>\EndIncludeInRelease % \end{macrocode} % @@ -1152,6 +1190,7 @@ %<latexrelease> \csname\@firstofone#1\@empty\endcsname}}% %<latexrelease> \endgroup %<latexrelease>} +%<latexrelease>\let\set@curr@file@nosearch\@undefined %<latexrelease>\EndIncludeInRelease % \end{macrocode} % @@ -1159,10 +1198,12 @@ %<latexrelease>\IncludeInRelease{0000/00/00}% %<latexrelease> {\set@curr@file}{Setting current file name}% %<latexrelease>\let\set@curr@file\@undefined +%<latexrelease>\let\set@curr@file@nosearch\@undefined %<latexrelease>\EndIncludeInRelease %<*2ekernel> % \end{macrocode} % \end{macro} +% \end{macro} % % % |