summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-04 22:26:32 +0000
committerKarl Berry <karl@freefriends.org>2015-10-04 22:26:32 +0000
commit0d43493d2610ea59a6611ae9b2b494bca3d7c4fd (patch)
tree5c4b626d59342d916e6ab1b9ada5f0b57d7aa689
parentdf227257473b435c063d95133438434400e00a9c (diff)
luatexbase (4oct15)
git-svn-id: svn://tug.org/texlive/trunk@38550 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdfbin263269 -> 263467 bytes
-rw-r--r--Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx27
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-regs.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty21
10 files changed, 44 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdf
index 9138c0c560f..71626c18736 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx b/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx
index 5dc0e37e520..a00e9481d15 100644
--- a/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx
+++ b/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx
@@ -30,7 +30,7 @@
\ProvidesFile{luatexbase.dtx}
%</driver>
%<*tex,sty>
-[2015/10/03 v1.2
+[2015/10/04 v1.3
%</tex,sty>
%<emu> luatexbase interface to LuaTeX
%<emu-cmp> luatexbase interface to LuaTeX (legacy subpackage)
@@ -259,7 +259,8 @@
%
% The returned functions are all instances of the functions provided by
% the kernel: |module_error|,
-% |module_warning| and |module_info|.
+% |module_warning| and |module_info|, They all use their first argument
+% as a format string fo rany later arguments.
%
% \DescribeMacro{errwarinf}\meta{name}\\
% Returns four error and warning functions associated with \meta{name}
@@ -547,14 +548,16 @@ luatexbase.is_active_callback = luatexbase.in_callback
%
% \textsf{ltluatex} implementation of |provides_module| does not return
% print functions so define modified version here.
+% \changes{v1.3}{2015/10/03}{Use the first argument as a format string for
+% later arguments}
% \begin{macrocode}
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)
@@ -583,6 +586,7 @@ end
{\catcode`\%=12 \gdef\@percentchar{%}}
\fi
% \end{macrocode}
+% \changes{v1.2a}{2015/10/03}{Add missing local definitions for whatsit code}
%
% \begin{macrocode}
%<*whatsit>
@@ -590,6 +594,17 @@ end
% \end{macrocode}
%
% \begin{macrocode}
+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
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