From bc1c525d19de0bd00e33e62eaa4dd1ed5466da25 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 30 Nov 2018 21:50:13 +0000 Subject: oberdiek (30nov18) git-svn-id: svn://tug.org/texlive/trunk@49285 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/oberdiek/askinclude.sty | 10 +++++-- .../texmf-dist/tex/latex/oberdiek/dtx-attach.sty | 6 ++-- Master/texmf-dist/tex/latex/oberdiek/luacolor.sty | 24 ++++------------ .../texmf-dist/tex/latex/oberdiek/transparent.sty | 33 ++++++++++++++++------ .../texmf-dist/tex/latex/oberdiek/zref-abspage.sty | 6 ++-- .../texmf-dist/tex/latex/oberdiek/zref-abspos.sty | 10 +++---- Master/texmf-dist/tex/latex/oberdiek/zref-base.sty | 4 +-- .../texmf-dist/tex/latex/oberdiek/zref-counter.sty | 6 ++-- .../texmf-dist/tex/latex/oberdiek/zref-dotfill.sty | 8 +++--- Master/texmf-dist/tex/latex/oberdiek/zref-env.sty | 6 ++-- .../tex/latex/oberdiek/zref-hyperref.sty | 6 ++-- .../tex/latex/oberdiek/zref-lastpage.sty | 8 +++--- .../texmf-dist/tex/latex/oberdiek/zref-marks.sty | 6 ++-- .../tex/latex/oberdiek/zref-nextpage.sty | 12 ++++---- .../tex/latex/oberdiek/zref-pageattr.sty | 12 ++++---- .../tex/latex/oberdiek/zref-pagelayout.sty | 8 +++--- .../texmf-dist/tex/latex/oberdiek/zref-perpage.sty | 19 ++++++++++--- Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty | 4 +-- .../texmf-dist/tex/latex/oberdiek/zref-savepos.sty | 6 ++-- .../texmf-dist/tex/latex/oberdiek/zref-thepage.sty | 8 +++--- .../tex/latex/oberdiek/zref-titleref.sty | 6 ++-- .../tex/latex/oberdiek/zref-totpages.sty | 10 +++---- Master/texmf-dist/tex/latex/oberdiek/zref-user.sty | 6 ++-- Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty | 6 ++-- Master/texmf-dist/tex/latex/oberdiek/zref.sty | 8 +++--- 25 files changed, 128 insertions(+), 110 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty index d3566fe022e..861d272b5f9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: askinclude -%% Version: 2016/05/14 v2.3 +%% Version: 2018/11/01 v2.4 %% %% Copyright (C) 1991-1994 by Pablo A. Straub %% Copyright (C) 2007, 2008, 2011 by @@ -98,9 +98,12 @@ \TMP@EnsureCode{96}{12}% ` \edef\AskInc@AtEnd{\AskInc@AtEnd\noexpand\endinput} \ProvidesPackage{askinclude}% - [2016/05/14 v2.3 Interactive asking of included files]% + [2018/11/01 v2.4 Interactive asking of included files]% \ifx\pdfextension\@undefined\else - \RequirePackage{luatex85} + \protected\def\pdflastobj {\numexpr\pdffeedback lastobj\relax} + \protected\def\pdfnames {\pdfextension names } + \protected\def\pdfobj {\pdfextension obj } + \let\pdfoutput \outputmode \fi \AtBeginDocument{% \let\AskInc@AtBeginDocument\@firstofone @@ -690,6 +693,7 @@ } \AtBeginDocument{\AskInc@MainQuestion} \AskInc@AtEnd% + \endinput %% %% End of file `askinclude.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty index f31785b0cb5..dd5c8c71184 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: embedfile -%% Version: 2016/05/15 v2.7 +%% Version: 2018/11/01 v2.8 %% %% Copyright (C) 2006-2011 by %% Heiko Oberdiek @@ -41,8 +41,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{dtx-attach} - [2016/05/15 v2.7 Embed \string\jobname.dtx (HO)]% -\RequirePackage{embedfile}[2016/05/15] + [2018/11/01 v2.8 Embed \string\jobname.dtx (HO)]% +\RequirePackage{embedfile}[2018/11/01] \embedfile[% stringmethod=escape,% mimetype=plain/text,% diff --git a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty index a09b5e628ce..4e93a218788 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: luacolor -%% Version: 2016/05/16 v1.10 +%% Version: 2018/11/22 v1.11 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek @@ -32,8 +32,7 @@ %% and the derived files %% luacolor.sty, luacolor.pdf, luacolor.ins, luacolor.drv, %% luacolor-test1.tex, luacolor-test2.tex, luacolor-test3.tex, -%% oberdiek.luacolor.lua, luacolor.lua, -%% oberdiek.luacolor-pre065.lua, luacolor-pre065.lua. +%% luacolor.lua, %% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -87,7 +86,7 @@ \edef\LuaCol@AtEnd{\LuaCol@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luacolor}% - [2016/05/16 v1.10 Color support via LuaTeX's attributes (HO)] + [2018/11/22 v1.11 Color support via LuaTeX's attributes (HO)] \RequirePackage{infwarerr}[2010/04/08]% \RequirePackage{ifluatex}[2010/03/01]% \RequirePackage{ifpdf}[2011/01/30]% @@ -95,10 +94,7 @@ \RequirePackage{color} \ifluatex \ifx\newattribute\@undefined - \ltx@ifpackageloaded{luatexbase-attr}{% - }{% - \RequirePackage{luatex}[2010/03/09]% - }% + \RequirePackage{ltluatex}% \fi \else \@PackageError{luacolor}{% @@ -106,11 +102,7 @@ }\@ehc \expandafter\LuaCol@AtEnd \fi% -\ifnum\luatexversion<36 % - \def\LuaCol@directlua{\directlua0 }% -\else \let\LuaCol@directlua\directlua -\fi \ifcolors@ \else \@PackageWarningNoLine{luacolor}{% @@ -123,10 +115,10 @@ \expandafter\LuaCol@AtEnd \fi% \LuaCol@directlua{% - require("oberdiek.luacolor\ifnum\luatexversion<65 -pre065\fi")% + require("luacolor")% } \begingroup - \edef\x{\LuaCol@directlua{tex.write("2016/05/16 v1.10")}}% + \edef\x{\LuaCol@directlua{tex.write("2018/11/22 v1.11")}}% \edef\y{% \LuaCol@directlua{% if oberdiek.luacolor.getversion then % @@ -208,18 +200,14 @@ \let\pdfxform\saveboxresource \fi \ltx@IfUndefined{pdfxform}{% - \ifnum\luatexversion>36 % \directlua{% tex.enableprimitives('',{% 'pdfxform','pdflastxform','pdfrefxform'% })% }% - \fi }{}% \ltx@IfUndefined{protected}{% - \ifnum\luatexversion>36 % \directlua{tex.enableprimitives('',{'protected'})}% - \fi }{}% \ltx@IfUndefined{pdfxform}{% \@PackageWarning{luacolor}{\string\pdfxform\space not found}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/transparent.sty b/Master/texmf-dist/tex/latex/oberdiek/transparent.sty index c00262b9576..9e084646e24 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/transparent.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/transparent.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: transparent -%% Version: 2016/05/16 v1.1 +%% Version: 2018/11/18 v1.3 %% %% Copyright (C) 2007 by %% Heiko Oberdiek @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{transparent}% - [2016/05/16 v1.1 Transparency via pdfTeX's color stack (HO)]% + [2018/11/18 v1.3 Transparency via pdfTeX's color stack (HO)]% \RequirePackage{ifpdf} \ifpdf \else @@ -44,13 +44,28 @@ }% \expandafter\endinput \fi -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfcolorstackinit\endcsname\relax +\ifx\pdfextension\@undefined + \let\TRP@pdfcolorstackinit\pdfcolorstackinit + \let\TRP@pdfpageresources\pdfpageresources + \let\TRP@pdfcolorstack\pdfcolorstack +\else + \def\TRP@pdfcolorstackinit {\pdffeedback colorstackinit} + \protected\edef\TRP@pdfpageresources {\pdfvariable pageresources} + \protected\def\TRP@pdfcolorstack {\pdfextension colorstack} +\fi +\ifcsname TRP@pdfcolorstackinit\endcsname\else \PackageWarningNoLine{transparent}{% Your pdfTeX version does not support color stacks% }% \expandafter\endinput \fi +\AtBeginDocument + {% + \ifcsname pgfutil@addpdfresource@extgs\endcsname + \let\TRP@addresource\relax + \pgfutil@addpdfresource@extgs{\TRP@list}% + \fi + } \RequirePackage{auxhook} \AddLineBeginAux{% \string\providecommand{\string\transparent@use}[1]{}% @@ -73,8 +88,8 @@ \def\TRP@addresource{% \begingroup \edef\x{\endgroup - \pdfpageresources{% - \the\pdfpageresources + \TRP@pdfpageresources{% + \the\TRP@pdfpageresources /ExtGState<<\TRP@list>>% }% }% @@ -82,7 +97,7 @@ } \newif\ifTRP@rerun \xdef\TRP@colorstack{% - \pdfcolorstackinit page direct{/TRP1 gs}% + \TRP@pdfcolorstackinit page direct{/TRP1 gs}% } \newcommand*{\transparent}[1]{% \begingroup @@ -126,14 +141,14 @@ \@ifundefined{TRP\transparent@current}{% \global\TRP@reruntrue }{% - \pdfcolorstack\TRP@colorstack push{% + \TRP@pdfcolorstack\TRP@colorstack push{% \csname TRP\transparent@current\endcsname }% \aftergroup\transparent@reset }% } \def\transparent@reset{% - \pdfcolorstack\TRP@colorstack pop\relax + \TRP@pdfcolorstack\TRP@colorstack pop\relax } \newcommand*{\texttransparent}[2]{% \protect\leavevmode diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index 2ef46b3d245..59129f25528 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2016/05/21 v2.26 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty index aaea3b1473a..5e4c75280a1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,18 +44,18 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspos}% - [2016/05/21 v2.26 Module abspos for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module abspos for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2016/05/21] +\RequirePackage{zref-savepos}[2018/11/21] \ifx\ZREF@savepos@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-pagelayout}[2016/05/21] +\RequirePackage{zref-pagelayout}[2018/11/21] \zref@addprop{savepos}{abspage} \RequirePackage{ifpdf}[2010/09/13] \newcommand*{\zref@absposx}[3]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index 38cb9fa2589..6dbbd6a800e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,7 +44,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2016/05/21 v2.26 Module base for zref (HO)]% + [2018/11/21 v2.27 Module base for zref (HO)]% \RequirePackage{ltxcmds}[2010/12/02] \RequirePackage{infwarerr}[2010/04/08] \RequirePackage{kvsetkeys}[2010/03/01] diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index 37b3ffcb588..082c7148ed7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2016/05/21 v2.26 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty index ea589fc538d..4766c4c18ce 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2016/05/21 v2.26 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2016/05/21] +\RequirePackage{zref-savepos}[2018/11/21] \zref@require@unique \RequirePackage{keyval} \define@key{ZREF@DF}{unit}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty index ae9ffa02c5d..d6c13c6fdb9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-env}% - [2016/05/21 v2.26 Module env for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module env for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty index 84b0ebea32a..72a1e36dd60 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2016/05/21 v2.26 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty index 7c9b44a2311..63fafd16dd6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,9 +44,9 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2016/05/21 v2.26 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] -\RequirePackage{zref-abspage}[2016/05/21] + [2018/11/21 v2.27 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] +\RequirePackage{zref-abspage}[2018/11/21] \RequirePackage{atveryend}[2009/12/07] \ifx\ZREF@base@ok Y% \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty index fd099804536..ec99f0a3eb6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2016/05/21 v2.26 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty index c4a06c74a09..805071af29f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,15 +44,15 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2016/05/21 v2.26 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2016/05/21] -\RequirePackage{zref-thepage}[2016/05/21] -\RequirePackage{zref-lastpage}[2016/05/21] +\RequirePackage{zref-abspage}[2018/11/21] +\RequirePackage{zref-thepage}[2018/11/21] +\RequirePackage{zref-lastpage}[2018/11/21] \RequirePackage{uniquecounter}[2009/12/18] \UniqueCounterNew{znextpage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty index a449d7f243a..ccd095440f7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pageattr}% - [2016/05/21 v2.26 Module pageattr for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module pageattr for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -86,7 +86,7 @@ \def\zref@pdfpageattr#1{}% \def\zref@pdfpageattr@used#1{}% }{% - \RequirePackage{zref-thepage}[2016/05/21]% + \RequirePackage{zref-thepage}[2018/11/21]% \zref@newprop*{pdfpageattr}[]{\zref@hex{\the\pdfpageattr}}% \zref@addprop{thepage}{pdfpageattr}% \let\ZREF@temp=Y% @@ -98,7 +98,7 @@ \def\zref@pdfpagesattr{}% \def\zref@pdfpagesattr@used{}% }{% - \RequirePackage{zref-lastpage}[2016/05/21]% + \RequirePackage{zref-lastpage}[2018/11/21]% \zref@newprop*{pdfpagesattr}[]{\zref@hex{\the\pdfpagesattr}}% \zref@addprop{LastPage}{pdfpagesattr}% \let\ZREF@temp=Y% @@ -106,7 +106,7 @@ \ifx\ZREF@temp N% \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2016/05/21] +\RequirePackage{zref-abspage}[2018/11/21] \RequirePackage{atveryend}[2010/03/24] \RequirePackage{pdftexcmds}[2010/04/01] \let\ZREF@temp=Y% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty index e35ae6e767f..9d7b68d6c0b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pagelayout}% - [2016/05/21 v2.26 Module pagelayout for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module pagelayout for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-thepage}[2016/05/21] +\RequirePackage{zref-thepage}[2018/11/21] \RequirePackage{ifluatex}[2010/03/01] \RequirePackage{atveryend}[2010/03/24] \ifluatex diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index b8e6ea15315..91d43276827 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2016/05/21 v2.26 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2016/05/21] +\RequirePackage{zref-abspage}[2018/11/21] \ZREF@NewPropPageValue \zref@newlist{perpage} \zref@addprops{perpage}{abspage,page,pagevalue} @@ -63,6 +63,17 @@ \fi \ZREF@org@stepcounter{#1}% } +\let\ZREF@org@@stpelt\@stpelt +\def\@stpelt#1{% + \ifcsname ZREF@perpage@#1\endcsname + \begingroup + \let\stepcounter\ZREF@org@stepcounter + \ZREF@org@@stpelt{#1}% + \endgroup + \expandafter\ltx@gobbletwo + \fi + \ZREF@org@@stpelt{#1}% +} \ZREF@IfDefinable\zmakeperpage\def{% {% \@ifnextchar[\ZREF@makeperpage@opt{\ZREF@@makeperpage[\ltx@zero]}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty index 82f072f27d3..a95e441f010 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,7 +44,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2016/05/21 v2.26 Module runs for zref (HO)]% + [2018/11/21 v2.27 Module runs for zref (HO)]% \providecommand*{\zruns}{0}% \AtBeginDocument{% \edef\zruns{\number\numexpr\zruns+1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty index 8927061f35e..f0b61ebc4b9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2016/05/21 v2.26 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty index a73fed0aa43..daa8fb18b4b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,14 +44,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2016/05/21 v2.26 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi \RequirePackage{atbegshi}[2011/10/05] -\RequirePackage{zref-abspage}[2016/05/21] +\RequirePackage{zref-abspage}[2018/11/21] \zref@newlist{thepage} \zref@addprop{thepage}{page} \ZREF@NewPropPageValue diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 222d9242638..5ec2057df02 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2016/05/21 v2.26 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 015fb4f3735..c5d8cd16358 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,14 +44,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2016/05/21 v2.26 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2016/05/21] -\RequirePackage{zref-lastpage}[2016/05/21] +\RequirePackage{zref-abspage}[2018/11/21] +\RequirePackage{zref-lastpage}[2018/11/21] \newcommand*{\ztotpages}{% \zref@extractdefault{LastPage}{abspage}{0}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty index ccffa5e91e7..39890d29f81 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2016/05/21 v2.26 Module user for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module user for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 18788a98e23..24f63b03e48 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,8 +44,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2016/05/21 v2.26 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2018/11/21] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index b8a8b20ab82..b18e3c5afc0 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2016/05/21 v2.26 +%% Version: 2018/11/21 v2.27 %% %% Copyright (C) 2006-2012 by %% Heiko Oberdiek @@ -44,13 +44,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2016/05/21 v2.26 A new reference scheme for LaTeX (HO)]% -\RequirePackage{zref-base}[2016/05/21] + [2018/11/21 v2.27 A new reference scheme for LaTeX (HO)]% +\RequirePackage{zref-base}[2018/11/21] \@ifundefined{ZREF@base@ok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2016/05/21]% + \RequirePackage{zref-#1}[2018/11/21]% }% }% } -- cgit v1.2.3