diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-10 21:47:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-10 21:47:35 +0000 |
commit | 632693bc68c5f9d12b8c4d13428ee05b3e3dba64 (patch) | |
tree | 770549832f7877df7170ecc803d636b81528af52 /Master/texmf-dist/tex/generic | |
parent | 79920ff1cab0432bde8e67f9b0b5b832113dd2e2 (diff) |
oberdiek (10jun16)
git-svn-id: svn://tug.org/texlive/trunk@41346 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
6 files changed, 54 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty index 93b99492946..5147bfefb75 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: atbegshi -%% Version: 2016/05/16 v1.17 +%% Version: 2016/06/09 v1.18 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% - [2016/05/16 v1.17 At begin shipout hook (HO)]% + [2016/06/09 v1.18 At begin shipout hook (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -470,8 +470,10 @@ X \endgroup \RequirePackage{ifpdf}[2011/01/30]% \fi \ifpdf - \def\AtBegShi@horigin{\pdfhorigin}% - \def\AtBegShi@vorigin{\pdfvorigin}% + \def\AtBegShi@horigin{% + \ifx\pdfhorigin\@undefined\pdfvariable horigin\else\pdfhorigin\fi}% + \def\AtBegShi@vorigin{% + \ifx\pdfvorigin\@undefined\pdfvariable vorigin\else\pdfvorigin\fi}% \else \def\AtBegShi@horigin{72.27pt}% \def\AtBegShi@vorigin{72.27pt}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index 60a208a8b7f..6a12c245b19 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -4561,7 +4561,7 @@ $ \x \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]% + [2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4732,7 +4732,7 @@ $ \x if tex.enableprimitives then tex.enableprimitives( 'pdf@', -{'primitive', 'ifprimitive', 'pdfdraftmode'} +{'primitive', 'ifprimitive', 'pdfdraftmode','draftmode'} ) tex.enableprimitives('', {'luaescapestring'}) end @@ -4755,14 +4755,15 @@ $ \x \fi \fi } -\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, LuaTeX -\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX -\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% LuaTeX -\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% LuaTeX -\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, LuaTeX -\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX -\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% LuaTeX -\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% LuaTeX +\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, oldLuaTeX +\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX, luatex +\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% oldLuaTeX +\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% oldLuaTeX +\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, oldLuaTeX +\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX, luatex +\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% oldLuaTeX +\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% oldLuaTeX +\ifluatex\else \begingroup \expandafter\ifx\csname pdf@primitive\endcsname\relax \else @@ -4786,6 +4787,7 @@ $ \x \fi \fi \endgroup +\fi \begingroup \@PackageInfoNoLine{pdftexcmds}{% \string\pdf@primitive\space is % @@ -4867,6 +4869,9 @@ $ \x \fi } \ifluatex +\ifx\pdfdraftmode\@undefined +\let\pdfdraftmode\draftmode +\fi \else \pdf@isprimitive \fi @@ -4962,7 +4967,7 @@ $ \x \fi \fi \begingroup -\def\x{2016/05/10 v0.21}% +\def\x{2016/05/21 v0.22}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty index 9a94cb6d510..db753d2d137 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty @@ -1470,7 +1470,7 @@ \fi \expandafter\x\csname ver@atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% - [2016/05/16 v1.17 At begin shipout hook (HO)]% + [2016/06/09 v1.18 At begin shipout hook (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -1837,8 +1837,10 @@ X \endgroup \RequirePackage{ifpdf}[2011/01/30]% \fi \ifpdf -\def\AtBegShi@horigin{\pdfhorigin}% -\def\AtBegShi@vorigin{\pdfvorigin}% +\def\AtBegShi@horigin{% +\ifx\pdfhorigin\@undefined\pdfvariable horigin\else\pdfhorigin\fi}% +\def\AtBegShi@vorigin{% +\ifx\pdfvorigin\@undefined\pdfvariable vorigin\else\pdfvorigin\fi}% \else \def\AtBegShi@horigin{72.27pt}% \def\AtBegShi@vorigin{72.27pt}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty index d4444f6cd8b..7c323fe9c4f 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdfcol -%% Version: 2016/05/16 v1.3 +%% Version: 2016/05/17 v1.4 %% %% Copyright (C) 2007 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@pdfcol.sty\endcsname \ProvidesPackage{pdfcol}% - [2016/05/16 v1.3 Handle new color stacks for pdfTeX (HO)]% + [2016/05/17 v1.4 Handle new color stacks for pdfTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -154,6 +154,9 @@ \RequirePackage{#1}[{#2}]% }% \fi +\ifx\pdfextension\@undefined\else + \PDFCOL@RequirePackage{luatex85}[2016/01/01] +\fi \PDFCOL@RequirePackage{ltxcmds}[2010/03/01] \ltx@newif\ifpdfcolAvailable \pdfcolAvailabletrue diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfrender.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfrender.sty index 1e907266a63..2f504fb6fac 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfrender.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfrender.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdfrender -%% Version: 2016/05/14 v1.3 +%% Version: 2016/05/17 v1.4 %% %% Copyright (C) 2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver@pdfrender.sty\endcsname \ProvidesPackage{pdfrender}% - [2016/05/14 v1.3 Access to some PDF graphics parameters (HO)]% + [2016/05/17 v1.4 Access to some PDF graphics parameters (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -158,9 +158,6 @@ \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{124}{12}% | -\ifx\pdfextension\@undefined\else - \RequirePackage{luatex85} -\fi \def\PdfRender@AtEndHook{} \expandafter\def\expandafter\PdfRender@AtEnd\expandafter{% \expandafter\PdfRender@AtEndHook @@ -202,6 +199,9 @@ \else \let\PdfRender@RequirePackage\RequirePackage \fi +\ifx\pdfextension\@undefined\else + \PdfRender@RequirePackage{luatex85}[2016/01/01] +\fi \PdfRender@RequirePackage{ifpdf}[2010/01/28] \PdfRender@RequirePackage{infwarerr}[2007/09/09] \PdfRender@RequirePackage{ltxcmds}[2010/01/28] diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty index e9c72178ce6..ab001ad2b7f 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: 2016/05/10 v0.21 +%% Version: 2016/05/21 v0.22 %% %% 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}% - [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]% + [2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -275,7 +275,7 @@ if tex.enableprimitives then tex.enableprimitives( 'pdf@', - {'primitive', 'ifprimitive', 'pdfdraftmode'} + {'primitive', 'ifprimitive', 'pdfdraftmode','draftmode'} ) tex.enableprimitives('', {'luaescapestring'}) end @@ -298,14 +298,15 @@ \fi \fi } -\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, LuaTeX -\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX -\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% LuaTeX -\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% LuaTeX -\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, LuaTeX -\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX -\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% LuaTeX -\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% LuaTeX +\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, oldLuaTeX +\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX, luatex +\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% oldLuaTeX +\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% oldLuaTeX +\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, oldLuaTeX +\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX, luatex +\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% oldLuaTeX +\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% oldLuaTeX +\ifluatex\else \begingroup \expandafter\ifx\csname pdf@primitive\endcsname\relax \else @@ -329,6 +330,7 @@ \fi \fi \endgroup +\fi \begingroup \@PackageInfoNoLine{pdftexcmds}{% \string\pdf@primitive\space is % @@ -410,6 +412,9 @@ \fi } \ifluatex +\ifx\pdfdraftmode\@undefined + \let\pdfdraftmode\draftmode +\fi \else \pdf@isprimitive \fi @@ -505,7 +510,7 @@ \fi \fi \begingroup - \def\x{2016/05/10 v0.21}% + \def\x{2016/05/21 v0.22}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% |