From 8de464391f34ff48f5909697c17029955fab69ba Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Mar 2017 21:48:50 +0000 Subject: oberdiek (26mar17) git-svn-id: svn://tug.org/texlive/trunk@43610 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/oberdiek/hobsub-generic.sty | 25 +++++++------ Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty | 8 ++--- .../texmf-dist/tex/generic/oberdiek/pdftexcmds.sty | 41 +++++++++++----------- Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty | 11 +++--- 4 files changed, 42 insertions(+), 43 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index 6a12c245b19..95716b31369 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -3402,16 +3402,16 @@ $ \next \hobsub@StopPackage \hobsub@StartPackage{ifpdf} %% Source File: ifpdf.dtx -%% Copyright 2016 Heiko Oberdiek and LaTeX3 project +%% Copyright 2016-2017 Heiko Oberdiek and LaTeX3 project %% %% This file may be distributed under the terms of the LPPL. -%% See README for details. +%% https://www.latex-project.org/lppl/ \ifx\ProvidesPackage\undefined \def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef -\csname ver@ifpdf.sty\endcsname{#3}} +\csname ver\string @ifpdf.sty\endcsname{#3}} \expandafter\next\fi \ProvidesPackage{ifpdf} -[2016/05/14 v3.1 Provides the ifpdf switch] +[2017/03/15 v3.2 Provides the ifpdf switch] \expandafter\ifx\csname ifpdf\endcsname\relax \csname newif\expandafter\endcsname\csname ifpdf\endcsname \else @@ -4561,7 +4561,7 @@ $ \x \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)]% + [2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4936,6 +4936,7 @@ $ \x \else \expandafter\pdftexcmds@AtEnd \fi% +\ifnum\luatexversion<80 \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \def\TMP@RequirePackage#1[#2]{% @@ -4948,8 +4949,9 @@ $ \x \else \RequirePackage{luatex-loader}[2009/04/10]% \fi +\fi \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% } \ifnum\luatexversion>37 % \ifnum0% @@ -4961,13 +4963,13 @@ $ \x \everyjob\expandafter{% \the\everyjob \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% }% }% \fi \fi \begingroup -\def\x{2016/05/21 v0.22}% +\def\x{2017/03/19 v0.25}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -5164,11 +5166,8 @@ $ \x \fi \ifnum\luatexversion<68 % \else -\def\pdf@shellescape{% -\directlua0{% - oberdiek.pdftexcmds.shellescape()% -}% -}% +\protected\edef\pdf@shellescape{% +\numexpr\directlua{tex.sprint(status.shell_escape)}\relax} \fi \def\pdf@system#1{% \directlua0{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty index 4aea4bbb5b4..0dad5060810 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty @@ -7,16 +7,16 @@ %% ifpdf.dtx (with options: `package') %% %% Source File: ifpdf.dtx -%% Copyright 2016 Heiko Oberdiek and LaTeX3 project +%% Copyright 2016-2017 Heiko Oberdiek and LaTeX3 project %% %% This file may be distributed under the terms of the LPPL. -%% See README for details. +%% https://www.latex-project.org/lppl/ \ifx\ProvidesPackage\undefined \def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef -\csname ver@ifpdf.sty\endcsname{#3}} +\csname ver\string @ifpdf.sty\endcsname{#3}} \expandafter\next\fi \ProvidesPackage{ifpdf} -[2016/05/14 v3.1 Provides the ifpdf switch] +[2017/03/15 v3.2 Provides the ifpdf switch] \expandafter\ifx\csname ifpdf\endcsname\relax \csname newif\expandafter\endcsname\csname ifpdf\endcsname \else diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty index ab001ad2b7f..3abd5898476 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/21 v0.22 +%% Version: 2017/03/19 v0.25 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)]% + [2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -479,20 +479,22 @@ \else \expandafter\pdftexcmds@AtEnd \fi% -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax - \def\TMP@RequirePackage#1[#2]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname ver@#1.sty\endcsname\relax - \input #1.sty\relax - \fi - }% - \TMP@RequirePackage{luatex-loader}[2009/04/10]% -\else - \RequirePackage{luatex-loader}[2009/04/10]% +\ifnum\luatexversion<80 + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{luatex-loader}[2009/04/10]% + \else + \RequirePackage{luatex-loader}[2009/04/10]% + \fi \fi \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% } \ifnum\luatexversion>37 % \ifnum0% @@ -504,13 +506,13 @@ \everyjob\expandafter{% \the\everyjob \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% }% }% \fi \fi \begingroup - \def\x{2016/05/21 v0.22}% + \def\x{2017/03/19 v0.25}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -707,11 +709,8 @@ \fi \ifnum\luatexversion<68 % \else - \def\pdf@shellescape{% - \directlua0{% - oberdiek.pdftexcmds.shellescape()% - }% - }% + \protected\edef\pdf@shellescape{% + \numexpr\directlua{tex.sprint(status.shell_escape)}\relax} \fi \def\pdf@system#1{% \directlua0{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty index 2d49d9a2fcb..e4e2e07f1d0 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: hypdoc -%% Version: 2016/05/16 v1.12 +%% Version: 2016/10/02 v1.13 %% %% Copyright (C) 2002, 2006, 2007, 2009-2011 by %% Heiko Oberdiek @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2016/05/16 v1.12 Hyper extensions for doc.sty (HO)]% + [2016/10/02 v1.13 Hyper extensions for doc.sty (HO)]% \newif\ifHD@numbered \DeclareOption{numbered}{\HD@numberedtrue} \ProcessOptions*\relax @@ -149,7 +149,7 @@ \else \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@listoffigures}]% - {\contentsname}{toc\theHD@unique}% + {\listfigurename}{toc\theHD@unique}% \fi \begingroup \HD@sectionpatch @@ -162,7 +162,7 @@ \else \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@listoftables}]% - {\contentsname}{toc\theHD@unique}% + {\listtablename}{toc\theHD@unique}% \fi \begingroup \HD@sectionpatch @@ -244,7 +244,7 @@ \let\Hy@writebookmark\HDorg@writebookmark \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@glossary@prologue}]% - {\glossaryname}{glossary\theHD@unique}% + {\changehistoryname}{glossary\theHD@unique}% \endgroup \fi \HDorg@glossary@prologue @@ -252,6 +252,7 @@ \HDorg@theglossary } \providecommand*{\glossaryname}{Change History} +\providecommand*{\changehistoryname}{\glossaryname} \newcounter{HD@hypercount} \newlength{\HD@helplength} \newif\ifHD@savedest -- cgit v1.2.3