summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-12-21 23:31:35 +0000
committerKarl Berry <karl@freefriends.org>2012-12-21 23:31:35 +0000
commit8bcf0c7ef3cd19666c206271cea9280846b5c7e6 (patch)
treeee538c7e2a14ad105a169fdd2e745356147577cc /Master/texmf-dist/source/latex/l3kernel/l3file.dtx
parentef0453041a9700a2d974c3c76e3398e40c4e4aeb (diff)
l3 (21dec12)
git-svn-id: svn://tug.org/texlive/trunk@28608 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3file.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3file.dtx9
1 files changed, 3 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
index c9e689f06ca..416fc76cacb 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3file.dtx 4212 2012-09-09 12:24:04Z bruno $
+\GetIdInfo$Id: l3file.dtx 4377 2012-12-20 11:13:29Z bruno $
{L3 File and I/O operations}
%</driver|package>
%<*driver>
@@ -699,7 +699,6 @@
%
% \begin{macro}{\file_input:n}
% \begin{macro}[aux]{\@@_input:n \@@_input:V}
-% \begin{macro}[aux, EXP]{\@@_input_aux:w}
% \begin{macro}[aux]{\@@_input_aux:n, \@@_input_aux:o}
% Loading a file is done in a safe way, checking first that the file
% exists and loading only if it does. Push the file name on the
@@ -718,12 +717,11 @@
}
\cs_new_protected:Npn \@@_input:n #1
{
- \quark_if_nil:oTF { \@@_input_aux:w #1 . \q_nil . \q_stop }
- { \@@_input_aux:o { \tl_to_str:n { #1 .tex } } }
+ \tl_if_in:nnTF {#1} { . }
{ \@@_input_aux:n {#1} }
+ { \@@_input_aux:o { \tl_to_str:n { #1 . tex } } }
}
\cs_generate_variant:Nn \@@_input:n { V }
-\cs_new:Npn \@@_input_aux:w #1 . #2 . #3 \q_stop { #2 }
\cs_new_protected:Npn \@@_input_aux:n #1
{
%<*initex>
@@ -745,7 +743,6 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\file_path_include:n}
% \begin{macro}{\file_path_remove:n}