From 0d43493d2610ea59a6611ae9b2b494bca3d7c4fd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 4 Oct 2015 22:26:32 +0000 Subject: luatexbase (4oct15) git-svn-id: svn://tug.org/texlive/trunk@38550 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/luatex/luatexbase/luatexbase-attr.sty | 2 +- .../tex/luatex/luatexbase/luatexbase-cctb.sty | 2 +- .../tex/luatex/luatexbase/luatexbase-compat.sty | 2 +- .../tex/luatex/luatexbase/luatexbase-loader.sty | 2 +- .../tex/luatex/luatexbase/luatexbase-mcb.sty | 2 +- .../tex/luatex/luatexbase/luatexbase-modutils.sty | 2 +- .../tex/luatex/luatexbase/luatexbase-regs.sty | 2 +- .../texmf-dist/tex/luatex/luatexbase/luatexbase.sty | 21 ++++++++++++++++----- 8 files changed, 23 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/luatex/luatexbase') diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty index 7b9c09933c6..5bd229cfd5f 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty @@ -4,7 +4,7 @@ #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}} \fi \ProvidesPackage{luatexbase-attr} -[2015/10/03 v1.2 +[2015/10/04 v1.3 luatexbase interface to LuaTeX (legacy subpackage) ] \ifx\RequirePackage\undefined diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty index 8e539217838..b49771228a4 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty @@ -4,7 +4,7 @@ #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}} \fi \ProvidesPackage{luatexbase-cctb} -[2015/10/03 v1.2 +[2015/10/04 v1.3 luatexbase interface to LuaTeX (legacy subpackage) ] \ifx\RequirePackage\undefined diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty index cb82d8df58e..b7e3e105573 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty @@ -4,7 +4,7 @@ #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}} \fi \ProvidesPackage{luatexbase-compat} -[2015/10/03 v1.2 +[2015/10/04 v1.3 luatexbase interface to LuaTeX (legacy subpackage) ] \ifx\RequirePackage\undefined diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty index 87fb3699c1b..600fea502fc 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty @@ -4,7 +4,7 @@ #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}} \fi \ProvidesPackage{luatexbase-loader} -[2015/10/03 v1.2 +[2015/10/04 v1.3 luatexbase interface to LuaTeX (legacy subpackage) ] \ifx\RequirePackage\undefined diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty index afd7cbf25d9..cda38f7675e 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty @@ -4,7 +4,7 @@ #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}} \fi \ProvidesPackage{luatexbase-mcb} -[2015/10/03 v1.2 +[2015/10/04 v1.3 luatexbase interface to LuaTeX (legacy subpackage) ] \ifx\RequirePackage\undefined diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty index 4cf39258138..2a36764c2b7 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty @@ -4,7 +4,7 @@ #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}} \fi \ProvidesPackage{luatexbase-modutils} -[2015/10/03 v1.2 +[2015/10/04 v1.3 luatexbase interface to LuaTeX (legacy subpackage) ] \ifx\RequirePackage\undefined diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty index 4ec7445c004..9cd43f33623 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty @@ -4,7 +4,7 @@ #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}} \fi \ProvidesPackage{luatexbase-regs} -[2015/10/03 v1.2 +[2015/10/04 v1.3 luatexbase interface to LuaTeX (legacy subpackage) ] \ifx\RequirePackage\undefined diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty index f485efd2898..a3416152758 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty @@ -5,7 +5,7 @@ #1#2[#3]{\endgroup\immediate\write-1{Package: #1 #3}} \fi \ProvidesPackage{luatexbase} -[2015/10/03 v1.2 +[2015/10/04 v1.3 luatexbase interface to LuaTeX ] \edef\emuatcatcode{\the\catcode`\@} @@ -122,10 +122,10 @@ luatexbase.is_active_callback = luatexbase.in_callback luatexbase.base_provides_module=luatexbase.provides_module function luatexbase.errwarinf(name) return - function(s) return luatexbase.module_error(name, s) end, - function(s) return luatexbase.module_warning(name, s) end, - function(s) return luatexbase.module_info(name, s) end, - function(s) return luatexbase.module_info(name, s) end + function(s,...) return luatexbase.module_error(name, s:format(...)) end, + function(s,...) return luatexbase.module_warning(name, s:format(...)) end, + function(s,...) return luatexbase.module_info(name, s:format(...)) end, + function(s,...) return luatexbase.module_info(name, s:format(...)) end end function luatexbase.provides_module(info) luatexbase.base_provides_module(info) @@ -145,6 +145,17 @@ end {\catcode`\%=12 \gdef\@percentchar{%}} \fi \directlua{% +local copynode = node.copy +local newnode = node.new +local nodesubtype = node.subtype +local nodetype = node.id +local stringformat = string.format +local tableunpack = unpack or table.unpack +local texiowrite_nl = texio.write_nl +local texiowrite = texio.write +local whatsit_t = nodetype"whatsit" +local user_defined_t = nodesubtype"user_defined" +local unassociated = "__unassociated" local user_whatsits = { __unassociated = { } } local whatsit_ids = { } local anonymous_whatsits = 0 -- cgit v1.2.3