diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx index f76fdcd07df..130cff2671b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3names} -\GetIdInfo$Id: l3alloc.dtx 2896 2011-10-09 20:36:50Z joseph $ +\GetIdInfo$Id: l3alloc.dtx 3086 2011-12-22 17:55:46Z bruno $ {L3 Experimental register allocation} %</driver|package> %<*driver> @@ -146,7 +146,7 @@ \cs_new_protected:Npn \alloc_new:nnnN #1#2#3#4 { \alloc_setup_type:nnn {#1} {#2} {#3} - \cs_new_nopar:cpn { #1 _new:N } ##1 { \alloc_reg:nNN {#1} #4 ##1 } + \cs_new:cpn { #1 _new:N } ##1 { \alloc_reg:nNN {#1} #4 ##1 } } % \end{macrocode} % \end{macro} @@ -181,7 +181,9 @@ % need to have their allocators set up \enquote{early}. It therefore % makes sense to collect most of them together here. % \begin{macrocode} -\alloc_new:nnnN { box } \c_zero \c_max_register_int \tex_mathchardef:D +\luatex_if_engine:TF + { \alloc_new:nnnN { box } \c_zero \c_max_register_int \tex_chardef:D } + { \alloc_new:nnnN { box } \c_zero \c_max_register_int \tex_mathchardef:D } \alloc_new:nnnN { dim } \c_zero \c_max_register_int \tex_dimendef:D \alloc_new:nnnN { int } { 11 } \c_max_register_int \tex_countdef:D \alloc_new:nnnN { muskip } \c_zero \c_max_register_int \tex_muskipdef:D @@ -195,7 +197,7 @@ % \begin{macrocode} \alloc_new:nnnN { insert } { 221 } { 254 } \tex_chardef:D \group_begin: - \cs_set_protected_nopar:Npn \alloc_reserve_insert:n #1 + \cs_set_protected:Npn \alloc_reserve_insert:n #1 { \tex_ifnum:D #1 > \c_insert_allocation_max_tl \scan_stop: \exp_after:wN \use_none:n @@ -226,7 +228,7 @@ % \begin{macro}[int]{\alloc_reg:nNN} % This internal macro performs the actual allocation. % \begin{macrocode} -\cs_new_protected_nopar:Npn \alloc_reg:nNN #1#2#3 +\cs_new_protected:Npn \alloc_reg:nNN #1#2#3 { \chk_if_free_cs:N #3 \tex_global:D #2 #3 \tl_use:c { g_ #1 _allocation_tl } \scan_stop: @@ -247,7 +249,7 @@ % first but that needs an additional calculation.) There is a built-in % loop to handle reserved allocation positions. % \begin{macrocode} -\cs_new_protected_nopar:Npn \alloc_next:n #1 +\cs_new_protected:Npn \alloc_next:n #1 { \tl_gset:cx { g_ #1 _allocation_tl } { \int_eval:n { \tl_use:c { g_ #1 _allocation_tl } + 1 } } |