[latex3-commits] [l3svn] branch master updated: ltluatex now parameterises some variables

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

The following commit(s) were added to refs/heads/master by this push:
       new  c1037e9   ltluatex now parameterises some variables
c1037e9 is described below

commit c1037e9ac0455171d4b1d3aa1e4b2d31ef818e41
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Feb 18 18:08:08 2017 +0000

    ltluatex now parameterises some variables
    
    This avoids needing to use 2e-style names for this L3 code:
    needs a just-updated ltluatex!
---
 l3kernel/l3alloc.dtx  |   21 +++++++++------------
 l3kernel/l3luatex.dtx |    4 ++++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/l3kernel/l3alloc.dtx b/l3kernel/l3alloc.dtx
index 9be0886..9132f6d 100644
--- a/l3kernel/l3alloc.dtx
+++ b/l3kernel/l3alloc.dtx
@@ -118,24 +118,21 @@
 %
 % \begin{variable}
 %   {
-%     \e at alloc@attribute at count ,
-%     \e at alloc@whatsit at count   ,
-%     \e at alloc@bytecode at count  ,
-%     \e at alloc@luachunk at count
+%     \g_@@_attribute_int ,
+%     \g_@@_bytecode_int  ,
+%     \g_@@_chunkname_int ,
+%     \g_@@_whatsit_int
 %   }
 %   To allow \LuaTeX{} to load |ltluatex.lua| for generic \Lua{} support, a
 %   small number of counts have to be correctly named at the \TeX{} level.
 %   At present there are no \pkg{expl3} allocators for these concepts so the
-%   numbers, \emph{etc.}, may well change here.
+%   names and numbers of the tracking variables may change.
 %    \begin{macrocode}
 \etex_ifdefined:D \luatex_luatexversion:D
-  \group_begin:
-    \tex_catcode:D `\@ = 11 ~
-    \tex_global:D \tex_countdef:D \e at alloc@attribute at count = 21 ~
-    \tex_global:D \tex_countdef:D \e at alloc@whatsit at count   = 22 ~
-    \tex_global:D \tex_countdef:D \e at alloc@bytecode at count  = 23 ~
-    \tex_global:D \tex_countdef:D \e at alloc@luachunk at count  = 24 ~
-  \group_end:
+  \tex_global:D \tex_countdef:D \g_@@_attribute_int = 21 ~
+  \tex_global:D \tex_countdef:D \g_@@_bytecode_int   = 22 ~
+  \tex_global:D \tex_countdef:D \g_@@_chunkname_int  = 23 ~
+  \tex_global:D \tex_countdef:D \g_@@_whatsit_int  = 24 ~
 \tex_fi:D
 %    \end{macrocode}
 % \end{variable}
diff --git a/l3kernel/l3luatex.dtx b/l3kernel/l3luatex.dtx
index baef9af..3c69cd9 100644
--- a/l3kernel/l3luatex.dtx
+++ b/l3kernel/l3luatex.dtx
@@ -286,6 +286,10 @@ l3kernel.charcat = charcat
 % A small amount of generic code is used by almost all \LuaTeX{} material so
 % needs to be loaded by the format.
 %    \begin{macrocode}
+local attribute_count_name = "g__alloc_attribute_int"
+local bytecode_count_name  = "g__alloc_bytecode_int"
+local chunkname_count_name = "g__alloc_chunkname_int"
+local whatsit_count_name   = "g__alloc_whatsit_int"
 require("ltluatex")
 %    \end{macrocode}
 %

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.