[latex3-commits] [l3svn] r6783 - Remove some more \c_minus_one, move \c_sixteen to l3int (see #316)

noreply at latex-project.org noreply at latex-project.org
Mon Dec 5 17:41:23 CET 2016 

Author: bruno
Date: 2016-12-05 17:41:23 +0100 (Mon, 05 Dec 2016)
New Revision: 6783

Added:
   trunk/l3kernel/testfiles/m3ior001.luatex.tlg
   trunk/l3kernel/testfiles/m3ior001.uptex.tlg
   trunk/l3kernel/testfiles/m3ior001.xetex.tlg
Modified:
   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
   trunk/l3kernel/testfiles/m3ior001.tlg
Log:
Remove some more \c_minus_one, move \c_sixteen to l3int (see #316)

This changes \c_sixteen from \char"10 to \mathchar"10 or \kchar"10
in some engines, hence the test file changes for m3ior001.


Modified: trunk/l3kernel/l3basics.dtx
===================================================================
--- trunk/l3kernel/l3basics.dtx	2016-12-05 16:09:01 UTC (rev 6782)
+++ trunk/l3kernel/l3basics.dtx	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1435,18 +1435,23 @@
 %
 % \subsection{Defining some constants}
 %
-% \begin{variable}{\c_minus_one, \c_zero, \c_sixteen}
-%    We need the constants \cs{c_minus_one} and \cs{c_sixteen} now for
-%    writing information to the log and the terminal and \cs{c_zero}
-%    which is used by some functions in the \textsf{l3alloc} module. The
-%    rest are defined in the \textsf{l3int} module -- at least for the
-%    ones that can be defined with \cs{tex_chardef:D} or
-%    \cs{tex_mathchardef:D}. For other constants the \textsf{l3int} module is
-%    required but it can't be used until the allocation has been set
-%    up properly! The actual allocation mechanism is in
-%    \pkg{l3alloc}, and works such that the first available count register
-%    is $10$.
+% \begin{variable}{\c_zero}
+%   We need the constant \cs{c_zero}
+%   which is used by some functions in the \textsf{l3alloc} module. The
+%   rest are defined in the \textsf{l3int} module -- at least for the
+%   ones that can be defined with \cs{tex_chardef:D} or
+%   \cs{tex_mathchardef:D}. For other constants the \textsf{l3int} module is
+%   required but it can't be used until the allocation has been set
+%   up properly!
 %    \begin{macrocode}
+\tex_chardef:D \c_zero    = 0 ~
+%    \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>
@@ -1454,8 +1459,6 @@
 \tex_countdef:D \c_minus_one = 10 ~
 \c_minus_one = -1 ~
 %</initex>
-\tex_chardef:D \c_sixteen = 16 ~
-\tex_chardef:D \c_zero    = 0 ~
 %    \end{macrocode}
 % \end{variable}
 %
@@ -2293,9 +2296,9 @@
 %    These will be redefined later by \pkg{l3io}.
 %    \begin{macrocode}
 \cs_set_protected:Npn \iow_log:x
-  { \tex_immediate:D \tex_write:D \c_minus_one }
+  { \tex_immediate:D \tex_write:D -1 }
 \cs_set_protected:Npn \iow_term:x
-  { \tex_immediate:D \tex_write:D \c_sixteen }
+  { \tex_immediate:D \tex_write:D 16 }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2692,7 +2695,7 @@
     \if_meaning:w \c_true_bool #3
       \tl_count:n {#2}
     \else:
-      \c_minus_one
+      -1
     \fi:
   }
 \cs_new:Npn \__cs_count_signature:c

Modified: trunk/l3kernel/l3int.dtx
===================================================================
--- trunk/l3kernel/l3int.dtx	2016-12-05 16:09:01 UTC (rev 6782)
+++ trunk/l3kernel/l3int.dtx	2016-12-05 16:41:23 UTC (rev 6783)
@@ -2384,7 +2384,7 @@
 %   {
 %     \c_one, \c_two, \c_three, \c_four, \c_five, \c_six, \c_seven, \c_eight,
 %     \c_nine, \c_ten, \c_eleven, \c_twelve, \c_thirteen, \c_fourteen,
-%     \c_fifteen
+%     \c_fifteen, \c_sixteen
 %   }
 % Low-number values not previously defined.
 %    \begin{macrocode}
@@ -2403,6 +2403,7 @@
 \int_const:Nn \c_thirteen { 13 }
 \int_const:Nn \c_fourteen { 14 }
 \int_const:Nn \c_fifteen  { 15 }
+\int_const:Nn \c_sixteen  { 16 }
 %    \end{macrocode}
 % \end{variable}
 %

Modified: trunk/l3kernel/testfiles/m3expl001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2016-12-05 16:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl001.luatex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1622,6 +1622,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen 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:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl001.ptex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1357,6 +1357,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen 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:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl001.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1357,6 +1357,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen 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:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl001.uptex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1357,6 +1357,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen 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:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl001.xetex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1620,6 +1620,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen 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:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl003.luatex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1622,6 +1622,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen 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:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl003.ptex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1357,6 +1357,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen 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:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl003.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1357,6 +1357,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen 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:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl003.uptex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1357,6 +1357,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen 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:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3expl003.xetex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -1620,6 +1620,7 @@
 Defining \c_thirteen on line ...
 Defining \c_fourteen on line ...
 Defining \c_fifteen on line ...
+Defining \c_sixteen on line ...
 Defining \c_thirty_two on line ...
 Defining \c_two_hundred_fifty_five on line ...
 Defining \c_two_hundred_fifty_six on line ...

Added: trunk/l3kernel/testfiles/m3ior001.luatex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3ior001.luatex.tlg	                        (rev 0)
+++ trunk/l3kernel/testfiles/m3ior001.luatex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -0,0 +1,74 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Joseph Wright
+============================================================
+TEST 1: Name a stream
+============================================================
+Defining \testa on line ...
+Defining \testb on line ...
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+! 
+! Control sequence \testa already defined.
+! 
+! See the LaTeX3 documentation for further information.
+! 
+! For immediate help type H <return>.
+!...............................................  
+l. ...}
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+| 
+| LaTeX has been asked to create a new control sequence '\testa' but this name
+| has already been used elsewhere.
+| 
+| The current meaning is:
+|   \char"10
+|...............................................
+Defining \testa on line ...
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+! 
+! Control sequence \testb already defined.
+! 
+! See the LaTeX3 documentation for further information.
+! 
+! For immediate help type H <return>.
+!...............................................  
+l. ...}
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+| 
+| LaTeX has been asked to create a new control sequence '\testb' but this name
+| has already been used elsewhere.
+| 
+| The current meaning is:
+|   \char"10
+|...............................................
+Defining \testb on line ...
+============================================================
+============================================================
+TEST 2: Close a read
+============================================================
+============================================================
+============================================================
+TEST 3: End of file conditionals (expect T/T/F/F)
+============================================================
+TRUE
+TRUE
+FALSE
+FALSE
+============================================================
+============================================================
+TEST 4: End of file predicate (expect T/F)
+============================================================
+\c_true_bool 
+\c_false_bool 
+============================================================
+============================================================
+TEST 5: Read to
+============================================================
+\ExplSyntaxOff 
+============================================================


Property changes on: trunk/l3kernel/testfiles/m3ior001.luatex.tlg
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/l3kernel/testfiles/m3ior001.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3ior001.tlg	2016-12-05 16:09:01 UTC (rev 6782)
+++ trunk/l3kernel/testfiles/m3ior001.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -24,7 +24,7 @@
 | has already been used elsewhere.
 | 
 | The current meaning is:
-|   \char"10
+|   \mathchar"10
 |...............................................
 Defining \testa on line ...
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -45,7 +45,7 @@
 | has already been used elsewhere.
 | 
 | The current meaning is:
-|   \char"10
+|   \mathchar"10
 |...............................................
 Defining \testb on line ...
 ============================================================

Added: trunk/l3kernel/testfiles/m3ior001.uptex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3ior001.uptex.tlg	                        (rev 0)
+++ trunk/l3kernel/testfiles/m3ior001.uptex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -0,0 +1,74 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Joseph Wright
+============================================================
+TEST 1: Name a stream
+============================================================
+Defining \testa on line ...
+Defining \testb on line ...
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+! 
+! Control sequence \testa already defined.
+! 
+! See the LaTeX3 documentation for further information.
+! 
+! For immediate help type H <return>.
+!...............................................  
+l. ...}
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+| 
+| LaTeX has been asked to create a new control sequence '\testa' but this name
+| has already been used elsewhere.
+| 
+| The current meaning is:
+|   \kchar"10
+|...............................................
+Defining \testa on line ...
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+! 
+! Control sequence \testb already defined.
+! 
+! See the LaTeX3 documentation for further information.
+! 
+! For immediate help type H <return>.
+!...............................................  
+l. ...}
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+| 
+| LaTeX has been asked to create a new control sequence '\testb' but this name
+| has already been used elsewhere.
+| 
+| The current meaning is:
+|   \kchar"10
+|...............................................
+Defining \testb on line ...
+============================================================
+============================================================
+TEST 2: Close a read
+============================================================
+============================================================
+============================================================
+TEST 3: End of file conditionals (expect T/T/F/F)
+============================================================
+TRUE
+TRUE
+FALSE
+FALSE
+============================================================
+============================================================
+TEST 4: End of file predicate (expect T/F)
+============================================================
+\c_true_bool 
+\c_false_bool 
+============================================================
+============================================================
+TEST 5: Read to
+============================================================
+\ExplSyntaxOff 
+============================================================


Property changes on: trunk/l3kernel/testfiles/m3ior001.uptex.tlg
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/l3kernel/testfiles/m3ior001.xetex.tlg
===================================================================
--- trunk/l3kernel/testfiles/m3ior001.xetex.tlg	                        (rev 0)
+++ trunk/l3kernel/testfiles/m3ior001.xetex.tlg	2016-12-05 16:41:23 UTC (rev 6783)
@@ -0,0 +1,74 @@
+This is a generated file for the LaTeX (2e + expl3) validation system.
+Don't change this file in any respect.
+Author: Joseph Wright
+============================================================
+TEST 1: Name a stream
+============================================================
+Defining \testa on line ...
+Defining \testb on line ...
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+! 
+! Control sequence \testa already defined.
+! 
+! See the LaTeX3 documentation for further information.
+! 
+! For immediate help type H <return>.
+!...............................................  
+l. ...}
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+| 
+| LaTeX has been asked to create a new control sequence '\testa' but this name
+| has already been used elsewhere.
+| 
+| The current meaning is:
+|   \char"10
+|...............................................
+Defining \testa on line ...
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+! LaTeX error: "kernel/command-already-defined"
+! 
+! Control sequence \testb already defined.
+! 
+! See the LaTeX3 documentation for further information.
+! 
+! For immediate help type H <return>.
+!...............................................  
+l. ...}
+|'''''''''''''''''''''''''''''''''''''''''''''''
+| This is a coding error.
+| 
+| LaTeX has been asked to create a new control sequence '\testb' but this name
+| has already been used elsewhere.
+| 
+| The current meaning is:
+|   \char"10
+|...............................................
+Defining \testb on line ...
+============================================================
+============================================================
+TEST 2: Close a read
+============================================================
+============================================================
+============================================================
+TEST 3: End of file conditionals (expect T/T/F/F)
+============================================================
+TRUE
+TRUE
+FALSE
+FALSE
+============================================================
+============================================================
+TEST 4: End of file predicate (expect T/F)
+============================================================
+\c_true_bool 
+\c_false_bool 
+============================================================
+============================================================
+TEST 5: Read to
+============================================================
+\ExplSyntaxOff 
+============================================================


Property changes on: trunk/l3kernel/testfiles/m3ior001.xetex.tlg
___________________________________________________________________
Added: svn:eol-style
   + native

More information about the latex3-commits mailing list