[latex3-commits] [l3svn] r6784 - Move definition of c_minus_one to l3int (see #316)

[noreply at latex-project.org]

Author: bruno
Date: 2016-12-05 18:04:46 +0100 (Mon, 05 Dec 2016)
New Revision: 6784

Modified:
   trunk/l3kernel/l3alloc.dtx
   trunk/l3kernel/l3basics.dtx
   trunk/l3kernel/l3int.dtx
   trunk/l3kernel/testfiles/m3expl001.luatex.tlg
   trunk/l3kernel/testfiles/m3expl001.ptex.tlg
   trunk/l3kernel/testfiles/m3expl001.tlg
   trunk/l3kernel/testfiles/m3expl001.uptex.tlg
   trunk/l3kernel/testfiles/m3expl001.xetex.tlg
   trunk/l3kernel/testfiles/m3expl003.luatex.tlg
   trunk/l3kernel/testfiles/m3expl003.ptex.tlg
   trunk/l3kernel/testfiles/m3expl003.tlg
   trunk/l3kernel/testfiles/m3expl003.uptex.tlg
   trunk/l3kernel/testfiles/m3expl003.xetex.tlg
Log:
Move definition of c_minus_one to l3int (see #316)

In package mode just copy \m at one, as before.  In format
mode, allocate; I've shifted the first used count from
11 to 10, hopefully that's right?


Modified: trunk/l3kernel/l3alloc.dtx
===================================================================
--- trunk/l3kernel/l3alloc.dtx	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/l3alloc.dtx	2016-12-05 17:04:46 UTC (rev 6784)
@@ -188,7 +188,7 @@
   { \@@_new:nnnN { box } \c_zero \c_max_register_int \tex_chardef:D }
   { \@@_new:nnnN { box } \c_zero \c_max_register_int \tex_mathchardef:D }
 \@@_new:nnnN { dim }     \c_zero \c_max_register_int \tex_dimendef:D
-\@@_new:nnnN { int }    { 11 }   \c_max_register_int \tex_countdef:D
+\@@_new:nnnN { int }    { 10 }   \c_max_register_int \tex_countdef:D
 \@@_new:nnnN { muskip } \c_zero  \c_max_register_int \tex_muskipdef:D
 \@@_new:nnnN { skip }   \c_zero  \c_max_register_int \tex_skipdef:D
 %    \end{macrocode}

Modified: trunk/l3kernel/l3basics.dtx
===================================================================
--- trunk/l3kernel/l3basics.dtx	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/l3basics.dtx	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1448,20 +1448,6 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{variable}{\c_minus_one}
-%   The actual allocation mechanism is in \pkg{l3alloc}, and works such
-%   that the first available count register is $10$.
-%    \begin{macrocode}
-%<*package>
-\tex_let:D \c_minus_one \m at ne
-%</package>
-%<*initex>
-\tex_countdef:D \c_minus_one = 10 ~
-\c_minus_one = -1 ~
-%</initex>
-%    \end{macrocode}
-% \end{variable}
-%
 % \begin{variable}{\c_max_register_int}
 %   This is here as this particular integer is needed both in package
 %   mode and to bootstrap \pkg{l3alloc}, and is documented in \pkg{l3int}.

Modified: trunk/l3kernel/l3int.dtx
===================================================================
--- trunk/l3kernel/l3int.dtx	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/l3int.dtx	2016-12-05 17:04:46 UTC (rev 6784)
@@ -2372,11 +2372,7 @@
 %
 % \subsection{Constant integers}
 %
-% \begin{variable}{\c_minus_one}
-%   This is needed early, and so is in \pkg{l3basics}
-% \end{variable}
-%
-% \begin{variable}{\c_zero, \c_sixteen}
+% \begin{variable}{\c_zero}
 %   Again, in \pkg{l3basics}
 % \end{variable}
 %
@@ -2407,6 +2403,19 @@
 %    \end{macrocode}
 % \end{variable}
 %
+% \begin{variable}{\c_minus_one}
+%   The actual allocation mechanism is in \pkg{l3alloc}; it requires
+%   \cs{c_one} to be defined.  In package mode, reuse \tn{m at ne}.
+%    \begin{macrocode}
+%<*package>
+\cs_new_eq:NN \c_minus_one \m at ne
+%</package>
+%<*initex>
+\int_const:Nn \c_minus_one { -1 }
+%</initex>
+%    \end{macrocode}
+% \end{variable}
+%
 % \begin{variable}{\c_thirty_two}
 %   One middling value.
 %    \begin{macrocode}

Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1623,6 +1623,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1358,6 +1358,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl001.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1358,6 +1358,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1358,6 +1358,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Modified: trunk/l3kernel/testfiles/m3expl001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1621,6 +1621,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1623,6 +1623,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.ptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1358,6 +1358,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl003.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1358,6 +1358,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1358,6 +1358,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Modified: trunk/l3kernel/testfiles/m3expl003.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2016-12-05 17:04:46 UTC (rev 6784)
@@ -1621,6 +1621,7 @@
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
 Defining \c_sixteen on line ...
+Defining \c_minus_one on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...