summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty58
1 files changed, 27 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
index 7494acf9185..2328dda0623 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3luatex.dtx 2995 2011-11-23 16:15:19Z bruno $
+\GetIdInfo$Id: l3luatex.dtx 3086 2011-12-22 17:55:46Z bruno $
{L3 Experimental LuaTeX-specific functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -54,8 +54,8 @@
\msg_kernel_new:nnnn { luatex } { bad-engine }
{ LuaTeX~engine~not~in~use!~Ignoring~#1. }
{
- The~feature~you~are~using~is~only~available\
- with~the~luaTeX~engine.~LaTeX3~ignored~`#1#2'.
+ The~feature~you~are~using~is~only~available~
+ with~the~LuaTeX~engine.~LaTeX3~ignored~`#1#2'.
}
\luatex_if_engine:TF
{
@@ -81,30 +81,24 @@
{ \lua_shipout_x:n { \exp_not:n {#1} } }
\cs_generate_variant:Nn \lua_shipout:n { x }
\int_new:N \g_cctab_allocate_int
-\int_set:Nn \g_cctab_allocate_int { -1 }
+\int_set:Nn \g_cctab_allocate_int { \c_minus_one }
\int_new:N \g_cctab_stack_int
\seq_new:N \g_cctab_stack_seq
-\cs_new_protected_nopar:Npn \cctab_new:N #1
+\cs_new_protected:Npn \cctab_new:N #1
{
- \cs_if_free:NTF #1
- {
- \int_gadd:Nn \g_cctab_allocate_int { 2 }
- \int_compare:nNnTF
- { \g_cctab_allocate_int } < { \c_max_register_int + 1 }
- {
- \tex_global:D \tex_mathchardef:D #1 \g_cctab_allocate_int
- \luatex_initcatcodetable:D #1
- }
- { \msg_kernel_fatal:nnx { alloc } { out-of-registers } { cctab } }
- }
+ \chk_if_free_cs:N #1
+ \int_gadd:Nn \g_cctab_allocate_int { \c_two }
+ \int_compare:nNnTF
+ \g_cctab_allocate_int < { \c_max_register_int + \c_one }
{
- \msg_kernel_error:nnx { code } { variable-already-defined }
- { \token_to_str:N #1 }
+ \tex_global:D \tex_chardef:D #1 \g_cctab_allocate_int
+ \luatex_initcatcodetable:D #1
}
+ { \msg_kernel_fatal:nnx { alloc } { out-of-registers } { cctab } }
}
\luatex_if_engine:F
{
- \cs_set_protected_nopar:Npn \cctab_new:N #1
+ \cs_set_protected:Npn \cctab_new:N #1
{
\msg_kernel_error:nnx { luatex } { bad-engine }
{ \exp_not:N \cctab_new:N }
@@ -112,33 +106,34 @@
}
\luatex_if_engine:T
{
- \cs_set_protected_nopar:Npn \cctab_new:N #1
+ \cs_set_protected:Npn \cctab_new:N #1
{
+ \chk_if_free_cs:N #1
\newcatcodetable #1
\luatex_initcatcodetable:D #1
}
}
-\cs_new_protected_nopar:Npn \cctab_begin:N #1
+\cs_new_protected:Npn \cctab_begin:N #1
{
\seq_gpush:Nx \g_cctab_stack_seq { \tex_the:D \luatex_catcodetable:D }
\luatex_catcodetable:D #1
- \int_gadd:Nn \g_cctab_stack_int { 2 }
- \int_compare:nNnT { \g_cctab_stack_int } > { 268 435 453 }
- { \msg_kernel_error:nn { code } { cctab-stack-full } }
+ \int_gadd:Nn \g_cctab_stack_int { \c_two }
+ \int_compare:nNnT \g_cctab_stack_int > \c_max_register_int
+ { \msg_kernel_fatal:nn { code } { cctab-stack-full } }
\luatex_savecatcodetable:D \g_cctab_stack_int
\luatex_catcodetable:D \g_cctab_stack_int
}
\cs_new_protected_nopar:Npn \cctab_end:
{
- \int_gsub:Nn \g_cctab_stack_int { 2 }
- \seq_gpop:NN \g_cctab_stack_seq \l_cctab_tmp_tl
- \quark_if_no_value:NT \l_cctab_tmp_tl
+ \int_gsub:Nn \g_cctab_stack_int { \c_two }
+ \seq_if_empty:NTF \g_cctab_stack_seq
{ \tl_set:Nn \l_cctab_tmp_tl { 0 } }
+ { \seq_gpop:NN \g_cctab_stack_seq \l_cctab_tmp_tl }
\luatex_catcodetable:D \l_cctab_tmp_tl \scan_stop:
}
\luatex_if_engine:F
{
- \cs_set_protected_nopar:Npn \cctab_begin:N #1
+ \cs_set_protected:Npn \cctab_begin:N #1
{
\msg_kernel_error:nnxx { luatex } { bad-engine }
{ \exp_not:N \cctab_begin:N } {#1}
@@ -151,7 +146,7 @@
}
\luatex_if_engine:T
{
- \cs_set_protected_nopar:Npn \cctab_begin:N #1 { \BeginCatcodeRegime #1 }
+ \cs_set_protected:Npn \cctab_begin:N #1 { \BeginCatcodeRegime #1 }
\cs_set_protected_nopar:Npn \cctab_end: { \EndCatcodeRegime }
}
\tl_new:N \l_cctab_tmp_tl
@@ -164,7 +159,7 @@
}
\luatex_if_engine:F
{
- \cs_set_protected_nopar:Npn \cctab_gset:Nn #1#2
+ \cs_set_protected:Npn \cctab_gset:Nn #1#2
{
\msg_kernel_error:nnxx { luatex } { bad-engine }
{ \exp_not:N \cctab_gset:Nn } { #1 {#2} }
@@ -180,8 +175,9 @@
\cs_new_eq:NN \c_document_cctab \CatcodeTableLaTeX
\cs_new_eq:NN \c_initex_cctab \CatcodeTableIniTeX
\cs_new_eq:NN \c_other_cctab \CatcodeTableOther
- \cs_new_eq:NN \c_string_cctab \CatcodeTableString
+ \cs_new_eq:NN \c_str_cctab \CatcodeTableString
}
+\cs_new_eq:NN \c_string_cctab \c_str_cctab
%%
%%
%% End of file `l3luatex.sty'.