fix sensitivity to \escapechar

2 files changed, 4 insertions, 6 deletions

diff --git a/Changes b/Changes
index 8ac51c5..12a56c0 100644
--- a/Changes
+++ b/Changes
@@ -5,6 +5,7 @@
         - add minimal test files for luatex and lualatex
         - fix allocation range (1->65535)
         - make sure newly allocated tables are initialised
+        - fix sensitivity to the current value of \escapechar
 
 2010/03/11
     luatexbase-attrs 0.1
diff --git a/luatexbase-cctb.dtx b/luatexbase-cctb.dtx
index a73f483..d7de151 100644
--- a/luatexbase-cctb.dtx
+++ b/luatexbase-cctb.dtx
@@ -215,6 +215,7 @@ and the derived files
     \allocationnumber\lltxb@catcodetable@alloc
     \global\chardef#1\allocationnumber
     \luatexinitcatcodetable\allocationnumber
+    \begingroup\escapechar\m@ne \expandafter\endgroup
     \directlua{luatextra.catcodetabledef_from_tex(
       '\luatexluaescapestring{\string#1}', '\number\allocationnumber')}%
     \wlog{\string#1=\string\luatexcatcodetable\the\allocationnumber}%
@@ -279,14 +280,10 @@ and the derived files
 \newluatexcatcodetable\CatcodeTableLaTeX
 \newluatexcatcodetable\CatcodeTableLaTeXAtLetter
 \newluatexcatcodetable\CatcodeTableExpl
-%% \luatexinitcatcodetable\CatcodeTableIniTeX
-
-\expandafter\ifx\csname @firstofone\endcsname\relax
-  \long\def\@firstofone#1{#1}%
-\fi
 
 \begingroup
   \def\@makeother#1{\catcode#1=12\relax}%
+  \long\def\@firstofone#1{#1}%
   \@firstofone{%
     \luatexcatcodetable\CatcodeTableIniTeX
     \begingroup
@@ -424,7 +421,7 @@ end
 \escapechar64
 \newluatexcatcodetable\anothercctb
 \endgroup
-% \directlua{assert(luatextra.catcodetables.anothercctb)}
+\directlua{assert(luatextra.catcodetables.anothercctb)}
 %</testplain,testlatex>
 %<testplain>\bye
 %<testlatex>\stop