l3kernel 2678 (28aug11)

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

1 files changed, 14 insertions, 86 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
index f596eb1a263..f5a36e95bad 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
@@ -35,7 +35,7 @@
 %
 %<*driver|package>
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3tl.dtx 2566 2011-08-13 22:04:42Z bruno $
+\GetIdInfo$Id: l3tl.dtx 2665 2011-08-25 22:15:27Z joseph $
   {L3 Experimental token lists}
 %</driver|package>
 %<*driver>
@@ -445,11 +445,6 @@
 %   (\emph{i.e.}~contains no item). The test is \texttt{true} if
 %   \meta{token list} is zero or more explicit tokens of character code~$32$
 %   and category code~$10$, and is \texttt{false} otherwise.
-%   The branching versions then leave either \meta{true code}
-%   or \meta{false code}  in the input stream, as appropriate to the
-%   truth of the test and the variant of the function chosen. The logical
-%   truth of the test is left in the input stream by the predicate
-%   version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\tl_if_empty:N, \tl_if_empty:c}
@@ -458,11 +453,7 @@
 %     \cs{tl_if_empty:NTF} \meta{tl var} \Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token list variable} is entirely empty
-%   (\emph{i.e.}~contains no tokens at all). The branching versions then
-%   leave either \meta{true code} or \meta{false code} in the input
-%   stream, as appropriate to the truth of the test and the variant of
-%   the function chosen. The logical truth of the test is left in the
-%   input stream by the predicate version.
+%   (\emph{i.e.}~contains no tokens at all).
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\tl_if_empty:n, \tl_if_empty:V, \tl_if_empty:o}
@@ -471,11 +462,7 @@
 %     \cs{tl_if_empty:nTF} \Arg{token list} \Arg{true code} \Arg{false code}
 %   \end{syntax}
 %   Tests if the \meta{token list} is entirely empty
-%   (\emph{i.e.}~contains no tokens at all). The branching versions then
-%   leave either \meta{true code} or \meta{false code} in the input
-%   stream, as appropriate to the truth of the test and the variant of
-%   the function chosen. The logical truth of the test is left in the
-%   input stream by the predicate version.
+%   (\emph{i.e.}~contains no tokens at all).
 % \end{function}
 %
 % \begin{function}[EXP,pTF]
@@ -494,11 +481,7 @@
 %     \tl_set:Nx \l_tmpb_tl { \tl_to_str:n { abc } }
 %     \tl_if_eq_p:NN \l_tmpa_tl \l_tmpb_tl
 %   \end{verbatim}
-%   is logically \texttt{false}. The branching versions then leave either
-%   \meta{true code} or \meta{false code} in the input stream, as
-%   appropriate to the truth of the test and the variant of the function
-%   chosen. The logical truth of the test is left in the input stream by
-%   the predicate version.
+%   is logically \texttt{false}.
 % \end{function}
 %
 % \begin{function}[TF]{\tl_if_eq:nn}
@@ -507,10 +490,7 @@
 %     ~~\Arg{false code}
 %   \end{syntax}
 %   Tests if \meta{token list1} and \meta{token list2} are equal, both in
-%   respect of character codes and category codes. Either the
-%   \meta{true code} or \meta{false code} in the input stream, as
-%   appropriate to the truth of the test and the variant of the function
-%   chosen.
+%   respect of character codes and category codes.
 % \end{function}
 %
 % \begin{function}[TF]{\tl_if_in:Nn, \tl_if_in:cn}
@@ -521,24 +501,18 @@
 %   Tests if the \meta{token list} is found in the content of the
 %   \meta{token list variable}. The \meta{token list} cannot contain
 %   the tokens |{|, |}| or |#| (assuming the usual \TeX{} category
-%   codes apply). Either the \meta{true code} or \meta{false code}
-%   is left in the
-%   input stream, as appropriate to the truth of the test and the variant
-%   of the function chosen.
+%   codes apply).
 % \end{function}
 %
 % \begin{function}[TF]
 %   {\tl_if_in:nn, \tl_if_in:Vn, \tl_if_in:on, \tl_if_in:on}
 %   \begin{syntax}
-%     \cs{tl_if_in:nnTF} \meta{token list1} \Arg{token list2} \Arg{true code}
+%     \cs{tl_if_in:nnTF} \Arg{token list1} \Arg{token list2} \Arg{true code}
 %     ~~\Arg{false code}
 %   \end{syntax}
-%   Tests if the \meta{token list1} is found inside \meta{token list2}.
+%   Tests if <token list2> is found inside <token list1>.
 %   The \meta{token list} cannot contain the tokens |{|, |}| or |#|
-%   (assuming the usual \TeX{} category codes apply). Either the
-%   \meta{true code} or \meta{false code} is left in the input stream, as
-%   appropriate to the truth of the test and the variant of the function
-%   chosen.
+%   (assuming the usual \TeX{} category codes apply).
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\tl_if_single:N, \tl_if_single:c}
@@ -550,11 +524,7 @@
 %   \emph{i.e.}~is either a single normal token (excluding spaces,
 %   and brace tokens) or a single brace group, surrounded by optional
 %   spaces on both sides. In other words, such a token list has length
-%   $1$ according to \cs{tl_length:N}. The branching
-%   versions then leave either \meta{true code} or \meta{false code}
-%   in the input stream, as appropriate to the truth of the test and the
-%   variant of the function chosen. The logical truth of the test is left
-%   in the input stream by the predicate version.
+%   $1$ according to \cs{tl_length:N}.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\tl_if_single:n}
@@ -567,10 +537,6 @@
 %   a single normal token or a single brace group, surrounded by
 %   optional spaces on both sides. In other words, such a token list
 %   has length $1$ according to \cs{tl_length:n}.
-%   The branching versions leave either \meta{true code} or \meta{false code}
-%   in the input stream, as appropriate to the truth of the test and
-%   the variant of the function chosen. The logical truth of the test
-%   is left in the input stream by the predicate.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\tl_if_single_token:n}
@@ -582,10 +548,6 @@
 %   Tests if the token list consists of exactly one token, \emph{i.e.}~is
 %   either a single space character or a single \enquote{normal} token.
 %   Token groups (|{|\ldots|}|) are not single tokens.
-%   The branching versions leave either \meta{true code} or \meta{false code}
-%   in the input stream, as appropriate to the truth of the test and
-%   the variant of the function chosen. The logical truth of the test
-%   is left in the input stream by the predicate.
 % \end{function}
 %
 % \section{Mapping to token lists}
@@ -912,12 +874,6 @@
 %   category code as the \meta{test token}. In the case where
 %   \meta{token list} is empty, its head is considered to be \cs{q_nil},
 %   and the test will be true if \meta{test token} is a control sequence.
-%   The branching versions then
-%   leave either \meta{true code} or \meta{false code}  in the input
-%   stream, as appropriate to the truth of the test and the variant of
-%   the function chosen. The logical truth of the test is left in the
-%   input stream by the predicate
-%   version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]
@@ -931,12 +887,6 @@
 %   character code as the \meta{test token}. In the case where
 %   \meta{token list} is empty, its head is considered to be \cs{q_nil},
 %   and the test will be true if \meta{test token} is a control sequence.
-%   The branching versions then
-%   leave either \meta{true code} or \meta{false code}  in the input
-%   stream, as appropriate to the truth of the test and the variant of
-%   the function chosen. The logical truth of the test is left in the
-%   input stream by the predicate
-%   version.
 % \end{function}
 %
 % \begin{function}[EXP,pTF]{\tl_if_head_eq_meaning:nN}
@@ -949,12 +899,6 @@
 %   meaning as the \meta{test token}. In the case where \meta{token list}
 %   is empty, its head is considered to be \cs{q_nil}, and the test will
 %   be true if \meta{test token} has the same meaning as \cs{q_nil}.
-%   The branching versions then
-%   leave either \meta{true code} or \meta{false code}  in the input
-%   stream, as appropriate to the truth of the test and the variant of
-%   the function chosen. The logical truth of the test is left in the
-%   input stream by the predicate
-%   version.
 % \end{function}
 % 
 % \begin{function}[EXP,pTF,int]{\tl_if_head_group:n}
@@ -971,10 +915,6 @@
 %   \cs{c_group_begin_token}, or if it empty.
 %   This function is useful to implement actions on token lists on
 %   a token by token basis.
-%   The branching versions leave either \meta{true code} or \meta{false code}
-%   in the input stream, as appropriate to the truth of the test and
-%   the variant of the function chosen. The logical truth of the test
-%   is left in the input stream by the predicate.
 % \end{function}
 %
 % \begin{function}[EXP,pTF,int]{\tl_if_head_N_type:n}
@@ -992,10 +932,6 @@
 %   first token.
 %   This function is useful to implement actions on token lists on
 %   a token by token basis.
-%   The branching versions leave either \meta{true code} or \meta{false code}
-%   in the input stream, as appropriate to the truth of the test and
-%   the variant of the function chosen. The logical truth of the test
-%   is left in the input stream by the predicate.
 % \end{function}
 %
 % \begin{function}[EXP,pTF,int]{\tl_if_head_space:n}
@@ -1013,10 +949,6 @@
 %   will yield false, as well as if the argument is empty.
 %   This function is useful to implement actions on token lists on
 %   a token by token basis.
-%   The branching versions leave either \meta{true code} or
-%   \meta{false code} in the input stream, as appropriate to the truth
-%   of the test and the variant of the function chosen. The logical
-%   truth of the test is left in the input stream by the predicate.
 %   \begin{texnote}
 %     When \TeX{} reads a character of category code $10$ for the
 %     first time, it is converted to an explicit space token, with
@@ -2371,22 +2303,18 @@
 %   spaces, whereas \pdfTeX{} and \XeTeX{} do. So there may be a correction to
 %   make in the \LuaTeX{} case.
 %    \begin{macrocode}
-%<*package>
-\tl_const:Nx \c_job_name_tl { \tex_jobname:D }
-%</package>
 %<*initex>
 \tex_everyjob:D \exp_after:wN
   {
     \tex_the:D \tex_everyjob:D
-    \luatex_if_engine:TF
+    \luatex_if_engine:T
       {
-        \tl_if_in:onTF { \tex_jobname:D } { ~ }
-          { \tl_const:Nx \c_job_name_tl { " \tex_jobname:D " } }
-          { \tl_const:Nx \c_job_name_tl { \tex_jobname:D } }
+        \lua_now:x
+          { dofile ( assert ( kpse.find_file ("lualatexquotejobname.lua" ) ) ) }
       }
-      { \tl_const:Nx \c_job_name_tl { \tex_jobname:D } }
   }
 %</initex>
+\tl_const:Nx \c_job_name_tl { \tex_jobname:D }
 %    \end{macrocode}
 % \end{variable}
 %