l3 (29jan17)

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

1 files changed, 23 insertions, 36 deletions

diff --git a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
index 838da42e278..340125f1313 100644
--- a/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
+++ b/Master/texmf-dist/source/latex/l3experimental/l3str/l3tl-analysis.dtx
@@ -1,41 +1,28 @@
 % \iffalse meta-comment
 %
 %% File: l3tl-analysis.dtx Copyright (C) 2011-2012,2015,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 "l3experimental 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 "l3experimental 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|package>
 \RequirePackage{expl3}
-\GetIdInfo$Id: l3tl-analysis.dtx 6589 2016-06-13 11:11:55Z joseph $
+\GetIdInfo$Id: l3tl-analysis.dtx 6805 2016-12-28 22:15:52Z joseph $
   {L3 Experimental token lists analysis}
 %</driver|package>
 %<*driver>
@@ -412,7 +399,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_setup:n #1
   {
-    \int_set_eq:NN \tex_escapechar:D \c_minus_one
+    \int_set:Nn \tex_escapechar:D { - \c_one }
     \exp_after:wN \@@_disable_loop:N
       \tl_to_str:n {#1} { ~ } { ? ~ \__prg_break: }
     \__prg_break_point:
@@ -520,7 +507,7 @@
           \c_one
         \else:
           \if_catcode:w \exp_not:N \l_@@_token \c_group_end_token
-            \c_minus_one
+            - \c_one
           \else:
             \c_two
           \fi:
@@ -670,7 +657,7 @@
       = \l_@@_normal_int sp plus \l_@@_type_int sp \scan_stop:
     \int_incr:N \l_@@_index_int
     \int_zero:N \l_@@_normal_int
-    \if_int_compare:w \l_@@_nesting_int = \c_minus_one
+    \if_int_compare:w \l_@@_nesting_int = - \c_one
       \cs_set_eq:NN \@@_a_loop:w \scan_stop:
     \fi:
   }
@@ -815,7 +802,7 @@
     \exp_not:n { \fi: \fi: \fi: \fi: \fi: \fi: \fi: \fi: }
     \exp_not:N \__int_value:w `#1 \s__tl
    \exp_not:N \exp_after:wN \exp_not:N \@@_b_normals:ww
-     \exp_not:N \__int_value:w \exp_not:N \__int_eval:w \c_minus_one +
+     \exp_not:N \__int_value:w \exp_not:N \__int_eval:w - \c_one +
   }
 %    \end{macrocode}
 % \end{macro}