[latex3-commits] [git/LaTeX3-latex3-latex3] master: Correct cctab stack behaviour (fixes #610) (a212e5234)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/a212e5234cd76fb32385395d4392851baa83fe5d

>---------------------------------------------------------------

commit a212e5234cd76fb32385395d4392851baa83fe5d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Aug 19 14:47:09 2019 +0100

    Correct cctab stack behaviour (fixes #610)


>---------------------------------------------------------------

a212e5234cd76fb32385395d4392851baa83fe5d
 l3experimental/CHANGELOG.md        | 4 ++++
 l3experimental/l3cctab/l3cctab.dtx | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/l3experimental/CHANGELOG.md b/l3experimental/CHANGELOG.md
index 8a221b340..75b250898 100644
--- a/l3experimental/CHANGELOG.md
+++ b/l3experimental/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+
+- Corrected behaviour of catcode tables (see #610)
+
 ## [2019-07-01]
 
 ### Added
diff --git a/l3experimental/l3cctab/l3cctab.dtx b/l3experimental/l3cctab/l3cctab.dtx
index ad4e422bd..7c608534f 100644
--- a/l3experimental/l3cctab/l3cctab.dtx
+++ b/l3experimental/l3cctab/l3cctab.dtx
@@ -276,7 +276,7 @@
 %    \begin{macrocode}
     \cs_new_protected:Npn \cctab_new:N #1
       {
-        \int_gadd:Nn \g_@@_allocate_int { 1 }
+        \int_gadd:Nn \g_@@_allocate_int { 2 }
         \int_const:Nn #1 { \g_@@_allocate_int }
         \intarray_new:cn { g_@@_ \int_use:N #1 _cctab } { 256 }
         \int_step_inline:nn { 256 }
@@ -297,7 +297,7 @@
       }
     \cs_new_protected:Npn \cctab_begin:N #1
       {
-        \int_gadd:Nn \g_@@_stack_int { 1 }
+        \int_gadd:Nn \g_@@_stack_int { 2 }
         \int_compare:nNnT \g_@@_stack_int > \c_max_register_int
           { \__kernel_msg_fatal:nn { kernel } { cctab-stack-full } }
         \cs_if_exist:cF { g_@@_ \int_use:N \g_@@_stack_int _cctab }