diff options
author | Karl Berry <karl@freefriends.org> | 2012-07-23 17:15:00 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-07-23 17:15:00 +0000 |
commit | 134349701bddf7cbbacf6030c6b9f9838aff96fa (patch) | |
tree | ec1140c46e1c0347a671a6fa3cf8af5a79e95f93 /Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty | |
parent | f7855c12c18bb97b7b9e49ab685ee558d8c0b47b (diff) |
l3kernel 3990 (17jul12)
git-svn-id: svn://tug.org/texlive/trunk@27108 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty | 83 |
1 files changed, 44 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty index 7655ba4ae08..c6050b44f98 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty @@ -46,17 +46,11 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3luatex.dtx 3355 2012-02-09 07:18:22Z joseph $ +\GetIdInfo$Id: l3luatex.dtx 3986 2012-07-15 19:23:51Z joseph $ {L3 Experimental LuaTeX-specific functions} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} -\package_check_loaded_expl: -\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'. - } +\__expl_package_check: \luatex_if_engine:TF { \cs_new_eq:NN \lua_now:x \luatex_directlua:D @@ -65,13 +59,13 @@ { \cs_new:Npn \lua_now:x #1 { - \msg_expandable_kernel_error:nnn - { luatex } { bad-engine } { \lua_now:x } + \__msg_kernel_expandable_error:nnn + { kernel } { bad-engine } { \lua_now:x } } \cs_new_protected:Npn \lua_shipout_x:n #1 { - \msg_expandable_kernel_error:nnn - { luatex } { bad-engine } { \lua_shipout_x:n } + \__msg_kernel_expandable_error:nnn + { kernel } { bad-engine } { \lua_shipout_x:n } } } \cs_new:Npn \lua_now:n #1 @@ -80,27 +74,27 @@ \cs_new_protected:Npn \lua_shipout:n #1 { \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 { \c_minus_one } -\int_new:N \g_cctab_stack_int -\seq_new:N \g_cctab_stack_seq +\int_new:N \g__cctab_allocate_int +\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:Npn \cctab_new:N #1 { - \chk_if_free_cs:N #1 - \int_gadd:Nn \g_cctab_allocate_int { \c_two } + \__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 } + \g__cctab_allocate_int < { \c_max_register_int + \c_one } { - \tex_global:D \tex_chardef:D #1 \g_cctab_allocate_int + \tex_global:D \tex_chardef:D #1 \g__cctab_allocate_int \luatex_initcatcodetable:D #1 } - { \msg_kernel_fatal:nnx { kernel } { out-of-registers } { cctab } } + { \__msg_kernel_fatal:nnx { kernel } { out-of-registers } { cctab } } } \luatex_if_engine:F { \cs_set_protected:Npn \cctab_new:N #1 { - \msg_kernel_error:nnx { luatex } { bad-engine } + \__msg_kernel_error:nnx { kernel } { bad-engine } { \exp_not:N \cctab_new:N } } } @@ -108,39 +102,39 @@ { \cs_set_protected:Npn \cctab_new:N #1 { - \chk_if_free_cs:N #1 + \__chk_if_free_cs:N #1 \newcatcodetable #1 \luatex_initcatcodetable:D #1 } } \cs_new_protected:Npn \cctab_begin:N #1 { - \seq_gpush:Nx \g_cctab_stack_seq { \tex_the:D \luatex_catcodetable:D } + \seq_gpush:Nx \g__cctab_stack_seq { \tex_the:D \luatex_catcodetable:D } \luatex_catcodetable:D #1 - \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 + \int_gadd:Nn \g__cctab_stack_int { \c_two } + \int_compare:nNnT \g__cctab_stack_int > \c_max_register_int + { \__msg_kernel_fatal:nn { kernel } { 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 { \c_two } - \seq_if_empty:NTF \g_cctab_stack_seq - { \tl_set:Nn \l_cctab_internal_tl { 0 } } - { \seq_gpop:NN \g_cctab_stack_seq \l_cctab_internal_tl } - \luatex_catcodetable:D \l_cctab_internal_tl \scan_stop: + \int_gsub:Nn \g__cctab_stack_int { \c_two } + \seq_if_empty:NTF \g__cctab_stack_seq + { \tl_set:Nn \l__cctab_internal_tl { 0 } } + { \seq_gpop:NN \g__cctab_stack_seq \l__cctab_internal_tl } + \luatex_catcodetable:D \l__cctab_internal_tl \scan_stop: } \luatex_if_engine:F { \cs_set_protected:Npn \cctab_begin:N #1 { - \msg_kernel_error:nnxx { luatex } { bad-engine } + \__msg_kernel_error:nnxx { kernel } { bad-engine } { \exp_not:N \cctab_begin:N } {#1} } \cs_set_protected_nopar:Npn \cctab_end: { - \msg_kernel_error:nnx { luatex } { bad-engine } + \__msg_kernel_error:nnx { kernel } { bad-engine } { \exp_not:N \cctab_end: } } } @@ -149,7 +143,7 @@ \cs_set_protected:Npn \cctab_begin:N #1 { \BeginCatcodeRegime #1 } \cs_set_protected_nopar:Npn \cctab_end: { \EndCatcodeRegime } } -\tl_new:N \l_cctab_internal_tl +\tl_new:N \l__cctab_internal_tl \cs_new_protected:Npn \cctab_gset:Nn #1#2 { \group_begin: @@ -161,7 +155,7 @@ { \cs_set_protected:Npn \cctab_gset:Nn #1#2 { - \msg_kernel_error:nnxx { luatex } { bad-engine } + \__msg_kernel_error:nnxx { kernel } { bad-engine } { \exp_not:N \cctab_gset:Nn } { #1 {#2} } } } @@ -177,7 +171,18 @@ \cs_new_eq:NN \c_other_cctab \CatcodeTableOther \cs_new_eq:NN \c_str_cctab \CatcodeTableString } -\cs_new_eq:NN \c_string_cctab \c_str_cctab +\__msg_kernel_new:nnnn { kernel } { 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'. + } +\__msg_kernel_new:nnnn { kernel } { cctab-stack-full } + { The~category~code~table~stack~is~exhausted. } + { + LaTeX~has~been~asked~to~switch~to~a~new~category~code~table,~ + but~there~is~no~more~space~to~do~this! + } %% %% %% End of file `l3luatex.sty'. |