l3 (29jan17)

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

1 files changed, 32 insertions, 41 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
index 98aedaa038e..34bdf48ad68 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
@@ -1,43 +1,30 @@
 % \iffalse meta-comment
 %
 %% File: l3token.dtx Copyright (C) 2005-2016 The LaTeX3 Project
-%%
-%% It may be distributed and/or modified under the conditions of the
-%% LaTeX Project Public License (LPPL), either version 1.3c of this
-%% license or (at your option) any later version.  The latest version
-%% of this license is in the file
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "l3kernel bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
+%
+% It may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this
+% license or (at your option) any later version.  The latest version
+% of this license is in the file
+%
+%    http://www.latex-project.org/lppl.txt
+%
+% This file is part of the "l3kernel bundle" (The Work in LPPL)
+% and all files in that bundle must be distributed together.
+%
+% -----------------------------------------------------------------------
+%
+% The development version of the bundle can be found at
+%
+%    https://github.com/latex3/latex3
+%
+% for those people who are interested.
 %
 %<*driver>
 \documentclass[full]{l3doc}
 %</driver>
 %<*driver|package>
-\GetIdInfo$Id: l3token.dtx 6695 2016-09-01 15:38:50Z bruno $
+\GetIdInfo$Id: l3token.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Experimental token manipulation}
 %</driver|package>
 %<*driver>
@@ -128,7 +115,7 @@
 %
 % \begin{function}[added = 2015-11-12]
 %   {
-%     \char_set_active_eq:nN,  \char_set_active_eq:nc
+%     \char_set_active_eq:nN,  \char_set_active_eq:nc,
 %     \char_gset_active_eq:nN, \char_gset_active_eq:nc
 %   }
 %   \begin{syntax}
@@ -197,7 +184,7 @@
 %   \begin{verbatim}
 %     \char_set_catcode_other:N \%
 %   \end{verbatim}
-%   The assignment is local. 
+%   The assignment is local.
 % \end{function}
 %
 % \begin{function}[updated = 2015-11-11]
@@ -237,7 +224,7 @@
 %   The first \meta{integer expression}
 %   is the character code and the second is the category code to apply.
 %   The setting applies within the current \TeX{} group. In general, the
-%   symbolic functions \cs{char_set_catcode_\meta{type}} should be preferred,
+%   symbolic functions \cs[no-index]{char_set_catcode_\meta{type}} should be preferred,
 %   but there are cases where these lower-level functions may be useful.
 % \end{function}
 %
@@ -1036,10 +1023,15 @@
 %     identical to the command that was used to select the current font
 %     (such as \tn{tenrm}) but it differs from it in shape.
 %   \item A \enquote{frozen} |\relax|, which differs from the primitive in
-%     both shape and meaning, is inserted when the closing \tn{fi} of a
+%     shape (but has the same meaning), is inserted when the closing \tn{fi} of a
 %     conditional is encountered before the conditional is evaluated.
-%   \item An |\endtemplate| (which expands to |\outer endtemplate:|)
-%     can be enountered when peeking ahead at the next token.
+%   \item Expanding \tn{noexpand} \meta{token} (when the \meta{token} is
+%     expandable) results in an internal token, displayed (temporarily)
+%     as \cs{notexpanded: \meta{token}}, whose shape coincides with the
+%     \meta{token} and whose meaning differs from \tn{relax}.
+%   \item An |\outer endtemplate:| (expanding to another internal token,
+%     |end of alignment template|) can be encountered when peeking ahead
+%     at the next token.
 %   \item Tricky programming might access a frozen |\endwrite|.
 %   \item Some frozen tokens can only be accessed in interactive
 %     sessions: |\cr|, |\right|, |\endgroup|, |\fi|, |\inaccessible|.
@@ -1347,7 +1339,7 @@
 \seq_set_split:Nnn \l_char_special_seq { }
   { \  \" \# \$ \% \& \\ \^ \_ \{ \} \~ }
 \seq_new:N \l_char_active_seq
-\seq_set_split:Nnn \l_char_special_seq { }
+\seq_set_split:Nnn \l_char_active_seq { }
   { \" \$ \& \^ \_ \~ }
 %    \end{macrocode}
 % \end{variable}
@@ -1372,7 +1364,6 @@
       \cs_new_protected:cpn { #1 :nN } ##1
         {
           \group_begin:
-            \char_set_catcode_active:n { ##1 }
             \char_set_lccode:nn { `\^^@ } { ##1 }
           \tex_lowercase:D { \group_end: #2 ^^@ }
         }
@@ -2110,7 +2101,7 @@
 %   and \tn{hyphen}, whose meaning is at most two characters.
 %   This leaves a string terminated by some |:|, and \cs{q_stop}.
 %
-%   The meaning of each one of the five \tn{...mark} primitives
+%   The meaning of each one of the five \tn[no-index]{...mark} primitives
 %   has the form \meta{letters}|:|\meta{user material}. In other words,
 %   the first non-letter is a colon. We remove everything after the first
 %   colon.