summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-11 21:38:01 +0000
committerKarl Berry <karl@freefriends.org>2016-05-11 21:38:01 +0000
commite0a2526f2f8befb2815eab43bb68ff44b35eee66 (patch)
tree0e254844aad8eb282b13b0575b264a8590a853bb /Master/texmf-dist
parent01058baf49ee1750accac90a502d1df4f4c7c2c8 (diff)
oberdiek (10may16)
git-svn-id: svn://tug.org/texlive/trunk@41047 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdfbin0 -> 147380 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/luatex.pdfbin220146 -> 381526 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdfbin252678 -> 390707 bytes
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/luatex-test1.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/luatex-test2.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/luatex-test3.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/luatex-test4.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/luatex-test5.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-escape.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-shell.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test1.tex2
-rw-r--r--Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test2.tex2
-rw-r--r--Master/texmf-dist/scripts/oberdiek/oberdiek.luatex.lua13
-rw-r--r--Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua12
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/hologo-eroux.patch23
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx4
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/luatex.dtx39
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/oberdiek.ins3
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdftexcmds-eroux.patch77
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx26
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty16
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/hologo.sty12
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty48
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty4
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/luatex.sty12
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty6
26 files changed, 143 insertions, 170 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf
new file mode 100644
index 00000000000..bafaed1874e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf b/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf
index 5e3bd29c561..0d8bdfea034 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf
index 7daade9a6b0..71c64b60bbe 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf
+++ b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test1.tex
index 6f025f679e3..9badc46cbb8 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test1.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test1.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: luatex
-%% Version: 2010/03/09 v0.4
+%% Version: 2016/05/10 v0.5
%%
%% Copyright (C) 2007, 2009, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test2.tex
index 5b991af3228..daf49ec5f27 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test2.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test2.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: luatex
-%% Version: 2010/03/09 v0.4
+%% Version: 2016/05/10 v0.5
%%
%% Copyright (C) 2007, 2009, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test3.tex b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test3.tex
index 517ba0e7976..a660ba12f5d 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test3.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test3.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: luatex
-%% Version: 2010/03/09 v0.4
+%% Version: 2016/05/10 v0.5
%%
%% Copyright (C) 2007, 2009, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test4.tex b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test4.tex
index f93b2dd9d42..3d15e7f8b2b 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test4.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test4.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: luatex
-%% Version: 2010/03/09 v0.4
+%% Version: 2016/05/10 v0.5
%%
%% Copyright (C) 2007, 2009, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test5.tex b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test5.tex
index 9593bd09b1d..fd3952e4b90 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test5.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/luatex-test5.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: luatex
-%% Version: 2010/03/09 v0.4
+%% Version: 2016/05/10 v0.5
%%
%% Copyright (C) 2007, 2009, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-escape.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-escape.tex
index 28e7be466a5..94135794b5c 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-escape.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-escape.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pdftexcmds
-%% Version: 2011/11/29 v0.20
+%% Version: 2016/05/10 v0.21
%%
%% Copyright (C) 2007, 2009-2011 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-shell.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-shell.tex
index 573240cd6ad..68ad6b2cb84 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-shell.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test-shell.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pdftexcmds
-%% Version: 2011/11/29 v0.20
+%% Version: 2016/05/10 v0.21
%%
%% Copyright (C) 2007, 2009-2011 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test1.tex
index 581c54bacce..f3259977479 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test1.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test1.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pdftexcmds
-%% Version: 2011/11/29 v0.20
+%% Version: 2016/05/10 v0.21
%%
%% Copyright (C) 2007, 2009-2011 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test2.tex
index ab9f530f70b..0116c5cf739 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test2.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdftexcmds-test2.tex
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pdftexcmds
-%% Version: 2011/11/29 v0.20
+%% Version: 2016/05/10 v0.21
%%
%% Copyright (C) 2007, 2009-2011 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/scripts/oberdiek/oberdiek.luatex.lua b/Master/texmf-dist/scripts/oberdiek/oberdiek.luatex.lua
index 8b933c0f577..10859f7f0f7 100644
--- a/Master/texmf-dist/scripts/oberdiek/oberdiek.luatex.lua
+++ b/Master/texmf-dist/scripts/oberdiek/oberdiek.luatex.lua
@@ -6,12 +6,12 @@
--
-- luatex.dtx (with options: `lua')
--
--- This (was) a generated file.
+-- This is a generated file.
--
-- Project: luatex
--- Version: 2013/04/28 v0.4-roux
+-- Version: 2016/05/10 v0.5
--
--- Copyright (C) 2007, 2009, 2010, 2013, 2014 by
+-- Copyright (C) 2007, 2009, 2010 by
-- Heiko Oberdiek <heiko.oberdiek at googlemail.com>
--
-- This work may be distributed and/or modified under the
@@ -47,14 +47,11 @@ function kpse_module_loader(module)
texio.write_nl("(" .. file .. ")")
return loader
end
- return "\n\t[oberdiek.luatex.kpse_module_loader]-eroux Loading error:\n\t"
+ return "\n\t[oberdiek.luatex.kpse_module_loader] Loading error:\n\t"
.. error
end
- return "\n\t[oberdiek.luatex.kpse_module_loader]-eroux Search failed"
+ return "\n\t[oberdiek.luatex.kpse_module_loader] Search failed"
end
--- following line changed to use package.searchers instead of
--- package.loaders for current luatex; this is the only change in the
--- code. eroux, 28apr13, (or package.loaders), 29mar14.
table.insert(package.searchers or package.loaders, kpse_module_loader)
--
-- End of File `oberdiek.luatex.lua'.
diff --git a/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua b/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua
index db03beeda95..a5aefbe514f 100644
--- a/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua
+++ b/Master/texmf-dist/scripts/oberdiek/pdftexcmds.lua
@@ -6,12 +6,12 @@
--
-- pdftexcmds.dtx (with options: `lua')
--
--- This (was) a generated file.
+-- This is a generated file.
--
-- Project: pdftexcmds
--- Version: 2013/04/28 v0.20-eroux
+-- Version: 2016/05/10 v0.21
--
--- Copyright (C) 2007, 2009-2011, 2013 by
+-- Copyright (C) 2007, 2009-2011 by
-- Heiko Oberdiek <heiko.oberdiek at googlemail.com>
--
-- This work may be distributed and/or modified under the
@@ -41,9 +41,7 @@
module("oberdiek.pdftexcmds", package.seeall)
local systemexitstatus
function getversion()
- tex.write("2011/11/29 v0.20")
- -- could not change above version string due to runtime version checks.
- -- eroux/karl, 28apr13
+ tex.write("2016/05/10 v0.21")
end
function strcmp(A, B)
if A == B then
@@ -152,8 +150,6 @@ function unescapehex(str, mode, patch)
end
result = utf8
end
- -- this next line added for current luatex; this is the only
- -- change in the file. eroux, 28apr13.
local unpack = _G["unpack"] or table.unpack
tex.settoks(toks, string.char(unpack(result)))
end
diff --git a/Master/texmf-dist/source/latex/oberdiek/hologo-eroux.patch b/Master/texmf-dist/source/latex/oberdiek/hologo-eroux.patch
deleted file mode 100644
index 9b0b4ac84c0..00000000000
--- a/Master/texmf-dist/source/latex/oberdiek/hologo-eroux.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- hologo-old.dtx 2013-05-13 16:33:39.000000000 +0200
-+++ hologo-new.dtx 2013-05-13 16:31:27.000000000 +0200
-@@ -2689,12 +2689,16 @@
- \def\HOLOGO@IfCharExists#1{%
- \ifnum
- \directlua{%
-- if font and font.fonts and font.current then %
-- local f = font.fonts[font.current()]%
-+ if luaotfload and luaotfload.aux then %
-+ if luaotfload.aux.font_has_glyph(font.current(), \number#1) then %
-+ tex.print("1") %
-+ end %
-+ elseif font and font.fonts and font.current then %
-+ local f = font.fonts[font.current()] %
- if f.characters and f.characters[\number#1] then %
-- tex.print("1")%
-+ tex.print("1") %
- end %
-- end%
-+ end %
- }0=\ltx@zero
- \expandafter\ltx@secondoftwo
- \else
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
index 9ab7d2ea5ee..e4e205d8224 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
@@ -1,6 +1,6 @@
% \iffalse
%% Source File: ifpdf.dtx
-%% Copyright 2016 LaTeX3 project
+%% Copyright 2016 Heiko Oberdiek and LaTeX3 project
%%
%% This file may be distributed under the terms of the LPPL.
%% See README for details.
@@ -31,7 +31,7 @@
% \title{The \textsf{ifpdf} Package\thanks{This file
% has version number \fileversion, last
% revised \filedate.
-% Please report any issues at https://github.com/davidcarlisle/ifpdf/issues}}
+% Please report any issues at https://github.com/ho-tex/oberdiek/issues}}
% \author{LaTeX3 project}
% \date{\filedate}
% \maketitle
diff --git a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx
index c5e43771787..5b525d60304 100644
--- a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% File: luatex.dtx
-% Version: 2010/03/09 v0.4
+% Version: 2016/05/10 v0.5
% Info: LuaTeX basic definition package
%
% Copyright (C) 2007, 2009, 2010 by
@@ -87,7 +87,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: luatex 2010/03/09 v0.4 LuaTeX basic definition package (HO)}
+\Msg{* Package: luatex 2016/05/10 v0.5 LuaTeX basic definition package (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -99,7 +99,7 @@
This is a generated file.
Project: luatex
-Version: 2010/03/09 v0.4
+Version: 2016/05/10 v0.5
Copyright (C) 2007, 2009, 2010 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -186,7 +186,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luatex.drv}%
- [2010/03/09 v0.4 LuaTeX basic definition package (HO)]%
+ [2016/05/10 v0.5 LuaTeX basic definition package (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\usepackage{paralist}
@@ -196,7 +196,6 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1429}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -217,7 +216,7 @@ and the derived files
% \GetFileInfo{luatex.drv}
%
% \title{The \xpackage{luatex} package}
-% \date{2010/03/09 v0.4}
+% \date{2016/05/10 v0.5}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -572,7 +571,7 @@ and the derived files
\fi
\expandafter\x\csname ver@luatex.sty\endcsname
\ProvidesPackage{luatex}%
- [2010/03/09 v0.4 LuaTeX basic definition package (HO)]%
+ [2016/05/10 v0.5 LuaTeX basic definition package (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -952,6 +951,7 @@ and the derived files
% \end{macro}
% \begin{macro}{\newattribute}
% \begin{macrocode}
+\ifx\newattribute\@undefined
\LuT@newcommand\newattribute[1]{%
\ifnum\LuT@AllocAttribute<65535 %
\global\advance\LuT@AllocAttribute\@ne
@@ -963,6 +963,7 @@ and the derived files
\errmessage{No room for a new \string\attribute}%
\fi
}
+\fi
% \end{macrocode}
% \end{macro}
%
@@ -970,13 +971,16 @@ and the derived files
%
% \begin{macro}{\setattribute}
% \begin{macrocode}
+\ifx\setattribute\@undefined
\LuT@newcommand\setattribute[2]{%
#1=\numexpr#2\relax
}
+\fi
% \end{macrocode}
% \end{macro}
% \begin{macro}{\unsetattribute}
% \begin{macrocode}
+\ifx\unsetattribute\@undefined
\ifnum\luatexversion<37
\LuT@newcommand\LuT@UnsetAttributeValue[0]{}%
\let\LuT@UnsetAttributeValue\m@ne
@@ -986,6 +990,7 @@ and the derived files
\LuT@newcommand\unsetattribute[1]{%
#1=\LuT@UnsetAttributeValue
}
+\fi
% \end{macrocode}
% \end{macro}
%
@@ -1003,6 +1008,7 @@ and the derived files
% \end{macro}
% \begin{macro}{\newcatcodetable}
% \begin{macrocode}
+\ifx\newcatcodetable\@undefined
\LuT@newcommand\newcatcodetable[1]{%
\ifnum\LuT@AllocCatcodeTable<1114110 % 0x10FFFF is maximal \chardef
% or < 268435455 % 2^28 - 1
@@ -1016,6 +1022,7 @@ and the derived files
\errmessage{No room for a new \string\catcodetable}%
\fi
}%
+\fi
% \end{macrocode}
% \end{macro}
%
@@ -1268,7 +1275,7 @@ and the derived files
\fi
\expandafter\x\csname ver@luatex-loader.sty\endcsname
\ProvidesPackage{luatex-loader}%
- [2010/03/09 v0.4 Lua module loader (HO)]%
+ [2016/05/10 v0.5 Lua module loader (HO)]%
% \end{macrocode}
% \begin{macrocode}
\begingroup\catcode61\catcode48\catcode32=10\relax%
@@ -1345,7 +1352,12 @@ function kpse_module_loader(module)
end
return "\n\t[oberdiek.luatex.kpse_module_loader] Search failed"
end
-table.insert(package.loaders, kpse_module_loader)
+% \end{macrocode}
+% following line changed to use package.searchers instead of
+% package.loaders for current luatex; this is the only change in the
+% code. eroux, 28apr13, (or package.loaders), 29mar14.
+% \begin{macrocode}
+table.insert(package.searchers or package.loaders, kpse_module_loader)
% \end{macrocode}
% \begin{macrocode}
%</lua>
@@ -1886,7 +1898,7 @@ table.insert(package.loaders, kpse_module_loader)
<authorref id='auth:oberdiek'/>
<copyright owner='Heiko Oberdiek' year='2007,2009,2010'/>
<license type='lppl1.3'/>
- <version number='0.4'/>
+ <version number='0.5'/>
<description>
LuaTeX is an extended version of pdfTeX using Lua as an embedded
scripting language. The LuaTeX project&#x2019;s main objective
@@ -1935,6 +1947,13 @@ table.insert(package.loaders, kpse_module_loader)
% \item
% Calling tex.enableprimitives for used primitives.
% \end{Version}
+% \begin{Version}{2016/05/10 v0.5}
+% \item
+% Use package.searchers
+% \item only conditionally define commands such as
+% \verb|\newcatcodetable|
+% that are now defined in the Lua\LaTeX\ format.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index 02880550112..de8a679be49 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
@@ -65,8 +65,7 @@
\batchinput{ifdraft.dtx}
\batchinput{iflang.dtx}
\batchinput{ifluatex.dtx}
-% incompatible with current luatex
-%\batchinput{ifpdf.dtx}
+\batchinput{ifpdf.dtx}
\batchinput{ifvtex.dtx}
\batchinput{infwarerr.dtx}
\batchinput{inputenx.dtx}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds-eroux.patch b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds-eroux.patch
deleted file mode 100644
index 671dfb5b6b3..00000000000
--- a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds-eroux.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: pdftexcmds.lua
-===================================================================
---- pdftexcmds.lua (revision 30140)
-+++ pdftexcmds.lua (working copy)
-@@ -6,12 +6,12 @@
- --
- -- pdftexcmds.dtx (with options: `lua')
- --
---- This is a generated file.
-+-- This (was) a generated file.
- --
- -- Project: pdftexcmds
---- Version: 2011/11/29 v0.20
-+-- Version: 2013/04/28 v0.20-eroux
- --
---- Copyright (C) 2007, 2009-2011 by
-+-- Copyright (C) 2007, 2009-2011, 2013 by
- -- Heiko Oberdiek <heiko.oberdiek at googlemail.com>
- --
- -- This work may be distributed and/or modified under the
-@@ -42,6 +42,8 @@
- local systemexitstatus
- function getversion()
- tex.write("2011/11/29 v0.20")
-+ -- could not change above version string due to runtime version checks.
-+ -- eroux/karl, 28apr13
- end
- function strcmp(A, B)
- if A == B then
-@@ -150,6 +152,9 @@
- end
- result = utf8
- end
-+ -- this next line added for current luatex; this is the only
-+ -- change in the file. eroux, 28apr13.
-+ local unpack = _G["unpack"] or table.unpack
- tex.settoks(toks, string.char(unpack(result)))
- end
- function escapestring(str, mode)
-Index: oberdiek.luatex.lua
-===================================================================
---- oberdiek.luatex.lua (revision 30140)
-+++ oberdiek.luatex.lua (working copy)
-@@ -6,12 +6,12 @@
- --
- -- luatex.dtx (with options: `lua')
- --
---- This is a generated file.
-+-- This (was) a generated file.
- --
- -- Project: luatex
---- Version: 2010/03/09 v0.4
-+-- Version: 2013/04/28 v0.4-roux
- --
---- Copyright (C) 2007, 2009, 2010 by
-+-- Copyright (C) 2007, 2009, 2010, 2013 by
- -- Heiko Oberdiek <heiko.oberdiek at googlemail.com>
- --
- -- This work may be distributed and/or modified under the
-@@ -47,11 +47,14 @@
- texio.write_nl("(" .. file .. ")")
- return loader
- end
-- return "\n\t[oberdiek.luatex.kpse_module_loader] Loading error:\n\t"
-+ return "\n\t[oberdiek.luatex.kpse_module_loader]-eroux Loading error:\n\t"
- .. error
- end
-- return "\n\t[oberdiek.luatex.kpse_module_loader] Search failed"
-+ return "\n\t[oberdiek.luatex.kpse_module_loader]-eroux Search failed"
- end
--table.insert(package.loaders, kpse_module_loader)
-+-- following line changed to use package.searchers instead of
-+-- package.loaders for current luatex; this is the only change in the
-+-- code. eroux, 28apr13.
-+table.insert(package.searchers, kpse_module_loader)
- --
- -- End of File `oberdiek.luatex.lua'.
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
index 455f5b95d17..2e775889f46 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% File: pdftexcmds.dtx
-% Version: 2011/11/29 v0.20
+% Version: 2016/05/10 v0.21
% Info: Utility functions of pdfTeX for LuaTeX
%
% Copyright (C) 2007, 2009-2011 by
@@ -88,7 +88,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: pdftexcmds 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)}
+\Msg{* Package: pdftexcmds 2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -100,7 +100,7 @@
This is a generated file.
Project: pdftexcmds
-Version: 2011/11/29 v0.20
+Version: 2016/05/10 v0.21
Copyright (C) 2007, 2009-2011 by
Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -201,7 +201,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{pdftexcmds.drv}%
- [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\usepackage{paralist}
@@ -239,7 +239,7 @@ and the derived files
% \GetFileInfo{pdftexcmds.drv}
%
% \title{The \xpackage{pdftexcmds} package}
-% \date{2011/11/29 v0.20}
+% \date{2016/05/10 v0.21}
% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
%
% \maketitle
@@ -615,7 +615,7 @@ and the derived files
\fi
\expandafter\x\csname ver@pdftexcmds.sty\endcsname
\ProvidesPackage{pdftexcmds}%
- [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]%
% \end{macrocode}
%
% \subsection{Catcodes}
@@ -1153,7 +1153,7 @@ and the derived files
\fi
\fi
\begingroup
- \def\x{2011/11/29 v0.20}%
+ \def\x{2016/05/10 v0.21}%
\ltx@onelevel@sanitize\x
\edef\y{%
\pdftexcmds@directlua{%
@@ -1560,7 +1560,7 @@ and the derived files
module("oberdiek.pdftexcmds", package.seeall)
local systemexitstatus
function getversion()
- tex.write("2011/11/29 v0.20")
+ tex.write("2016/05/10 v0.21")
end
% \end{macrocode}
%
@@ -1678,6 +1678,11 @@ function unescapehex(str, mode, patch)
end
result = utf8
end
+% \end{macrocode}
+% this next line added for current luatex; this is the only
+% change in the file. eroux, 28apr13. (v 0.21)
+% \begin{macrocode}
+ local unpack = _G["unpack"] or table.unpack
tex.settoks(toks, string.char(unpack(result)))
end
% \end{macrocode}
@@ -2653,6 +2658,11 @@ end
% \cs{pdf@resettimer} and \cs{pdf@elapsedtime} added
% (thanks Andy Thomas).
% \end{Version}
+% \begin{Version}{2016/05/10 v0.21}
+% \item
+% local unpack added
+% (thanks \'{E}lie Roux).
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
index 2964ba0b6be..84fa473f009 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
@@ -39,7 +39,7 @@
%% This is a generated file.
%%
%% Project: hobsub
-%% Version: 2012/05/28 v1.13
+%% Version: 2012/04/25 v1.12
%%
%% Copyright (C) 2011, 2012 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -132,7 +132,7 @@
\fi
\expandafter\x\csname ver@hobsub-generic.sty\endcsname
\ProvidesPackage{hobsub-generic}%
- [2012/05/28 v1.13 Bundle oberdiek, subset generic (HO)]%
+ [2012/04/25 v1.12 Bundle oberdiek, subset generic (HO)]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5 % ^^M
\endlinechar=13 %
@@ -256,11 +256,11 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax
\immediate\write-1{%
- Package: hobsub 2012/05/28 v1.13 Construct package bundles (HO)%
+ Package: hobsub 2012/04/25 v1.12 Construct package bundles (HO)%
}%
\else
\ProvidesPackage{hobsub}%
- [2012/05/28 v1.13 Construct package bundles (HO)]%
+ [2012/04/25 v1.12 Construct package bundles (HO)]%
\fi
\endinput
<hobsub>
@@ -3402,7 +3402,7 @@ $ \next
\hobsub@StopPackage
\hobsub@StartPackage{ifpdf}
%% Source File: ifpdf.dtx
-%% Copyright 2016 LaTeX3 project
+%% Copyright 2016 Heiko Oberdiek and LaTeX3 project
%%
%% This file may be distributed under the terms of the LPPL.
%% See README for details.
@@ -4455,7 +4455,7 @@ $ \x
\fi
\expandafter\x\csname ver@luatex-loader.sty\endcsname
\ProvidesPackage{luatex-loader}%
- [2010/03/09 v0.4 Lua module loader (HO)]%
+ [2016/05/10 v0.5 Lua module loader (HO)]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5\endlinechar=13\relax%
\catcode10=12 % ^^J
@@ -4560,7 +4560,7 @@ $ \x
\fi
\expandafter\x\csname ver@pdftexcmds.sty\endcsname
\ProvidesPackage{pdftexcmds}%
- [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5 % ^^M
\endlinechar=13 %
@@ -4961,7 +4961,7 @@ $ \x
\fi
\fi
\begingroup
-\def\x{2011/11/29 v0.20}%
+\def\x{2016/05/10 v0.21}%
\ltx@onelevel@sanitize\x
\edef\y{%
\pdftexcmds@directlua{%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty
index 29167201e6a..642bce61e03 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty
@@ -1337,16 +1337,12 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
\def\HOLOGO@IfCharExists#1{%
\ifnum
\directlua{%
- if luaotfload and luaotfload.aux then %
- if luaotfload.aux.font_has_glyph(font.current(), \number#1) then %
- tex.print("1") %
- end %
- elseif font and font.fonts and font.current then %
- local f = font.fonts[font.current()] %
+ if font and font.fonts and font.current then %
+ local f = font.fonts[font.current()]%
if f.characters and f.characters[\number#1] then %
- tex.print("1") %
+ tex.print("1")%
end %
- end %
+ end%
}0=\ltx@zero
\expandafter\ltx@secondoftwo
\else
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty
new file mode 100644
index 00000000000..55a25a8b577
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty
@@ -0,0 +1,48 @@
+%%
+%% This is file `ifpdf.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ifpdf.dtx (with options: `package')
+%%
+%% Source File: ifpdf.dtx
+%% Copyright 2016 Heiko Oberdiek and LaTeX3 project
+%%
+%% This file may be distributed under the terms of the LPPL.
+%% See README for details.
+\ifx\ProvidesPackage\undefined
+\def\next#1#2[#3]{\wlog{#2 #3}}
+\expandafter\next\fi
+\ProvidesPackage{ifpdf}
+[2016/04/04 v3.0 Provides the ifpdf switch]
+\expandafter\ifx\csname ifpdf\endcsname\relax
+ \csname newif\expandafter\endcsname\csname ifpdf\endcsname
+\else
+ \ifx\pdftrue\undefined
+ \ifx\PackageError\undefined
+ \begingroup\def\PackageError#1#2#3{\endgroup\errmessage{#2}}
+ \fi
+ \PackageError{ifpdf}{incompatible ifpdf definition}{}
+ \expandafter\expandafter\expandafter
+ \fi
+\fi
+\let\ifpdf\iffalse
+\ifx\directlua\undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdfoutput\endcsname\relax
+\else
+ \ifnum\pdfoutput>0 %
+ \pdftrue
+ \fi
+\fi
+\else
+\directlua{%
+if (tex.outputmode or tex.pdfoutput or 0) > 0 then
+ tex.print('\string\\pdftrue')
+end
+}
+\fi
+\endinput
+%%
+%% End of file `ifpdf.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty
index 677916f6e11..b8b6c88b202 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: luatex
-%% Version: 2010/03/09 v0.4
+%% Version: 2016/05/10 v0.5
%%
%% Copyright (C) 2007, 2009, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -103,7 +103,7 @@
\fi
\expandafter\x\csname ver@luatex-loader.sty\endcsname
\ProvidesPackage{luatex-loader}%
- [2010/03/09 v0.4 Lua module loader (HO)]%
+ [2016/05/10 v0.5 Lua module loader (HO)]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5\endlinechar=13\relax%
\catcode10=12 % ^^J
diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex.sty
index 2cf3f09d128..1a6697d552a 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/luatex.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: luatex
-%% Version: 2010/03/09 v0.4
+%% Version: 2016/05/10 v0.5
%%
%% Copyright (C) 2007, 2009, 2010 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -103,7 +103,7 @@
\fi
\expandafter\x\csname ver@luatex.sty\endcsname
\ProvidesPackage{luatex}%
- [2010/03/09 v0.4 LuaTeX basic definition package (HO)]%
+ [2016/05/10 v0.5 LuaTeX basic definition package (HO)]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5 % ^^M
\endlinechar=13 %
@@ -360,6 +360,7 @@
\fi
\newcount\LuT@AllocAttribute
\LuT@AllocAttribute=\m@ne
+\ifx\newattribute\@undefined
\LuT@newcommand\newattribute[1]{%
\ifnum\LuT@AllocAttribute<65535 %
\global\advance\LuT@AllocAttribute\@ne
@@ -371,9 +372,13 @@
\errmessage{No room for a new \string\attribute}%
\fi
}
+\fi
+\ifx\setattribute\@undefined
\LuT@newcommand\setattribute[2]{%
#1=\numexpr#2\relax
}
+\fi
+\ifx\unsetattribute\@undefined
\ifnum\luatexversion<37
\LuT@newcommand\LuT@UnsetAttributeValue[0]{}%
\let\LuT@UnsetAttributeValue\m@ne
@@ -383,10 +388,12 @@
\LuT@newcommand\unsetattribute[1]{%
#1=\LuT@UnsetAttributeValue
}
+\fi
\newcount\LuT@AllocCatcodeTable
\LuT@AllocCatcodeTable=\m@ne
\newcount\CatcodeTableStack
\CatcodeTableStack=\z@
+\ifx\newcatcodetable\@undefined
\LuT@newcommand\newcatcodetable[1]{%
\ifnum\LuT@AllocCatcodeTable<1114110 % 0x10FFFF is maximal \chardef
% or < 268435455 % 2^28 - 1
@@ -400,6 +407,7 @@
\errmessage{No room for a new \string\catcodetable}%
\fi
}%
+\fi
\LuT@newcommand\IncCatcodeTableStack[0]{%
\ifnum\CatcodeTableStack<268435454 %
\global\advance\CatcodeTableStack by\tw@
diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
index b2b48f13ab7..e9c72178ce6 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Project: pdftexcmds
-%% Version: 2011/11/29 v0.20
+%% Version: 2016/05/10 v0.21
%%
%% Copyright (C) 2007, 2009-2011 by
%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -104,7 +104,7 @@
\fi
\expandafter\x\csname ver@pdftexcmds.sty\endcsname
\ProvidesPackage{pdftexcmds}%
- [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]%
\begingroup\catcode61\catcode48\catcode32=10\relax%
\catcode13=5 % ^^M
\endlinechar=13 %
@@ -505,7 +505,7 @@
\fi
\fi
\begingroup
- \def\x{2011/11/29 v0.20}%
+ \def\x{2016/05/10 v0.21}%
\ltx@onelevel@sanitize\x
\edef\y{%
\pdftexcmds@directlua{%